- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r8182 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by Freeswitch SVN 23 Apr '08

23 Apr '08

Author: mikej Date: Wed Apr 23 14:38:25 2008 New Revision: 8182 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c Log: Wed Apr 23 14:30:07 EDT 2008 first.last(a)nokia.com * nua_notifier.c: fixed crash with event fetch Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Apr 23 14:38:25 2008 @@ -1 +1 @@ -Wed Apr 23 14:36:09 EDT 2008 +Wed Apr 23 14:38:18 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c Wed Apr 23 14:38:25 2008 @@ -340,7 +340,8 @@ { nua_handle_t *nh = sr->sr_owner; nua_dialog_state_t *ds = nh->nh_ds; - struct notifier_usage *nu = nua_dialog_usage_private(sr->sr_usage); + nua_dialog_usage_t *du = sr->sr_usage; + struct notifier_usage *nu = nua_dialog_usage_private(du); enum nua_substate substate = nua_substate_terminated; int notify = 0; int retval; @@ -365,16 +366,18 @@ else #endif notify = 1; + + notify = notify && du->du_cr != NULL; } retval = nua_base_server_treport(sr, NUTAG_SUBSTATE(substate), TAG_END()); - if (retval >= 2 || nu == NULL) + if (retval >= 2 || du == NULL) return retval; if (notify) { /* Send NOTIFY (and terminate subscription, when needed) */ - nua_dialog_usage_refresh(nh, ds, sr->sr_usage, sip_now()); + nua_dialog_usage_refresh(nh, ds, du, sip_now()); } return retval;

1 0

[commit] r8181 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip
by Freeswitch SVN 23 Apr '08

23 Apr '08

Author: mikej Date: Wed Apr 23 14:37:18 2008 New Revision: 8181 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/torture_sip.c Log: Fri Apr 18 06:55:45 EDT 2008 Pekka.Pessi(a)nokia.com * torture_sip.c: added test for sip_header_as_string() producing string longer than 128 Fri Apr 18 06:55:45 EDT 2008 Pekka.Pessi(a)nokia.com UNDO: torture_sip.c: added test for sip_header_as_string() producing string longer than 128 Wed Apr 23 13:56:40 EDT 2008 Pekka.Pessi(a)nokia.com * torture_sip.c: added test for sip_header_as_string() producing string longer than 128 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/torture_sip.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/torture_sip.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/torture_sip.c Wed Apr 23 14:37:18 2008 @@ -2247,6 +2247,31 @@ END(); } +static int test_www_authenticate(void) +{ + sip_www_authenticate_t *www; + su_home_t *home; + char const *s; + BEGIN(); + + TEST_1(home = su_home_create()); + TEST_1(www = sip_www_authenticate_make + (home, "Digest realm=\"Registered_Subscribers\",\n" + "domain=\"sip:206.229.26.61\",\n" + "nonce=\"20dfb7e5a77abee7a02dbe53efe42cdd\", " + "opaque=\"423767123y723742376423762376423784623782a794e58\",\n" + "stale=FALSE,algorithm=MD5")); + TEST_S(www->au_scheme, "Digest"); + TEST_1(www->au_params && www->au_params[0] && www->au_params[1] && www->au_params[2] && + www->au_params[3] && www->au_params[4] && www->au_params[5] && + !www->au_params[6]); + TEST_1(s = sip_header_as_string(home, (sip_header_t *)www)); + TEST_1(strlen(s) >= 128); + + su_home_unref(home); + END(); +} + int test_retry_after(void) { /* Test Session-Expires header */ @@ -3548,7 +3573,7 @@ retval |= test_caller_prefs(); fflush(stdout); retval |= test_callerpref_scoring(); fflush(stdout); retval |= test_warning(); fflush(stdout); - + retval |= test_www_authenticate(); fflush(stdout); retval |= test_sec_ext(); fflush(stdout); retval |= test_utils(); fflush(stdout);

1 0

[commit] r8180 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by Freeswitch SVN 23 Apr '08

23 Apr '08

Author: mikej Date: Wed Apr 23 14:36:25 2008 New Revision: 8180 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c Log: revert previous patch Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Apr 23 14:36:25 2008 @@ -1 +1 @@ -Tue Apr 22 16:13:56 CDT 2008 +Wed Apr 23 14:36:09 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c Wed Apr 23 14:36:25 2008 @@ -351,8 +351,8 @@ /* nu_requested is set by SUBSCRIBE and cleared when NOTIFY is sent */ if (nu && nu->nu_requested && substate != nua_substate_embryonic) { - sip_t const *sip = sr->sr_request.sip; #if SU_HAVE_EXPERIMENTAL + sip_t const *sip = sr->sr_request.sip; sip_suppress_notify_if_match_t *snim = sip_suppress_notify_if_match(sip); sip_suppress_body_if_match_t *sbim = sip_suppress_body_if_match(sip); @@ -364,7 +364,7 @@ notify = 1, nu->nu_no_body = 1; else #endif - if (sip->sip_expires && sip->sip_expires->ex_delta) notify = 1; + notify = 1; } retval = nua_base_server_treport(sr, NUTAG_SUBSTATE(substate), TAG_END());

1 0

[commit] r8179 - in freeswitch/trunk/src: . include mod/applications/mod_commands
by Freeswitch SVN 23 Apr '08

23 Apr '08

Author: anthm Date: Wed Apr 23 13:38:13 2008 New Revision: 8179 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/switch_console.c freeswitch/trunk/src/switch_core_sqldb.c Log: dunno, some stuff... Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Wed Apr 23 13:38:13 2008 @@ -1601,6 +1601,7 @@ SWITCH_DECLARE(uint32_t) switch_core_max_dtmf_duration(uint32_t duration); SWITCH_DECLARE(uint32_t) switch_core_default_dtmf_duration(uint32_t duration); SWITCH_DECLARE(switch_status_t) switch_console_set_complete(const char *string); +SWITCH_DECLARE(switch_status_t) switch_console_set_alias(const char *string); ///\} 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 Wed Apr 23 13:38:13 2008 @@ -1885,7 +1885,7 @@ return 0; } -#define COMPLETE_SYNTAX "add <word>|del [<word>|all]" +#define COMPLETE_SYNTAX "add <word>|del [<word>|*]" SWITCH_STANDARD_API(complete_function) { @@ -1900,7 +1900,23 @@ return SWITCH_STATUS_SUCCESS; } -#define SHOW_SYNTAX "codec|application|api|dialplan|file|timer|calls|channels" + +#define ALIAS_SYNTAX "add <alias> <command> | del [<alias>|*]" +SWITCH_STANDARD_API(alias_function) +{ + + switch_status_t status; + + if ((status = switch_console_set_alias(cmd)) == SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "+OK\n"); + } else { + stream->write_function(stream, "-USAGE: %s\n", ALIAS_SYNTAX); + } + + return SWITCH_STATUS_SUCCESS; +} + +#define SHOW_SYNTAX "codec|application|api|dialplan|file|timer|calls|channels|aliases|complete" SWITCH_STANDARD_API(show_function) { char sql[1024]; @@ -1951,6 +1967,10 @@ sprintf(sql, "select * from calls order by created_epoch"); } else if (!strcasecmp(command, "channels")) { sprintf(sql, "select * from channels order by created_epoch"); + } else if (!strcasecmp(command, "aliases")) { + sprintf(sql, "select * from aliases order by alias"); + } else if (!strcasecmp(command, "complete")) { + sprintf(sql, "select * from complete order by a1,a2,a3,a4,a5,a6,a7,a8,a9,a10"); } else if (!strncasecmp(command, "help", 4)) { char *cmdname = NULL; @@ -2280,6 +2300,7 @@ SWITCH_ADD_API(commands_api_interface, "break", "Break", break_function, BREAK_SYNTAX); SWITCH_ADD_API(commands_api_interface, "show", "Show", show_function, SHOW_SYNTAX); SWITCH_ADD_API(commands_api_interface, "complete", "Complete", complete_function, COMPLETE_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "alias", "Alias", alias_function, ALIAS_SYNTAX); SWITCH_ADD_API(commands_api_interface, "status", "status", status_function, ""); SWITCH_ADD_API(commands_api_interface, "uuid_bridge", "uuid_bridge", uuid_bridge_function, ""); SWITCH_ADD_API(commands_api_interface, "uuid_setvar", "uuid_setvar", uuid_setvar_function, SETVAR_SYNTAX); Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Wed Apr 23 13:38:13 2008 @@ -154,9 +154,47 @@ return ret ? SWITCH_STATUS_FALSE : SWITCH_STATUS_SUCCESS; } -static int switch_console_process(char *cmd) +static int alias_callback(void *pArg, int argc, char **argv, char **columnNames) { - char *arg = NULL; + char **r = (char **) pArg; + *r = strdup(argv[0]); + return -1; +} + +char *expand_alias(char *cmd, char *arg) +{ + char *errmsg = NULL; + char *r = NULL; + char *sql; + char *exp = NULL; + switch_core_db_t *db = switch_core_db_handle(); + + sql = switch_mprintf("select command from aliases where alias='%s'", cmd); + switch_core_db_exec(db, sql, alias_callback, &r, &errmsg); + + if (errmsg) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error [%s][%s]\n", sql, errmsg); + free(errmsg); + } + + if (r) { + if (arg) { + exp = switch_mprintf("%s %s", r, arg); + free(r); + } else { + exp = r; + } + } else { + exp = cmd; + } + + switch_core_db_close(db); + return exp; +} + +static int switch_console_process(char *cmd, int rec) +{ + char *arg = NULL, *alias = NULL; switch_stream_handle_t stream = { 0 }; if (!strcmp(cmd, "shutdown") || !strcmp(cmd, "...")) { @@ -175,6 +213,12 @@ *arg++ = '\0'; } + if (!rec && (alias = expand_alias(cmd, arg)) && alias != cmd) { + int r = switch_console_process(alias, ++rec); + free(alias); + return r; + } + SWITCH_STANDARD_STREAM(stream); if (stream.data) { if (switch_api_execute(cmd, arg, NULL, &stream) == SWITCH_STATUS_SUCCESS) { @@ -268,7 +312,7 @@ } cmd = strdup(c); - switch_console_process(cmd); + switch_console_process(cmd, 0); free(cmd); return CC_REDISPLAY; @@ -353,7 +397,7 @@ } assert(cmd != NULL); history(myhistory, &ev, H_ENTER, line); - running = switch_console_process(cmd); + running = switch_console_process(cmd, 0); el_deletestr(el, strlen(foo)+1); memset(foo, 0, strlen(foo)); free(cmd); @@ -528,7 +572,7 @@ for(x = 0; x < 10; x++) { mystream.write_function(&mystream, "'%s'%s", switch_str_nil(argv[x+1]), x == 9 ? ")" : ", "); } - switch_core_db_persistant_execute(db, mystream.data, 1); + switch_core_db_persistant_execute(db, mystream.data, 5); status = SWITCH_STATUS_SUCCESS; } else if (!strcasecmp(argv[0], "del")) { char *what = argv[1]; @@ -555,6 +599,46 @@ } +SWITCH_DECLARE(switch_status_t) switch_console_set_alias(const char *string) +{ + char *mydata = NULL, *argv[3] = {0}; + int argc; + switch_status_t status = SWITCH_STATUS_FALSE; + + if (string && (mydata = strdup(string))) { + if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) >= 2) { + switch_core_db_t *db = switch_core_db_handle(); + char *sql = NULL; + + if (!strcasecmp(argv[0], "add") && argc == 3) { + sql = switch_mprintf("delete from aliases where alias='%q'", argv[1]); + switch_core_db_persistant_execute(db, sql, 5); + switch_safe_free(sql); + sql = switch_mprintf("insert into aliases (alias, command) values ('%q','%q')", argv[1], argv[2]); + switch_core_db_persistant_execute(db, sql, 5); + status = SWITCH_STATUS_SUCCESS; + } else if (!strcasecmp(argv[0], "del") && argc == 2) { + char *what = argv[1]; + if (!strcasecmp(what, "*")) { + switch_core_db_persistant_execute(db, "delete from aliases", 1); + } else { + sql = switch_mprintf("delete from aliases where alias='%q'", argv[1]); + switch_core_db_persistant_execute(db, sql, 5); + } + status = SWITCH_STATUS_SUCCESS; + } + switch_safe_free(sql); + switch_core_db_close(db); + } + } + + switch_safe_free(mydata); + + return status; + +} + + SWITCH_DECLARE(void) switch_console_loop(void) { switch_thread_t *thread; @@ -712,7 +796,7 @@ } if (cmd[0]) { - running = switch_console_process(cmd); + running = switch_console_process(cmd, 0); } } } Modified: freeswitch/trunk/src/switch_core_sqldb.c ============================================================================== --- freeswitch/trunk/src/switch_core_sqldb.c (original) +++ freeswitch/trunk/src/switch_core_sqldb.c Wed Apr 23 13:38:13 2008 @@ -380,6 +380,12 @@ " a10 VARCHAR(255)\n" ");\n"; + char create_alias_sql[] = + "CREATE TABLE aliases (\n" + " alias VARCHAR(255),\n" + " command VARCHAR(255)\n" + ");\n"; + char create_channels_sql[] = "CREATE TABLE channels (\n" " uuid VARCHAR(255),\n" @@ -440,6 +446,7 @@ switch_core_db_exec(sql_manager.db, "PRAGMA temp_store=MEMORY;", NULL, NULL, NULL); switch_core_db_test_reactive(sql_manager.db, "select a1 from complete", "DROP TABLE complete", create_complete_sql); + switch_core_db_test_reactive(sql_manager.db, "select alias from aliases", "DROP TABLE aliases", create_alias_sql); switch_core_db_exec(sql_manager.db, create_channels_sql, NULL, NULL, NULL); switch_core_db_exec(sql_manager.db, create_calls_sql, NULL, NULL, NULL); switch_core_db_exec(sql_manager.db, create_interfaces_sql, NULL, NULL, NULL);

1 0

[commit] r8178 - in freeswitch/trunk: . debian docs
by Freeswitch SVN 23 Apr '08

23 Apr '08

Author: anthm Date: Wed Apr 23 13:33:00 2008 New Revision: 8178 Modified: freeswitch/trunk/debian/changelog freeswitch/trunk/debian/files freeswitch/trunk/docs/ChangeLog freeswitch/trunk/freeswitch.spec Log: getting ready for rc4 Modified: freeswitch/trunk/debian/changelog ============================================================================== --- freeswitch/trunk/debian/changelog (original) +++ freeswitch/trunk/debian/changelog Wed Apr 23 13:33:00 2008 @@ -1,3 +1,38 @@ +freeswitch (1.0~rc4-1) unstable; urgency=low + * Add tab completion in cli + Add "inline" dialplan + Fixed segfault in enum + Enhance enum to fork dial equal priority entries + Added auto-reload to enum + Fixed odbc bug is mod_sofia presence handling + Add presence for conference and dial an eavesdrop + Fix stack overflow segfault when recursively parking calls + Fixed race is sofia registration handling + Enhance sofia registration, unregister on keep-alive OPTIONS failure + Added internal routing loop detection/avoidance + Fixed race in bgapi in event socket + Fixed vars to execute apps before bridge "bridge_pre_execute_aleg_app" and "bridge_pre_execute_bleg_app" + Fixed re-setting sound prefix to no prefix after a pharse + Enhanced setting of bracket vars from originate so they show in the CHANNEL_ORIGINATE event + Add "enable-timer" and "enable-100rel" options to turn off default behaviors in sofia + Add originate_timeout to originate vars + Fixed hanging channels in mod_portaudio + Added auto time sync on vps migration to different hardware + Fixed seg on transfer when both legs are not sip + Added configurable dtmf duration defaults + Enhanced voicemail, allow interruption of hello message + Fixed voicemail to not light up light on saved messages + Enhance mod_amr honor disable dtx in fmtp (MODCODEC-3) + Fixed bootstrap to install automake dependencies so you can use tarball without same version of automake installed + Fixed MODLANG-56 (bad audio on originate and javascript streamFile) + Added hold/unhold dialplan apps + Enhanced sofia error checking to outlaw 0.0.0.0 in sofia ip params + Backport fixes from sofia-sip tree + Fixed MSVC build + Fixed segfault on sip SUBSCRIBE with Expires: 0 + + -- Michael Jerris <mike(a)jerris.com> Wed, 23 Apr 2008 12:58:00 -0400 + freeswitch (1.0~rc3-1) unstable; urgency=low * Enhance xml menu system fixes upstream from sofia-sip library Modified: freeswitch/trunk/debian/files ============================================================================== --- freeswitch/trunk/debian/files (original) +++ freeswitch/trunk/debian/files Wed Apr 23 13:33:00 2008 @@ -1,9 +1,9 @@ -freeswitch_1.0~rc3-1_i386.deb net extra -freeswitch-spidermonkey_1.0~rc3-1_i386.deb net extra -freeswitch-dev_1.0~rc3-1_i386.deb net extra -freeswitch-codec-passthru-g7231_1.0~rc3-1_i386.deb net extra -freeswitch-codec-passthru-amr_1.0~rc3-1_i386.deb net extra -freeswitch-codec-passthru-g729_1.0~rc3-1_i386.deb net extra -freeswitch-lang-en_1.0~rc3-1_i386.deb net extra -freeswitch-lang-de_1.0~rc3-1_i386.deb net extra -freeswitch-lang-fr_1.0~rc3-1_i386.deb net extra +freeswitch_1.0~rc4-1_i386.deb net extra +freeswitch-spidermonkey_1.0~rc4-1_i386.deb net extra +freeswitch-dev_1.0~rc4-1_i386.deb net extra +freeswitch-codec-passthru-g7231_1.0~rc4-1_i386.deb net extra +freeswitch-codec-passthru-amr_1.0~rc4-1_i386.deb net extra +freeswitch-codec-passthru-g729_1.0~rc4-1_i386.deb net extra +freeswitch-lang-en_1.0~rc4-1_i386.deb net extra +freeswitch-lang-de_1.0~rc4-1_i386.deb net extra +freeswitch-lang-fr_1.0~rc4-1_i386.deb net extra Modified: freeswitch/trunk/docs/ChangeLog ============================================================================== --- freeswitch/trunk/docs/ChangeLog (original) +++ freeswitch/trunk/docs/ChangeLog Wed Apr 23 13:33:00 2008 @@ -1,3 +1,37 @@ +freeswitch (1.0.rc4) + + Add tab completion in cli + Add "inline" dialplan + Fixed segfault in enum + Enhance enum to fork dial equal priority entries + Added auto-reload to enum + Fixed odbc bug is mod_sofia presence handling + Add presence for conference and dial an eavesdrop + Fix stack overflow segfault when recursively parking calls + Fixed race is sofia registration handling + Enhance sofia registration, unregister on keep-alive OPTIONS failure + Added internal routing loop detection/avoidance + Fixed race in bgapi in event socket + Fixed vars to execute apps before bridge "bridge_pre_execute_aleg_app" and "bridge_pre_execute_bleg_app" + Fixed re-setting sound prefix to no prefix after a pharse + Enhanced setting of bracket vars from originate so they show in the CHANNEL_ORIGINATE event + Add "enable-timer" and "enable-100rel" options to turn off default behaviors in sofia + Add originate_timeout to originate vars + Fixed hanging channels in mod_portaudio + Added auto time sync on vps migration to different hardware + Fixed seg on transfer when both legs are not sip + Added configurable dtmf duration defaults + Enhanced voicemail, allow interruption of hello message + Fixed voicemail to not light up light on saved messages + Enhance mod_amr honor disable dtx in fmtp (MODCODEC-3) + Fixed bootstrap to install automake dependencies so you can use tarball without same version of automake installed + Fixed MODLANG-56 (bad audio on originate and javascript streamFile) + Added hold/unhold dialplan apps + Enhanced sofia error checking to outlaw 0.0.0.0 in sofia ip params + Backport fixes from sofia-sip tree + Fixed MSVC build + Fixed segfault on sip SUBSCRIBE with Expires: 0 + freeswitch (1.0.rc3) Enhance xml menu system Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Wed Apr 23 13:33:00 2008 @@ -5,7 +5,7 @@ Summary: FreeSWITCH open source telephony platform License: MPL Group: Productivity/Telephony/Servers -Version: 1.0.rc1 +Version: 1.0.rc4 Release: 1 URL: http://www.freeswitch.org/ Packager: Michal Bielicki

1 0

[commit] r8177 - freeswitch/trunk/libs/voipcodecs/src
by Freeswitch SVN 23 Apr '08

23 Apr '08

Author: mikej Date: Wed Apr 23 12:49:34 2008 New Revision: 8177 Modified: freeswitch/trunk/libs/voipcodecs/src/lpc10_decode.c Log: try to silence stupid compiler Modified: freeswitch/trunk/libs/voipcodecs/src/lpc10_decode.c ============================================================================== --- freeswitch/trunk/libs/voipcodecs/src/lpc10_decode.c (original) +++ freeswitch/trunk/libs/voipcodecs/src/lpc10_decode.c Wed Apr 23 12:49:34 2008 @@ -445,8 +445,8 @@ xxy = expf(xxy); rci[j + *nout*rci_dim1 + 1] = (xxy - 1.0f)/(xxy + 1.0f); } - f = logf(*rms) - logf(s->rmso); - rmsi[*nout - 1] = logf(s->rmso) + prop * f; + f = ((logf(*rms)) - (logf(s->rmso))); + rmsi[*nout - 1] = logf(s->rmso) + (prop * f); rmsi[*nout - 1] = expf(rmsi[*nout - 1]); } }

