- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r6157 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 03 Nov '07

03 Nov '07

Author: anthm Date: Fri Nov 2 20:46:23 2007 New Revision: 6157 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: fix obscure bug in late neg 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 Nov 2 20:46:23 2007 @@ -295,15 +295,17 @@ } } else { if (switch_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION)) { - const char *r_sdp = switch_channel_get_variable(channel, SWITCH_R_SDP_VARIABLE); - tech_pvt->num_codecs = 0; - sofia_glue_tech_prepare_codecs(tech_pvt); - if (sofia_glue_tech_media(tech_pvt, r_sdp) != SWITCH_STATUS_SUCCESS) { - switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "CODEC NEGOTIATION ERROR"); - nua_respond(tech_pvt->nh, SIP_488_NOT_ACCEPTABLE, TAG_END()); - return SWITCH_STATUS_FALSE; - } switch_clear_flag_locked(tech_pvt, TFLAG_LATE_NEGOTIATION); + if (!switch_channel_test_flag(tech_pvt->channel, CF_OUTBOUND)) { + const char *r_sdp = switch_channel_get_variable(channel, SWITCH_R_SDP_VARIABLE); + tech_pvt->num_codecs = 0; + sofia_glue_tech_prepare_codecs(tech_pvt); + if (sofia_glue_tech_media(tech_pvt, r_sdp) != SWITCH_STATUS_SUCCESS) { + switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "CODEC NEGOTIATION ERROR"); + nua_respond(tech_pvt->nh, SIP_488_NOT_ACCEPTABLE, TAG_END()); + return SWITCH_STATUS_FALSE; + } + } } if ((status = sofia_glue_tech_choose_port(tech_pvt)) != SWITCH_STATUS_SUCCESS) { @@ -900,15 +902,17 @@ } } else { if (switch_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION)) { - const char *r_sdp = switch_channel_get_variable(channel, SWITCH_R_SDP_VARIABLE); - tech_pvt->num_codecs = 0; - sofia_glue_tech_prepare_codecs(tech_pvt); - if (sofia_glue_tech_media(tech_pvt, r_sdp) != SWITCH_STATUS_SUCCESS) { - switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "CODEC NEGOTIATION ERROR"); - nua_respond(tech_pvt->nh, SIP_488_NOT_ACCEPTABLE, TAG_END()); - return SWITCH_STATUS_FALSE; - } switch_clear_flag_locked(tech_pvt, TFLAG_LATE_NEGOTIATION); + if (!switch_channel_test_flag(tech_pvt->channel, CF_OUTBOUND)) { + const char *r_sdp = switch_channel_get_variable(channel, SWITCH_R_SDP_VARIABLE); + tech_pvt->num_codecs = 0; + sofia_glue_tech_prepare_codecs(tech_pvt); + if (sofia_glue_tech_media(tech_pvt, r_sdp) != SWITCH_STATUS_SUCCESS) { + switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "CODEC NEGOTIATION ERROR"); + nua_respond(tech_pvt->nh, SIP_488_NOT_ACCEPTABLE, TAG_END()); + return SWITCH_STATUS_FALSE; + } + } } if ((status = sofia_glue_tech_choose_port(tech_pvt)) != SWITCH_STATUS_SUCCESS) { @@ -1591,6 +1595,7 @@ switch_channel_set_caller_profile(nchannel, caller_profile); switch_channel_set_flag(nchannel, CF_OUTBOUND); switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND); + switch_clear_flag_locked(tech_pvt, TFLAG_LATE_NEGOTIATION); switch_channel_set_state(nchannel, CS_INIT); *new_session = nsession; cause = SWITCH_CAUSE_SUCCESS; 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 Nov 2 20:46:23 2007 @@ -1214,7 +1214,7 @@ } goto done; } else { - if (switch_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION)) { + if (switch_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION) && !switch_channel_test_flag(tech_pvt->channel, CF_OUTBOUND)) { switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "DELAYED NEGOTIATION"); } else { if (sofia_glue_tech_media(tech_pvt, (char *) r_sdp) != SWITCH_STATUS_SUCCESS) {

1 0

[commit] r6156 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 02 Nov '07

02 Nov '07

Author: anthm Date: Fri Nov 2 18:13:36 2007 New Revision: 6156 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: patch from MODAPP-46 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 Fri Nov 2 18:13:36 2007 @@ -1396,7 +1396,6 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No variable name specified.\n"); stream->write_function(stream, "No variable specified\n"); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SET [%s]=[%s]\n", var_name, var_value ? var_value : "UNDEF"); switch_channel_set_variable(channel, var_name, var_value); stream->write_function(stream, "OK\n"); }

