June 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r8787 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 08 Jun '08

08 Jun '08

Author: anthm Date: Sat Jun 7 21:34:17 2008 New Revision: 8787 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: fix leak Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Sat Jun 7 21:34:17 2008 @@ -427,6 +427,7 @@ } switch_safe_free(user); + switch_safe_free(probe_user); } return; case SWITCH_EVENT_PRESENCE_IN:

1 0

[commit] r8786 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 07 Jun '08

07 Jun '08

Author: anthm Date: Sat Jun 7 11:34:33 2008 New Revision: 8786 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: add sip_outgoing_call_id variable Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Sat Jun 7 11:34:33 2008 @@ -930,6 +930,7 @@ const char *val; const char *rep; char *sticky = NULL; + const char *call_id = NULL; rep = switch_channel_get_variable(channel, SOFIA_REPLACES_HEADER); @@ -1156,6 +1157,8 @@ sofia_glue_tech_patch_sdp(tech_pvt); } + call_id = switch_channel_get_variable(channel, "sip_outgoing_call_id"); + nua_invite(tech_pvt->nh, NUTAG_AUTOANSWER(0), NUTAG_SESSION_TIMER(session_timeout), @@ -1164,6 +1167,7 @@ TAG_IF(!switch_strlen_zero(extra_headers), SIPTAG_HEADER_STR(extra_headers)), TAG_IF(!switch_strlen_zero(max_forwards), SIPTAG_MAX_FORWARDS_STR(max_forwards)), TAG_IF(sticky, NUTAG_PROXY(tech_pvt->record_route)), + TAG_IF(call_id, SIPTAG_CALL_ID_STR(call_id)), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_REUSE_REJECTED(1), SOATAG_ORDERED_USER(1),

1 0

[commit] r8785 - freeswitch/trunk/src
by Freeswitch SVN 06 Jun '08

06 Jun '08

Author: anthm Date: Fri Jun 6 15:20:01 2008 New Revision: 8785 Modified: freeswitch/trunk/src/switch_cpp.cpp Log: tweak Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Fri Jun 6 15:20:01 2008 @@ -342,34 +342,13 @@ SWITCH_DECLARE_CONSTRUCTOR CoreSession::CoreSession() { - session = NULL; - channel = NULL; - uuid = NULL; - tts_name = NULL; - voice_name = NULL; - memset(&args, 0, sizeof(args)); - ap = NULL; - on_hangup = NULL; - cb_state.function = NULL; - - memset(&caller_profile, 0, sizeof(caller_profile)); - caller_profile.source = "mod_unknown"; - caller_profile.dialplan = ""; - caller_profile.context = ""; - caller_profile.caller_id_name = ""; - caller_profile.caller_id_number = ""; - caller_profile.network_addr = ""; - caller_profile.ani = ""; - caller_profile.aniii = ""; - caller_profile.rdnis = ""; - caller_profile.username = ""; - + init_vars(); } SWITCH_DECLARE_CONSTRUCTOR CoreSession::CoreSession(char *nuuid) { - memset(&caller_profile, 0, sizeof(caller_profile)); init_vars(); + if (!strchr(nuuid, '/') && (session = switch_core_session_locate(nuuid))) { uuid = strdup(nuuid); channel = switch_core_session_get_channel(session); @@ -388,8 +367,8 @@ SWITCH_DECLARE_CONSTRUCTOR CoreSession::CoreSession(switch_core_session_t *new_session) { - memset(&caller_profile, 0, sizeof(caller_profile)); init_vars(); + if (new_session) { session = new_session; channel = switch_core_session_get_channel(session); @@ -403,14 +382,12 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CoreSession::~CoreSession desctructor\n"); switch_channel_t *channel = NULL; - init_vars(); this_check_void(); - switch_safe_free(xml_cdr_text); switch_safe_free(uuid); switch_safe_free(tts_name); switch_safe_free(voice_name); - + if (session) { channel = switch_core_session_get_channel(session); if (switch_test_flag(this, S_HUP) && !switch_channel_test_flag(channel, CF_TRANSFER)) {

1 0

[commit] r8784 - freeswitch/trunk/src
by Freeswitch SVN 06 Jun '08

06 Jun '08

Author: anthm Date: Fri Jun 6 14:24:35 2008 New Revision: 8784 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: per channel callerid Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Fri Jun 6 14:24:35 2008 @@ -729,8 +729,9 @@ for (r = 0; r < or_argc; r++) { uint32_t hups; - char *p,*e = NULL; - + char *p, *e = NULL; + const char *var_begin, *var_end; + reason = SWITCH_CAUSE_UNALLOCATED; memset(peer_names, 0, sizeof(peer_names)); peer_session = NULL; @@ -859,6 +860,31 @@ myflags |= SOF_FORKED_DIAL; } } + + if (vdata && (var_begin = switch_stristr("effective_caller_id_number=", vdata))) { + char tmp[512] = ""; + var_begin += strlen("effective_caller_id_number="); + var_end = strchr(var_begin, '|'); + if (var_end) { + strncpy(tmp, var_begin, var_end-var_begin); + } else { + strncpy(tmp, var_begin, strlen(var_begin)); + } + new_profile->caller_id_number = switch_core_strdup(new_profile->pool, tmp); + } + + if (vdata && (var_begin = switch_stristr("effective_caller_id_name=", vdata))) { + char tmp[512] = ""; + var_begin += strlen("effective_caller_id_name="); + var_end = strchr(var_begin, '|'); + if (var_end) { + strncpy(tmp, var_begin, var_end-var_begin); + } else { + strncpy(tmp, var_begin, strlen(var_begin)); + } + new_profile->caller_id_name = switch_core_strdup(new_profile->pool, tmp); + } + if ((reason = switch_core_session_outgoing_channel(session, var_event, chan_type, new_profile, &new_session, &pool, myflags)) != SWITCH_CAUSE_SUCCESS) {

1 0

[commit] r8783 - freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl
by Freeswitch SVN 06 Jun '08

06 Jun '08

Author: intralanman Date: Fri Jun 6 14:07:34 2008 New Revision: 8783 Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/dialplan_importer.php Log: RAAAAIIIIDD Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/dialplan_importer.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/dialplan_importer.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/dialplan_importer.php Fri Jun 6 14:07:34 2008 @@ -118,14 +118,14 @@ foreach ($extension -> condition as $condition) { //print_r($condition); $cf = $condition['field']; - $ce = str_replace('\\', '\\\\', $condition['expression']); + $ce = addslashes($condition['expression']); //echo "<pre>Condidtion Expression for $en:\n before: " . $condition['expression'] . "\n after: $ce</pre>"; $cb = $condition['break']; $weight = 0; foreach ($condition as $type => $action) { //echo "-------------------$type-----------------------------\n"; $app_name = $action['application']; - $app_data = str_replace('\\', '\\\\', $action['data']); + $app_data = addslashes($action['data']); $weight++; //echo "$cn\t$en\t$cf\t$ce\t$cc\t$app_name\t$app_data\t$ec\t$global_weight\t$weight\n"; $query = sprintf('%s %s %s %s %s %s;',

1 0

[commit] r8782 - in freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl: . configuration
by Freeswitch SVN 06 Jun '08

06 Jun '08

Author: intralanman Date: Fri Jun 6 13:45:47 2008 New Revision: 8782 Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/console.conf.php freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/dialplan_importer.php freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_dialplan.php freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/global_defines.php Log: added a couple of bug fixes to the dialplan_importer and fs_dialplan so that there's no longer a requirement for continue to be numeric. this implies changing the .sql so that ext_continue is no longer an int field. Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/console.conf.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/console.conf.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/console.conf.php Fri Jun 6 13:45:47 2008 @@ -30,21 +30,36 @@ $this -> xmlw -> writeAttribute('name', basename(__FILE__, '.php')); $this -> xmlw -> writeAttribute('description', 'Console configuration'); + $this -> xmlw -> startElement('mappings'); + + $this -> xmlw -> startElement('map'); + $this -> xmlw -> writeAttribute('name', 'all'); + $this -> xmlw -> writeAttribute('value', 'notice,warning,error,crit,alert,info,debug'); + $this -> xmlw -> endElement(); + + $this -> xmlw -> endElement(); + + + + $this -> xmlw -> startElement('settings'); - $this -> xmlw -> startElement('param'); + + $this -> xmlw -> startElement('param'); $this -> xmlw -> writeAttribute('name', 'colorize'); $this -> xmlw -> writeAttribute('value', 'true'); - $this -> xmlw -> endElement(); - $this -> xmlw -> endElement(); + $this -> xmlw -> endElement(); + + $this -> xmlw -> startElement('param'); + $this -> xmlw -> writeAttribute('name', 'loglevel'); + $this -> xmlw -> writeAttribute('value', 'debug'); + $this -> xmlw -> endElement(); + + $this -> xmlw -> endElement(); + + - $this -> xmlw -> startElement('mappings'); - $this -> xmlw -> startElement('map'); - $this -> xmlw -> writeAttribute('name', 'all'); - $this -> xmlw -> writeAttribute('value', 'notice,warning,error,crit,alert'); - $this -> xmlw -> endElement(); - $this -> xmlw -> endElement(); $this -> xmlw -> endElement(); } } -?> \ No newline at end of file +?> Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/dialplan_importer.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/dialplan_importer.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/dialplan_importer.php Fri Jun 6 13:45:47 2008 @@ -39,12 +39,13 @@ * @return null */ function run_query($db, $query) { + syslog(LOG_INFO, $query); $affected = $db -> exec($query); if (MDB2::isError($affected)) { if (!defined('UNSUCCESSFUL_QUERY')) { define('UNSUCCESSFUL_QUERY', true); } - echo "$query\n"; + echo "$query<br>\n"; echo $affected -> getMessage() . "\n"; } } @@ -96,7 +97,7 @@ $xml_file = $_FILES['file']['tmp_name']; move_uploaded_file($tmp_file, $xml_file); //echo $xml_file . "\n<br>"; - $xml_str = sprintf('<?xml version="1.0" encoding="UTF-8" standalone="no"?>%s', file_get_contents($xml_file)); + $xml_str = sprintf('%s', file_get_contents($xml_file)); //echo $xml_str; } @@ -111,27 +112,29 @@ $global_weight = 100; foreach ($context -> extension as $extension) { $en = $extension['name']; - $ec = is_numeric($extension['continue']) ? $extension['continue'] : '0'; + //printf("<pre>%s</pre>", print_r($extension, true)); + $ec = $extension['continue']; $global_weight+=100; foreach ($extension -> condition as $condition) { //print_r($condition); $cf = $condition['field']; - $ce = $condition['expression']; - $cc = $condition['continue']; + $ce = str_replace('\\', '\\\\', $condition['expression']); + //echo "<pre>Condidtion Expression for $en:\n before: " . $condition['expression'] . "\n after: $ce</pre>"; + $cb = $condition['break']; $weight = 0; foreach ($condition as $type => $action) { //echo "-------------------$type-----------------------------\n"; $app_name = $action['application']; - $app_data = $action['data']; + $app_data = str_replace('\\', '\\\\', $action['data']); $weight++; //echo "$cn\t$en\t$cf\t$ce\t$cc\t$app_name\t$app_data\t$ec\t$global_weight\t$weight\n"; $query = sprintf('%s %s %s %s %s %s;', - "INSERT INTO curl_dialplan SET", + "INSERT INTO dialplan SET", "context='$cn', extension='$en', condition_field='$cf',", "condition_expression='$ce', application_name='$app_name',", "application_data='$app_data', weight='$weight', type='$type',", "ext_continue='$ec', global_weight='$global_weight',", - "condition_continue='$cc'" + "cond_break='$cb'" ); run_query($db, $query); } @@ -144,4 +147,6 @@ echo "<h2>File Successfully Imported</h2>"; } upload_form(); -?> \ No newline at end of file + +//printf("<pre>%s</pre>", print_r($xml_obj, true); +?> Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_dialplan.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_dialplan.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_dialplan.php Fri Jun 6 13:45:47 2008 @@ -26,7 +26,7 @@ /** * This is the method that determines the XML output. Customized dialplans can - * be easily created by adding a record to the dialplan_special table with the + * be easily created by adding a record to the dialplan_special table with the * appropriate values. The php class MUST contain a "main()" method. The method * should write directly to the xmlw obj that's pased or take care of writing * out the xml itself and exiting as to not return. @@ -120,7 +120,7 @@ * @see fs_dialplan::get_dialplan * @param array $dpArray Multi-dimentional array from which we write the XML * @todo this method should REALLY be broken down into several smaller methods - * + * */ private function writeDialplan($dpArray) { //print_r($dpArray); @@ -140,7 +140,7 @@ $ex_split = split(';', $extension); $this -> xmlw -> startElement('extension'); $this -> xmlw -> writeAttribute('name', $ex_split[0]); - if ($ex_split[1] > 0) { + if (strlen($ex_split[1]) > 0) { $this -> xmlw -> writeAttribute('continue', $ex_split[1]); } $this -> debug($conditions); Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/global_defines.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/global_defines.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/global_defines.php Fri Jun 6 13:45:47 2008 @@ -43,7 +43,7 @@ /** * Define debug level... should not be used in production for performance reasons */ -define('FS_CURL_DEBUG', 0); +define('FS_CURL_DEBUG', 9); /** * define how debugging should be done (depends on FS_CURL_DEBUG) @@ -62,4 +62,4 @@ //define('', ''); -?> \ No newline at end of file +?>

1 0

[commit] r8781 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 06 Jun '08

06 Jun '08

Author: anthm Date: Fri Jun 6 12:14:29 2008 New Revision: 8781 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: add header 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 Fri Jun 6 12:14:29 2008 @@ -873,8 +873,7 @@ switch_uuid_get(&uuid); switch_uuid_format(acs->uuid_str, &uuid); } - switch_snprintf(reply, reply_len, "+OK Job-UUID: %s", acs->uuid_str); - + switch_snprintf(reply, reply_len, "~Reply-Text: +OK Job-UUID: %s\nJob-UUID: %s\n\n", acs->uuid_str, acs->uuid_str); switch_thread_create(&thread, thd_attr, api_exec, acs, acs->pool); return SWITCH_STATUS_SUCCESS; @@ -1143,7 +1142,7 @@ switch_caller_profile_event_set_data(switch_channel_get_caller_profile(channel), "Channel", call_event); switch_channel_event_set_data(channel, call_event); switch_event_add_header(call_event, SWITCH_STACK_BOTTOM, "Content-Type", "command/reply"); - + switch_event_add_header(call_event, SWITCH_STACK_BOTTOM, "Reply-Text", "+OK\n"); switch_event_add_header(call_event, SWITCH_STACK_BOTTOM, "Socket-Mode", switch_test_flag(listener, LFLAG_ASYNC) ? "async" : "static"); switch_event_add_header(call_event, SWITCH_STACK_BOTTOM, "Control", switch_test_flag(listener, LFLAG_FULL) ? "full" : "single-channel"); @@ -1177,7 +1176,11 @@ goto done; } if (*reply != '\0') { - switch_snprintf(buf, sizeof(buf), "Content-Type: command/reply\nReply-Text: %s\n\n", reply); + if (*reply == '~') { + switch_snprintf(buf, sizeof(buf), "Content-Type: command/reply\n%s", reply + 1); + } else { + switch_snprintf(buf, sizeof(buf), "Content-Type: command/reply\nReply-Text: %s\n\n", reply); + } len = strlen(buf); switch_socket_send(listener->sock, buf, &len); } @@ -1206,7 +1209,11 @@ } if (*reply != '\0') { - switch_snprintf(buf, sizeof(buf), "Content-Type: command/reply\nReply-Text: %s\n\n", reply); + if (*reply == '~') { + switch_snprintf(buf, sizeof(buf), "Content-Type: command/reply\n%s", reply + 1); + } else { + switch_snprintf(buf, sizeof(buf), "Content-Type: command/reply\nReply-Text: %s\n\n", reply); + } len = strlen(buf); switch_socket_send(listener->sock, buf, &len); }

1 0

[commit] r8780 - freeswitch/trunk/scripts/contrib/intralanman/perl
by Freeswitch SVN 06 Jun '08

06 Jun '08

Author: intralanman Date: Fri Jun 6 11:31:32 2008 New Revision: 8780 Modified: freeswitch/trunk/scripts/contrib/intralanman/perl/fspb Log: added proxy support, thanks to agx Modified: freeswitch/trunk/scripts/contrib/intralanman/perl/fspb ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/perl/fspb (original) +++ freeswitch/trunk/scripts/contrib/intralanman/perl/fspb Fri Jun 6 11:31:32 2008 @@ -14,6 +14,7 @@ } my $ua = new LWP::UserAgent; +$ua->env_proxy(); my $url = 'http://pastebin.freeswitch.org/'; my $line; my $text;

1 0

[commit] r8779 - in freeswitch/trunk/src: . include
by Freeswitch SVN 06 Jun '08

06 Jun '08

Author: anthm Date: Fri Jun 6 11:27:16 2008 New Revision: 8779 Modified: freeswitch/trunk/src/include/switch_cpp.h freeswitch/trunk/src/switch_cpp.cpp Log: fix FSCORE-136 Modified: freeswitch/trunk/src/include/switch_cpp.h ============================================================================== --- freeswitch/trunk/src/include/switch_cpp.h (original) +++ freeswitch/trunk/src/include/switch_cpp.h Fri Jun 6 11:27:16 2008 @@ -13,7 +13,7 @@ #define this_check_void() do { if (!this) { switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "object is not initalized\n");}} while(0) #define sanity_check(x) do { if (!(session && allocated)) { switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "session is not initalized\n"); return x;}} while(0) #define sanity_check_noreturn do { if (!(session && allocated)) { switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "session is not initalized\n"); return;}} while(0) -#define init_vars() do { allocated = 0; session = NULL; channel = NULL; uuid = NULL; tts_name = NULL; voice_name = NULL; xml_cdr_text = NULL; memset(&args, 0, sizeof(args)); ap = NULL; caller_profile.source = "mod_unknown"; caller_profile.dialplan = ""; caller_profile.context = ""; caller_profile.caller_id_name = ""; caller_profile.caller_id_number = ""; caller_profile.network_addr = ""; caller_profile.ani = ""; caller_profile.aniii = ""; caller_profile.rdnis = ""; caller_profile.username = ""; on_hangup = NULL; memset(&cb_state, 0, sizeof(cb_state)); hook_state = CS_NEW; } while(0) +#define init_vars() do { allocated = 0; session = NULL; channel = NULL; uuid = NULL; tts_name = NULL; voice_name = NULL; xml_cdr_text = NULL; memset(&caller_profile, 0, sizeof(caller_profile)); memset(&args, 0, sizeof(args)); ap = NULL; caller_profile.source = "mod_unknown"; caller_profile.dialplan = ""; caller_profile.context = ""; caller_profile.caller_id_name = ""; caller_profile.caller_id_number = ""; caller_profile.network_addr = ""; caller_profile.ani = ""; caller_profile.aniii = ""; caller_profile.rdnis = ""; caller_profile.username = ""; on_hangup = NULL; memset(&cb_state, 0, sizeof(cb_state)); hook_state = CS_NEW; } while(0) //// C++ Interface: switch_to_cpp_mempool//// Description: This class allows for overloading the new operator to allocate from a switch_memory_pool_t//// Author: Yossi Neiman <freeswitch(a)cartissolutions.com>, (C) 2007//// Copyright: See COPYING file that comes with this distribution// #if 0 #ifndef SWITCHTOMEMPOOL Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Fri Jun 6 11:27:16 2008 @@ -402,7 +402,15 @@ { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CoreSession::~CoreSession desctructor\n"); switch_channel_t *channel = NULL; - + + init_vars(); + this_check_void(); + + switch_safe_free(xml_cdr_text); + switch_safe_free(uuid); + switch_safe_free(tts_name); + switch_safe_free(voice_name); + if (session) { channel = switch_core_session_get_channel(session); if (switch_test_flag(this, S_HUP) && !switch_channel_test_flag(channel, CF_TRANSFER)) { @@ -411,10 +419,7 @@ switch_core_session_rwunlock(session); } - switch_safe_free(xml_cdr_text); - switch_safe_free(uuid); - switch_safe_free(tts_name); - switch_safe_free(voice_name); + } SWITCH_DECLARE(char *) CoreSession::getXMLCDR() @@ -783,7 +788,6 @@ switch_call_cause_t cause; this_check(0); - sanity_check(0); cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;

1 0

[commit] r8778 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 06 Jun '08

06 Jun '08

Author: anthm Date: Fri Jun 6 10:52:41 2008 New Revision: 8778 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: add CtRiX's patch, beat him up if it causes a regression 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 Jun 6 10:52:41 2008 @@ -1453,8 +1453,8 @@ struct cb_helper *cb = (struct cb_helper *) pArg; char *contact; - if (!switch_strlen_zero(argv[0]) && (contact = sofia_glue_get_url_from_contact(argv[0], 1))) { - cb->stream->write_function(cb->stream, "sofia/%s/%s,", cb->profile->name, contact + 4); + if (!switch_strlen_zero(argv[0]) && (contact = sofia_glue_get_url_from_contact(argv[0], 1)) ) { + cb->stream->write_function(cb->stream, "%ssofia/%s/%s,", argv[1], cb->profile->name, contact + 4); free(contact); } @@ -1466,6 +1466,7 @@ char *data; char *user = NULL; char *domain = NULL; + char *concat = NULL; char *profile_name = NULL; char *p; sofia_profile_t *profile = NULL; @@ -1496,6 +1497,14 @@ if ((domain = strchr(user, '@'))) { *domain++ = '\0'; + if ( (concat = strchr( domain, '/')) ) { + *concat++ = '\0'; + } + } + else { + if ( (concat = strchr( user, '/')) ) { + *concat++ = '\0'; + } } if (!profile_name && domain) { @@ -1528,10 +1537,11 @@ cb.stream = &mystream; if (exclude_contact) { - sql = switch_mprintf("select contact from sip_registrations where sip_user='%q' and sip_host='%q' and contact not like '%%%s%%'", - user, domain, exclude_contact); + sql = switch_mprintf("select contact, '%q' from sip_registrations where sip_user='%q' and sip_host='%q' and contact not like '%%%s%%'", + ( concat != NULL ) ? concat : "", user, domain, exclude_contact); } else { - sql = switch_mprintf("select contact from sip_registrations where sip_user='%q' and sip_host='%q'", user, domain); + sql = switch_mprintf("select contact, '%q' from sip_registrations where sip_user='%q' and sip_host='%q'", + ( concat != NULL ) ? concat : "", user, domain); } switch_assert(sql);

1 0