1 0

[commit] r8176 - in freeswitch/trunk/src: . include mod/applications/mod_commands
by Freeswitch SVN 23 Apr '08

23 Apr '08

Author: anthm Date: Wed Apr 23 12:46:24 2008 New Revision: 8176 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/switch_console.c freeswitch/trunk/src/switch_core_sqldb.c Log: update Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Wed Apr 23 12:46:24 2008 @@ -1600,6 +1600,7 @@ SWITCH_DECLARE(void) switch_time_set_monotonic(switch_bool_t enable); SWITCH_DECLARE(uint32_t) switch_core_max_dtmf_duration(uint32_t duration); SWITCH_DECLARE(uint32_t) switch_core_default_dtmf_duration(uint32_t duration); +SWITCH_DECLARE(switch_status_t) switch_console_set_complete(const char *string); ///\} 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 Wed Apr 23 12:46:24 2008 @@ -1888,45 +1888,16 @@ #define COMPLETE_SYNTAX "add <word>|del [<word>|all]" SWITCH_STANDARD_API(complete_function) { - char *mydata = NULL, *argv[2] = {0}; - int fail = 1, argc; - char sql[1024] = ""; - if (cmd && (mydata = strdup(cmd))) { - if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { - switch_core_db_t *db = switch_core_db_handle(); - - if (!strcasecmp(argv[0], "add")) { - switch_snprintf(sql, sizeof(sql), "delete from complete where name = '%s'", argv[1]); - switch_core_db_persistant_execute(db, sql, 1); - switch_snprintf(sql, sizeof(sql), "insert into complete values ('%s')", argv[1]); - switch_core_db_persistant_execute(db, sql, 1); - stream->write_function(stream, "+OK\n"); - fail = 0; - } else if (!strcasecmp(argv[0], "del")) { - char *what = argv[1]; - if (!strcasecmp(what, "*")) { - switch_snprintf(sql, sizeof(sql), "delete from complete"); - } else { - switch_snprintf(sql, sizeof(sql), "delete from complete where name = '%s'", what); - } - switch_core_db_persistant_execute(db, sql, 1); - stream->write_function(stream, "+OK\n"); - fail = 0; - } + switch_status_t status; - switch_core_db_close(db); - } - } - - switch_safe_free(mydata); - - if (fail) { + if ((status = switch_console_set_complete(cmd)) == SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "+OK\n"); + } else { stream->write_function(stream, "-USAGE: %s\n", COMPLETE_SYNTAX); } return SWITCH_STATUS_SUCCESS; - } #define SHOW_SYNTAX "codec|application|api|dialplan|file|timer|calls|channels" Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Wed Apr 23 12:46:24 2008 @@ -371,6 +371,7 @@ EditLine *el; int len; int hits; + int words; char last[512]; FILE *out; }; @@ -378,10 +379,17 @@ static int comp_callback(void *pArg, int argc, char **argv, char **columnNames) { struct helper *h = (struct helper *) pArg; + char *target = NULL; + + target = argv[0]; + + if (!target) { + return -1; + } - fprintf(h->out, "%20s\t", argv[0]); + fprintf(h->out, "%20s\t", target); - switch_copy_string(h->last, argv[0], sizeof(h->last)); + switch_copy_string(h->last, target, sizeof(h->last)); if ((++h->hits % 4) == 0) { fprintf(h->out, "\n"); @@ -400,7 +408,6 @@ char *p, *lp = NULL; char *errmsg = NULL; struct helper h = { el }; - int words = 0; unsigned char ret = CC_REDISPLAY; h.out = switch_core_get_console(); @@ -416,7 +423,7 @@ for(p = buf; p && *p; p++) { if (*p == ' ') { lp = p; - words++; + h.words++; } } @@ -428,7 +435,7 @@ fprintf(h.out, "\n\n"); - if (words == 0) { + if (h.words == 0) { sql = switch_mprintf("select distinct name from interfaces where type='api' and name like '%s%%' order by name", buf); } else { sql = switch_mprintf("select distinct uuid from channels where uuid like '%s%%' order by uuid", buf); @@ -444,14 +451,42 @@ } if (h.hits != 1) { - switch_safe_free(sql); - sql = switch_mprintf("select distinct name from complete where name like '%s%%' order by name", buf); - switch_core_db_exec(db, sql, comp_callback, &h, &errmsg); + char *dupdup = strdup(dup); + switch_assert(dupdup); + int x, argc = 0; + char *argv[10] = {0}; + switch_stream_handle_t stream = { 0 }; + SWITCH_STANDARD_STREAM(stream); + + + argc = switch_separate_string(dupdup, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + + if (h.words == 0) { + stream.write_function(&stream, + "select distinct a1 from complete where " + "a1 not in (select name from interfaces) and "); + } else { + stream.write_function(&stream, + "select distinct a%d from complete where ", h.words + 1); + + } + + for(x = 0; x < argc; x++) { + stream.write_function(&stream, "(a%d = '' or a%d like '%s%%')%s", x+1, x+1, switch_str_nil(argv[x]), x == argc -1 ? "" : " and "); + } + switch_core_db_exec(db, stream.data, comp_callback, &h, &errmsg); + if (errmsg) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error [%s][%s]\n", sql, errmsg); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error [%s][%s]\n", (char *) stream.data, errmsg); free(errmsg); ret = CC_ERROR; + } + + switch_safe_free(dupdup); + switch_safe_free(stream.data); + + if (ret == CC_ERROR) { goto end; } } @@ -475,6 +510,51 @@ return (ret); } + +SWITCH_DECLARE(switch_status_t) switch_console_set_complete(const char *string) +{ + char *mydata = NULL, *argv[11] = {0}; + int argc, x; + switch_status_t status = SWITCH_STATUS_FALSE; + + if (string && (mydata = strdup(string))) { + if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { + switch_core_db_t *db = switch_core_db_handle(); + switch_stream_handle_t mystream = { 0 }; + SWITCH_STANDARD_STREAM(mystream); + + if (!strcasecmp(argv[0], "add")) { + mystream.write_function(&mystream, "insert into complete values ("); + for(x = 0; x < 10; x++) { + mystream.write_function(&mystream, "'%s'%s", switch_str_nil(argv[x+1]), x == 9 ? ")" : ", "); + } + switch_core_db_persistant_execute(db, mystream.data, 1); + status = SWITCH_STATUS_SUCCESS; + } else if (!strcasecmp(argv[0], "del")) { + char *what = argv[1]; + if (!strcasecmp(what, "*")) { + switch_core_db_persistant_execute(db, "delete from complete", 1); + } else { + mystream.write_function(&mystream, "delete from complete where "); + for(x = 0; x < argc - 1; x++) { + mystream.write_function(&mystream, "a%d = '%s'%s", x+1, switch_str_nil(argv[x+1]), x == argc - 2 ? "" : " and "); + } + switch_core_db_persistant_execute(db, mystream.data, 1); + } + status = SWITCH_STATUS_SUCCESS; + } + switch_safe_free(mystream.data); + switch_core_db_close(db); + } + } + + switch_safe_free(mydata); + + return status; + +} + + SWITCH_DECLARE(void) switch_console_loop(void) { switch_thread_t *thread; Modified: freeswitch/trunk/src/switch_core_sqldb.c ============================================================================== --- freeswitch/trunk/src/switch_core_sqldb.c (original) +++ freeswitch/trunk/src/switch_core_sqldb.c Wed Apr 23 12:46:24 2008 @@ -368,7 +368,16 @@ } else { char create_complete_sql[] = "CREATE TABLE complete (\n" - " name VARCHAR(255)\n" + " a1 VARCHAR(255),\n" + " a2 VARCHAR(255),\n" + " a3 VARCHAR(255),\n" + " a4 VARCHAR(255),\n" + " a5 VARCHAR(255),\n" + " a6 VARCHAR(255),\n" + " a7 VARCHAR(255),\n" + " a8 VARCHAR(255),\n" + " a9 VARCHAR(255),\n" + " a10 VARCHAR(255)\n" ");\n"; char create_channels_sql[] = @@ -430,7 +439,7 @@ switch_core_db_exec(sql_manager.db, "PRAGMA cache_size=8000", NULL, NULL, NULL); switch_core_db_exec(sql_manager.db, "PRAGMA temp_store=MEMORY;", NULL, NULL, NULL); - switch_core_db_exec(sql_manager.db, create_complete_sql, NULL, NULL, NULL); + switch_core_db_test_reactive(sql_manager.db, "select a1 from complete", "DROP TABLE complete", create_complete_sql); switch_core_db_exec(sql_manager.db, create_channels_sql, NULL, NULL, NULL); switch_core_db_exec(sql_manager.db, create_calls_sql, NULL, NULL, NULL); switch_core_db_exec(sql_manager.db, create_interfaces_sql, NULL, NULL, NULL);