1 0

[commit] r6155 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 02 Nov '07

02 Nov '07

Author: anthm Date: Fri Nov 2 18:09:28 2007 New Revision: 6155 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: patch from MODAPP-46 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 Fri Nov 2 18:09:28 2007 @@ -1394,9 +1394,11 @@ if (switch_strlen_zero(var_name)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No variable name specified.\n"); + stream->write_function(stream, "No variable specified\n"); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SET [%s]=[%s]\n", var_name, var_value ? var_value : "UNDEF"); switch_channel_set_variable(channel, var_name, var_value); + stream->write_function(stream, "OK\n"); } switch_core_session_rwunlock(psession); @@ -1415,6 +1417,58 @@ return SWITCH_STATUS_SUCCESS; } +#define GETVAR_SYNTAX "<uuid> <var>" +SWITCH_STANDARD_API(uuid_getvar_function) +{ + switch_core_session_t *psession = NULL; + char *mycmd = NULL, *argv[4] = { 0 }; + int argc = 0; + + if (session) { + return SWITCH_STATUS_FALSE; + } + + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (argc >= 2) { + char *uuid = argv[0]; + char *var_name = argv[1]; + const char *var_value = NULL; + + if ((psession = switch_core_session_locate(uuid))) { + switch_channel_t *channel; + channel = switch_core_session_get_channel(psession); + + assert(channel != NULL); + + if (switch_strlen_zero(var_name)) { + stream->write_function(stream, "No variable name specified!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No variable name specified.\n"); + } else { + var_value = switch_channel_get_variable(channel, var_name); + if (var_value != NULL) { + stream->write_function(stream, "%s", var_value); + } else { + stream->write_function(stream, "_undef_"); + } + } + + switch_core_session_rwunlock(psession); + + } else { + stream->write_function(stream, "No Such Channel!\n"); + } + goto done; + } + } + + stream->write_function(stream, "USAGE: %s\n", GETVAR_SYNTAX); + + done: + switch_safe_free(mycmd); + return SWITCH_STATUS_SUCCESS; +} + SWITCH_MODULE_LOAD_FUNCTION(mod_commands_load) { switch_api_interface_t *commands_api_interface; @@ -1433,6 +1487,7 @@ 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); + SWITCH_ADD_API(commands_api_interface, "uuid_getvar", "uuid_getvar", uuid_getvar_function, GETVAR_SYNTAX); SWITCH_ADD_API(commands_api_interface, "session_displace", "session displace", session_displace_function, "<uuid> [start|stop] <path> [<limit>] [mux]"); SWITCH_ADD_API(commands_api_interface, "session_record", "session record", session_record_function, SESS_REC_SYNTAX); SWITCH_ADD_API(commands_api_interface, "broadcast", "broadcast", uuid_broadcast_function, BROADCAST_SYNTAX);

1 0

[commit] r6154 - freeswitch/trunk/conf
by Freeswitch SVN 02 Nov '07

02 Nov '07

Author: anthm Date: Fri Nov 2 17:59:52 2007 New Revision: 6154 Modified: freeswitch/trunk/conf/xml_cdr.conf.xml Log: encode by default Modified: freeswitch/trunk/conf/xml_cdr.conf.xml ============================================================================== --- freeswitch/trunk/conf/xml_cdr.conf.xml (original) +++ freeswitch/trunk/conf/xml_cdr.conf.xml Fri Nov 2 17:59:52 2007 @@ -17,7 +17,7 @@ <param name="log-dir" value=""/>  -  + <param name="encode" value="true"/>

1 0

[commit] r6153 - in freeswitch/trunk: conf src/mod/applications/mod_voicemail
by Freeswitch SVN 02 Nov '07

02 Nov '07

