September 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r9667 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 26 Sep '08

26 Sep '08

Author: anthm Date: Fri Sep 26 15:17:03 2008 New Revision: 9667 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: deal with MODENDP-138 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 Fri Sep 26 15:17:03 2008 @@ -1279,63 +1279,87 @@ } } else if (!strcasecmp(argv[0], "profile")) { struct cb_helper cb; + char *sql = NULL; if ((argv[1]) && (profile = sofia_glue_find_profile(argv[1]))) { - stream->write_function(stream, "%s\n", line); - stream->write_function(stream, "Name \t\t%s\n", switch_str_nil(argv[1])); - stream->write_function(stream, "Domain Name \t\t%s\n", profile->domain_name ? profile->domain_name : "N/A"); - if (strcasecmp(argv[1], profile->name)) { - stream->write_function(stream, "Alias Of \t\t%s\n", switch_str_nil(profile->name)); - } - stream->write_function(stream, "DBName \t\t%s\n", switch_str_nil(profile->dbname)); - stream->write_function(stream, "Pres Hosts \t\t%s\n", switch_str_nil(profile->presence_hosts)); - stream->write_function(stream, "Dialplan \t\t%s\n", switch_str_nil(profile->dialplan)); - stream->write_function(stream, "Context \t\t%s\n", switch_str_nil(profile->context)); - stream->write_function(stream, "Challenge Realm\t\t%s\n", - switch_strlen_zero(profile->challenge_realm) ? "auto_to" : profile->challenge_realm); - stream->write_function(stream, "RTP-IP \t\t%s\n", switch_str_nil(profile->rtpip)); - if (profile->extrtpip) { - stream->write_function(stream, "Ext-RTP-IP \t\t%s\n", profile->extrtpip); - } + if (!argv[2] || strcasecmp(argv[2], "reg")) { + stream->write_function(stream, "%s\n", line); + stream->write_function(stream, "Name \t\t%s\n", switch_str_nil(argv[1])); + stream->write_function(stream, "Domain Name \t\t%s\n", profile->domain_name ? profile->domain_name : "N/A"); + if (strcasecmp(argv[1], profile->name)) { + stream->write_function(stream, "Alias Of \t\t%s\n", switch_str_nil(profile->name)); + } + stream->write_function(stream, "DBName \t\t%s\n", switch_str_nil(profile->dbname)); + stream->write_function(stream, "Pres Hosts \t\t%s\n", switch_str_nil(profile->presence_hosts)); + stream->write_function(stream, "Dialplan \t\t%s\n", switch_str_nil(profile->dialplan)); + stream->write_function(stream, "Context \t\t%s\n", switch_str_nil(profile->context)); + stream->write_function(stream, "Challenge Realm\t\t%s\n", + switch_strlen_zero(profile->challenge_realm) ? "auto_to" : profile->challenge_realm); + stream->write_function(stream, "RTP-IP \t\t%s\n", switch_str_nil(profile->rtpip)); + if (profile->extrtpip) { + stream->write_function(stream, "Ext-RTP-IP \t\t%s\n", profile->extrtpip); + } - stream->write_function(stream, "SIP-IP \t\t%s\n", switch_str_nil(profile->sipip)); - if (profile->extsipip) { - stream->write_function(stream, "Ext-SIP-IP \t\t%s\n", profile->extsipip); - } - stream->write_function(stream, "URL \t\t%s\n", switch_str_nil(profile->url)); - stream->write_function(stream, "BIND-URL \t\t%s\n", switch_str_nil(profile->bindurl)); - if (sofia_test_pflag(profile, PFLAG_TLS)) { - stream->write_function(stream, "TLS-URL \t\t%s\n", switch_str_nil(profile->tls_url)); - stream->write_function(stream, "TLS-BIND-URL \t%s\n", switch_str_nil(profile->tls_bindurl)); - } - stream->write_function(stream, "HOLD-MUSIC \t\t%s\n", switch_strlen_zero(profile->hold_music) ? "N/A" : profile->hold_music); - stream->write_function(stream, "CODECS \t\t%s\n", switch_str_nil(profile->codec_string)); - stream->write_function(stream, "TEL-EVENT \t\t%d\n", profile->te); - if (profile->dtmf_type == DTMF_2833) { - stream->write_function(stream, "DTMF-MODE \t\trfc2833\n"); - } else if (profile->dtmf_type == DTMF_INFO) { - stream->write_function(stream, "DTMF-MODE \t\tinfo\n"); - } else { - stream->write_function(stream, "DTMF-MODE \t\tnone\n"); + stream->write_function(stream, "SIP-IP \t\t%s\n", switch_str_nil(profile->sipip)); + if (profile->extsipip) { + stream->write_function(stream, "Ext-SIP-IP \t\t%s\n", profile->extsipip); + } + stream->write_function(stream, "URL \t\t%s\n", switch_str_nil(profile->url)); + stream->write_function(stream, "BIND-URL \t\t%s\n", switch_str_nil(profile->bindurl)); + if (sofia_test_pflag(profile, PFLAG_TLS)) { + stream->write_function(stream, "TLS-URL \t\t%s\n", switch_str_nil(profile->tls_url)); + stream->write_function(stream, "TLS-BIND-URL \t%s\n", switch_str_nil(profile->tls_bindurl)); + } + stream->write_function(stream, "HOLD-MUSIC \t\t%s\n", switch_strlen_zero(profile->hold_music) ? "N/A" : profile->hold_music); + stream->write_function(stream, "CODECS \t\t%s\n", switch_str_nil(profile->codec_string)); + stream->write_function(stream, "TEL-EVENT \t\t%d\n", profile->te); + if (profile->dtmf_type == DTMF_2833) { + stream->write_function(stream, "DTMF-MODE \t\trfc2833\n"); + } else if (profile->dtmf_type == DTMF_INFO) { + stream->write_function(stream, "DTMF-MODE \t\tinfo\n"); + } else { + stream->write_function(stream, "DTMF-MODE \t\tnone\n"); + } + stream->write_function(stream, "CNG \t\t%d\n", profile->cng_pt); + stream->write_function(stream, "SESSION-TO \t\t%d\n", profile->session_timeout); + stream->write_function(stream, "MAX-DIALOG \t\t%d\n", profile->max_proceeding); + stream->write_function(stream, "NOMEDIA \t\t%s\n", switch_test_flag(profile, TFLAG_INB_NOMEDIA) ? "true" : "false"); + stream->write_function(stream, "LATE-NEG \t\t%s\n", switch_test_flag(profile, TFLAG_LATE_NEGOTIATION) ? "true" : "false"); + stream->write_function(stream, "PROXY-MEDIA \t\t%s\n", switch_test_flag(profile, TFLAG_PROXY_MEDIA) ? "true" : "false"); + stream->write_function(stream, "AGGRESSIVENAT \t\t%s\n", sofia_test_pflag(profile, PFLAG_AGGRESSIVE_NAT_DETECTION) ? "true" : "false"); + stream->write_function(stream, "STUN_ENABLED \t\t%s\n", sofia_test_pflag(profile, PFLAG_STUN_ENABLED) ? "true" : "false"); + stream->write_function(stream, "STUN_AUTO_DISABLE \t%s\n", sofia_test_pflag(profile, PFLAG_STUN_AUTO_DISABLE) ? "true" : "false"); } - stream->write_function(stream, "CNG \t\t%d\n", profile->cng_pt); - stream->write_function(stream, "SESSION-TO \t\t%d\n", profile->session_timeout); - stream->write_function(stream, "MAX-DIALOG \t\t%d\n", profile->max_proceeding); - stream->write_function(stream, "NOMEDIA \t\t%s\n", switch_test_flag(profile, TFLAG_INB_NOMEDIA) ? "true" : "false"); - stream->write_function(stream, "LATE-NEG \t\t%s\n", switch_test_flag(profile, TFLAG_LATE_NEGOTIATION) ? "true" : "false"); - stream->write_function(stream, "PROXY-MEDIA \t\t%s\n", switch_test_flag(profile, TFLAG_PROXY_MEDIA) ? "true" : "false"); - stream->write_function(stream, "AGGRESSIVENAT \t\t%s\n", sofia_test_pflag(profile, PFLAG_AGGRESSIVE_NAT_DETECTION) ? "true" : "false"); - stream->write_function(stream, "STUN_ENABLED \t\t%s\n", sofia_test_pflag(profile, PFLAG_STUN_ENABLED) ? "true" : "false"); - stream->write_function(stream, "STUN_AUTO_DISABLE \t%s\n", sofia_test_pflag(profile, PFLAG_STUN_AUTO_DISABLE) ? "true" : "false"); stream->write_function(stream, "\nRegistrations:\n%s\n", line); cb.profile = profile; cb.stream = stream; + + if (argv[3]) { + if (argv[4]) { + if (!strcasecmp(argv[3], "pres")) { + sql = switch_mprintf("select call_id,sip_user,sip_host,contact,status," + "rpid,expires,user_agent,server_user,server_host,profile_name,hostname" + " from sip_registrations where profile_name='%q' and presence_hosts like '%%%q%%'", + profile->name, argv[4]); + } + } else { + sql = switch_mprintf("select call_id,sip_user,sip_host,contact,status," + "rpid,expires,user_agent,server_user,server_host,profile_name,hostname" + " from sip_registrations where profile_name='%q' and contact like '%%%q%%'", + profile->name, argv[3]); + } + } + + if (!sql) { + sql = switch_mprintf("select call_id,sip_user,sip_host,contact,status," + "rpid,expires,user_agent,server_user,server_host,profile_name,hostname" + " from sip_registrations where profile_name='%q'", + profile->name); + } - sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, - "select call_id,sip_user,sip_host,contact,status," - "rpid,expires,user_agent,server_user,server_host,profile_name,hostname" - " from sip_registrations", show_reg_callback, &cb); + sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, sql, show_reg_callback, &cb); + free(sql); stream->write_function(stream, "%s\n", line);

1 0

[commit] r9666 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 26 Sep '08

26 Sep '08

Author: brian Date: Fri Sep 26 14:26:00 2008 New Revision: 9666 Modified: freeswitch/trunk/conf/sip_profiles/internal.xml Log: Document chances from MODENDP-131 for min se Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Fri Sep 26 14:26:00 2008 @@ -47,6 +47,7 @@    +  <param name="apply-inbound-acl" value="domains"/>

1 0

[commit] r9665 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 26 Sep '08

26 Sep '08

Author: brian Date: Fri Sep 26 14:21:42 2008 New Revision: 9665 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: MODENDP-131 with minor mods Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Fri Sep 26 14:21:42 2008 @@ -368,6 +368,7 @@ uint32_t inuse; time_t started; uint32_t session_timeout; + uint32_t minimum_session_expires; uint32_t max_proceeding; uint32_t rtp_timeout_sec; uint32_t rtp_hold_timeout_sec; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Fri Sep 26 14:21:42 2008 @@ -575,6 +575,7 @@ NUTAG_ALLOW("NOTIFY"), NUTAG_ALLOW_EVENTS("talk"), NUTAG_SESSION_TIMER(profile->session_timeout), + TAG_IF(profile->minimum_session_expires, NUTAG_MIN_SE(profile->minimum_session_expires)), NTATAG_MAX_PROCEEDING(profile->max_proceeding), TAG_IF(profile->pres_type, NUTAG_ALLOW("PUBLISH")), TAG_IF(profile->pres_type, NUTAG_ALLOW("SUBSCRIBE")), @@ -1682,6 +1683,12 @@ if (!switch_true(val)) { profile->pflags |= PFLAG_DISABLE_TIMER; } + } else if (!strcasecmp(var, "minimum-session-expires")) { + profile->minimum_session_expires = atoi(val); + /* per RFC 4028: minimum_session_expires must be > 90 */ + if (profile->minimum_session_expires < 90) { + profile->minimum_session_expires = 90; + } } else if (!strcasecmp(var, "enable-100rel")) { if (!switch_true(val)) { profile->pflags |= PFLAG_DISABLE_100REL;

1 0

[commit] r9664 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 26 Sep '08

26 Sep '08

Author: mikej Date: Fri Sep 26 14:17:11 2008 New Revision: 9664 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: spellcheck 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 Fri Sep 26 14:17:11 2008 @@ -1775,7 +1775,7 @@ path and right side as a time limit on the recording */ - /* if we find a + and the charecter before it is a space */ + /* if we find a + and the character before it is a space */ if ((path_end = strrchr(path, '+')) && path_end > path && *(path_end - 1) == ' ') { char *limit_start = path_end + 1;

1 0

[commit] r9663 - freeswitch/trunk/src/mod/asr_tts/mod_cepstral
by Freeswitch SVN 26 Sep '08

26 Sep '08

Author: mikej Date: Fri Sep 26 14:14:37 2008 New Revision: 9663 Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c Log: extra protection 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 Fri Sep 26 14:14:37 2008 @@ -150,7 +150,7 @@ voice_name = NULL; } - if (!voice_name) { + if (switch_strlen_zero(voice_name)) { /* Find the first voice on the system */ if ((cepstral->voice = swift_port_find_first_voice(cepstral->port, NULL, NULL)) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to find any voices!\n"); @@ -219,6 +219,9 @@ cepstral->tts_stream = NULL; + if (switch_strlen_zero(text)) { + return SWITCH_STATUS_FALSE; + } if (!strncasecmp(text, fp, len)) { text += len; if (switch_strlen_zero(text)) {

1 0

[commit] r9662 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 26 Sep '08

26 Sep '08

Author: mikej Date: Fri Sep 26 14:03:17 2008 New Revision: 9662 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: (MODAPP-148) fix parsing fix windows build 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 Fri Sep 26 14:03:17 2008 @@ -1310,7 +1310,9 @@ SWITCH_STANDARD_APP(sleep_function) -{ +{ + switch_channel_t *channel = switch_core_session_get_channel(session); + if (switch_strlen_zero(data)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No timeout specified.\n"); } else { @@ -1322,7 +1324,6 @@ args.buf = buf; args.buflen = sizeof(buf); - switch_channel_t *channel = switch_core_session_get_channel(session); switch_channel_set_variable(channel, SWITCH_PLAYBACK_TERMINATOR_USED, "" ); switch_ivr_sleep(session, ms, &args); @@ -1619,12 +1620,12 @@ SWITCH_STANDARD_APP(playback_function) { switch_input_args_t args = { 0 }; + switch_channel_t *channel = switch_core_session_get_channel(session); switch_channel_pre_answer(switch_core_session_get_channel(session)); args.input_callback = on_dtmf; - switch_channel_t *channel = switch_core_session_get_channel(session); switch_channel_set_variable(channel, SWITCH_PLAYBACK_TERMINATOR_USED, "" ); switch_ivr_play_file(session, NULL, data, &args); @@ -1636,6 +1637,7 @@ switch_input_args_t args = { 0 }; char *l; int32_t loops = 0; + switch_channel_t *channel = switch_core_session_get_channel(session); if (switch_strlen_zero(data) || !(tone_script = switch_core_session_strdup(session, data))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Params!\n"); @@ -1655,7 +1657,6 @@ args.input_callback = on_dtmf; - switch_channel_t *channel = switch_core_session_get_channel(session); switch_channel_set_variable(channel, SWITCH_PLAYBACK_TERMINATOR_USED, "" ); switch_ivr_gentones(session, tone_script, loops, &args); @@ -1759,7 +1760,8 @@ SWITCH_STANDARD_APP(record_session_function) { - char *p, *path = NULL; + char *path = NULL; + char *path_end; uint32_t limit = 0; if (switch_strlen_zero(data)) { @@ -1768,17 +1770,28 @@ path = switch_core_session_strdup(session, data); - if (!path) - return; + /* Search for a space then a plus followed by only numbers at the end of the path, + if found trim any spaces to the left/right of the plus use the left side as the + path and right side as a time limit on the recording + */ + + /* if we find a + and the charecter before it is a space */ + if ((path_end = strrchr(path, '+')) && path_end > path && *(path_end - 1) == ' ') { + char *limit_start = path_end + 1; + + /* not at the end and the rest is numbers lets parse out the limit and fix up the path */ + if (*limit_start != '\0' && switch_is_number(limit_start) == SWITCH_TRUE) { + limit = atoi(limit_start); + /* back it off by one charecter to the char before the + */ + path_end--; + + /* trim spaces to the left of the plus */ + while(path_end > path && *path_end == ' ') { + path_end--; + } - if ((p = strchr(path, '+'))) { - char *q = p - 1; - while (q && *q == ' ') { - *q = '\0'; - q--; + *(path_end + 1) = '\0'; } - *p++ = '\0'; - limit = atoi(p); } switch_ivr_record_session(session, path, limit, NULL); } @@ -2349,7 +2362,7 @@ SWITCH_ADD_APP(app_interface, "att_xfer", "Attended Transfer", "Attended Transfer", att_xfer_function, "<channel_url>", SAF_NONE); SWITCH_ADD_APP(app_interface, "read", "Read Digits", "Read Digits", read_function, "<min> <max> <file> <var name> <timeout> <terminators>", SAF_NONE); SWITCH_ADD_APP(app_interface, "stop_record_session", "Stop Record Session", STOP_SESS_REC_DESC, stop_record_session_function, "<path>", SAF_NONE); - SWITCH_ADD_APP(app_interface, "record_session", "Record Session", SESS_REC_DESC, record_session_function, "<path>", SAF_NONE); + SWITCH_ADD_APP(app_interface, "record_session", "Record Session", SESS_REC_DESC, record_session_function, "<path> [+<timeout>]", SAF_NONE); SWITCH_ADD_APP(app_interface, "record", "Record File", "Record a file from the channels input", record_function, "<path> [<time_limit_secs>] [<silence_thresh>] [<silence_hits>]", SAF_NONE); SWITCH_ADD_APP(app_interface, "stop_displace_session", "Stop Displace File", "Stop Displacing to a file", stop_displace_session_function, "<path>",

1 0

[commit] r9661 - freeswitch/trunk/src/mod/languages/mod_lua/lua
by Freeswitch SVN 26 Sep '08

26 Sep '08

Author: mikej Date: Fri Sep 26 13:36:01 2008 New Revision: 9661 Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/loslib.c Log: if we want to override system function in lua we should do so from mod_lua, not hack the lib. We did the same thing for exit. Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/loslib.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/lua/loslib.c (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/lua/loslib.c Fri Sep 26 13:36:01 2008 @@ -36,7 +36,7 @@ static int os_execute (lua_State *L) { - lua_pushinteger(L, switch_system(luaL_optstring(L, 1, NULL), 1)); + lua_pushinteger(L, system(luaL_optstring(L, 1, NULL))); return 1; }

1 0

[commit] r9660 - freeswitch/trunk/src/mod/languages/mod_lua/lua
by Freeswitch SVN 26 Sep '08

26 Sep '08

Author: mikej Date: Fri Sep 26 13:26:36 2008 New Revision: 9660 Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/loslib.c Log: fix lua build Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/loslib.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/lua/loslib.c (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/lua/loslib.c Fri Sep 26 13:26:36 2008 @@ -36,7 +36,7 @@ static int os_execute (lua_State *L) { - lua_pushinteger(L, switch_system(luaL_optstring(L, 1, NULL), SWITCH_TRUE)); + lua_pushinteger(L, switch_system(luaL_optstring(L, 1, NULL), 1)); return 1; }

1 0

[commit] r9659 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 26 Sep '08

26 Sep '08

Author: anthm Date: Fri Sep 26 13:00:30 2008 New Revision: 9659 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: expand notify thing to let you pick a certian call_id instead of user@host 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 Fri Sep 26 13:00:30 2008 @@ -2166,20 +2166,31 @@ const char *es = switch_event_get_header(event, "event-string"); const char *user = switch_event_get_header(event, "user"); const char *host = switch_event_get_header(event, "host"); + const char *call_id = switch_event_get_header(event, "call-id"); const char *body = switch_event_get_body(event); sofia_profile_t *profile; if (profile_name && ct && es && user && host && (profile = sofia_glue_find_profile(profile_name))) { - char *sql = switch_mprintf("select sip_user,sip_host,contact,profile_name,'%q','%q','%q' " - "from sip_registrations where sip_user='%s' and sip_host='%q'", - ct, es, body, user, host - ); + char *sql; + + if (call_id) { + sql = switch_mprintf("select sip_user,sip_host,contact,profile_name,'%q','%q','%q' " + "from sip_registrations where call_id='%q'", ct, es, body, call_id + ); + } else { + sql = switch_mprintf("select sip_user,sip_host,contact,profile_name,'%q','%q','%q' " + "from sip_registrations where sip_user='%s' and sip_host='%q'", + ct, es, body, user, host + ); + } switch_mutex_lock(profile->ireg_mutex); sofia_glue_execute_sql_callback(profile, SWITCH_TRUE, NULL, sql, notify_callback, profile); switch_mutex_unlock(profile->ireg_mutex); sofia_glue_release_profile(profile); + + free(sql); } }

1 0

[commit] r9658 - in freeswitch/trunk/src: . include
by Freeswitch SVN 26 Sep '08

26 Sep '08

Author: mikej Date: Fri Sep 26 12:40:16 2008 New Revision: 9658 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/switch_core.c Log: tweak Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Fri Sep 26 12:40:16 2008 @@ -1654,7 +1654,7 @@ SWITCH_DECLARE(switch_status_t) switch_console_set_complete(const char *string); SWITCH_DECLARE(switch_status_t) switch_console_set_alias(const char *string); -SWITCH_DECLARE(int) switch_system(char *cmd, switch_bool_t wait); +SWITCH_DECLARE(int) switch_system(const char *cmd, switch_bool_t wait); ///\} Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Fri Sep 26 12:40:16 2008 @@ -1459,7 +1459,7 @@ return NULL; } -SWITCH_DECLARE(int) switch_system(char *cmd, switch_bool_t wait) +SWITCH_DECLARE(int) switch_system(const char *cmd, switch_bool_t wait) { switch_thread_t *thread; switch_threadattr_t *thd_attr;

1 0