1 0

[commit] r8175 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 23 Apr '08

23 Apr '08

Author: anthm Date: Wed Apr 23 10:57:03 2008 New Revision: 8175 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: update 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 Wed Apr 23 10:57:03 2008 @@ -2752,6 +2752,7 @@ } jss->session = peer_session; + switch_set_flag(jss, S_HUP); *rval = BOOLEAN_TO_JSVAL(JS_TRUE); switch_channel_set_state(switch_core_session_get_channel(jss->session), CS_TRANSMIT); @@ -2781,7 +2782,7 @@ switch_channel_set_private(channel, "jss", NULL); switch_core_event_hook_remove_state_change(session, hanguphook); - if (switch_test_flag(jss, S_HUP) || switch_channel_get_state(channel) != CS_EXECUTE) { + if (switch_test_flag(jss, S_HUP)) { switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); }

1 0

[commit] r8174 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by Freeswitch SVN 22 Apr '08

22 Apr '08

Author: mikej Date: Tue Apr 22 17:26:50 2008 New Revision: 8174 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c Log: interim fix for SFSIP-55, don't segfault on subscribe with Expires: 0 Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Apr 22 17:26:50 2008 @@ -1 +1 @@ -Mon Apr 21 18:30:34 EDT 2008 +Tue Apr 22 16:13:56 CDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c Tue Apr 22 17:26:50 2008 @@ -351,8 +351,8 @@ /* nu_requested is set by SUBSCRIBE and cleared when NOTIFY is sent */ if (nu && nu->nu_requested && substate != nua_substate_embryonic) { -#if SU_HAVE_EXPERIMENTAL sip_t const *sip = sr->sr_request.sip; +#if SU_HAVE_EXPERIMENTAL sip_suppress_notify_if_match_t *snim = sip_suppress_notify_if_match(sip); sip_suppress_body_if_match_t *sbim = sip_suppress_body_if_match(sip); @@ -364,7 +364,7 @@ notify = 1, nu->nu_no_body = 1; else #endif - notify = 1; + if (sip->sip_expires && sip->sip_expires->ex_delta) notify = 1; } retval = nua_base_server_treport(sr, NUTAG_SUBSTATE(substate), TAG_END());

1 0

[commit] r8173 - freeswitch/trunk/src
by Freeswitch SVN 22 Apr '08

22 Apr '08

Author: anthm Date: Tue Apr 22 17:25:38 2008 New Revision: 8173 Modified: freeswitch/trunk/src/switch_console.c Log: tweak Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Tue Apr 22 17:25:38 2008 @@ -461,7 +461,6 @@ if (h.hits == 1) { el_deletestr(el, h.len); el_insertstr(el, h.last); - el_insertstr(el, " "); } end:

1 0