Author: anthm Date: Fri Nov 2 17:58:04 2007 New Revision: 6153 Modified: freeswitch/trunk/conf/voicemail.conf.xml freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: add patchfrom MODAPP-42 Modified: freeswitch/trunk/conf/voicemail.conf.xml ============================================================================== --- freeswitch/trunk/conf/voicemail.conf.xml (original) +++ freeswitch/trunk/conf/voicemail.conf.xml Fri Nov 2 17:58:04 2007 @@ -29,6 +29,11 @@ <param name="restart-key" value="1"/> <param name="ff-key" value="6"/> <param name="rew-key" value="4"/> +  + <param name="operator-extension" value="operator XML default"/> + <param name="operator-key" value="9"/> <email> <body><![CDATA[At ${voicemail_time} you were left a message from ${voicemail_caller_id_name} ${voicemail_caller_id_number} to your account ${voicemail_account}@${voicemail_domain} Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Fri Nov 2 17:58:04 2007 @@ -38,7 +38,7 @@ #ifdef _MSC_VER /* compilers are stupid sometimes */ #define TRY_CODE(code) for(;;) {status = code; if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { goto end; } break;} #else -#define TRY_CODE(code) do {status = code; if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { goto end; } break;} while(status) +#define TRY_CODE(code) do { status = code; if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { goto end; } break;} while(status) #endif SWITCH_MODULE_LOAD_FUNCTION(mod_voicemail_load); @@ -78,7 +78,9 @@ char ff_key[2]; char rew_key[2]; char urgent_key[2]; + char operator_key[2]; char file_ext[10]; + char *operator_ext; char *tone_spec; char *storage_dir; char *callback_dialplan; @@ -284,6 +286,8 @@ char *ff_key = "6"; char *rew_key = "4"; char *urgent_key = "*"; + char *operator_key = ""; + char *operator_ext = ""; char *tone_spec = "%(1000, 0, 640)"; char *file_ext = "wav"; char *storage_dir = ""; @@ -368,6 +372,10 @@ rew_key = val; } else if (!strcasecmp(var, "urgent-key") && !switch_strlen_zero(val)) { urgent_key = val; + } else if (!strcasecmp(var, "operator-key") && !switch_strlen_zero(val)) { + operator_key = val; + } else if (!strcasecmp(var, "operator-extension") && !switch_strlen_zero(val)) { + operator_ext = val; } else if (!strcasecmp(var, "storage-dir") && !switch_strlen_zero(val)) { storage_dir = val; } else if (!strcasecmp(var, "callback-dialplan") && !switch_strlen_zero(val)) { @@ -492,8 +500,10 @@ *profile->ff_key = *ff_key; *profile->rew_key = *rew_key; *profile->urgent_key = *urgent_key; + *profile->operator_key = *operator_key; + profile->operator_ext = switch_core_strdup(globals.pool, operator_ext); profile->storage_dir = switch_core_strdup(globals.pool, storage_dir); profile->tone_spec = switch_core_strdup(globals.pool, tone_spec); profile->callback_dialplan = switch_core_strdup(globals.pool, callback_dialplan); @@ -1665,6 +1675,20 @@ if (*buf != '\0') { if (!strcasecmp(buf, profile->main_menu_key)) { voicemail_check_main(session, profile_name, domain_name, id, 0); + } else if(!strcasecmp(buf, profile->operator_key) && !switch_strlen_zero(profile->operator_key)) { + int argc; + char *argv[4]; + char *mycmd; + + if (!switch_strlen_zero(profile->operator_ext) && (mycmd = switch_core_session_strdup(session, profile->operator_ext))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if(argc >= 1 && argc <= 4) { + switch_ivr_session_transfer(session, argv[0], argv[1], argv[2]); + /* the application still runs after we leave it so we need to make sure that we dont do anything evil */ + send_mail=0; + goto end; + } + } } else { goto greet; }

1 0

[commit] r6152 - freeswitch/trunk/src/mod/xml_int/mod_xml_curl
by Freeswitch SVN 02 Nov '07

02 Nov '07

Author: anthm Date: Fri Nov 2 17:49:48 2007 New Revision: 6152 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Log: add header patch from MDXMLINT-15 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Fri Nov 2 17:49:48 2007 @@ -75,6 +75,7 @@ char *file_url; struct curl_slist *slist = NULL; long httpRes = 0; + struct curl_slist *headers = NULL; if (!binding) { return NULL; @@ -105,6 +106,8 @@ snprintf(filename, sizeof(filename), "%s%s.tmp.xml", SWITCH_GLOBAL_dirs.temp_dir, uuid_str); curl_handle = curl_easy_init(); + headers = curl_slist_append(headers, "Content-Type: application/x-www-form-urlencoded"); + if (!strncasecmp(binding->url, "https", 5)) { curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0); curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0); @@ -116,6 +119,7 @@ curl_easy_setopt(curl_handle, CURLOPT_HTTPAUTH, CURLAUTH_ANY); curl_easy_setopt(curl_handle, CURLOPT_USERPWD, binding->cred); } + curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, headers); curl_easy_setopt(curl_handle, CURLOPT_POST, 1); curl_easy_setopt(curl_handle, CURLOPT_POSTFIELDS, data); curl_easy_setopt(curl_handle, CURLOPT_URL, binding->url); @@ -135,6 +139,7 @@ curl_easy_perform(curl_handle); curl_easy_getinfo(curl_handle, CURLINFO_RESPONSE_CODE,&httpRes); curl_easy_cleanup(curl_handle); + curl_slist_free_all(headers); close(config_data.fd); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening temp file!\n");

