- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r3472 - in freeswitch/trunk/src/mod/languages: mod_spidermonkey mod_spidermonkey_core_db mod_spidermonkey_teletone
by Freeswitch SVN 28 Nov '06

28 Nov '06

Author: anthm Date: Tue Nov 28 15:52:04 2006 New Revision: 3472 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c Log: fix a few js issues Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Nov 28 15:52:04 2006 @@ -409,7 +409,7 @@ } -static switch_status_t sm_load_file(char *filename, sm_loadable_module_t **new_module) +static switch_status_t sm_load_file(char *filename) { sm_loadable_module_t *module = NULL; apr_dso_handle_t *dso = NULL; @@ -424,7 +424,6 @@ assert(filename != NULL); - *new_module = NULL; status = apr_dso_load(&dso, filename, module_manager.pool); while (loading) { @@ -447,7 +446,7 @@ break; } - if ((module = switch_core_permanent_alloc(sizeof(sm_loadable_module_t))) == 0) { + if (!(module = (sm_loadable_module_t *) switch_core_permanent_alloc(sizeof(*module)))) { err = "Could not allocate memory\n"; break; } @@ -465,11 +464,10 @@ module->module_interface = module_interface; module->lib = dso; - *new_module = module; switch_core_hash_insert(module_manager.mod_hash, (char *) module->filename, (void *) module); - for (mp = module_interface; mp; mp = mp->next) { + for (mp = module->module_interface; mp; mp = mp->next) { switch_core_hash_insert(module_manager.load_hash, (char *)mp->name, (void *) mp); } @@ -484,7 +482,6 @@ switch_size_t len = 0; char *path; char *file; - sm_loadable_module_t *new_module = NULL; #ifdef WIN32 const char *ext = ".dll"; @@ -517,7 +514,7 @@ } } - return sm_load_file(path, &new_module); + return sm_load_file(path); } static switch_status_t load_modules(void) @@ -961,6 +958,13 @@ } } + if (argc > 4) { + int32 samps; + uint32_t pos = 0; + JS_ValueToInt32(cx, argv[4], &samps); + switch_core_file_seek(&fh, &pos, samps, SEEK_CUR); + } + memset(&fh, 0, sizeof(fh)); cb_state.extra = &fh; cb_state.ret = BOOLEAN_TO_JSVAL( JS_FALSE ); @@ -1214,13 +1218,13 @@ char *app_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); char *app_arg = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); struct js_session *jss = JS_GetPrivate(cx, obj); - jsrefcount saveDepth; + //jsrefcount saveDepth; if ((application_interface = switch_loadable_module_get_application_interface(app_name))) { if (application_interface->application_function) { - saveDepth = JS_SuspendRequest(cx); + //saveDepth = JS_SuspendRequest(cx); application_interface->application_function(jss->session, app_arg); - JS_ResumeRequest(cx, saveDepth); + //JS_ResumeRequest(cx, saveDepth); retval = JS_TRUE; } } Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c Tue Nov 28 15:52:04 2006 @@ -31,7 +31,7 @@ */ #include "mod_spidermonkey.h" -static const char modname[] = "DB"; +static const char modname[] = "CoreDB"; struct db_obj { switch_memory_pool_t *pool; @@ -148,10 +148,9 @@ { struct db_obj *dbo = JS_GetPrivate(cx, obj); *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); - - if (dbo->stmt) { - int running = 1; + if (dbo->stmt) { + int running = 1; while (running < 5000) { int result = switch_core_db_step(dbo->stmt); if (result == SQLITE_ROW) { @@ -210,10 +209,9 @@ dbo->stmt = NULL; } - if (argc > 0) { + if (argc > 0) { char *sql = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); - - if(switch_core_db_prepare(dbo->db, sql, 0, &dbo->stmt, 0)) { + if(switch_core_db_prepare(dbo->db, sql, -1, &dbo->stmt, 0)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error %s\n", switch_core_db_errmsg(dbo->db)); } else { *rval = BOOLEAN_TO_JSVAL( JS_TRUE ); @@ -266,18 +264,14 @@ } JSClass db_class = { - "DB", JSCLASS_HAS_PRIVATE, + modname, JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub, db_getProperty, JS_PropertyStub, JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, db_destroy, NULL, NULL, NULL, db_construct }; - - - - -switch_status_t spidermonkey_load(JSContext *cx, JSObject *obj) +switch_status_t db_load(JSContext *cx, JSObject *obj) { JS_InitClass(cx, @@ -291,14 +285,13 @@ db_props, db_methods ); - return SWITCH_STATUS_SUCCESS; } const sm_module_interface_t DB_module_interface = { /*.name = */ modname, - /*.spidermonkey_load*/ spidermonkey_load, + /*.spidermonkey_load*/ db_load, /*.next*/ NULL }; Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c Tue Nov 28 15:52:04 2006 @@ -357,7 +357,7 @@ }; -switch_status_t spidermonkey_load(JSContext *cx, JSObject *obj) +switch_status_t teletone_load(JSContext *cx, JSObject *obj) { JS_InitClass(cx, obj, @@ -376,7 +376,7 @@ const sm_module_interface_t teletone_module_interface = { /*.name = */ modname, - /*.spidermonkey_load*/ spidermonkey_load, + /*.spidermonkey_load*/ teletone_load, /*.next*/ NULL };

1 0

[commit] r3471 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 28 Nov '06

28 Nov '06

Author: ptinsley Date: Tue Nov 28 15:20:22 2006 New Revision: 3471 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: Fix a few overflow problems Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Tue Nov 28 15:20:22 2006 @@ -579,9 +579,9 @@ holder.print_title = 0; if ((cmdname = strchr(cmd, ' ')) != 0) { *cmdname++ = '\0'; - sprintf (sql, "select name, syntax, description from interfaces where type = 'api' and name = '%s'", cmdname); + snprintf (sql, sizeof(sql) - 1, "select name, syntax, description from interfaces where type = 'api' and name = '%s'", cmdname); } else { - sprintf (sql, "select name, syntax, description from interfaces where type = 'api'"); + snprintf (sql, sizeof(sql) - 1, "select name, syntax, description from interfaces where type = 'api'"); } } else { stream->write_function(stream, "USAGE: %s\n", show_api_interface.syntax); @@ -633,7 +633,7 @@ sprintf (showcmd, "help"); all = 1; } else { - sprintf (showcmd, "help %s", cmd); + snprintf(showcmd, sizeof(showcmd) -1, "help %s", cmd); } if (all) {

1 0

[commit] r3470 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 28 Nov '06

28 Nov '06

Author: ptinsley Date: Tue Nov 28 14:33:54 2006 New Revision: 3470 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: Get rid of the hard coded console help output, and add an api version command for fun. Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Tue Nov 28 14:33:54 2006 @@ -26,12 +26,14 @@ * Anthony Minessale II <anthmct(a)yahoo.com> * Michael Jerris <mike(a)jerris.com> * Johny Kadarisman <jkr888(a)gmail.com> + * Paul Tinsley <jackhammer(a)gmail.com> * * * mod_commands.c -- Misc. Command Module * */ #include <switch.h> +#include <switch_version.h> static const char modname[] = "mod_commands"; static switch_api_interface_t ctl_api_interface; @@ -614,6 +616,15 @@ return SWITCH_STATUS_SUCCESS; } +static switch_status_t version_function(char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream) +{ + char version_string[1024]; + snprintf(version_string, sizeof(version_string) - 1, "FreeSwitch Version %s\n", SWITCH_VERSION_FULL); + + stream->write_function(stream, version_string); + return SWITCH_STATUS_SUCCESS; +} + static switch_status_t help_function(char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream) { char showcmd[1024]; @@ -631,19 +642,23 @@ show_function(showcmd, session, stream); - if (all) { - stream->write_function(stream, "version\n" "shutdown - stop the program\n"); - } - return SWITCH_STATUS_SUCCESS; } +static switch_api_interface_t version_api_interface = { + /*.interface_name */ "version", + /*.desc */ "Show version of the switch", + /*.function */ version_function, + /*.syntax */ "", + /*.next */ NULL +}; + static switch_api_interface_t help_api_interface = { /*.interface_name */ "help", /*.desc */ "Show help for all the api commands", /*.function */ help_function, /*.syntax */ "", - /*.next */ NULL + /*.next */ &version_api_interface, }; static switch_api_interface_t ctl_api_interface = {

1 0

[commit] r3469 - freeswitch/trunk/support
by Freeswitch SVN 28 Nov '06

28 Nov '06

Author: brian Date: Tue Nov 28 14:07:29 2006 New Revision: 3469 Modified: freeswitch/trunk/support/freeswitch.pub Log: update public key Modified: freeswitch/trunk/support/freeswitch.pub ============================================================================== --- freeswitch/trunk/support/freeswitch.pub (original) +++ freeswitch/trunk/support/freeswitch.pub Tue Nov 28 14:07:29 2006 @@ -1 +1 @@ -ssh-dss AAAAB3NzaC1kc3MAAAEBAOWKsqPrtDlTVwuZa2GnGR9iTqPGI5dfHRwiJ33WVUIz5LdwqwDPQ1799cF1282YCL6eH55EXODUNskMWdmCe4lqFbW35aCepOL917p7oaf8KchWA5KRNyySlydr2WS51jNpZ47yICrf51nuBgmKchTh0AuBB50PcVff0SOvTuhTAdDdId6gsELdzLHDb+uSPdV77puQRhk7E5t1gy5y3Kfdz5SznCd+FLocYdliWSkduq04B6vZKc1fGkdu4zOfXy7dLp3ISj9Ci3AEqTnB7Ov9xpx5rkhbLDNmkac480IYdMw1M1JHRdK56uAzZgcwOetrN6K/6faBgKcPHDE2SwMAAAAVAN+ipXk7qhjA2SF20p02ZNrcEXujAAABAQDOwfZ22lfjnwkxgIgZjjdIAX0711e30UMyjQvCl2eKaLFharVMyzMFKER1hdjkd2UiU/rKgTKf/9qh8a6gqzaY5O19ZenXlPvVmgLLmwk21vGGrvXEVlacv18JdrkBharZbIrWx+TnxL0iJ7mKtxfafAJRpUMW+Jt9cklAVKOWAnLbXHZisbGamzjUnEfZrsdJl90MQ+3by2htBSdv3lVEXIuqw0duWNj23mW9BN2l3U6uumDFVjNSxf6apppekeprzXn1NXbPTgXp50ejGYnZWm0/sq1zB7ENMnsvpthrxTSeckTDkNVaoV+klJuMDUt1RTSxZQQS776+CcOIxXb5AAABAQCoa7+B2WPk/tToNoI9exb7UVmBYVmdWyIG+9q4apI1AA4VRz2HGqK233qe38VHsDjE8G7chXJrlu9RVHIvRVgZYjtBkLgPBPhcOFrrW/1TjrYLbIVJp/2fIHAZP41pbofwP/Mw8rgmoftWDMh4nx7zEYdGwxz9azgQWPKpPGf0SxLWaIjFqKsB2CFp/uAuMD6+g8LEf30hJ+tCsY4VY0zGGq8Ivofflqt1ZW/1g3AhZSH8DGp1hfOt3o3ZqPd7xg0T1RK+IHgy4FK2np1S7eavPw7fZ6L7QbYIJC5zoCq9IshmrGfSebkUH1XgSUdmDNdFXxHEueej9P79VpKDPtnW FreeSWITCH Public SSH Key +ssh-dss AAAAB3NzaC1kc3MAAAEBALai7vFlKP9jcy8tb/UTvCvVUN5rCiPTux8vjaWY3uZAbGvfeKtbRLeSI1LGkujh/WRJTZdgRYyHaB0SqnR0Ifesw+bD0n4vhH64inESSVaCmgKaAblBiDloVxZNIa6KMzmCXoXLogSHD6FD/r1/LBvRV3Fsk7YwATltMzwug2tZxeKQBaRbsSYtwKR/7KdIlN9R3ieXaesEjvYgxcp/6UN8VOqqgxi6uHnBSYFhpOOXqFAm1Q92eC3NBtxD6KBjWzJmI4WgLTrVLXfUkVmWqkLtKLovpj4oMtM1pGk8rmb1N+vkB57utqpPqrQdgqMUMvPCufb7shHfwoA755yw/1MAAAAVAOCIbu71sK9dCY6sBPZEvDzIpvkjAAABAQCcGCIjWd+0U5LwYIRZjpicsWgetIvd0vTJ6/6mZwfEpB64IV3yqMOlzA/oOTjCHErs2insz0l6FqAVSp2BbQMD13ZULTuhb8G0Rlh2kwXJvFx+JVsJ+j1SMOJPaLp6ZN1xTQXJ3j+fmvLAzd3cPE/XHWOuvvCCmKV2sIA+nti6gR8WcqTyWrbWuooVBMRwTkajS7qZfwVZxtIvVvAh3FF9DtDfrECLMJ0dOg5W0aTtwqRIsL2f1QMI0pXQqrr+v6rQ+ml7L6fvcJQ1zXqk+zCqKBexG98q3p3MQfNEwusQuQ7WtK31crCPryTMjCo0rHbvo3akJEEraeSQLl1PBNP5AAABAA29RnQ6Yt/DaTq8F057IzI6dX2JSbUaAr26qXV05F6Tsm18PsBaTSaur/FSlGf5DovXwMGvWCg1aZpdOd6fAsrcFXomNH/lHaEqr55qn5zKEsImUD7+gmZl32syLPZLa+qTwARqAqk6WAK3j+6Q/QxsAJpLjmKwvvUMWFLbDWjYEWdUSvaBWACBop0qd6Xy1VVu28EYZeZAAiGKg93P1K3a0Ji0gUS+C+zZ/JwMtRQZXQXgiAOooawechf/SDuSnszrANQlk/2T+uQrN87HJrvLlx+p9TIGfu9NrcAPDsdAbKPZOwEaz+WniccMqGNha0wcSYXLSa1EHCyB3Y80FDM= FreeSWITCH Public SSH Key

1 0

[commit] r3467 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 28 Nov '06

28 Nov '06

Author: anthm Date: Tue Nov 28 11:45:25 2006 New Revision: 3467 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: add some vard Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Tue Nov 28 11:45:25 2006 @@ -2344,7 +2344,7 @@ to_host = (char *) to->a_url->url_host; } - + if (!to_user) { return; } @@ -3926,7 +3926,9 @@ char *username, *to_username = NULL; char *url_user = (char *) from->a_url->url_user; char *to_user, *to_host, *to_port; - + char *req_user, *req_host, *req_port; + char uri[1024]; + if (!(tech_pvt = (private_object_t *) switch_core_session_alloc(session, sizeof(private_object_t)))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Hey where is my memory pool?\n"); terminate_session(&session, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER, __LINE__); @@ -4006,9 +4008,31 @@ switch_channel_set_variable(channel, "sip_from_host", (char *) from->a_url->url_host); switch_channel_set_variable(channel, "sip_from_port", (char *) from->a_url->url_port); - switch_channel_set_variable(channel, "sip_to_user", (char *) to_user); + + snprintf(uri, sizeof(uri), "%s@%s:%s", (char *) from->a_url->url_user, (char *) from->a_url->url_host, (char *) from->a_url->url_port); + switch_channel_set_variable(channel, "sip_from_uri", uri); + + + switch_channel_set_variable(channel, "sip_to_user", to_user); switch_channel_set_variable(channel, "sip_to_host", to_host); - switch_channel_set_variable(channel, "sip_to_port", (char *) to_port); + switch_channel_set_variable(channel, "sip_to_port", to_port); + + snprintf(uri, sizeof(uri), "%s@%s:%s", to_user, to_host, to_port); + switch_channel_set_variable(channel, "sip_to_uri", uri); + + + req_user = (char *) sip->sip_request->rq_url->url_user; + req_host = (char *) sip->sip_request->rq_url->url_host; + req_port = (char *) sip->sip_request->rq_url->url_port; + + switch_channel_set_variable(channel, "sip_req_user", req_user); + switch_channel_set_variable(channel, "sip_req_host", req_host); + switch_channel_set_variable(channel, "sip_req_port", req_port); + + snprintf(uri, sizeof(uri), "%s@%s:%s", req_user, req_host, req_port); + switch_channel_set_variable(channel, "sip_req_uri", uri); + + if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), (char *) from->a_url->url_user, profile->dialplan,

1 0

[commit] r3463 - in freeswitch/trunk/src: . mod/applications/mod_dptools
by Freeswitch SVN 28 Nov '06

28 Nov '06

Author: anthm Date: Mon Nov 27 21:23:26 2006 New Revision: 3463 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core.c Log: fix obscure bs, remove CR from dptools, add info app Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Mon Nov 27 21:23:26 2006 @@ -1,425 +1,465 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * - * The Initial Developer of the Original Code is - * Anthony Minessale II <anthmct(a)yahoo.com> - * Portions created by the Initial Developer are Copyright (C) - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Anthony Minessale II <anthmct(a)yahoo.com> - * Ken Rice, Asteria Solutions Group, Inc <ken(a)asteriasgi.com> - * Michael Murdock <mike at mmurdock dot org> - * - * - * mod_dptools.c -- Raw Audio File Streaming Application Module - * - */ -#include <switch.h> - -static const char modname[] = "mod_dptools"; - -static const switch_application_interface_t detect_speech_application_interface; - -static void detect_speech_function(switch_core_session_t *session, char *data) -{ - char *argv[4]; - int argc; - char *lbuf = NULL; - - if ((lbuf = switch_core_session_strdup(session, data)) && (argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { - if (!strcasecmp(argv[0], "grammar") && argc >= 1) { - switch_ivr_detect_speech_load_grammar(session, argv[1], argv[2]); - } else if (!strcasecmp(argv[0], "nogrammar")) { - switch_ivr_detect_speech_unload_grammar(session, argv[1]); - } else if (!strcasecmp(argv[0], "pause")) { - switch_ivr_pause_detect_speech(session); - } else if (!strcasecmp(argv[0], "resume")) { - switch_ivr_resume_detect_speech(session); - } else if (!strcasecmp(argv[0], "stop")) { - switch_ivr_stop_detect_speech(session); - } else if (argc >= 3) { - switch_ivr_detect_speech(session, argv[0], argv[1], argv[2], argv[3], NULL); - } - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", detect_speech_application_interface.syntax); - } - -} - -static void ringback_function(switch_core_session_t *session, char *data) -{ - switch_channel_t *channel; - channel = switch_core_session_get_channel(session); - assert(channel != NULL); - switch_channel_ringback(channel); -} - -static void transfer_function(switch_core_session_t *session, char *data) -{ - int argc; - char *argv[4] = {0}; - char *mydata; - - if ((mydata = switch_core_session_strdup(session, data))) { - if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) >= 1) { - switch_ivr_session_transfer(session, argv[0], argv[1], argv[2]); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No extension specified.\n"); - } - } -} - -static void sleep_function(switch_core_session_t *session, char *data) -{ - - if (switch_strlen_zero(data)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No timeout specified.\n"); - } else { - uint32_t ms = atoi(data); - switch_ivr_sleep(session, ms); - } -} - -static void eval_function(switch_core_session_t *session, char *data) -{ - return; -} - -static void answer_function(switch_core_session_t *session, char *data) -{ - switch_channel_t *channel; - channel = switch_core_session_get_channel(session); - assert(channel != NULL); - switch_channel_answer(channel); -} - -static void set_function(switch_core_session_t *session, char *data) -{ - switch_channel_t *channel; - char *var, *val = NULL; - - channel = switch_core_session_get_channel(session); - assert(channel != NULL); - - if (switch_strlen_zero(data)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No variable name specified.\n"); - } else { - var = switch_core_session_strdup(session, data); - val = strchr(var, '='); - - if (val) { - *val++ = '\0'; - if (!strcmp(val, "_UNDEF_")) { - val = NULL; - } - } - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SET [%s]=[%s]\n", var, val ? val : "UNDEF"); - switch_channel_set_variable(channel, var, val); - } -} - -static void log_function(switch_core_session_t *session, char *data) -{ - switch_channel_t *channel; - channel = switch_core_session_get_channel(session); - assert(channel != NULL); - - if (!switch_strlen_zero(data)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s\n", data); - } -} - -static void privacy_function(switch_core_session_t *session, char *data) -{ - switch_channel_t *channel; - switch_caller_profile_t *caller_profile; - char *arg; - - channel = switch_core_session_get_channel(session); - assert(channel != NULL); - - caller_profile = switch_channel_get_caller_profile(channel); - - if (switch_strlen_zero(data)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No privacy mode specified.\n"); - } else { - arg = switch_core_session_strdup(session, data); - - switch_set_flag(caller_profile, SWITCH_CPF_SCREEN); - - if(!strcasecmp(arg, "no")) { - switch_clear_flag(caller_profile, SWITCH_CPF_HIDE_NAME); - switch_clear_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER); - } else if (!strcasecmp(arg, "yes")) { - switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NAME | SWITCH_CPF_HIDE_NUMBER); - } else if (!strcasecmp(arg, "full")) { - switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NAME | SWITCH_CPF_HIDE_NUMBER); - } else if (!strcasecmp(arg, "name")) { - switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NAME); - } else if (!strcasecmp(arg, "number")) { - switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID privacy mode specified. Use a valid mode [no|yes|name|full|number].\n"); - } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set Privacy to %s [%d]\n", arg, caller_profile->flags); - } -} - -static void strftime_function(switch_core_session_t *session, char *data) -{ - char *argv[2]; - int argc; - char *lbuf; - - if ((lbuf = switch_core_session_strdup(session, data))&&(argc = switch_separate_string(lbuf, '=', argv, (sizeof(argv) / sizeof(argv[0])))) > 1) { - switch_size_t retsize; - switch_time_exp_t tm; - char date[80] = ""; - switch_channel_t *channel; - - channel = switch_core_session_get_channel(session); - assert(channel != NULL); - - switch_time_exp_lt(&tm, switch_time_now()); - switch_strftime(date, &retsize, sizeof(date), argv[1], &tm); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SET [%s]=[%s]\n", argv[0], date); - switch_channel_set_variable(channel, argv[0], date); - } -} - -static switch_status_t strftime_api_function(char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream) -{ - switch_size_t retsize; - switch_time_exp_t tm; - char date[80] = ""; - - switch_time_exp_lt(&tm, switch_time_now()); - switch_strftime(date, &retsize, sizeof(date), fmt, &tm); - stream->write_function(stream, date); - - return SWITCH_STATUS_SUCCESS; -} - -static switch_status_t presence_api_function(char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream) -{ - switch_event_t *event; - char *lbuf, *argv[4]; - int argc = 0; - switch_event_types_t type = SWITCH_EVENT_PRESENCE_IN; - - if (fmt && (lbuf = strdup(fmt)) && (argc = switch_separate_string(lbuf, '|', argv, (sizeof(argv) / sizeof(argv[0])))) > 0) { - if (!strcasecmp(argv[0], "out")) { - type = SWITCH_EVENT_PRESENCE_OUT; - } else if (argc != 4) { - stream->write_function(stream, "Invalid"); - return SWITCH_STATUS_SUCCESS; - } - - if (switch_event_create(&event, type) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", "dp"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", __FILE__); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", argv[1]); - if (type == SWITCH_EVENT_PRESENCE_IN) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "rpid", "%s", argv[2]); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "%s", argv[3]); - } - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); - switch_event_fire(&event); - } - stream->write_function(stream, "Event Sent"); - switch_safe_free(lbuf); - } else { - stream->write_function(stream, "Invalid"); - } - - return SWITCH_STATUS_SUCCESS; -} - - -static switch_status_t chat_api_function(char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream) -{ - char *lbuf, *argv[4]; - int argc = 0; - - if ((lbuf = strdup(fmt)) && (argc = switch_separate_string(lbuf, '|', argv, (sizeof(argv) / sizeof(argv[0])))) == 4) { - switch_chat_interface_t *ci; - - if ((ci = switch_loadable_module_get_chat_interface(argv[0]))) { - ci->chat_send("dp", argv[1], argv[2], "", argv[3], ""); - stream->write_function(stream, "Sent"); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invaid Chat Interface [%s]!\n", argv[0]); - } - } else { - stream->write_function(stream, "Invalid"); - } - - return SWITCH_STATUS_SUCCESS; -} - - -static switch_api_interface_t chat_api_interface = { - /*.interface_name */ "chat", - /*.desc */ "chat", - /*.function */ chat_api_function, - /*.syntax */ "<proto>|<from>|<to>|<message>", - /*.next */ NULL -}; - -static switch_api_interface_t dptools_api_interface = { - /*.interface_name */ "strftime", - /*.desc */ "strftime", - /*.function */ strftime_api_function, - /*.syntax */ "<format_string>", - /*.next */ &chat_api_interface -}; - -static switch_api_interface_t presence_api_interface = { - /*.interface_name */ "presence", - /*.desc */ "presence", - /*.function */ presence_api_function, - /*.syntax */ "<user> <rpid> <message>", - /*.next */ &dptools_api_interface -}; - -static const switch_application_interface_t detect_speech_application_interface = { - /*.interface_name */ "detect_speech", - /*.application_function */ detect_speech_function, - /* long_desc */ "Detect speech on a channel.", - /* short_desc */ "Detect speech", - /* syntax */ "<mod_name> <gram_name> <gram_path> [<addr>] OR grammar <gram_name> [<path>] OR pause OR resume", - /*.next */ NULL -}; - -static const switch_application_interface_t ringback_application_interface = { - /*.interface_name */ "ringback", - /*.application_function */ ringback_function, - /* long_desc */ "Indicate Ringback on a channel.", - /* short_desc */ "Indicate Ringback", - /* syntax */ "", - /*.next */ &detect_speech_application_interface -}; - -static const switch_application_interface_t set_application_interface = { - /*.interface_name */ "set", - /*.application_function */ set_function, - /* long_desc */ "Set a channel varaible for the channel calling the application.", - /* short_desc */ "Set a channel varaible", - /* syntax */ "<varname>=[<value>|_UNDEF_]", - /*.next */ &ringback_application_interface -}; - -static const switch_application_interface_t log_application_interface = { - /*.interface_name */ "log", - /*.application_function */ log_function, - /* long_desc */ "Logs a channel varaible for the channel calling the application.", - /* short_desc */ "Logs a channel varaible", - /* syntax */ "<varname>", - /*.next */ &set_application_interface -}; - -static const switch_application_interface_t answer_application_interface = { - /*.interface_name */ "answer", - /*.application_function */ answer_function, - /* long_desc */ "Answer the call for a channel.", - /* short_desc */ "Answer the call", - /* syntax */ "", - /*.next */ &log_application_interface - -}; - -static const switch_application_interface_t eval_application_interface = { - /*.interface_name */ "eval", - /*.application_function */ eval_function, - /* long_desc */ "Do Nothing", - /* short_desc */ "Do Nothing", - /* syntax */ "", - /*.next */ &answer_application_interface - -}; - -static const switch_application_interface_t strftime_application_interface = { - /*.interface_name */ "strftime", - /*.application_function */ strftime_function, - /* long_desc */ NULL, - /* short_desc */ NULL, - /* syntax */ NULL, - /*.next */ &eval_application_interface - -}; - -static const switch_application_interface_t sleep_application_interface = { - /*.interface_name */ "sleep", - /*.application_function */ sleep_function, - /* long_desc */ "Pause the channel for a given number of milliseconds, consuming the audio for that period of time.", - /* short_desc */ "Pause a channel", - /* syntax */ "<pausemilliseconds>", - /* next */ &strftime_application_interface -}; - -static const switch_application_interface_t transfer_application_interface = { - /*.interface_name */ "transfer", - /*.application_function */ transfer_function, - /* long_desc */ "Immediatly transfer the calling channel to a new extension", - /* short_desc */ "Transfer a channel", - /* syntax */ "<exten> [<dialplan> <context>]", - /* next */ &sleep_application_interface -}; - -static const switch_application_interface_t privacy_application_interface = { - /*.interface_name */ "privacy", - /*.application_function */ privacy_function, - /* long_desc */ "Set caller privacy on calls.", - /* short_desc */ "Set privacy on calls", - /* syntax */ "off|on|name|full|number", - /*.next */ &transfer_application_interface -}; - -static const switch_loadable_module_interface_t mod_dptools_module_interface = { - /*.module_name = */ modname, - /*.endpoint_interface = */ NULL, - /*.timer_interface = */ NULL, - /*.dialplan_interface = */ NULL, - /*.codec_interface = */ NULL, - /*.application_interface */ &privacy_application_interface, - /*.api_interface */ &presence_api_interface -}; - -SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) -{ - - /* connect my internal structure to the blank pointer passed to me */ - *module_interface = &mod_dptools_module_interface; - - - /* indicate that the module should continue to be loaded */ - return SWITCH_STATUS_SUCCESS; -} - -/* 'switch_module_runtime' will start up in a thread by itself just by having it exist -if it returns anything but SWITCH_STATUS_TERM it will be called again automaticly -*/ - - -//switch_status_t switch_module_runtime(void) +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Anthony Minessale II <anthmct(a)yahoo.com> + * Ken Rice, Asteria Solutions Group, Inc <ken(a)asteriasgi.com> + * Michael Murdock <mike at mmurdock dot org> + * + * + * mod_dptools.c -- Raw Audio File Streaming Application Module + * + */ +#include <switch.h> + +static const char modname[] = "mod_dptools"; + +static const switch_application_interface_t detect_speech_application_interface; + +static void detect_speech_function(switch_core_session_t *session, char *data) +{ + char *argv[4]; + int argc; + char *lbuf = NULL; + + if ((lbuf = switch_core_session_strdup(session, data)) && (argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { + if (!strcasecmp(argv[0], "grammar") && argc >= 1) { + switch_ivr_detect_speech_load_grammar(session, argv[1], argv[2]); + } else if (!strcasecmp(argv[0], "nogrammar")) { + switch_ivr_detect_speech_unload_grammar(session, argv[1]); + } else if (!strcasecmp(argv[0], "pause")) { + switch_ivr_pause_detect_speech(session); + } else if (!strcasecmp(argv[0], "resume")) { + switch_ivr_resume_detect_speech(session); + } else if (!strcasecmp(argv[0], "stop")) { + switch_ivr_stop_detect_speech(session); + } else if (argc >= 3) { + switch_ivr_detect_speech(session, argv[0], argv[1], argv[2], argv[3], NULL); + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", detect_speech_application_interface.syntax); + } + +} + +static void ringback_function(switch_core_session_t *session, char *data) +{ + switch_channel_t *channel; + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + switch_channel_ringback(channel); +} + +static void transfer_function(switch_core_session_t *session, char *data) +{ + int argc; + char *argv[4] = {0}; + char *mydata; + + if ((mydata = switch_core_session_strdup(session, data))) { + if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) >= 1) { + switch_ivr_session_transfer(session, argv[0], argv[1], argv[2]); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No extension specified.\n"); + } + } +} + +static void sleep_function(switch_core_session_t *session, char *data) +{ + + if (switch_strlen_zero(data)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No timeout specified.\n"); + } else { + uint32_t ms = atoi(data); + switch_ivr_sleep(session, ms); + } +} + +static void eval_function(switch_core_session_t *session, char *data) +{ + return; +} + +static void answer_function(switch_core_session_t *session, char *data) +{ + switch_channel_t *channel; + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + switch_channel_answer(channel); +} + +static void set_function(switch_core_session_t *session, char *data) +{ + switch_channel_t *channel; + char *var, *val = NULL; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + if (switch_strlen_zero(data)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No variable name specified.\n"); + } else { + var = switch_core_session_strdup(session, data); + val = strchr(var, '='); + + if (val) { + *val++ = '\0'; + if (!strcmp(val, "_UNDEF_")) { + val = NULL; + } + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SET [%s]=[%s]\n", var, val ? val : "UNDEF"); + switch_channel_set_variable(channel, var, val); + } +} + +static void log_function(switch_core_session_t *session, char *data) +{ + switch_channel_t *channel; + char *level, *log_str; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + if ((level = strdup(data))) { + switch_event_types_t etype = SWITCH_LOG_DEBUG; + + if ((log_str = strchr(level, ' '))) { + *log_str++ = '\0'; + switch_name_event(level, &etype); + } else { + log_str = level; + } + + switch_log_printf(SWITCH_CHANNEL_LOG, etype, "%s\n", log_str); + switch_safe_free(level); + } +} + + +static void info_function(switch_core_session_t *session, char *data) +{ + switch_channel_t *channel; + switch_event_t *event; + char *buf; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { + switch_channel_event_set_data(channel, event); + switch_event_serialize(event, &buf); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "CHANNEL_DATA:\n%s\n", buf); + switch_event_destroy(&event); + } + +} + +static void privacy_function(switch_core_session_t *session, char *data) +{ + switch_channel_t *channel; + switch_caller_profile_t *caller_profile; + char *arg; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + caller_profile = switch_channel_get_caller_profile(channel); + + if (switch_strlen_zero(data)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No privacy mode specified.\n"); + } else { + arg = switch_core_session_strdup(session, data); + + switch_set_flag(caller_profile, SWITCH_CPF_SCREEN); + + if(!strcasecmp(arg, "no")) { + switch_clear_flag(caller_profile, SWITCH_CPF_HIDE_NAME); + switch_clear_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER); + } else if (!strcasecmp(arg, "yes")) { + switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NAME | SWITCH_CPF_HIDE_NUMBER); + } else if (!strcasecmp(arg, "full")) { + switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NAME | SWITCH_CPF_HIDE_NUMBER); + } else if (!strcasecmp(arg, "name")) { + switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NAME); + } else if (!strcasecmp(arg, "number")) { + switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID privacy mode specified. Use a valid mode [no|yes|name|full|number].\n"); + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set Privacy to %s [%d]\n", arg, caller_profile->flags); + } +} + +static void strftime_function(switch_core_session_t *session, char *data) +{ + char *argv[2]; + int argc; + char *lbuf; + + if ((lbuf = switch_core_session_strdup(session, data))&&(argc = switch_separate_string(lbuf, '=', argv, (sizeof(argv) / sizeof(argv[0])))) > 1) { + switch_size_t retsize; + switch_time_exp_t tm; + char date[80] = ""; + switch_channel_t *channel; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + switch_time_exp_lt(&tm, switch_time_now()); + switch_strftime(date, &retsize, sizeof(date), argv[1], &tm); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SET [%s]=[%s]\n", argv[0], date); + switch_channel_set_variable(channel, argv[0], date); + } +} + +static switch_status_t strftime_api_function(char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream) +{ + switch_size_t retsize; + switch_time_exp_t tm; + char date[80] = ""; + + switch_time_exp_lt(&tm, switch_time_now()); + switch_strftime(date, &retsize, sizeof(date), fmt, &tm); + stream->write_function(stream, date); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t presence_api_function(char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream) +{ + switch_event_t *event; + char *lbuf, *argv[4]; + int argc = 0; + switch_event_types_t type = SWITCH_EVENT_PRESENCE_IN; + + if (fmt && (lbuf = strdup(fmt)) && (argc = switch_separate_string(lbuf, '|', argv, (sizeof(argv) / sizeof(argv[0])))) > 0) { + if (!strcasecmp(argv[0], "out")) { + type = SWITCH_EVENT_PRESENCE_OUT; + } else if (argc != 4) { + stream->write_function(stream, "Invalid"); + return SWITCH_STATUS_SUCCESS; + } + + if (switch_event_create(&event, type) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", "dp"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", __FILE__); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", argv[1]); + if (type == SWITCH_EVENT_PRESENCE_IN) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "rpid", "%s", argv[2]); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "%s", argv[3]); + } + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); + switch_event_fire(&event); + } + stream->write_function(stream, "Event Sent"); + switch_safe_free(lbuf); + } else { + stream->write_function(stream, "Invalid"); + } + + return SWITCH_STATUS_SUCCESS; +} + + +static switch_status_t chat_api_function(char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream) +{ + char *lbuf, *argv[4]; + int argc = 0; + + if ((lbuf = strdup(fmt)) && (argc = switch_separate_string(lbuf, '|', argv, (sizeof(argv) / sizeof(argv[0])))) == 4) { + switch_chat_interface_t *ci; + + if ((ci = switch_loadable_module_get_chat_interface(argv[0]))) { + ci->chat_send("dp", argv[1], argv[2], "", argv[3], ""); + stream->write_function(stream, "Sent"); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invaid Chat Interface [%s]!\n", argv[0]); + } + } else { + stream->write_function(stream, "Invalid"); + } + + return SWITCH_STATUS_SUCCESS; +} + + +static switch_api_interface_t chat_api_interface = { + /*.interface_name */ "chat", + /*.desc */ "chat", + /*.function */ chat_api_function, + /*.syntax */ "<proto>|<from>|<to>|<message>", + /*.next */ NULL +}; + +static switch_api_interface_t dptools_api_interface = { + /*.interface_name */ "strftime", + /*.desc */ "strftime", + /*.function */ strftime_api_function, + /*.syntax */ "<format_string>", + /*.next */ &chat_api_interface +}; + +static switch_api_interface_t presence_api_interface = { + /*.interface_name */ "presence", + /*.desc */ "presence", + /*.function */ presence_api_function, + /*.syntax */ "<user> <rpid> <message>", + /*.next */ &dptools_api_interface +}; + +static const switch_application_interface_t detect_speech_application_interface = { + /*.interface_name */ "detect_speech", + /*.application_function */ detect_speech_function, + /* long_desc */ "Detect speech on a channel.", + /* short_desc */ "Detect speech", + /* syntax */ "<mod_name> <gram_name> <gram_path> [<addr>] OR grammar <gram_name> [<path>] OR pause OR resume", + /*.next */ NULL +}; + +static const switch_application_interface_t ringback_application_interface = { + /*.interface_name */ "ringback", + /*.application_function */ ringback_function, + /* long_desc */ "Indicate Ringback on a channel.", + /* short_desc */ "Indicate Ringback", + /* syntax */ "", + /*.next */ &detect_speech_application_interface +}; + +static const switch_application_interface_t set_application_interface = { + /*.interface_name */ "set", + /*.application_function */ set_function, + /* long_desc */ "Set a channel varaible for the channel calling the application.", + /* short_desc */ "Set a channel varaible", + /* syntax */ "<varname>=[<value>|_UNDEF_]", + /*.next */ &ringback_application_interface +}; + +static const switch_application_interface_t info_application_interface = { + /*.interface_name */ "info", + /*.application_function */ info_function, + /* long_desc */ "Display Call Info", + /* short_desc */ "Display Call Info", + /* syntax */ "", + /*.next */ &set_application_interface +}; + +static const switch_application_interface_t log_application_interface = { + /*.interface_name */ "log", + /*.application_function */ log_function, + /* long_desc */ "Logs a channel varaible for the channel calling the application.", + /* short_desc */ "Logs a channel varaible", + /* syntax */ "<varname>", + /*.next */ &info_application_interface +}; + +static const switch_application_interface_t answer_application_interface = { + /*.interface_name */ "answer", + /*.application_function */ answer_function, + /* long_desc */ "Answer the call for a channel.", + /* short_desc */ "Answer the call", + /* syntax */ "", + /*.next */ &log_application_interface + +}; + +static const switch_application_interface_t eval_application_interface = { + /*.interface_name */ "eval", + /*.application_function */ eval_function, + /* long_desc */ "Do Nothing", + /* short_desc */ "Do Nothing", + /* syntax */ "", + /*.next */ &answer_application_interface + +}; + +static const switch_application_interface_t strftime_application_interface = { + /*.interface_name */ "strftime", + /*.application_function */ strftime_function, + /* long_desc */ NULL, + /* short_desc */ NULL, + /* syntax */ NULL, + /*.next */ &eval_application_interface + +}; + +static const switch_application_interface_t sleep_application_interface = { + /*.interface_name */ "sleep", + /*.application_function */ sleep_function, + /* long_desc */ "Pause the channel for a given number of milliseconds, consuming the audio for that period of time.", + /* short_desc */ "Pause a channel", + /* syntax */ "<pausemilliseconds>", + /* next */ &strftime_application_interface +}; + +static const switch_application_interface_t transfer_application_interface = { + /*.interface_name */ "transfer", + /*.application_function */ transfer_function, + /* long_desc */ "Immediatly transfer the calling channel to a new extension", + /* short_desc */ "Transfer a channel", + /* syntax */ "<exten> [<dialplan> <context>]", + /* next */ &sleep_application_interface +}; + +static const switch_application_interface_t privacy_application_interface = { + /*.interface_name */ "privacy", + /*.application_function */ privacy_function, + /* long_desc */ "Set caller privacy on calls.", + /* short_desc */ "Set privacy on calls", + /* syntax */ "off|on|name|full|number", + /*.next */ &transfer_application_interface +}; + +static const switch_loadable_module_interface_t mod_dptools_module_interface = { + /*.module_name = */ modname, + /*.endpoint_interface = */ NULL, + /*.timer_interface = */ NULL, + /*.dialplan_interface = */ NULL, + /*.codec_interface = */ NULL, + /*.application_interface */ &privacy_application_interface, + /*.api_interface */ &presence_api_interface +}; + +SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) +{ + + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = &mod_dptools_module_interface; + + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +/* 'switch_module_runtime' will start up in a thread by itself just by having it exist +if it returns anything but SWITCH_STATUS_TERM it will be called again automaticly +*/ + + +//switch_status_t switch_module_runtime(void) /* For Emacs: * Local Variables: Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Mon Nov 27 21:23:26 2006 @@ -1198,11 +1198,14 @@ } if ((nlen = sub_val ? strlen(sub_val) : 0)) { if (len + nlen >= olen) { - olen = (olen + len + nlen + block); + char *dp; + olen += (len + nlen + block); cpos = c - data; - data = realloc(data, olen); - c = data + cpos; - memset(c, 0, olen - cpos); + if ((dp = realloc(data, olen))) { + data = dp; + c = data + cpos; + memset(c, 0, olen - cpos); + } } len += nlen; Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Nov 27 21:23:26 2006 @@ -2673,7 +2673,8 @@ } while (switch_channel_get_state(session->channel) == CS_EXECUTE && extension->current_application) { - char *expanded; + char *expanded = NULL; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Execute %s(%s)\n", extension->current_application->application_name, extension->current_application->application_data); @@ -2720,7 +2721,7 @@ application_interface->application_function(session, expanded); if (expanded != extension->current_application->application_data) { - free(expanded); + switch_safe_free(expanded); } extension->current_application = extension->current_application->next; }

1 0

27 Nov '06

Author: mikej Date: Mon Nov 27 17:30:48 2006 New Revision: 3462 Modified: freeswitch/trunk/libs/libdingaling/src/ldl_compat.h freeswitch/trunk/libs/libdingaling/src/libdingaling.c freeswitch/trunk/libs/libdingaling/src/libdingaling.h freeswitch/trunk/libs/libdingaling/src/sha1.c freeswitch/trunk/libs/libteletone/src/libteletone.h freeswitch/trunk/libs/libteletone/src/libteletone_detect.c freeswitch/trunk/libs/libteletone/src/libteletone_detect.h freeswitch/trunk/libs/libteletone/src/libteletone_generate.c freeswitch/trunk/libs/libteletone/src/libteletone_generate.h freeswitch/trunk/src/include/switch.h freeswitch/trunk/src/include/switch_apr.h freeswitch/trunk/src/include/switch_bitpack.h freeswitch/trunk/src/include/switch_buffer.h freeswitch/trunk/src/include/switch_caller.h freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/include/switch_config.h freeswitch/trunk/src/include/switch_console.h freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_event.h freeswitch/trunk/src/include/switch_frame.h freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/include/switch_loadable_module.h freeswitch/trunk/src/include/switch_log.h freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/include/switch_platform.h freeswitch/trunk/src/include/switch_resample.h freeswitch/trunk/src/include/switch_rtp.h freeswitch/trunk/src/include/switch_sqlite.h freeswitch/trunk/src/include/switch_stun.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/include/switch_xml.h freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/applications/mod_echo/mod_echo.c freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c freeswitch/trunk/src/mod/applications/mod_park/mod_park.c freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.c freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c freeswitch/trunk/src/mod/codecs/mod_gsm/mod_gsm.c freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.c freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c freeswitch/trunk/src/mod/codecs/mod_lpc10/mod_lpc10.c freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.h freeswitch/trunk/src/mod/event_handlers/mod_cdr/baseregistry.cpp freeswitch/trunk/src/mod/event_handlers/mod_cdr/baseregistry.h freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.h freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.cpp freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.h freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.cpp freeswitch/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp freeswitch/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.h freeswitch/trunk/src/mod/event_handlers/mod_cdr/pddcdr.cpp freeswitch/trunk/src/mod/event_handlers/mod_cdr/pddcdr.h freeswitch/trunk/src/mod/event_handlers/mod_cdr/xmlcdr.cpp freeswitch/trunk/src/mod/event_handlers/mod_cdr/xmlcdr.h freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/trunk/src/mod/event_handlers/mod_event_test/mod_event_test.c freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.c freeswitch/trunk/src/mod/formats/mod_native_file/mod_native_file.c freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.c freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c freeswitch/trunk/src/mod/languages/mod_php/mod_php.c freeswitch/trunk/src/mod/languages/mod_php/php_freeswitch.h freeswitch/trunk/src/mod/languages/mod_python/mod_python.c freeswitch/trunk/src/mod/languages/mod_ruby/mod_ruby.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c freeswitch/trunk/src/mod/languages/mod_spidermonkey_skel/mod_spidermonkey_skel.c freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c freeswitch/trunk/src/switch.c freeswitch/trunk/src/switch_buffer.c freeswitch/trunk/src/switch_caller.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_config.c freeswitch/trunk/src/switch_console.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_event.c freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_loadable_module.c freeswitch/trunk/src/switch_log.c freeswitch/trunk/src/switch_resample.c freeswitch/trunk/src/switch_rtp.c freeswitch/trunk/src/switch_stun.c freeswitch/trunk/src/switch_swig.c freeswitch/trunk/src/switch_utils.c freeswitch/trunk/src/switch_xml.c Log: Add magic comments for emacs and vi in source and header files to properly format and display tabs vs. spaces in those editors: /* For Emacs: * Local Variables: * mode:c * indent-tabs-mode:nil * tab-width:4 * c-basic-offset:4 * End: * For VIM: * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: */ Modified: freeswitch/trunk/libs/libdingaling/src/ldl_compat.h ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/ldl_compat.h (original) +++ freeswitch/trunk/libs/libdingaling/src/ldl_compat.h Mon Nov 27 17:30:48 2006 @@ -61,3 +61,14 @@ #endif #endif + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Mon Nov 27 17:30:48 2006 @@ -2134,4 +2134,13 @@ handle->log_stream = log_stream; } - +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.h ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.h (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.h Mon Nov 27 17:30:48 2006 @@ -557,3 +557,14 @@ * */ #endif + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/libs/libdingaling/src/sha1.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/sha1.c (original) +++ freeswitch/trunk/libs/libdingaling/src/sha1.c Mon Nov 27 17:30:48 2006 @@ -212,4 +212,13 @@ #endif } - +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/libs/libteletone/src/libteletone.h ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone.h (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone.h Mon Nov 27 17:30:48 2006 @@ -74,3 +74,14 @@ #endif #endif + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/libs/libteletone/src/libteletone_detect.c ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone_detect.c (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone_detect.c Mon Nov 27 17:30:48 2006 @@ -401,3 +401,13 @@ return max; } +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/libs/libteletone/src/libteletone_detect.h ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone_detect.h (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone_detect.h Mon Nov 27 17:30:48 2006 @@ -225,3 +225,14 @@ #endif #endif + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/libs/libteletone/src/libteletone_generate.c ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone_generate.c (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone_generate.c Mon Nov 27 17:30:48 2006 @@ -414,3 +414,14 @@ return 0; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/libs/libteletone/src/libteletone_generate.h ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone_generate.h (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone_generate.h Mon Nov 27 17:30:48 2006 @@ -163,3 +163,14 @@ #endif #endif + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/include/switch.h ============================================================================== --- freeswitch/trunk/src/include/switch.h (original) +++ freeswitch/trunk/src/include/switch.h Mon Nov 27 17:30:48 2006 @@ -166,3 +166,14 @@ * */ #endif + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/include/switch_apr.h ============================================================================== --- freeswitch/trunk/src/include/switch_apr.h (original) +++ freeswitch/trunk/src/include/switch_apr.h Mon Nov 27 17:30:48 2006 @@ -1441,3 +1441,14 @@ SWITCH_END_EXTERN_C #endif + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/include/switch_bitpack.h ============================================================================== --- freeswitch/trunk/src/include/switch_bitpack.h (original) +++ freeswitch/trunk/src/include/switch_bitpack.h Mon Nov 27 17:30:48 2006 @@ -280,3 +280,14 @@ SWITCH_END_EXTERN_C #endif + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/include/switch_buffer.h ============================================================================== --- freeswitch/trunk/src/include/switch_buffer.h (original) +++ freeswitch/trunk/src/include/switch_buffer.h Mon Nov 27 17:30:48 2006 @@ -131,3 +131,14 @@ SWITCH_END_EXTERN_C #endif + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/include/switch_caller.h ============================================================================== --- freeswitch/trunk/src/include/switch_caller.h (original) +++ freeswitch/trunk/src/include/switch_caller.h Mon Nov 27 17:30:48 2006 @@ -203,4 +203,13 @@ #endif - +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Mon Nov 27 17:30:48 2006 @@ -436,3 +436,14 @@ SWITCH_END_EXTERN_C #endif + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/include/switch_config.h ============================================================================== --- freeswitch/trunk/src/include/switch_config.h (original) +++ freeswitch/trunk/src/include/switch_config.h Mon Nov 27 17:30:48 2006 @@ -109,3 +109,14 @@ /** @} */ #endif + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/include/switch_console.h ============================================================================== --- freeswitch/trunk/src/include/switch_console.h (original) +++ freeswitch/trunk/src/include/switch_console.h Mon Nov 27 17:30:48 2006 @@ -71,3 +71,14 @@ SWITCH_END_EXTERN_C #endif + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Mon Nov 27 17:30:48 2006 @@ -1362,3 +1362,14 @@ SWITCH_END_EXTERN_C #endif + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/include/switch_event.h ============================================================================== --- freeswitch/trunk/src/include/switch_event.h (original) +++ freeswitch/trunk/src/include/switch_event.h Mon Nov 27 17:30:48 2006 @@ -313,3 +313,14 @@ SWITCH_END_EXTERN_C #endif + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/include/switch_frame.h ============================================================================== --- freeswitch/trunk/src/include/switch_frame.h (original) +++ freeswitch/trunk/src/include/switch_frame.h Mon Nov 27 17:30:48 2006 @@ -71,3 +71,14 @@ SWITCH_END_EXTERN_C #endif + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Mon Nov 27 17:30:48 2006 @@ -578,4 +578,13 @@ #endif - +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/include/switch_loadable_module.h ============================================================================== --- freeswitch/trunk/src/include/switch_loadable_module.h (original) +++ freeswitch/trunk/src/include/switch_loadable_module.h Mon Nov 27 17:30:48 2006 @@ -251,3 +251,14 @@ SWITCH_END_EXTERN_C #endif + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/include/switch_log.h ============================================================================== --- freeswitch/trunk/src/include/switch_log.h (original) +++ freeswitch/trunk/src/include/switch_log.h Mon Nov 27 17:30:48 2006 @@ -120,3 +120,14 @@ SWITCH_END_EXTERN_C #endif + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Mon Nov 27 17:30:48 2006 @@ -604,3 +604,14 @@ SWITCH_END_EXTERN_C #endif + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/include/switch_platform.h ============================================================================== --- freeswitch/trunk/src/include/switch_platform.h (original) +++ freeswitch/trunk/src/include/switch_platform.h Mon Nov 27 17:30:48 2006 @@ -155,3 +155,14 @@ SWITCH_END_EXTERN_C #endif + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/include/switch_resample.h ============================================================================== --- freeswitch/trunk/src/include/switch_resample.h (original) +++ freeswitch/trunk/src/include/switch_resample.h Mon Nov 27 17:30:48 2006 @@ -168,4 +168,13 @@ #endif - +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/include/switch_rtp.h ============================================================================== --- freeswitch/trunk/src/include/switch_rtp.h (original) +++ freeswitch/trunk/src/include/switch_rtp.h Mon Nov 27 17:30:48 2006 @@ -380,3 +380,14 @@ SWITCH_END_EXTERN_C #endif + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/include/switch_sqlite.h ============================================================================== --- freeswitch/trunk/src/include/switch_sqlite.h (original) +++ freeswitch/trunk/src/include/switch_sqlite.h Mon Nov 27 17:30:48 2006 @@ -1808,3 +1808,14 @@ SWITCH_END_EXTERN_C #endif + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/include/switch_stun.h ============================================================================== --- freeswitch/trunk/src/include/switch_stun.h (original) +++ freeswitch/trunk/src/include/switch_stun.h Mon Nov 27 17:30:48 2006 @@ -243,3 +243,14 @@ SWITCH_END_EXTERN_C #endif + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Nov 27 17:30:48 2006 @@ -912,3 +912,14 @@ SWITCH_END_EXTERN_C #endif + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Mon Nov 27 17:30:48 2006 @@ -240,3 +240,14 @@ SWITCH_END_EXTERN_C #endif + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/include/switch_xml.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml.h (original) +++ freeswitch/trunk/src/include/switch_xml.h Mon Nov 27 17:30:48 2006 @@ -336,3 +336,14 @@ ///\} #endif // _SWITCH_XML_H + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c (original) +++ freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c Mon Nov 27 17:30:48 2006 @@ -108,3 +108,14 @@ /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Mon Nov 27 17:30:48 2006 @@ -769,3 +769,14 @@ /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Mon Nov 27 17:30:48 2006 @@ -3436,3 +3436,14 @@ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Mon Nov 27 17:30:48 2006 @@ -420,3 +420,14 @@ //switch_status_t switch_module_runtime(void) + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/applications/mod_echo/mod_echo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_echo/mod_echo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_echo/mod_echo.c Mon Nov 27 17:30:48 2006 @@ -72,3 +72,14 @@ /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c (original) +++ freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c Mon Nov 27 17:30:48 2006 @@ -491,3 +491,14 @@ //switch_status_t switch_module_runtime(void) + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/applications/mod_park/mod_park.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_park/mod_park.c (original) +++ freeswitch/trunk/src/mod/applications/mod_park/mod_park.c Mon Nov 27 17:30:48 2006 @@ -65,3 +65,14 @@ /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.c (original) +++ freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.c Mon Nov 27 17:30:48 2006 @@ -224,3 +224,14 @@ //switch_status_t switch_module_runtime(void) + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c (original) +++ freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c Mon Nov 27 17:30:48 2006 @@ -679,3 +679,13 @@ return SWITCH_STATUS_SUCCESS; } +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c (original) +++ freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c Mon Nov 27 17:30:48 2006 @@ -78,3 +78,14 @@ return SWITCH_STATUS_TERM; } */ + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c Mon Nov 27 17:30:48 2006 @@ -435,3 +435,14 @@ /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c Mon Nov 27 17:30:48 2006 @@ -326,3 +326,14 @@ /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c Mon Nov 27 17:30:48 2006 @@ -183,3 +183,14 @@ /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c Mon Nov 27 17:30:48 2006 @@ -222,3 +222,14 @@ /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c Mon Nov 27 17:30:48 2006 @@ -448,3 +448,14 @@ /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c Mon Nov 27 17:30:48 2006 @@ -282,3 +282,14 @@ /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/codecs/mod_gsm/mod_gsm.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_gsm/mod_gsm.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_gsm/mod_gsm.c Mon Nov 27 17:30:48 2006 @@ -174,4 +174,13 @@ return SWITCH_STATUS_SUCCESS; } - +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.c Mon Nov 27 17:30:48 2006 @@ -333,9 +333,13 @@ } - - - - - - +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c Mon Nov 27 17:30:48 2006 @@ -263,3 +263,14 @@ /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/codecs/mod_lpc10/mod_lpc10.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_lpc10/mod_lpc10.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_lpc10/mod_lpc10.c Mon Nov 27 17:30:48 2006 @@ -210,3 +210,14 @@ /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c Mon Nov 27 17:30:48 2006 @@ -351,3 +351,14 @@ /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c Mon Nov 27 17:30:48 2006 @@ -183,3 +183,14 @@ /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Mon Nov 27 17:30:48 2006 @@ -356,3 +356,14 @@ /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.c ============================================================================== --- freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.c (original) +++ freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.c Mon Nov 27 17:30:48 2006 @@ -228,3 +228,14 @@ /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Mon Nov 27 17:30:48 2006 @@ -2633,3 +2633,13 @@ return LDL_STATUS_SUCCESS; } +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Mon Nov 27 17:30:48 2006 @@ -1200,3 +1200,14 @@ } return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Mon Nov 27 17:30:48 2006 @@ -1029,3 +1029,14 @@ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Mon Nov 27 17:30:48 2006 @@ -5355,3 +5355,14 @@ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Mon Nov 27 17:30:48 2006 @@ -1532,5 +1532,13 @@ } - - +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Mon Nov 27 17:30:48 2006 @@ -1391,3 +1391,14 @@ /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp Mon Nov 27 17:30:48 2006 @@ -358,3 +358,14 @@ } } } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.h ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.h (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.h Mon Nov 27 17:30:48 2006 @@ -105,3 +105,14 @@ #endif #endif + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/baseregistry.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/baseregistry.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/baseregistry.cpp Mon Nov 27 17:30:48 2006 @@ -79,3 +79,14 @@ { BaseRegistry::get().add(creator); } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/baseregistry.h ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/baseregistry.h (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/baseregistry.h Mon Nov 27 17:30:48 2006 @@ -76,3 +76,14 @@ #endif // ifdef __cplusplus #endif + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp Mon Nov 27 17:30:48 2006 @@ -163,3 +163,14 @@ delete newloggerobject; } } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.h ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.h (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.h Mon Nov 27 17:30:48 2006 @@ -69,3 +69,14 @@ #endif #endif + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.cpp Mon Nov 27 17:30:48 2006 @@ -284,3 +284,14 @@ } AUTO_REGISTER_BASECDR(CsvCDR); + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.h ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.h (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.h Mon Nov 27 17:30:48 2006 @@ -75,3 +75,14 @@ }; #endif + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.cpp Mon Nov 27 17:30:48 2006 @@ -105,3 +105,14 @@ delete newcdrcontainer; return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp Mon Nov 27 17:30:48 2006 @@ -625,3 +625,14 @@ } AUTO_REGISTER_BASECDR(MysqlCDR); + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.h ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.h (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.h Mon Nov 27 17:30:48 2006 @@ -99,3 +99,14 @@ }; #endif + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/pddcdr.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/pddcdr.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/pddcdr.cpp Mon Nov 27 17:30:48 2006 @@ -214,3 +214,14 @@ } AUTO_REGISTER_BASECDR(PddCDR); + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/pddcdr.h ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/pddcdr.h (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/pddcdr.h Mon Nov 27 17:30:48 2006 @@ -69,3 +69,14 @@ }; #endif + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/xmlcdr.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/xmlcdr.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/xmlcdr.cpp Mon Nov 27 17:30:48 2006 @@ -219,3 +219,14 @@ } AUTO_REGISTER_BASECDR(XmlCDR); + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/xmlcdr.h ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/xmlcdr.h (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/xmlcdr.h Mon Nov 27 17:30:48 2006 @@ -70,3 +70,14 @@ }; #endif + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Mon Nov 27 17:30:48 2006 @@ -331,5 +331,13 @@ return SWITCH_STATUS_TERM; } - - +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Mon Nov 27 17:30:48 2006 @@ -1041,5 +1041,13 @@ return SWITCH_STATUS_TERM; } - - +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_test/mod_event_test.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_test/mod_event_test.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_test/mod_event_test.c Mon Nov 27 17:30:48 2006 @@ -153,3 +153,14 @@ /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c Mon Nov 27 17:30:48 2006 @@ -439,3 +439,14 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "disconnecting client %d\n", RUNNING); return RUNNING ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_TERM; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.c Mon Nov 27 17:30:48 2006 @@ -318,3 +318,14 @@ RUNNING = 0; return SWITCH_STATUS_TERM; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/formats/mod_native_file/mod_native_file.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_native_file/mod_native_file.c (original) +++ freeswitch/trunk/src/mod/formats/mod_native_file/mod_native_file.c Mon Nov 27 17:30:48 2006 @@ -180,3 +180,14 @@ /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c (original) +++ freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Mon Nov 27 17:30:48 2006 @@ -350,3 +350,14 @@ /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.c (original) +++ freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.c Mon Nov 27 17:30:48 2006 @@ -283,3 +283,14 @@ { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, msg); } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c Mon Nov 27 17:30:48 2006 @@ -137,3 +137,14 @@ /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/languages/mod_php/mod_php.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_php/mod_php.c (original) +++ freeswitch/trunk/src/mod/languages/mod_php/mod_php.c Mon Nov 27 17:30:48 2006 @@ -307,3 +307,14 @@ } */ + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/languages/mod_php/php_freeswitch.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_php/php_freeswitch.h (original) +++ freeswitch/trunk/src/mod/languages/mod_php/php_freeswitch.h Mon Nov 27 17:30:48 2006 @@ -93,3 +93,14 @@ #endif #endif /* PHP_FREESWITCH_H */ + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/mod_python.c (original) +++ freeswitch/trunk/src/mod/languages/mod_python/mod_python.c Mon Nov 27 17:30:48 2006 @@ -110,3 +110,14 @@ /* Return the number of arguments of the application command line */ + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/languages/mod_ruby/mod_ruby.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_ruby/mod_ruby.c (original) +++ freeswitch/trunk/src/mod/languages/mod_ruby/mod_ruby.c Mon Nov 27 17:30:48 2006 @@ -102,3 +102,14 @@ /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Mon Nov 27 17:30:48 2006 @@ -2475,3 +2475,14 @@ curl_global_cleanup(); return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c Mon Nov 27 17:30:48 2006 @@ -307,3 +307,14 @@ *module_interface = &DB_module_interface; return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_skel/mod_spidermonkey_skel.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_skel/mod_spidermonkey_skel.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_skel/mod_spidermonkey_skel.c Mon Nov 27 17:30:48 2006 @@ -108,3 +108,14 @@ *module_interface = &skel_module_interface; return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c Mon Nov 27 17:30:48 2006 @@ -385,3 +385,14 @@ *module_interface = &teletone_module_interface; return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Mon Nov 27 17:30:48 2006 @@ -158,3 +158,13 @@ return SWITCH_STATUS_SUCCESS; } +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c Mon Nov 27 17:30:48 2006 @@ -171,3 +171,13 @@ return SWITCH_STATUS_SUCCESS; } +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c ============================================================================== --- freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c (original) +++ freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c Mon Nov 27 17:30:48 2006 @@ -222,3 +222,14 @@ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Mon Nov 27 17:30:48 2006 @@ -349,3 +349,13 @@ return SWITCH_STATUS_SUCCESS; } +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Mon Nov 27 17:30:48 2006 @@ -309,3 +309,14 @@ return switch_core_destroy(vg); } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/switch_buffer.c ============================================================================== --- freeswitch/trunk/src/switch_buffer.c (original) +++ freeswitch/trunk/src/switch_buffer.c Mon Nov 27 17:30:48 2006 @@ -255,3 +255,14 @@ *buffer = NULL; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/switch_caller.c ============================================================================== --- freeswitch/trunk/src/switch_caller.c (original) +++ freeswitch/trunk/src/switch_caller.c Mon Nov 27 17:30:48 2006 @@ -248,3 +248,14 @@ } } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Mon Nov 27 17:30:48 2006 @@ -1230,3 +1230,14 @@ free(indup); return data; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/switch_config.c ============================================================================== --- freeswitch/trunk/src/switch_config.c (original) +++ freeswitch/trunk/src/switch_config.c Mon Nov 27 17:30:48 2006 @@ -205,3 +205,14 @@ return ret; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Mon Nov 27 17:30:48 2006 @@ -250,3 +250,14 @@ } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Nov 27 17:30:48 2006 @@ -4187,3 +4187,14 @@ return SWITCH_STATUS_SUCCESS; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Mon Nov 27 17:30:48 2006 @@ -848,3 +848,14 @@ return SWITCH_STATUS_MEMERR; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Nov 27 17:30:48 2006 @@ -4052,3 +4052,14 @@ return status; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Mon Nov 27 17:30:48 2006 @@ -800,3 +800,14 @@ return status; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/switch_log.c ============================================================================== --- freeswitch/trunk/src/switch_log.c (original) +++ freeswitch/trunk/src/switch_log.c Mon Nov 27 17:30:48 2006 @@ -287,3 +287,13 @@ return SWITCH_STATUS_SUCCESS; } +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/switch_resample.c ============================================================================== --- freeswitch/trunk/src/switch_resample.c (original) +++ freeswitch/trunk/src/switch_resample.c Mon Nov 27 17:30:48 2006 @@ -216,3 +216,13 @@ } } +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Mon Nov 27 17:30:48 2006 @@ -1429,3 +1429,14 @@ { return rtp_session->private_data; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/switch_stun.c ============================================================================== --- freeswitch/trunk/src/switch_stun.c (original) +++ freeswitch/trunk/src/switch_stun.c Mon Nov 27 17:30:48 2006 @@ -370,3 +370,14 @@ return SWITCH_STATUS_FALSE; } + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/switch_swig.c ============================================================================== --- freeswitch/trunk/src/switch_swig.c (original) +++ freeswitch/trunk/src/switch_swig.c Mon Nov 27 17:30:48 2006 @@ -326,3 +326,13 @@ return status == SWITCH_STATUS_SUCCESS ? 1 : 0; } +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Mon Nov 27 17:30:48 2006 @@ -347,3 +347,14 @@ apr_socket_opt_set(NULL, 0, 0); } #endif + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Mon Nov 27 17:30:48 2006 @@ -1336,4 +1336,13 @@ switch_xml_free(xml); } - +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */

1 0

[commit] r3461 - in freeswitch/trunk/src: . include mod/applications/mod_bridgecall mod/endpoints/mod_sofia
by Freeswitch SVN 27 Nov '06

27 Nov '06

Author: anthm Date: Mon Nov 27 16:52:38 2006 New Revision: 3461 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_ivr.c Log: no_media/ringback tweaks Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Nov 27 16:52:38 2006 @@ -465,7 +465,8 @@ CF_CONTROLLED = (1 << 12), CF_NOMEDIA = (1 << 13), CF_SUSPEND = (1 << 14), - CF_EVENT_PARSE = (1 << 15) + CF_EVENT_PARSE = (1 << 15), + CF_NO_INDICATE = (1 << 16) } switch_channel_flag_t; Modified: freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c (original) +++ freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c Mon Nov 27 16:52:38 2006 @@ -42,6 +42,7 @@ switch_core_session_t *peer_session; unsigned int timelimit = 60; char *var; + uint8_t no_media_bridge = 0; switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING; caller_channel = switch_core_session_get_channel(session); @@ -50,9 +51,14 @@ if ((var = switch_channel_get_variable(caller_channel, "call_timeout"))) { timelimit = atoi(var); } - - if ((var = switch_channel_get_variable(caller_channel, "no_media"))) { - switch_channel_set_flag(caller_channel, CF_NOMEDIA); + + if ((var = switch_channel_get_variable(caller_channel, "no_media")) && switch_true(var)) { + if (!switch_channel_test_flag(caller_channel, CF_ANSWERED) && !switch_channel_test_flag(caller_channel, CF_EARLY_MEDIA)) { + switch_channel_set_flag(caller_channel, CF_NOMEDIA); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel is already up, delaying point-to-point mode 'till both legs are up.\n"); + no_media_bridge = 1; + } } if (switch_ivr_originate(session, &peer_session, &cause, data, timelimit, NULL, NULL, NULL, NULL) != SWITCH_STATUS_SUCCESS) { @@ -61,10 +67,17 @@ switch_channel_hangup(caller_channel, cause); return; } else { - if (switch_channel_test_flag(caller_channel, CF_NOMEDIA)) { - switch_ivr_signal_bridge(session, peer_session); + if (no_media_bridge) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Redirecting media to point-to-point mode.\n"); + switch_ivr_nomedia(switch_core_session_get_uuid(session), SMF_FORCE); + switch_ivr_nomedia(switch_core_session_get_uuid(peer_session), SMF_FORCE); + switch_ivr_signal_bridge(session, peer_session); } else { - switch_ivr_multi_threaded_bridge(session, peer_session, NULL, NULL, NULL); + if (switch_channel_test_flag(caller_channel, CF_NOMEDIA)) { + switch_ivr_signal_bridge(session, peer_session); + } else { + switch_ivr_multi_threaded_bridge(session, peer_session, NULL, NULL, NULL); + } } } } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Mon Nov 27 16:52:38 2006 @@ -2441,9 +2441,10 @@ if (!switch_channel_get_variable(other_channel, SWITCH_B_SDP_VARIABLE)) { switch_channel_set_variable(other_channel, SWITCH_B_SDP_VARIABLE, sdp); } + if (!switch_test_flag(tech_pvt, TFLAG_CHANGE_MEDIA) && ( switch_channel_test_flag(other_channel, CF_OUTBOUND) && - switch_channel_test_flag(other_channel, CF_NOMEDIA) && + //switch_channel_test_flag(other_channel, CF_NOMEDIA) && switch_channel_test_flag(channel, CF_OUTBOUND) && switch_channel_test_flag(channel, CF_NOMEDIA))) { switch_ivr_nomedia(val, SMF_FORCE); @@ -2526,7 +2527,7 @@ break; case nua_callstate_proceeding: if (channel) { - if (status == 180) { + if (status == 180 && !(switch_channel_test_flag(channel, CF_NO_INDICATE))) { if (switch_test_flag(tech_pvt, TFLAG_NOMEDIA)) { if ((uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE)) && (other_session = switch_core_session_locate(uuid))) { switch_core_session_message_t msg; Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Nov 27 16:52:38 2006 @@ -2443,6 +2443,8 @@ peer_channels[i] = switch_core_session_get_channel(peer_sessions[i]); assert(peer_channels[i] != NULL); + //switch_channel_set_flag(peer_channels[i], CF_NO_INDICATE); + if (table == &noop_state_handler) { table = NULL; } else if (!table) { @@ -2501,7 +2503,7 @@ switch_channel_pre_answer(caller_channel); } - if (session && !switch_channel_test_flag(caller_channel, CF_NOMEDIA)) { + if (session && (ringback_data || !switch_channel_test_flag(caller_channel, CF_NOMEDIA))) { read_codec = switch_core_session_get_read_codec(session); assert(read_codec != NULL); @@ -2527,6 +2529,7 @@ if (ringback_data) { char *tmp_data = NULL; + switch_buffer_create_dynamic(&ringback.audio_buffer, 512, 1024, 0); switch_buffer_create_dynamic(&ringback.loop_buffer, 512, 1024, 0); @@ -2581,7 +2584,7 @@ } } } - + while ((!caller_channel || switch_channel_ready(caller_channel)) && check_channel_status(peer_channels, peer_sessions, and_argc, &idx, file, key, ringback_data)) { @@ -2603,13 +2606,14 @@ } /* read from the channel while we wait if the audio is up on it */ - if (session && !switch_channel_test_flag(caller_channel, CF_NOMEDIA) && + if (session && (ringback_data || !switch_channel_test_flag(caller_channel, CF_NOMEDIA)) && (switch_channel_test_flag(caller_channel, CF_ANSWERED) || switch_channel_test_flag(caller_channel, CF_EARLY_MEDIA))) { switch_status_t status = switch_core_session_read_frame(session, &read_frame, 1000, 0); if (!SWITCH_READ_ACCEPTABLE(status)) { break; } + if (read_frame && !pass && !switch_test_flag(read_frame, SFF_CNG) && read_frame->datalen > 1) { if (ringback.fh) { uint8_t abuf[1024]; @@ -2653,7 +2657,8 @@ break; } } - } + } + if (switch_core_session_write_frame(session, &write_frame, 1000, 0) != SWITCH_STATUS_SUCCESS) { break; } @@ -2674,7 +2679,7 @@ idx = IDX_CANCEL; } - if (session && !switch_channel_test_flag(caller_channel, CF_NOMEDIA)) { + if (session && (ringback_data || !switch_channel_test_flag(caller_channel, CF_NOMEDIA))) { switch_core_session_reset(session); }

1 0

[commit] r3460 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia
by Freeswitch SVN 27 Nov '06

27 Nov '06

Author: anthm Date: Mon Nov 27 12:12:40 2006 New Revision: 3460 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_ivr.c Log: update Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Nov 27 12:12:40 2006 @@ -465,8 +465,7 @@ CF_CONTROLLED = (1 << 12), CF_NOMEDIA = (1 << 13), CF_SUSPEND = (1 << 14), - CF_EVENT_PARSE = (1 << 15), - CF_NO_EARLY = (1 << 16) + CF_EVENT_PARSE = (1 << 15) } switch_channel_flag_t; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Mon Nov 27 12:12:40 2006 @@ -2548,12 +2548,6 @@ } } if (r_sdp) { - if (switch_channel_test_flag(channel, CF_NO_EARLY)) { - //ignore 183 but how do we say we dont want it and not end the call - //nua_respond(nh, SIP_403_FORBIDDEN, TAG_END()); - return; - } - if (switch_test_flag(tech_pvt, TFLAG_NOMEDIA)) { switch_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA); switch_channel_set_flag(channel, CF_EARLY_MEDIA); Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Nov 27 12:12:40 2006 @@ -2436,13 +2436,13 @@ peer_sessions[i] = NULL; continue; } - //switch_channel_set_flag(peer_channels[i], CF_NO_EARLY); + switch_core_session_read_lock(peer_sessions[i]); pool = NULL; peer_channels[i] = switch_core_session_get_channel(peer_sessions[i]); assert(peer_channels[i] != NULL); - + if (table == &noop_state_handler) { table = NULL; } else if (!table) {

1 0

[commit] r3458 - freeswitch/trunk/src
by Freeswitch SVN 26 Nov '06

26 Nov '06

Author: anthm Date: Sun Nov 26 15:06:04 2006 New Revision: 3458 Modified: freeswitch/trunk/src/switch_channel.c Log: update Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Sun Nov 26 15:06:04 2006 @@ -1196,19 +1196,19 @@ return in; } } - nlen = sub_val ? strlen(sub_val) : 0; + if ((nlen = sub_val ? strlen(sub_val) : 0)) { + if (len + nlen >= olen) { + olen = (olen + len + nlen + block); + cpos = c - data; + data = realloc(data, olen); + c = data + cpos; + memset(c, 0, olen - cpos); + } - if (len + nlen >= olen) { - olen = (olen + len + nlen + block); - cpos = c - data; - data = realloc(data, olen); - c = data + cpos; - memset(c, 0, olen - cpos); - } - if (nlen) { len += nlen; strcat(c, sub_val); c += nlen; + } switch_safe_free(func_val);

1 0