July 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r9131 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 22 Jul '08

22 Jul '08

Author: anthm Date: Tue Jul 22 11:07:16 2008 New Revision: 9131 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: add clarification to warning message 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 Tue Jul 22 11:07:16 2008 @@ -1244,7 +1244,11 @@ if (switch_xml_locate_user("id", switch_strlen_zero(username) ? "nobody" : username, domain_name, ip, &xml, &domain, &user, params) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "can't find user [%s@%s]\n", username, domain_name); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "can't find user [%s@%s]\n" + "You must define a domain called '%s' in your directory and add a user with the id=\"%s\" attribute\n" + "and you must configure your device to use the proper domain in it's authentication credentials.\n" + , username, domain_name, domain_name, username); + ret = AUTH_FORBIDDEN; goto end; }

1 0

[commit] r9130 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 22 Jul '08

22 Jul '08

Author: anthm Date: Tue Jul 22 10:53:54 2008 New Revision: 9130 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: update 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 Tue Jul 22 10:53:54 2008 @@ -1192,7 +1192,9 @@ } } else { if ((to = atol(argv[3])) < switch_timestamp(NULL)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID Timeout!\n"); + if (to >= 1) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID Timeout!\n"); + } to = 0; } }

1 0

[commit] r9129 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 22 Jul '08

22 Jul '08