1 0

[commit] r6151 - freeswitch/trunk/src
by Freeswitch SVN 02 Nov '07

02 Nov '07

Author: anthm Date: Fri Nov 2 17:34:11 2007 New Revision: 6151 Modified: freeswitch/trunk/src/switch_rtp.c Log: tweak rtp Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Nov 2 17:34:11 2007 @@ -1611,11 +1611,10 @@ rtp_session->ts = (uint32_t) frame->timestamp; } else if (rtp_session->timer.timer_interface) { uint32_t sc = rtp_session->timer.samplecount; - if (rtp_session->last_write_ts == sc) { - rtp_session->ts = sc + rtp_session->samples_per_interval; - } else { - rtp_session->ts = sc; + if (sc <= rtp_session->last_write_ts) { + sc = rtp_session->last_write_ts + rtp_session->samples_per_interval; } + rtp_session->ts = sc; } else { rtp_session->ts += rtp_session->samples_per_interval; }

1 0

[commit] r6150 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 02 Nov '07

02 Nov '07

Author: anthm Date: Fri Nov 2 15:44:26 2007 New Revision: 6150 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: add tolken notify 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 Fri Nov 2 15:44:26 2007 @@ -842,8 +842,7 @@ SIPTAG_CONTACT_STR(contact_str), TAG_END()); - - + nua_notify(nh, SIPTAG_EVENT_STR(event), TAG_END()); switch_safe_free(sstr);

1 0

[commit] r6149 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 02 Nov '07

02 Nov '07

Author: anthm Date: Fri Nov 2 15:19:19 2007 New Revision: 6149 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: fix Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Fri Nov 2 15:19:19 2007 @@ -973,56 +973,35 @@ } } - if (first && ret == AUTH_OK) { + if (v_event) { + switch_event_create(v_event, SWITCH_EVENT_MESSAGE); + } if (v_event && *v_event) { switch_event_add_header(*v_event, SWITCH_STACK_BOTTOM, "sip_mailbox", "%s", mailbox); switch_event_add_header(*v_event, SWITCH_STACK_BOTTOM, "sip_auth_username", "%s", username); switch_event_add_header(*v_event, SWITCH_STACK_BOTTOM, "sip_auth_realm", "%s", realm); if ((xparams = switch_xml_child(user, "variables"))) { - if (switch_event_create(v_event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { - for (param = switch_xml_child(xparams, "variable"); param; param = param->next) { - const char *var = switch_xml_attr_soft(param, "name"); - const char *val = switch_xml_attr_soft(param, "value"); - sofia_gateway_t *gateway_ptr = NULL; + for (param = switch_xml_child(xparams, "variable"); param; param = param->next) { + const char *var = switch_xml_attr_soft(param, "name"); + const char *val = switch_xml_attr_soft(param, "value"); + sofia_gateway_t *gateway_ptr = NULL; - if (!switch_strlen_zero(var) && !switch_strlen_zero(val)) { - switch_event_add_header(*v_event, SWITCH_STACK_BOTTOM, var, "%s", val); + if (!switch_strlen_zero(var) && !switch_strlen_zero(val)) { + switch_event_add_header(*v_event, SWITCH_STACK_BOTTOM, var, "%s", val); - if (!strcasecmp(var, "register-gateway")) { - if (!strcasecmp(val, "all")) { - switch_xml_t gateways_tag, gateway_tag; - if ((gateways_tag = switch_xml_child(user, "gateways"))) { - for (gateway_tag = switch_xml_child(gateways_tag, "gateway"); gateway_tag; gateway_tag = gateway_tag->next) { - char *name = (char *) switch_xml_attr_soft(gateway_tag, "name"); - if (switch_strlen_zero(name)) { - name = "anonymous"; - } - - if ((gateway_ptr = sofia_reg_find_gateway(name))) { - gateway_ptr->retry = 0; - if (exptime) { - gateway_ptr->state = REG_STATE_UNREGED; - } else { - gateway_ptr->state = REG_STATE_UNREGISTER; - } - sofia_reg_release_gateway(gateway_ptr); - } - + if (!strcasecmp(var, "register-gateway")) { + if (!strcasecmp(val, "all")) { + switch_xml_t gateways_tag, gateway_tag; + if ((gateways_tag = switch_xml_child(user, "gateways"))) { + for (gateway_tag = switch_xml_child(gateways_tag, "gateway"); gateway_tag; gateway_tag = gateway_tag->next) { + char *name = (char *) switch_xml_attr_soft(gateway_tag, "name"); + if (switch_strlen_zero(name)) { + name = "anonymous"; } - } - } else { - int x, argc; - char *mydata, *argv[50]; - - mydata = strdup(val); - assert(mydata != NULL); - - argc = switch_separate_string(mydata, ',', argv, (sizeof(argv) / sizeof(argv[0]))); - - for (x = 0; x < argc; x++) { - if ((gateway_ptr = sofia_reg_find_gateway((char *)argv[x]))) { + + if ((gateway_ptr = sofia_reg_find_gateway(name))) { gateway_ptr->retry = 0; if (exptime) { gateway_ptr->state = REG_STATE_UNREGED; @@ -1030,13 +1009,34 @@ gateway_ptr->state = REG_STATE_UNREGISTER; } sofia_reg_release_gateway(gateway_ptr); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Gateway '%s' not found.\n", argv[x]); } + } + } + } else { + int x, argc; + char *mydata, *argv[50]; + + mydata = strdup(val); + assert(mydata != NULL); + + argc = switch_separate_string(mydata, ',', argv, (sizeof(argv) / sizeof(argv[0]))); - free(mydata); + for (x = 0; x < argc; x++) { + if ((gateway_ptr = sofia_reg_find_gateway((char *)argv[x]))) { + gateway_ptr->retry = 0; + if (exptime) { + gateway_ptr->state = REG_STATE_UNREGED; + } else { + gateway_ptr->state = REG_STATE_UNREGISTER; + } + sofia_reg_release_gateway(gateway_ptr); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Gateway '%s' not found.\n", argv[x]); + } } + + free(mydata); } } }

1 0

[commit] r6148 - freeswitch/trunk/src
by Freeswitch SVN 02 Nov '07

02 Nov '07

Author: anthm Date: Fri Nov 2 14:34:26 2007 New Revision: 6148 Modified: freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_ivr_async.c Log: fix tiny snafu Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Fri Nov 2 14:34:26 2007 @@ -316,13 +316,14 @@ if (loop_h) { loops = atoi(loop_h); } - + if (app_name) { if ((application_interface = switch_loadable_module_get_application_interface(app_name))) { if (application_interface->application_function) { int x; switch_channel_set_flag(channel, CF_BROADCAST); for (x = 0; x < loops || loops < 0; x++) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Command Execute %s(%s)\n", app_name, app_arg); switch_core_session_exec(session, application_interface, app_arg); if (!switch_channel_ready(channel) || !switch_channel_test_flag(channel, CF_BROADCAST)) { break; Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Fri Nov 2 14:34:26 2007 @@ -1325,9 +1325,10 @@ switch_ivr_media(uuid, SMF_REBRIDGE); } - if ((p = strchr(mypath, ':'))) { + if ((p = strchr(mypath, ':')) && *(p+1) == ':') { app = mypath; *p++ = '\0'; + *p++ = '\0'; path = p; }

1 0