Author: anthm Date: Tue Jul 22 10:04:51 2008 New Revision: 9129 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Log: add sip_bye_h prefix to add headers to bye Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Tue Jul 22 10:04:51 2008 @@ -284,6 +284,28 @@ if (tech_pvt->nh && !switch_test_flag(tech_pvt, TFLAG_BYE)) { char reason[128] = ""; + switch_stream_handle_t stream = { 0 }; + switch_event_header_t *hi; + char *bye_headers = NULL; + + SWITCH_STANDARD_STREAM(stream); + if ((hi = switch_channel_variable_first(channel))) { + for (; hi; hi = hi->next) { + const char *name = (char *) hi->name; + char *value = (char *) hi->value; + + if (!strncasecmp(name, SOFIA_SIP_BYE_HEADER_PREFIX, strlen(SOFIA_SIP_BYE_HEADER_PREFIX))) { + const char *hname = name + strlen(SOFIA_SIP_BYE_HEADER_PREFIX); + stream.write_function(&stream, "%s: %s\r\n", hname, value); + } + } + switch_channel_variable_last(channel); + } + + if (stream.data) { + bye_headers = stream.data; + } + if (cause > 1 && cause < 128) { switch_snprintf(reason, sizeof(reason), "Q.850;cause=%d;text=\"%s\"", cause, switch_channel_cause2str(cause)); } else if (cause == SWITCH_CAUSE_PICKED_OFF) { @@ -294,17 +316,28 @@ if (switch_test_flag(tech_pvt, TFLAG_ANS)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending BYE to %s\n", switch_channel_get_name(channel)); - nua_bye(tech_pvt->nh, SIPTAG_REASON_STR(reason), TAG_END()); + nua_bye(tech_pvt->nh, + SIPTAG_REASON_STR(reason), + TAG_IF(!switch_strlen_zero(bye_headers), SIPTAG_HEADER_STR(bye_headers)), + TAG_END()); } else { if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending CANCEL to %s\n", switch_channel_get_name(channel)); - nua_cancel(tech_pvt->nh, SIPTAG_REASON_STR(reason), TAG_END()); + nua_cancel(tech_pvt->nh, + SIPTAG_REASON_STR(reason), + TAG_IF(!switch_strlen_zero(bye_headers), SIPTAG_HEADER_STR(bye_headers)), + TAG_IF(!switch_strlen_zero(bye_headers), SIPTAG_HEADER_STR(bye_headers)), + TAG_END()); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Responding to INVITE with: %d\n", sip_cause); - nua_respond(tech_pvt->nh, sip_cause, sip_status_phrase(sip_cause), SIPTAG_REASON_STR(reason), TAG_END()); + nua_respond(tech_pvt->nh, sip_cause, sip_status_phrase(sip_cause), + SIPTAG_REASON_STR(reason), + TAG_IF(!switch_strlen_zero(bye_headers), SIPTAG_HEADER_STR(bye_headers)), + TAG_END()); } } switch_set_flag(tech_pvt, TFLAG_BYE); + switch_safe_free(stream.data); } switch_clear_flag(tech_pvt, TFLAG_IO); 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 Tue Jul 22 10:04:51 2008 @@ -78,6 +78,7 @@ #define SOFIA_USER_AGENT "FreeSWITCH-mod_sofia/" SWITCH_VERSION_MAJOR "." SWITCH_VERSION_MINOR "." SWITCH_VERSION_MICRO "-" SWITCH_VERSION_REVISION #define SOFIA_CHAT_PROTO "sip" #define SOFIA_SIP_HEADER_PREFIX "sip_h_" +#define SOFIA_SIP_BYE_HEADER_PREFIX "sip_bye_h_" #define SOFIA_SIP_HEADER_PREFIX_T "~sip_h_" #define SOFIA_DEFAULT_PORT "5060" #define SOFIA_DEFAULT_TLS_PORT "5061"

1 0

[commit] r9128 - freeswitch/trunk/src
by Freeswitch SVN 22 Jul '08

22 Jul '08

Author: anthm Date: Tue Jul 22 09:38:42 2008 New Revision: 9128 Modified: freeswitch/trunk/src/switch_core.c Log: tweak startup so acl.conf and post_load_switch.conf are loaded after all the modules are loaded Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Jul 22 09:38:42 2008 @@ -44,6 +44,7 @@ /* The main runtime obj we keep this hidden for ourselves */ struct switch_runtime runtime; +static void switch_load_core_config(const char *file); static void send_heartbeat(void) { @@ -860,7 +861,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switch_bool_t console, const char **err) { - switch_xml_t xml = NULL, cfg = NULL; switch_uuid_t uuid; char guess_ip[256]; char *dir_path; @@ -929,81 +929,7 @@ return SWITCH_STATUS_MEMERR; } - if ((xml = switch_xml_open_cfg("switch.conf", &cfg, NULL))) { - switch_xml_t settings, param; - - if ((settings = switch_xml_child(cfg, "settings"))) { - for (param = switch_xml_child(settings, "param"); param; param = param->next) { - const char *var = switch_xml_attr_soft(param, "name"); - const char *val = switch_xml_attr_soft(param, "value"); - - if (!strcasecmp(var, "crash-protection")) { - if (switch_true(val)) { - switch_set_flag((&runtime), SCF_CRASH_PROT); - } - } else if (!strcasecmp(var, "loglevel")) { - int level; - if (*val > 47 && *val < 58) { - level = atoi(val); - } else { - level = switch_log_str2level(val); - } - - if (level != SWITCH_LOG_INVALID) { - switch_core_session_ctl(SCSC_LOGLEVEL, &level); - } -#ifdef HAVE_SETRLIMIT - } else if (!strcasecmp(var, "dump-cores")) { - struct rlimit rlp; - memset(&rlp, 0, sizeof(rlp)); - rlp.rlim_cur = RLIM_INFINITY; - rlp.rlim_max = RLIM_INFINITY; - setrlimit(RLIMIT_CORE, &rlp); -#endif - } else if (!strcasecmp(var, "colorize-console") && switch_true(val)) { - runtime.colorize_console = SWITCH_TRUE; - } else if (!strcasecmp(var, "mailer-app") && !switch_strlen_zero(val)) { - runtime.mailer_app = switch_core_strdup(runtime.memory_pool, val); - } else if (!strcasecmp(var, "mailer-app-args") && val) { - runtime.mailer_app_args = switch_core_strdup(runtime.memory_pool, val); - } else if (!strcasecmp(var, "sessions-per-second") && !switch_strlen_zero(val)) { - switch_core_sessions_per_second(atoi(val)); - } else if (!strcasecmp(var, "max_dtmf_duration") && !switch_strlen_zero(val)) { - int tmp = atoi(val); - if (tmp > 0) { - switch_core_max_dtmf_duration((uint32_t) tmp); - } - } else if (!strcasecmp(var, "default_dtmf_duration") && !switch_strlen_zero(val)) { - int tmp = atoi(val); - if (tmp > 0) { - switch_core_default_dtmf_duration((uint32_t) tmp); - } - } else if (!strcasecmp(var, "disable-monotonic-timing")) { - switch_time_set_monotonic(SWITCH_FALSE); - } else if (!strcasecmp(var, "max-sessions") && !switch_strlen_zero(val)) { - switch_core_session_limit(atoi(val)); - } else if (!strcasecmp(var, "rtp-start-port") && !switch_strlen_zero(val)) { - switch_rtp_set_start_port((switch_port_t) atoi(val)); - } else if (!strcasecmp(var, "rtp-end-port") && !switch_strlen_zero(val)) { - switch_rtp_set_end_port((switch_port_t) atoi(val)); - } - } - } - - if ((settings = switch_xml_child(cfg, "variables"))) { - for (param = switch_xml_child(settings, "variable"); param; param = param->next) { - const char *var = switch_xml_attr_soft(param, "name"); - const char *val = switch_xml_attr_soft(param, "value"); - char *varr = NULL, *vall = NULL; - - varr = switch_core_strdup(runtime.memory_pool, var); - vall = switch_core_strdup(runtime.memory_pool, val); - switch_core_hash_insert(runtime.global_vars, varr, vall); - } - } - - switch_xml_free(xml); - } + switch_load_core_config("switch.conf"); switch_log_init(runtime.memory_pool, runtime.colorize_console); switch_core_state_machine_init(runtime.memory_pool); @@ -1096,9 +1022,95 @@ return; } + +static void switch_load_core_config(const char *file) +{ + switch_xml_t xml = NULL, cfg = NULL; + + if ((xml = switch_xml_open_cfg(file, &cfg, NULL))) { + switch_xml_t settings, param; + + if ((settings = switch_xml_child(cfg, "settings"))) { + for (param = switch_xml_child(settings, "param"); param; param = param->next) { + const char *var = switch_xml_attr_soft(param, "name"); + const char *val = switch_xml_attr_soft(param, "value"); + + if (!strcasecmp(var, "crash-protection")) { + if (switch_true(val)) { + switch_set_flag((&runtime), SCF_CRASH_PROT); + } + } else if (!strcasecmp(var, "loglevel")) { + int level; + if (*val > 47 && *val < 58) { + level = atoi(val); + } else { + level = switch_log_str2level(val); + } + + if (level != SWITCH_LOG_INVALID) { + switch_core_session_ctl(SCSC_LOGLEVEL, &level); + } +#ifdef HAVE_SETRLIMIT + } else if (!strcasecmp(var, "dump-cores")) { + struct rlimit rlp; + memset(&rlp, 0, sizeof(rlp)); + rlp.rlim_cur = RLIM_INFINITY; + rlp.rlim_max = RLIM_INFINITY; + setrlimit(RLIMIT_CORE, &rlp); +#endif + } else if (!strcasecmp(var, "colorize-console") && switch_true(val)) { + runtime.colorize_console = SWITCH_TRUE; + } else if (!strcasecmp(var, "mailer-app") && !switch_strlen_zero(val)) { + runtime.mailer_app = switch_core_strdup(runtime.memory_pool, val); + } else if (!strcasecmp(var, "mailer-app-args") && val) { + runtime.mailer_app_args = switch_core_strdup(runtime.memory_pool, val); + } else if (!strcasecmp(var, "sessions-per-second") && !switch_strlen_zero(val)) { + switch_core_sessions_per_second(atoi(val)); + } else if (!strcasecmp(var, "max_dtmf_duration") && !switch_strlen_zero(val)) { + int tmp = atoi(val); + if (tmp > 0) { + switch_core_max_dtmf_duration((uint32_t) tmp); + } + } else if (!strcasecmp(var, "default_dtmf_duration") && !switch_strlen_zero(val)) { + int tmp = atoi(val); + if (tmp > 0) { + switch_core_default_dtmf_duration((uint32_t) tmp); + } + } else if (!strcasecmp(var, "disable-monotonic-timing")) { + switch_time_set_monotonic(SWITCH_FALSE); + } else if (!strcasecmp(var, "max-sessions") && !switch_strlen_zero(val)) { + switch_core_session_limit(atoi(val)); + } else if (!strcasecmp(var, "rtp-start-port") && !switch_strlen_zero(val)) { + switch_rtp_set_start_port((switch_port_t) atoi(val)); + } else if (!strcasecmp(var, "rtp-end-port") && !switch_strlen_zero(val)) { + switch_rtp_set_end_port((switch_port_t) atoi(val)); + } + } + } + + if ((settings = switch_xml_child(cfg, "variables"))) { + for (param = switch_xml_child(settings, "variable"); param; param = param->next) { + const char *var = switch_xml_attr_soft(param, "name"); + const char *val = switch_xml_attr_soft(param, "value"); + char *varr = NULL, *vall = NULL; + + varr = switch_core_strdup(runtime.memory_pool, var); + vall = switch_core_strdup(runtime.memory_pool, val); + switch_core_hash_insert(runtime.global_vars, varr, vall); + } + } + + switch_xml_free(xml); + } + + +} + + SWITCH_DECLARE(switch_status_t) switch_core_init_and_modload(switch_core_flag_t flags, switch_bool_t console, const char **err) { switch_event_t *event; + if (switch_core_init(flags, console, err) != SWITCH_STATUS_SUCCESS) { return SWITCH_STATUS_GENERR; } @@ -1124,7 +1136,7 @@ signal(SIGUSR1, handle_SIGHUP); #endif signal(SIGHUP, handle_SIGHUP); - switch_load_network_lists(SWITCH_FALSE); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Bringing up environment.\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Loading Modules.\n"); @@ -1134,6 +1146,10 @@ return SWITCH_STATUS_GENERR; } + switch_load_network_lists(SWITCH_FALSE); + + switch_load_core_config("post_load_switch.conf"); + if (switch_event_create(&event, SWITCH_EVENT_STARTUP) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Event-Info", "System Ready"); switch_event_fire(&event);

1 0

[commit] r9127 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 21 Jul '08

21 Jul '08

Author: anthm Date: Mon Jul 21 18:18:24 2008 New Revision: 9127 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: update 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 Mon Jul 21 18:18:24 2008 @@ -1035,6 +1035,12 @@ if (!tech_pvt->from_str) { const char* sipip = tech_pvt->profile->extsipip ? tech_pvt->profile->extsipip : tech_pvt->profile->sipip; const char* format = strchr(sipip, ':') ? "\"%s\" <sip:%s%s[%s]>" : "\"%s\" <sip:%s%s%s>"; + const char *alt = NULL; + + if ((alt = switch_channel_get_variable(channel, "sip_invite_domain"))) { + sipip = alt; + } + tech_pvt->from_str = switch_core_session_sprintf(tech_pvt->session, format,

1 0

[commit] r9126 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 21 Jul '08

21 Jul '08

Author: anthm Date: Mon Jul 21 14:42:11 2008 New Revision: 9126 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: fix profile restart issue 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 Mon Jul 21 14:42:11 2008 @@ -2642,7 +2642,11 @@ } for (gp = profile->gateways; gp; gp = gp->next) { - sofia_glue_del_gateway(gp); + switch_core_hash_delete(mod_sofia_globals.gateway_hash, gp->name); + switch_core_hash_delete(mod_sofia_globals.gateway_hash, gp->register_from); + switch_core_hash_delete(mod_sofia_globals.gateway_hash, gp->register_contact); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "deleted gateway %s\n", gp->name); + profile->gateways = NULL; } } switch_mutex_unlock(mod_sofia_globals.hash_mutex);

1 0

[commit] r9125 - freeswitch/trunk/src
by Freeswitch SVN 21 Jul '08

21 Jul '08

Author: anthm Date: Mon Jul 21 13:33:46 2008 New Revision: 9125 Modified: freeswitch/trunk/src/switch_loadable_module.c Log: doh Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Mon Jul 21 13:33:46 2008 @@ -860,6 +860,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Module is not unloadable.\n"); *err = "Module is not unloadable"; status = SWITCH_STATUS_NOUNLOAD; + goto end; } else { do_shutdown(module); } @@ -868,6 +869,7 @@ *err = "No such module!"; status = SWITCH_STATUS_FALSE; } + end: switch_mutex_unlock(loadable_modules.mutex); return status;

1 0

[commit] r9123 - freeswitch/trunk/src
by Freeswitch SVN 21 Jul '08

21 Jul '08

Author: anthm Date: Mon Jul 21 12:48:05 2008 New Revision: 9123 Modified: freeswitch/trunk/src/switch_stun.c Log: update Modified: freeswitch/trunk/src/switch_stun.c ============================================================================== --- freeswitch/trunk/src/switch_stun.c (original) +++ freeswitch/trunk/src/switch_stun.c Mon Jul 21 12:48:05 2008 @@ -493,6 +493,10 @@ if (funny) { packet = (switch_stun_packet_t *) buf; bytes += 4; + buf[bytes++] = 0; + buf[bytes++] = 0; + buf[bytes++] = 0; + buf[bytes++] = 0; } switch_socket_sendto(sock, remote_addr, 0, (void *) packet, &bytes); @@ -534,6 +538,10 @@ switch (attr->type) { case SWITCH_STUN_ATTR_MAPPED_ADDRESS: if (attr->type) { + if(funny) + { + ((switch_stun_ip_t *) attr->value)->address ^= ntohl(0xabcdabcd); + } switch_stun_packet_attribute_get_mapped_address(attr, rip, &rport); } break;

1 0

[commit] r9124 - in freeswitch/trunk/conf: autoload_configs dialplan
by Freeswitch SVN 21 Jul '08

21 Jul '08

Author: brian Date: Mon Jul 21 12:48:05 2008 New Revision: 9124 Modified: freeswitch/trunk/conf/autoload_configs/voicemail.conf.xml freeswitch/trunk/conf/dialplan/default.xml Log: revert a previous change that I did Modified: freeswitch/trunk/conf/autoload_configs/voicemail.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/voicemail.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/voicemail.conf.xml Mon Jul 21 12:48:05 2008 @@ -2,7 +2,7 @@ <settings> </settings> <profiles> - <profile name="$${domain}"> + <profile name="default"> <param name="file-extension" value="wav"/> <param name="terminator-key" value="#"/> <param name="max-login-attempts" value="3"/> Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Mon Jul 21 12:48:05 2008 @@ -145,7 +145,7 @@ <action application="set" data="voicemail_authorized=${sip_authorized}"/> <action application="answer"/> <action application="sleep" data="1000"/> - <action application="voicemail" data="check $${domain} $${domain} ${dialed_ext}"/> + <action application="voicemail" data="check default $${domain} ${dialed_ext}"/>  <anti-action application="bind_meta_app" data="1 b s execute_extension::dx XML features"/> <anti-action application="bind_meta_app" data="2 b s record_session::$${base_dir}/recordings/${caller_id_number}.${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/> @@ -162,7 +162,7 @@ <anti-action application="answer"/>  <anti-action application="sleep" data="1000"/> - <anti-action application="voicemail" data="$${domain} $${domain} ${dialed_ext}"/> + <anti-action application="voicemail" data="default $${domain} ${dialed_ext}"/> </condition> </extension>

1 0

[commit] r9122 - in freeswitch/trunk: conf/sip_profiles src/mod/endpoints/mod_sofia
by Freeswitch SVN 21 Jul '08

21 Jul '08

Author: anthm Date: Mon Jul 21 12:40:28 2008 New Revision: 9122 Modified: freeswitch/trunk/conf/sip_profiles/internal.xml freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: update Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Mon Jul 21 12:40:28 2008 @@ -122,7 +122,11 @@    - +  +  +  +  +  </settings> </profile> Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Mon Jul 21 12:40:28 2008 @@ -1201,22 +1201,22 @@ switch_assert(gp->state < REG_STATE_LAST); stream->write_function(stream, "%s\n", line); - stream->write_function(stream, "Name \t%s\n", switch_str_nil(gp->name)); - stream->write_function(stream, "Scheme \t%s\n", switch_str_nil(gp->register_scheme)); - stream->write_function(stream, "Realm \t%s\n", switch_str_nil(gp->register_realm)); - stream->write_function(stream, "Username\t%s\n", switch_str_nil(gp->register_username)); - stream->write_function(stream, "Password\t%s\n", switch_strlen_zero(gp->register_password) ? "no" : "yes"); - stream->write_function(stream, "From \t%s\n", switch_str_nil(gp->register_from)); - stream->write_function(stream, "Contact \t%s\n", switch_str_nil(gp->register_contact)); - stream->write_function(stream, "To \t%s\n", switch_str_nil(gp->register_to)); - stream->write_function(stream, "Proxy \t%s\n", switch_str_nil(gp->register_proxy)); - stream->write_function(stream, "Context \t%s\n", switch_str_nil(gp->register_context)); - stream->write_function(stream, "Expires \t%s\n", switch_str_nil(gp->expires_str)); - stream->write_function(stream, "Freq \t%d\n", gp->freq); - stream->write_function(stream, "Ping \t%d\n", gp->ping); - stream->write_function(stream, "PingFreq\t%d\n", gp->ping_freq); - stream->write_function(stream, "State \t%s\n", sofia_state_names[gp->state]); - stream->write_function(stream, "Status \t%s%s\n", status_names[gp->status], gp->pinging ? " (ping)" : ""); + stream->write_function(stream, "Name \t\t%s\n", switch_str_nil(gp->name)); + stream->write_function(stream, "Scheme \t\t%s\n", switch_str_nil(gp->register_scheme)); + stream->write_function(stream, "Realm \t\t%s\n", switch_str_nil(gp->register_realm)); + stream->write_function(stream, "Username\t\t%s\n", switch_str_nil(gp->register_username)); + stream->write_function(stream, "Password\t\t%s\n", switch_strlen_zero(gp->register_password) ? "no" : "yes"); + stream->write_function(stream, "From \t\t%s\n", switch_str_nil(gp->register_from)); + stream->write_function(stream, "Contact \t\t%s\n", switch_str_nil(gp->register_contact)); + stream->write_function(stream, "To \t\t%s\n", switch_str_nil(gp->register_to)); + stream->write_function(stream, "Proxy \t\t%s\n", switch_str_nil(gp->register_proxy)); + stream->write_function(stream, "Context \t\t%s\n", switch_str_nil(gp->register_context)); + stream->write_function(stream, "Expires \t\t%s\n", switch_str_nil(gp->expires_str)); + stream->write_function(stream, "Freq \t\t%d\n", gp->freq); + stream->write_function(stream, "Ping \t\t%d\n", gp->ping); + stream->write_function(stream, "PingFreq\t\t%d\n", gp->ping_freq); + stream->write_function(stream, "State \t\t%s\n", sofia_state_names[gp->state]); + stream->write_function(stream, "Status \t\t%s%s\n", status_names[gp->status], gp->pinging ? " (ping)" : ""); stream->write_function(stream, "%s\n", line); sofia_reg_release_gateway(gp); } else { @@ -1227,46 +1227,48 @@ if ((profile = sofia_glue_find_profile(argv[1]))) { stream->write_function(stream, "%s\n", line); - stream->write_function(stream, "Name \t%s\n", switch_str_nil(argv[1])); - stream->write_function(stream, "Domain Name \t%s\n", switch_str_nil(profile->domain_name)); + stream->write_function(stream, "Name \t\t%s\n", switch_str_nil(argv[1])); + stream->write_function(stream, "Domain Name \t\t%s\n", switch_str_nil(profile->domain_name)); if (strcasecmp(argv[1], profile->name)) { - stream->write_function(stream, "Alias Of \t%s\n", switch_str_nil(profile->name)); + stream->write_function(stream, "Alias Of \t\t%s\n", switch_str_nil(profile->name)); } - stream->write_function(stream, "DBName \t%s\n", switch_str_nil(profile->dbname)); - stream->write_function(stream, "Dialplan \t%s\n", switch_str_nil(profile->dialplan)); - stream->write_function(stream, "Context \t%s\n", switch_str_nil(profile->context)); - stream->write_function(stream, "RTP-IP \t%s\n", switch_str_nil(profile->rtpip)); + stream->write_function(stream, "DBName \t\t%s\n", switch_str_nil(profile->dbname)); + 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, "RTP-IP \t\t%s\n", switch_str_nil(profile->rtpip)); if (profile->extrtpip) { - stream->write_function(stream, "Ext-RTP-IP \t%s\n", profile->extrtpip); + stream->write_function(stream, "Ext-RTP-IP \t\t%s\n", profile->extrtpip); } - stream->write_function(stream, "SIP-IP \t%s\n", switch_str_nil(profile->sipip)); + 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%s\n", profile->extsipip); + stream->write_function(stream, "Ext-SIP-IP \t\t%s\n", profile->extsipip); } - stream->write_function(stream, "URL \t%s\n", switch_str_nil(profile->url)); - stream->write_function(stream, "BIND-URL \t%s\n", switch_str_nil(profile->bindurl)); + 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%s\n", switch_str_nil(profile->tls_url)); - stream->write_function(stream, "TLS-BIND-URL %s\n", switch_str_nil(profile->tls_bindurl)); + 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%s\n", switch_str_nil(profile->hold_music)); - stream->write_function(stream, "CODECS \t%s\n", switch_str_nil(profile->codec_string)); - stream->write_function(stream, "TEL-EVENT \t%d\n", profile->te); + stream->write_function(stream, "HOLD-MUSIC \t\t%s\n", switch_strlen_zero(profile->hold_music) ? "NONE" : 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 \trfc2833\n"); + stream->write_function(stream, "DTMF-MODE \t\trfc2833\n"); } else if (profile->dtmf_type == DTMF_INFO) { - stream->write_function(stream, "DTMF-MODE \tinfo\n"); + stream->write_function(stream, "DTMF-MODE \t\tinfo\n"); } else { - stream->write_function(stream, "DTMF-MODE \tnone\n"); + stream->write_function(stream, "DTMF-MODE \t\tnone\n"); } - stream->write_function(stream, "CNG \t%d\n", profile->cng_pt); - stream->write_function(stream, "SESSION-TO \t%d\n", profile->session_timeout); - stream->write_function(stream, "MAX-DIALOG \t%d\n", profile->max_proceeding); - stream->write_function(stream, "NOMEDIA \t%s\n", switch_test_flag(profile, TFLAG_INB_NOMEDIA) ? "true" : "false"); - stream->write_function(stream, "LATE-NEG \t%s\n", switch_test_flag(profile, TFLAG_LATE_NEGOTIATION) ? "true" : "false"); - stream->write_function(stream, "PROXY-MEDIA \t%s\n", switch_test_flag(profile, TFLAG_PROXY_MEDIA) ? "true" : "false"); - stream->write_function(stream, "AGGRESSIVENAT \t%s\n", sofia_test_pflag(profile, PFLAG_AGGRESSIVE_NAT_DETECTION) ? "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; @@ -1376,6 +1378,37 @@ goto done; } + if (!strcasecmp(argv[1], "stun-auto-disable")) { + if (argv[2]) { + int is_true = switch_true(argv[2]); + if (is_true) { + profile->pflags |= PFLAG_STUN_AUTO_DISABLE; + } else { + profile->pflags &= ~PFLAG_STUN_AUTO_DISABLE; + } + } + + stream->write_function(stream, "+OK stun-auto-disable=%s", (profile->pflags & PFLAG_STUN_AUTO_DISABLE) ? "true" : "false"); + + goto done; + } + + if (!strcasecmp(argv[1], "stun-enabled")) { + if (argv[2]) { + int is_true = switch_true(argv[2]); + if (is_true) { + profile->pflags |= PFLAG_STUN_ENABLED; + } else { + profile->pflags &= ~PFLAG_STUN_ENABLED; + } + } + + stream->write_function(stream, "+OK stun-enabled=%s", (profile->pflags & PFLAG_STUN_ENABLED) ? "true" : "false"); + + goto done; + } + + if (!strcasecmp(argv[1], "rescan")) { if (argc > 2 && !strcasecmp(argv[2], "reloadxml")) { 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 Mon Jul 21 12:40:28 2008 @@ -157,7 +157,9 @@ PFLAG_3PCC = (1 << 23), PFLAG_DISABLE_RTP_AUTOADJ = (1 << 24), PFLAG_DISABLE_SRTP_AUTH = (1 << 25), - PFLAG_FUNNY_STUN = (1 << 26) + PFLAG_FUNNY_STUN = (1 << 26), + PFLAG_STUN_ENABLED = (1 << 27), + PFLAG_STUN_AUTO_DISABLE = (1 << 28) } PFLAGS; typedef enum { 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 Mon Jul 21 12:40:28 2008 @@ -982,6 +982,8 @@ /* you could change profile->foo here if it was a minor change like context or dialplan ... */ profile->rport_level = 1; /* default setting */ + profile->acl_count = 0; + profile->pflags |= PFLAG_STUN_ENABLED; if ((settings = switch_xml_child(xprofile, "settings"))) { for (param = switch_xml_child(settings, "param"); param; param = param->next) { @@ -1053,6 +1055,36 @@ } else { profile->pflags &= ~PFLAG_FUNNY_STUN; } + } else if (!strcasecmp(var, "stun-enabled")) { + if (switch_true(val)) { + profile->pflags |= PFLAG_STUN_ENABLED; + } else { + profile->pflags &= ~PFLAG_STUN_ENABLED; + } + } else if (!strcasecmp(var, "stun-auto-disable")) { + if (switch_true(val)) { + profile->pflags |= PFLAG_STUN_AUTO_DISABLE; + } else { + profile->pflags &= ~PFLAG_STUN_AUTO_DISABLE; + } + } else if (!strcasecmp(var, "apply-nat-acl")) { + if (profile->acl_count < SOFIA_MAX_ACL) { + profile->nat_acl[profile->nat_acl_count++] = switch_core_strdup(profile->pool, val); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Max acl records of %d reached\n", SOFIA_MAX_ACL); + } + } else if (!strcasecmp(var, "apply-inbound-acl")) { + if (profile->acl_count < SOFIA_MAX_ACL) { + profile->acl[profile->acl_count++] = switch_core_strdup(profile->pool, val); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Max acl records of %d reached\n", SOFIA_MAX_ACL); + } + } else if (!strcasecmp(var, "apply-register-acl")) { + if (profile->reg_acl_count < SOFIA_MAX_ACL) { + profile->reg_acl[profile->reg_acl_count++] = switch_core_strdup(profile->pool, val); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Max acl records of %d reached\n", SOFIA_MAX_ACL); + } } else if (!strcasecmp(var, "rfc2833-pt")) { profile->te = (switch_payload_t) atoi(val); } else if (!strcasecmp(var, "cng-pt")) { @@ -1173,6 +1205,7 @@ } } + if ((gateways_tag = switch_xml_child(xprofile, "gateways"))) { parse_gateways(profile, gateways_tag); } @@ -1333,6 +1366,7 @@ profile->tls_version = 0; profile->mflags = MFLAG_REFER | MFLAG_REGISTER; profile->rport_level = 1; + profile->pflags |= PFLAG_STUN_ENABLED; for (param = switch_xml_child(settings, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); @@ -1392,6 +1426,18 @@ } else { profile->pflags &= ~PFLAG_FUNNY_STUN; } + } else if (!strcasecmp(var, "stun-enabled")) { + if (switch_true(val)) { + profile->pflags |= PFLAG_STUN_ENABLED; + } else { + profile->pflags &= ~PFLAG_STUN_ENABLED; + } + } else if (!strcasecmp(var, "stun-auto-disable")) { + if (switch_true(val)) { + profile->pflags |= PFLAG_STUN_AUTO_DISABLE; + } else { + profile->pflags &= ~PFLAG_STUN_AUTO_DISABLE; + } } else if (!strcasecmp(var, "rfc2833-pt")) { profile->te = (switch_payload_t) atoi(val); } else if (!strcasecmp(var, "cng-pt")) { @@ -1680,6 +1726,10 @@ profile->dialplan = switch_core_strdup(profile->pool, "XML"); } + if (!profile->context) { + profile->context = switch_core_strdup(profile->pool, "default"); + } + if (!profile->sipdomain) { profile->sipdomain = switch_core_strdup(profile->pool, profile->sipip); } 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 Mon Jul 21 12:40:28 2008 @@ -442,6 +442,12 @@ if (!strncasecmp(sourceip, "stun:", 5)) { char *p; + + if (!(profile->pflags & PFLAG_STUN_ENABLED)) { + *ip = switch_core_strdup(pool, tech_pvt->profile->rtpip); + return SWITCH_STATUS_SUCCESS; + } + stun_ip = strdup(sourceip + 5); if ((p = strchr(stun_ip, ':'))) { @@ -483,6 +489,10 @@ if (tech_pvt) { if (myport == *port && !strcmp(*ip, tech_pvt->profile->rtpip)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Stun Not Required ip and port match. [%s]:[%d]\n", *ip, *port); + if (profile->pflags & PFLAG_STUN_AUTO_DISABLE) { + profile->pflags &= ~PFLAG_STUN_ENABLED; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Stun completely disabled.\n"); + } } else { tech_pvt->stun_ip = switch_core_session_strdup(tech_pvt->session, stun_ip); tech_pvt->stun_port = stun_port;

1 0