June 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r13567 - in freeswitch/trunk: conf/autoload_configs src/mod/event_handlers/mod_event_socket
by FreeSWITCH SVN 03 Jun '09

03 Jun '09

Author: brian Date: Wed Jun 3 09:25:35 2009 New Revision: 13567 Log: adding nat-map option to mod_event_socket Modified: freeswitch/trunk/conf/autoload_configs/event_socket.conf.xml freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Modified: freeswitch/trunk/conf/autoload_configs/event_socket.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/event_socket.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/event_socket.conf.xml Wed Jun 3 09:25:35 2009 @@ -1,5 +1,6 @@ <configuration name="event_socket.conf" description="Socket Client"> <settings> + <param name="nat-map" value="false"/> <param name="listen-ip" value="127.0.0.1"/> <param name="listen-port" value="8021"/> <param name="password" value="ClueCon"/> 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 Wed Jun 3 09:25:35 2009 @@ -115,6 +115,7 @@ char *acl[MAX_ACL]; uint32_t acl_count; uint32_t id; + int nat_map; } prefs; @@ -2211,6 +2212,10 @@ set_pref_ip(val); } else if (!strcmp(var, "debug")) { globals.debug = atoi(val); + } else if (!strcmp(var, "nat-map")) { + if (switch_true(val)) { + prefs.nat_map = 1; + } } else if (!strcmp(var, "listen-port")) { prefs.port = (uint16_t) atoi(val); } else if (!strcmp(var, "password")) { @@ -2235,6 +2240,10 @@ set_pref_pass("ClueCon"); } + if (!prefs.nat_map) { + prefs.nat_map = 0; + } + if (!prefs.port) { prefs.port = 8021; } @@ -2276,6 +2285,11 @@ if (rv) goto sock_fail; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Socket up listening on %s:%u\n", prefs.ip, prefs.port); + + if (prefs.nat_map) { + switch_nat_add_mapping(prefs.port, SWITCH_NAT_TCP); + } + break; sock_fail: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Socket Error! Could not listen on %s:%u\n", prefs.ip, prefs.port); @@ -2326,6 +2340,10 @@ } close_socket(&listen_list.sock); + + if (prefs.nat_map) { + switch_nat_del_mapping(prefs.port, SWITCH_NAT_TCP); + } if (pool) { switch_core_destroy_memory_pool(&pool);

1 0

[commit] r13566 - freeswitch/trunk/src/mod/applications/mod_cluechoo
by FreeSWITCH SVN 03 Jun '09

03 Jun '09

Author: anthm Date: Wed Jun 3 08:45:12 2009 New Revision: 13566 Log: fix compiler warning Modified: freeswitch/trunk/src/mod/applications/mod_cluechoo/mod_cluechoo.c Modified: freeswitch/trunk/src/mod/applications/mod_cluechoo/mod_cluechoo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_cluechoo/mod_cluechoo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_cluechoo/mod_cluechoo.c Wed Jun 3 08:45:12 2009 @@ -42,10 +42,10 @@ */ SWITCH_MODULE_DEFINITION(mod_cluechoo, mod_cluechoo_load, mod_cluechoo_shutdown, NULL); -int add_D51(); -int add_sl(); -int add_man(); -int add_smoke(); +int add_D51(int x); +int add_sl(int x); +int add_man(int y, int x); +int add_smoke(int y, int x); int go(int i); int vgo(int i, switch_core_session_t *session);

1 0

[commit] r13557 - freeswitch/trunk/src
by FreeSWITCH SVN 02 Jun '09

02 Jun '09

Author: anthm Date: Tue Jun 2 17:46:38 2009 New Revision: 13557 Log: fix long delay in nat detection Modified: freeswitch/trunk/src/switch_nat.c Modified: freeswitch/trunk/src/switch_nat.c ============================================================================== --- freeswitch/trunk/src/switch_nat.c (original) +++ freeswitch/trunk/src/switch_nat.c Tue Jun 2 17:46:38 2009 @@ -101,11 +101,11 @@ static int init_pmp(void) { - int r = 0; + int r = 0, i = 0, max = 5; natpmpresp_t response; char *pubaddr = NULL; fd_set fds; - struct timeval timeout; + initnatpmp(&nat_globals.natpmp); r = sendpublicaddressrequest(&nat_globals.natpmp); @@ -115,12 +115,16 @@ } do { + struct timeval timeout = { 1, 0}; + i++; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Checking for PMP %d/%d\n", i, max); + FD_ZERO(&fds); FD_SET(nat_globals.natpmp.s, &fds); getnatpmprequesttimeout(&nat_globals.natpmp, &timeout); select(FD_SETSIZE, &fds, NULL, NULL, &timeout); r = readnatpmpresponseorretry(&nat_globals.natpmp, &response); - } while(r == NATPMP_TRYAGAIN); + } while(r == NATPMP_TRYAGAIN && i < max); if (r < 0) { goto end; @@ -147,13 +151,12 @@ switch_find_local_ip(nat_globals.pvt_addr, sizeof(nat_globals.pvt_addr), NULL, AF_INET); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Detecting NAT\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Scanning for NAT\n"); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Checking for PMP\n"); init_pmp(); - if (nat_globals.nat_type) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Checking for UPNP\n"); + if (!nat_globals.nat_type) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Checking for UPnP\n"); init_upnp(); } @@ -163,7 +166,7 @@ switch_core_set_variable("nat_type", nat_globals.nat_type == SWITCH_NAT_TYPE_PMP ? "pmp" : "upnp"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "NAT detected type: %s\n", nat_globals.nat_type == SWITCH_NAT_TYPE_PMP ? "pmp" : "upnp"); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "No PMP or uPNP NAT device detected!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "No PMP or UPnP NAT detected!\n"); } }

1 0

[commit] r13556 - freeswitch/trunk/src
by FreeSWITCH SVN 02 Jun '09

02 Jun '09

Author: anthm Date: Tue Jun 2 17:03:33 2009 New Revision: 13556 Log: fix order of ops to enable logging sooner Modified: freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_nat.c freeswitch/trunk/src/switch_xml.c Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Jun 2 17:03:33 2009 @@ -1176,6 +1176,12 @@ runtime.flags = flags; runtime.sps_total = 30; + *err = NULL; + + if (console) { + runtime.console = stdout; + } + switch_find_local_ip(guess_ip, sizeof(guess_ip), &mask, AF_INET); switch_core_set_variable("local_ip_v4", guess_ip); switch_core_set_variable("local_mask_v4", inet_ntoa(*(struct in_addr *)&mask)); @@ -1188,25 +1194,21 @@ switch_event_init(runtime.memory_pool); - if (switch_test_flag((&runtime), SCF_USE_AUTO_NAT)) { - switch_nat_init(runtime.memory_pool); - } - if (switch_xml_init(runtime.memory_pool, err) != SWITCH_STATUS_SUCCESS) { apr_terminate(); return SWITCH_STATUS_MEMERR; } - switch_load_core_config("switch.conf"); - + if (switch_test_flag((&runtime), SCF_USE_AUTO_NAT)) { + switch_nat_init(runtime.memory_pool); + } + switch_log_init(runtime.memory_pool, runtime.colorize_console); - switch_core_state_machine_init(runtime.memory_pool); - *err = NULL; + switch_load_core_config("switch.conf"); - if (console) { - runtime.console = stdout; - } + + switch_core_state_machine_init(runtime.memory_pool); if (switch_test_flag((&runtime), SCF_USE_SQL)) { switch_core_sqldb_start(runtime.memory_pool); Modified: freeswitch/trunk/src/switch_nat.c ============================================================================== --- freeswitch/trunk/src/switch_nat.c (original) +++ freeswitch/trunk/src/switch_nat.c Tue Jun 2 17:03:33 2009 @@ -146,9 +146,14 @@ switch_find_local_ip(nat_globals.pvt_addr, sizeof(nat_globals.pvt_addr), NULL, AF_INET); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Detecting NAT\n"); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Checking for PMP\n"); init_pmp(); - if (!nat_globals.nat_type) { + if (nat_globals.nat_type) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Checking for UPNP\n"); init_upnp(); } @@ -156,8 +161,9 @@ switch_core_set_variable("nat_public_addr", nat_globals.pub_addr); switch_core_set_variable("nat_private_addr", nat_globals.pvt_addr); switch_core_set_variable("nat_type", nat_globals.nat_type == SWITCH_NAT_TYPE_PMP ? "pmp" : "upnp"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "NAT detected type: %s\n", nat_globals.nat_type == SWITCH_NAT_TYPE_PMP ? "pmp" : "upnp"); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No PMP or uPNP NAT device detected!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "No PMP or uPNP NAT device detected!\n"); } } Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Tue Jun 2 17:03:33 2009 @@ -1287,8 +1287,8 @@ char *bp = expand_vars(buf, ebuf, sizeof(ebuf), &cur, &err); line++; - if (err && stderr) { - fprintf(stderr, "Error [%s] in file %s line %d\n", err, file, line); + if (err) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error [%s] in file %s line %d\n", err, file, line); } /* we ignore <include> or </include> for the sake of validators as well as <?xml version="1.0"?> type stuff */

1 0

[commit] r13551 - in freeswitch/trunk/src: . include mod/languages/mod_managed mod/languages/mod_managed/managed mod/languages/mod_perl
by FreeSWITCH SVN 02 Jun '09

02 Jun '09

Author: anthm Date: Tue Jun 2 14:50:04 2009 New Revision: 13551 Log: fix recursive file record during file playback issue IRC-00 Modified: freeswitch/trunk/src/include/switch_cpp.h freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp freeswitch/trunk/src/switch_cpp.cpp Modified: freeswitch/trunk/src/include/switch_cpp.h ============================================================================== --- freeswitch/trunk/src/include/switch_cpp.h (original) +++ freeswitch/trunk/src/include/switch_cpp.h Tue Jun 2 14:50:04 2009 @@ -203,7 +203,6 @@ char *xml_cdr_text; void store_file_handle(switch_file_handle_t *fh); void *on_hangup; // language specific callback function, cast as void * - switch_file_handle_t local_fh; switch_file_handle_t *fhp; char dtmf_buf[512]; Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx Tue Jun 2 14:50:04 2009 @@ -5718,6 +5718,32 @@ } +SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_memory_pool_set_data(void * jarg1, char * jarg2, void * jarg3) { + switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ; + char *arg2 = (char *) 0 ; + void *arg3 = (void *) 0 ; + + arg1 = (switch_memory_pool_t *)jarg1; + arg2 = (char *)jarg2; + arg3 = (void *)jarg3; + switch_core_memory_pool_set_data(arg1,(char const *)arg2,arg3); +} + + +SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_memory_pool_get_data(void * jarg1, char * jarg2) { + void * jresult ; + switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ; + char *arg2 = (char *) 0 ; + void *result = 0 ; + + arg1 = (switch_memory_pool_t *)jarg1; + arg2 = (char *)jarg2; + result = (void *)switch_core_memory_pool_get_data(arg1,(char const *)arg2); + jresult = (void *)result; + return jresult; +} + + SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_run(void * jarg1) { switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; @@ -5968,6 +5994,14 @@ } +SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_reporting_state(void * jarg1) { + switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; + + arg1 = (switch_core_session_t *)jarg1; + switch_core_session_reporting_state(arg1); +} + + SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_session_count() { unsigned long jresult ; uint32_t result; @@ -6082,6 +6116,18 @@ } +SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_force_locate(char * jarg1) { + void * jresult ; + char *arg1 = (char *) 0 ; + switch_core_session_t *result = 0 ; + + arg1 = (char *)jarg1; + result = (switch_core_session_t *)switch_core_session_force_locate((char const *)arg1); + jresult = (void *)result; + return jresult; +} + + SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_get_variable(char * jarg1) { char * jresult ; char *arg1 = (char *) 0 ; @@ -6142,6 +6188,20 @@ } +SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_get_partner(void * jarg1, void * jarg2) { + int jresult ; + switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; + switch_core_session_t **arg2 = (switch_core_session_t **) 0 ; + switch_status_t result; + + arg1 = (switch_core_session_t *)jarg1; + arg2 = (switch_core_session_t **)jarg2; + result = (switch_status_t)switch_core_session_get_partner(arg1,arg2); + jresult = result; + return jresult; +} + + SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_message_send(char * jarg1, void * jarg2) { int jresult ; char *arg1 = (char *) 0 ; @@ -8687,17 +8747,19 @@ } -SWIGEXPORT int SWIGSTDCALL CSharp_switch_find_local_ip(char * jarg1, int jarg2, int jarg3) { +SWIGEXPORT int SWIGSTDCALL CSharp_switch_find_local_ip(char * jarg1, int jarg2, void * jarg3, int jarg4) { int jresult ; char *arg1 = (char *) 0 ; int arg2 ; - int arg3 ; + int *arg3 = (int *) 0 ; + int arg4 ; switch_status_t result; arg1 = (char *)jarg1; arg2 = (int)jarg2; - arg3 = (int)jarg3; - result = (switch_status_t)switch_find_local_ip(arg1,arg2,arg3); + arg3 = (int *)jarg3; + arg4 = (int)jarg4; + result = (switch_status_t)switch_find_local_ip(arg1,arg2,arg3,arg4); jresult = result; return jresult; } @@ -9029,7 +9091,7 @@ arg1 = (char *)jarg1; arg2 = (char *)jarg2; arg3 = (size_t)jarg3; - result = (switch_bool_t)switch_ast2regex(arg1,arg2,arg3); + result = (switch_bool_t)switch_ast2regex((char const *)arg1,arg2,arg3); jresult = result; return jresult; } @@ -9195,17 +9257,19 @@ } -SWIGEXPORT int SWIGSTDCALL CSharp_switch_network_list_create(void * jarg1, int jarg2, void * jarg3) { +SWIGEXPORT int SWIGSTDCALL CSharp_switch_network_list_create(void * jarg1, char * jarg2, int jarg3, void * jarg4) { int jresult ; switch_network_list_t **arg1 = (switch_network_list_t **) 0 ; - switch_bool_t arg2 ; - switch_memory_pool_t *arg3 = (switch_memory_pool_t *) 0 ; + char *arg2 = (char *) 0 ; + switch_bool_t arg3 ; + switch_memory_pool_t *arg4 = (switch_memory_pool_t *) 0 ; switch_status_t result; arg1 = (switch_network_list_t **)jarg1; - arg2 = (switch_bool_t)jarg2; - arg3 = (switch_memory_pool_t *)jarg3; - result = (switch_status_t)switch_network_list_create(arg1,arg2,arg3); + arg2 = (char *)jarg2; + arg3 = (switch_bool_t)jarg3; + arg4 = (switch_memory_pool_t *)jarg4; + result = (switch_status_t)switch_network_list_create(arg1,(char const *)arg2,arg3,arg4); jresult = result; return jresult; } @@ -10587,6 +10651,29 @@ } +SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_extra_data_set(void * jarg1, void * jarg2) { + switch_frame *arg1 = (switch_frame *) 0 ; + void *arg2 = (void *) 0 ; + + arg1 = (switch_frame *)jarg1; + arg2 = (void *)jarg2; + if (arg1) (arg1)->extra_data = arg2; + +} + + +SWIGEXPORT void * SWIGSTDCALL CSharp_switch_frame_extra_data_get(void * jarg1) { + void * jresult ; + switch_frame *arg1 = (switch_frame *) 0 ; + void *result = 0 ; + + arg1 = (switch_frame *)jarg1; + result = (void *) ((arg1)->extra_data); + jresult = (void *)result; + return jresult; +} + + SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_data_set(void * jarg1, void * jarg2) { switch_frame *arg1 = (switch_frame *) 0 ; void *arg2 = (void *) 0 ; @@ -18478,6 +18565,18 @@ } +SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_wait_for_state_timeout(void * jarg1, int jarg2, unsigned long jarg3) { + switch_channel_t *arg1 = (switch_channel_t *) 0 ; + switch_channel_state_t arg2 ; + uint32_t arg3 ; + + arg1 = (switch_channel_t *)jarg1; + arg2 = (switch_channel_state_t)jarg2; + arg3 = (uint32_t)jarg3; + switch_channel_wait_for_state_timeout(arg1,arg2,arg3); +} + + SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_wait_for_flag(void * jarg1, int jarg2, int jarg3, unsigned long jarg4, void * jarg5) { int jresult ; switch_channel_t *arg1 = (switch_channel_t *) 0 ; @@ -18933,6 +19032,20 @@ } +SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_channel_test_flag_partner(void * jarg1, int jarg2) { + unsigned long jresult ; + switch_channel_t *arg1 = (switch_channel_t *) 0 ; + switch_channel_flag_t arg2 ; + uint32_t result; + + arg1 = (switch_channel_t *)jarg1; + arg2 = (switch_channel_flag_t)jarg2; + result = (uint32_t)switch_channel_test_flag_partner(arg1,arg2); + jresult = (unsigned long)result; + return jresult; +} + + SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_state_flag(void * jarg1, int jarg2) { switch_channel_t *arg1 = (switch_channel_t *) 0 ; switch_channel_flag_t arg2 ; @@ -24398,6 +24511,20 @@ } +SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_parse_str_dynamic(char * jarg1, int jarg2) { + void * jresult ; + char *arg1 = (char *) 0 ; + switch_bool_t arg2 ; + switch_xml_t result; + + arg1 = (char *)jarg1; + arg2 = (switch_bool_t)jarg2; + result = (switch_xml_t)switch_xml_parse_str_dynamic(arg1,arg2); + jresult = (void *)result; + return jresult; +} + + SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_parse_str(char * jarg1, void * jarg2) { void * jresult ; char *arg1 = (char *) 0 ; Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs Tue Jun 2 14:50:04 2009 @@ -1050,6 +1050,16 @@ return ret; } + public static void switch_core_memory_pool_set_data(SWIGTYPE_p_apr_pool_t pool, string key, SWIGTYPE_p_void data) { + freeswitchPINVOKE.switch_core_memory_pool_set_data(SWIGTYPE_p_apr_pool_t.getCPtr(pool), key, SWIGTYPE_p_void.getCPtr(data)); + } + + public static SWIGTYPE_p_void switch_core_memory_pool_get_data(SWIGTYPE_p_apr_pool_t pool, string key) { + IntPtr cPtr = freeswitchPINVOKE.switch_core_memory_pool_get_data(SWIGTYPE_p_apr_pool_t.getCPtr(pool), key); + SWIGTYPE_p_void ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_void(cPtr, false); + return ret; + } + public static void switch_core_session_run(SWIGTYPE_p_switch_core_session session) { freeswitchPINVOKE.switch_core_session_run(SWIGTYPE_p_switch_core_session.getCPtr(session)); } @@ -1130,6 +1140,10 @@ freeswitchPINVOKE.switch_core_session_destroy_state(SWIGTYPE_p_switch_core_session.getCPtr(session)); } + public static void switch_core_session_reporting_state(SWIGTYPE_p_switch_core_session session) { + freeswitchPINVOKE.switch_core_session_reporting_state(SWIGTYPE_p_switch_core_session.getCPtr(session)); + } + public static uint switch_core_session_count() { uint ret = freeswitchPINVOKE.switch_core_session_count(); return ret; @@ -1182,6 +1196,12 @@ return ret; } + public static SWIGTYPE_p_switch_core_session switch_core_session_force_locate(string uuid_str) { + IntPtr cPtr = freeswitchPINVOKE.switch_core_session_force_locate(uuid_str); + SWIGTYPE_p_switch_core_session ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_switch_core_session(cPtr, false); + return ret; + } + public static string switch_core_get_variable(string varname) { string ret = freeswitchPINVOKE.switch_core_get_variable(varname); return ret; @@ -1207,6 +1227,11 @@ freeswitchPINVOKE.switch_core_session_hupall_endpoint(switch_endpoint_interface.getCPtr(endpoint_interface), (int)cause); } + public static switch_status_t switch_core_session_get_partner(SWIGTYPE_p_switch_core_session session, SWIGTYPE_p_p_switch_core_session partner) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_get_partner(SWIGTYPE_p_switch_core_session.getCPtr(session), SWIGTYPE_p_p_switch_core_session.getCPtr(partner)); + return ret; + } + public static switch_status_t switch_core_session_message_send(string uuid_str, switch_core_session_message message) { switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_message_send(uuid_str, switch_core_session_message.getCPtr(message)); return ret; @@ -2102,8 +2127,8 @@ return ret; } - public static switch_status_t switch_find_local_ip(string buf, int len, int family) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_find_local_ip(buf, len, family); + public static switch_status_t switch_find_local_ip(string buf, int len, SWIGTYPE_p_int mask, int family) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_find_local_ip(buf, len, SWIGTYPE_p_int.getCPtr(mask), family); return ret; } @@ -2274,8 +2299,8 @@ return ret; } - public static switch_status_t switch_network_list_create(SWIGTYPE_p_p_switch_network_list list, switch_bool_t default_type, SWIGTYPE_p_apr_pool_t pool) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_network_list_create(SWIGTYPE_p_p_switch_network_list.getCPtr(list), (int)default_type, SWIGTYPE_p_apr_pool_t.getCPtr(pool)); + public static switch_status_t switch_network_list_create(SWIGTYPE_p_p_switch_network_list list, string name, switch_bool_t default_type, SWIGTYPE_p_apr_pool_t pool) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_network_list_create(SWIGTYPE_p_p_switch_network_list.getCPtr(list), name, (int)default_type, SWIGTYPE_p_apr_pool_t.getCPtr(pool)); return ret; } @@ -2355,6 +2380,10 @@ freeswitchPINVOKE.switch_channel_wait_for_state(SWIGTYPE_p_switch_channel.getCPtr(channel), SWIGTYPE_p_switch_channel.getCPtr(other_channel), (int)want_state); } + public static void switch_channel_wait_for_state_timeout(SWIGTYPE_p_switch_channel other_channel, switch_channel_state_t want_state, uint timeout) { + freeswitchPINVOKE.switch_channel_wait_for_state_timeout(SWIGTYPE_p_switch_channel.getCPtr(other_channel), (int)want_state, timeout); + } + public static switch_status_t switch_channel_wait_for_flag(SWIGTYPE_p_switch_channel channel, switch_channel_flag_t want_flag, switch_bool_t pres, uint to, SWIGTYPE_p_switch_channel super_channel) { switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_channel_wait_for_flag(SWIGTYPE_p_switch_channel.getCPtr(channel), (int)want_flag, (int)pres, to, SWIGTYPE_p_switch_channel.getCPtr(super_channel)); return ret; @@ -2523,6 +2552,11 @@ return ret; } + public static uint switch_channel_test_flag_partner(SWIGTYPE_p_switch_channel channel, switch_channel_flag_t flag) { + uint ret = freeswitchPINVOKE.switch_channel_test_flag_partner(SWIGTYPE_p_switch_channel.getCPtr(channel), (int)flag); + return ret; + } + public static void switch_channel_set_state_flag(SWIGTYPE_p_switch_channel channel, switch_channel_flag_t flag) { freeswitchPINVOKE.switch_channel_set_state_flag(SWIGTYPE_p_switch_channel.getCPtr(channel), (int)flag); } @@ -3706,6 +3740,12 @@ return ret; } + public static switch_xml switch_xml_parse_str_dynamic(string s, switch_bool_t dup) { + IntPtr cPtr = freeswitchPINVOKE.switch_xml_parse_str_dynamic(s, (int)dup); + switch_xml ret = (cPtr == IntPtr.Zero) ? null : new switch_xml(cPtr, false); + return ret; + } + public static switch_xml switch_xml_parse_str(string s, SWIGTYPE_p_switch_size_t len) { IntPtr cPtr = freeswitchPINVOKE.switch_xml_parse_str(s, SWIGTYPE_p_switch_size_t.getCPtr(len)); switch_xml ret = (cPtr == IntPtr.Zero) ? null : new switch_xml(cPtr, false); @@ -5850,6 +5890,12 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_core_perform_destroy_memory_pool")] public static extern int switch_core_perform_destroy_memory_pool(HandleRef jarg1, string jarg2, string jarg3, int jarg4); + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_memory_pool_set_data")] + public static extern void switch_core_memory_pool_set_data(HandleRef jarg1, string jarg2, HandleRef jarg3); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_memory_pool_get_data")] + public static extern IntPtr switch_core_memory_pool_get_data(HandleRef jarg1, string jarg2); + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_run")] public static extern void switch_core_session_run(HandleRef jarg1); @@ -5895,6 +5941,9 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_destroy_state")] public static extern void switch_core_session_destroy_state(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_reporting_state")] + public static extern void switch_core_session_reporting_state(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_count")] public static extern uint switch_core_session_count(); @@ -5925,6 +5974,9 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_locate")] public static extern IntPtr switch_core_session_locate(string jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_force_locate")] + public static extern IntPtr switch_core_session_force_locate(string jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_get_variable")] public static extern string switch_core_get_variable(string jarg1); @@ -5943,6 +5995,9 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_hupall_endpoint")] public static extern void switch_core_session_hupall_endpoint(HandleRef jarg1, int jarg2); + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_get_partner")] + public static extern int switch_core_session_get_partner(HandleRef jarg1, HandleRef jarg2); + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_message_send")] public static extern int switch_core_session_message_send(string jarg1, HandleRef jarg2); @@ -6493,7 +6548,7 @@ public static extern int switch_frame_free(HandleRef jarg1); [DllImport("mod_managed", EntryPoint="CSharp_switch_find_local_ip")] - public static extern int switch_find_local_ip(string jarg1, int jarg2, int jarg3); + public static extern int switch_find_local_ip(string jarg1, int jarg2, HandleRef jarg3, int jarg4); [DllImport("mod_managed", EntryPoint="CSharp_get_addr")] public static extern string get_addr(string jarg1, HandleRef jarg2, HandleRef jarg3, HandleRef jarg4); @@ -6595,7 +6650,7 @@ public static extern int switch_parse_cidr(string jarg1, HandleRef jarg2, HandleRef jarg3, HandleRef jarg4); [DllImport("mod_managed", EntryPoint="CSharp_switch_network_list_create")] - public static extern int switch_network_list_create(HandleRef jarg1, int jarg2, HandleRef jarg3); + public static extern int switch_network_list_create(HandleRef jarg1, string jarg2, int jarg3, HandleRef jarg4); [DllImport("mod_managed", EntryPoint="CSharp_switch_network_list_add_cidr_token")] public static extern int switch_network_list_add_cidr_token(HandleRef jarg1, string jarg2, int jarg3, string jarg4); @@ -6912,6 +6967,12 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_frame_packetlen_get")] public static extern uint switch_frame_packetlen_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_frame_extra_data_set")] + public static extern void switch_frame_extra_data_set(HandleRef jarg1, HandleRef jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_frame_extra_data_get")] + public static extern IntPtr switch_frame_extra_data_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_frame_data_set")] public static extern void switch_frame_data_set(HandleRef jarg1, HandleRef jarg2); @@ -8910,6 +8971,9 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_wait_for_state")] public static extern void switch_channel_wait_for_state(HandleRef jarg1, HandleRef jarg2, int jarg3); + [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_wait_for_state_timeout")] + public static extern void switch_channel_wait_for_state_timeout(HandleRef jarg1, int jarg2, uint jarg3); + [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_wait_for_flag")] public static extern int switch_channel_wait_for_flag(HandleRef jarg1, int jarg2, int jarg3, uint jarg4, HandleRef jarg5); @@ -9012,6 +9076,9 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_clear_flag_partner")] public static extern int switch_channel_clear_flag_partner(HandleRef jarg1, int jarg2); + [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_test_flag_partner")] + public static extern uint switch_channel_test_flag_partner(HandleRef jarg1, int jarg2); + [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_set_state_flag")] public static extern void switch_channel_set_state_flag(HandleRef jarg1, int jarg2); @@ -10185,6 +10252,9 @@ [DllImport("mod_managed", EntryPoint="CSharp_delete_switch_xml")] public static extern void delete_switch_xml(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_xml_parse_str_dynamic")] + public static extern IntPtr switch_xml_parse_str_dynamic(string jarg1, int jarg2); + [DllImport("mod_managed", EntryPoint="CSharp_switch_xml_parse_str")] public static extern IntPtr switch_xml_parse_str(string jarg1, HandleRef jarg2); @@ -17542,6 +17612,10 @@ CF_PAUSE_BUGS, CF_DIVERT_EVENTS, CF_BLOCK_STATE, + CF_FS_RTP, + CF_REPORTING, + CF_PARK, + CF_TIMESTAMP_SET, CF_FLAG_MAX } @@ -18779,7 +18853,8 @@ SCF_CRASH_PROT = (1 << 3), SCF_VG = (1 << 4), SCF_RESTART = (1 << 5), - SCF_SHUTDOWN_REQUESTED = (1 << 6) + SCF_SHUTDOWN_REQUESTED = (1 << 6), + SCF_USE_AUTO_NAT = (1 << 7) } } @@ -20324,6 +20399,7 @@ SWITCH_EVENT_CHANNEL_STATE, SWITCH_EVENT_CHANNEL_ANSWER, SWITCH_EVENT_CHANNEL_HANGUP, + SWITCH_EVENT_CHANNEL_HANGUP_COMPLETE, SWITCH_EVENT_CHANNEL_EXECUTE, SWITCH_EVENT_CHANNEL_EXECUTE_COMPLETE, SWITCH_EVENT_CHANNEL_BRIDGE, @@ -20382,6 +20458,7 @@ SWITCH_EVENT_SERVER_DISCONNECTED, SWITCH_EVENT_SEND_INFO, SWITCH_EVENT_RECV_INFO, + SWITCH_EVENT_CALL_SECURE, SWITCH_EVENT_ALL } @@ -21123,6 +21200,17 @@ } } + public SWIGTYPE_p_void extra_data { + set { + freeswitchPINVOKE.switch_frame_extra_data_set(swigCPtr, SWIGTYPE_p_void.getCPtr(value)); + } + get { + IntPtr cPtr = freeswitchPINVOKE.switch_frame_extra_data_get(swigCPtr); + SWIGTYPE_p_void ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_void(cPtr, false); + return ret; + } + } + public SWIGTYPE_p_void data { set { freeswitchPINVOKE.switch_frame_data_set(swigCPtr, SWIGTYPE_p_void.getCPtr(value)); @@ -21260,7 +21348,8 @@ SFF_PLC = (1 << 3), SFF_RFC2833 = (1 << 4), SFF_PROXY_PACKET = (1 << 5), - SFF_DYNAMIC = (1 << 6) + SFF_DYNAMIC = (1 << 6), + SFF_ZRTP = (1 << 7) } } @@ -23391,7 +23480,11 @@ SWITCH_RTP_FLAG_SHUTDOWN = (1 << 19), SWITCH_RTP_FLAG_FLUSH = (1 << 20), SWITCH_RTP_FLAG_AUTOFLUSH = (1 << 21), - SWITCH_RTP_FLAG_STICKY_FLUSH = (1 << 22) + SWITCH_RTP_FLAG_STICKY_FLUSH = (1 << 22), + SWITCH_ZRTP_FLAG_SECURE_SEND = (1 << 23), + SWITCH_ZRTP_FLAG_SECURE_RECV = (1 << 24), + SWITCH_ZRTP_FLAG_SECURE_MITM_SEND = (1 << 25), + SWITCH_ZRTP_FLAG_SECURE_MITM_RECV = (1 << 26) } } Modified: freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp Tue Jun 2 14:50:04 2009 @@ -11562,17 +11562,17 @@ SWIG_TypeClientData(SWIGTYPE_p_IVRMenu, (void*) "freeswitch::IVRMenu"); SWIG_TypeClientData(SWIGTYPE_p_API, (void*) "freeswitch::API"); SWIG_TypeClientData(SWIGTYPE_p_input_callback_state, (void*) "freeswitch::input_callback_state_t"); - /*@SWIG:/usr/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { + /*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "S_HUP", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_HUP))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { + /*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "S_FREE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_FREE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { + /*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "S_RDLOCK", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_RDLOCK))); SvREADONLY_on(sv); Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Tue Jun 2 14:50:04 2009 @@ -829,6 +829,7 @@ switch_status_t status; //switch_file_handle_t fh = { 0 }; const char *prebuf; + switch_file_handle_t local_fh; this_check(-1); sanity_check(-1); @@ -978,6 +979,7 @@ SWITCH_DECLARE(int) CoreSession::recordFile(char *file_name, int time_limit, int silence_threshold, int silence_hits) { switch_status_t status; + switch_file_handle_t local_fh; this_check(-1); sanity_check(-1);

1 0

[commit] r13550 - freeswitch/trunk/src
by FreeSWITCH SVN 02 Jun '09

02 Jun '09

Author: anthm Date: Tue Jun 2 13:30:18 2009 New Revision: 13550 Log: rupa said this segged Modified: freeswitch/trunk/src/switch_utils.c Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Tue Jun 2 13:30:18 2009 @@ -747,7 +747,7 @@ { struct ifaddrs *ifaddrs, *i = NULL; - if (getifaddrs(&ifaddrs) < 0) { + if (!me || getifaddrs(&ifaddrs) < 0) { return -1; } @@ -755,7 +755,7 @@ struct sockaddr_in *s = (struct sockaddr_in *)i->ifa_addr; struct sockaddr_in *m = (struct sockaddr_in *)i->ifa_netmask; - if (s->sin_addr.s_addr == me->sin_addr.s_addr) { + if (s && m && s->sin_addr.s_addr == me->sin_addr.s_addr) { *mask = m->sin_addr.s_addr; return 0; }

1 0

[commit] r13549 - in freeswitch/trunk: conf/autoload_configs conf/jingle_profiles src src/include src/mod/applications/mod_commands src/mod/applications/mod_esf src/mod/endpoints/mod_alsa src/mod/endpoints/mod_dingaling src/mod/endpoints/mod_portaudio src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 02 Jun '09

02 Jun '09

Author: anthm Date: Tue Jun 2 11:55:10 2009 New Revision: 13549 Log: add netmask detection for nat discovery work Modified: freeswitch/trunk/conf/autoload_configs/acl.conf.xml freeswitch/trunk/conf/jingle_profiles/client.xml freeswitch/trunk/conf/jingle_profiles/server.xml freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.c freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c 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_reg.c freeswitch/trunk/src/switch.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_event.c freeswitch/trunk/src/switch_nat.c freeswitch/trunk/src/switch_utils.c Modified: freeswitch/trunk/conf/autoload_configs/acl.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/acl.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/acl.conf.xml Tue Jun 2 11:55:10 2009 @@ -1,26 +1,18 @@ <configuration name="acl.conf" description="Network Lists"> <network-lists> +  <list name="lan" default="allow"> <node type="deny" cidr="192.168.42.0/24"/> <node type="allow" cidr="192.168.42.42/32"/> </list> - <list name="strict" default="deny"> - <node type="allow" cidr="208.102.123.124/32"/> - </list>  <param name="vad" value="both"/>  -  +  </x-profile> </include> Modified: freeswitch/trunk/conf/jingle_profiles/server.xml ============================================================================== --- freeswitch/trunk/conf/jingle_profiles/server.xml (original) +++ freeswitch/trunk/conf/jingle_profiles/server.xml Tue Jun 2 11:55:10 2009 @@ -16,6 +16,6 @@    -  +  </x-profile> </include> Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Tue Jun 2 11:55:10 2009 @@ -232,7 +232,8 @@ SCF_CRASH_PROT = (1 << 3), SCF_VG = (1 << 4), SCF_RESTART = (1 << 5), - SCF_SHUTDOWN_REQUESTED = (1 << 6) + SCF_SHUTDOWN_REQUESTED = (1 << 6), + SCF_USE_AUTO_NAT = (1 << 7) } switch_core_flag_enum_t; typedef uint32_t switch_core_flag_t; Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Tue Jun 2 11:55:10 2009 @@ -172,7 +172,7 @@ \return SWITCH_STATUS_SUCCESSS for success, otherwise failure */ SWITCH_DECLARE(switch_status_t) switch_find_local_ip(_Out_opt_bytecapcount_(len) - char *buf, _In_ int len, _In_ int family); + char *buf, _In_ int len, _In_ int *mask, _In_ int family); /*! \brief find the char representation of an ip adress @@ -550,7 +550,7 @@ SWITCH_DECLARE(char *) switch_find_end_paren(const char *s, char open, char close); SWITCH_DECLARE(int) switch_parse_cidr(const char *string, uint32_t *ip, uint32_t *mask, uint32_t *bitp); -SWITCH_DECLARE(switch_status_t) switch_network_list_create(switch_network_list_t **list, switch_bool_t default_type, switch_memory_pool_t *pool); +SWITCH_DECLARE(switch_status_t) switch_network_list_create(switch_network_list_t **list, const char *name, switch_bool_t default_type, switch_memory_pool_t *pool); SWITCH_DECLARE(switch_status_t) switch_network_list_add_cidr_token(switch_network_list_t *list, const char *cidr_str, switch_bool_t ok, const char *token); #define switch_network_list_add_cidr(_list, _cidr_str, _ok) switch_network_list_add_cidr_token(_list, _cidr_str, _ok, NULL) 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 Tue Jun 2 11:55:10 2009 @@ -608,7 +608,7 @@ if (pip) { switch_copy_string(ip_buf, pip, sizeof(ip_buf)); } else { - switch_find_local_ip(ip_buf, sizeof(ip_buf), AF_INET); + switch_find_local_ip(ip_buf, sizeof(ip_buf), NULL, AF_INET); } switch_core_new_memory_pool(&pool); Modified: freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.c (original) +++ freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.c Tue Jun 2 11:55:10 2009 @@ -172,7 +172,7 @@ if ((var = switch_channel_get_variable(channel, "esf_broadcast_ip"))) { esf_broadcast_ip = switch_core_session_strdup(session, var); } else { - switch_find_local_ip(guess_ip, sizeof(guess_ip), AF_INET); + switch_find_local_ip(guess_ip, sizeof(guess_ip), NULL, AF_INET); esf_broadcast_ip = guess_ip; } Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c Tue Jun 2 11:55:10 2009 @@ -1484,7 +1484,7 @@ tech_pvt->codec_ms = atoi(argv[5]); } - switch_find_local_ip(ip, sizeof(ip), AF_INET); + switch_find_local_ip(ip, sizeof(ip), NULL, AF_INET); if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), NULL, Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Tue Jun 2 11:55:10 2009 @@ -2215,7 +2215,7 @@ memset(&globals, 0, sizeof(globals)); globals.running = 1; - switch_find_local_ip(globals.guess_ip, sizeof(globals.guess_ip), AF_INET); + switch_find_local_ip(globals.guess_ip, sizeof(globals.guess_ip), NULL, AF_INET); switch_core_hash_init(&globals.profile_hash, module_pool); Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Tue Jun 2 11:55:10 2009 @@ -1755,7 +1755,7 @@ tech_pvt->codec_ms = atoi(argv[5]); } - switch_find_local_ip(ip, sizeof(ip), AF_INET); + switch_find_local_ip(ip, sizeof(ip), NULL, AF_INET); if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), NULL, dialplan, cid_name, cid_num, ip, NULL, NULL, NULL, modname, NULL, dest)) != 0) { 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 Jun 2 11:55:10 2009 @@ -3204,7 +3204,8 @@ mod_sofia_globals.pool = pool; switch_mutex_init(&mod_sofia_globals.mutex, SWITCH_MUTEX_NESTED, mod_sofia_globals.pool); - switch_find_local_ip(mod_sofia_globals.guess_ip, sizeof(mod_sofia_globals.guess_ip), AF_INET); + switch_find_local_ip(mod_sofia_globals.guess_ip, sizeof(mod_sofia_globals.guess_ip), &mod_sofia_globals.guess_mask, AF_INET); + switch_set_string(mod_sofia_globals.guess_mask_str, inet_ntoa(*(struct in_addr *)&mod_sofia_globals.guess_mask)); gethostname(mod_sofia_globals.hostname, sizeof(mod_sofia_globals.hostname)); 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 Jun 2 11:55:10 2009 @@ -268,6 +268,8 @@ switch_event_node_t *roster_node; switch_event_node_t *custom_node; switch_event_node_t *mwi_node; + int guess_mask; + char guess_mask_str[16]; int debug_presence; int auto_restart; }; 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 Tue Jun 2 11:55:10 2009 @@ -627,7 +627,7 @@ switch_mutex_lock(profile->ireg_mutex); sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); - switch_find_local_ip(guess_ip4, sizeof(guess_ip4), AF_INET); + switch_find_local_ip(guess_ip4, sizeof(guess_ip4), NULL, AF_INET); sql = switch_mprintf("insert into sip_registrations " "(call_id,sip_user,sip_host,presence_hosts,contact,status,rpid,expires," "user_agent,server_user,server_host,profile_name,hostname,network_ip,network_port,sip_username,sip_realm) " 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 Jun 2 11:55:10 2009 @@ -1045,7 +1045,7 @@ switch_mutex_lock(profile->ireg_mutex); sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); - switch_find_local_ip(guess_ip4, sizeof(guess_ip4), AF_INET); + switch_find_local_ip(guess_ip4, sizeof(guess_ip4), NULL, AF_INET); sql = switch_mprintf("insert into sip_registrations " "(call_id,sip_user,sip_host,presence_hosts,contact,status,rpid,expires," "user_agent,server_user,server_host,profile_name,hostname,network_ip,network_port,sip_username,sip_realm) " Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Tue Jun 2 11:55:10 2009 @@ -171,7 +171,7 @@ /* the main service entry point */ void WINAPI service_main(DWORD numArgs, char **args) { - switch_core_flag_t flags = SCF_USE_SQL; + switch_core_flag_t flags = SCF_USE_SQL | SCF_USE_AUTO_NAT; const char *err = NULL; /* error value for return from freeswitch initialization */ /* we have to initialize the service-specific stuff */ memset(&status, 0, sizeof(SERVICE_STATUS)); @@ -274,7 +274,7 @@ int alt_dirs = 0; int known_opt; int high_prio = 0; - switch_core_flag_t flags = SCF_USE_SQL; + switch_core_flag_t flags = SCF_USE_SQL | SCF_USE_AUTO_NAT; int ret = 0; switch_status_t destroy_status; switch_file_t *fd; @@ -306,6 +306,7 @@ "\t-hp -- enable high priority settings\n" "\t-vg -- run under valgrind\n" "\t-nosql -- disable internal sql scoreboard\n" + "\t-nonat -- disable auto nat detection\n" "\t-stop -- stop freeswitch\n" "\t-nc -- do not output to a console and background\n" "\t-c -- output to a console and stay in the foreground\n" @@ -463,6 +464,11 @@ known_opt++; } + if (argv[x] && !strcmp(argv[x], "-nonat")) { + flags &= ~SCF_USE_AUTO_NAT; + known_opt++; + } + if (argv[x] && !strcmp(argv[x], "-vg")) { flags |= SCF_VG; known_opt++; Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Jun 2 11:55:10 2009 @@ -95,9 +95,10 @@ char old_ip4[256] = ""; char old_ip6[256] = ""; int ok4 = 1, ok6 = 1; - - switch_find_local_ip(guess_ip4, sizeof(guess_ip4), AF_INET); - switch_find_local_ip(guess_ip6, sizeof(guess_ip6), AF_INET6); + int mask = 0; + + switch_find_local_ip(guess_ip4, sizeof(guess_ip4), &mask, AF_INET); + switch_find_local_ip(guess_ip6, sizeof(guess_ip6), NULL, AF_INET6); if (!*main_ip4) { switch_set_string(main_ip4, guess_ip4); @@ -106,6 +107,7 @@ switch_set_string(old_ip4, main_ip4); switch_set_string(main_ip4, guess_ip4); switch_core_set_variable("local_ip_v4", guess_ip4); + switch_core_set_variable("local_mask_v4", inet_ntoa(*(struct in_addr *)&mask)); } } @@ -861,9 +863,16 @@ SWITCH_DECLARE(void) switch_load_network_lists(switch_bool_t reload) { switch_xml_t xml = NULL, x_lists = NULL, x_list = NULL, x_node = NULL, cfg = NULL; - switch_network_list_t *list; - + switch_network_list_t *rfc_list, *list; + char guess_ip[16] = ""; + int mask = 0; + char guess_mask[16] = ""; + char *tmp_name; + int ip_tmp = 0; + switch_find_local_ip(guess_ip, sizeof(guess_ip), &mask, AF_INET); + switch_set_string(guess_mask, inet_ntoa(*(struct in_addr *)&mask)); + switch_mutex_lock(runtime.global_mutex); if (IP_LIST.hash) { @@ -878,6 +887,44 @@ switch_core_new_memory_pool(&IP_LIST.pool); switch_core_hash_init(&IP_LIST.hash, IP_LIST.pool); + + tmp_name = "rfc1918.auto"; + switch_network_list_create(&rfc_list, tmp_name, SWITCH_FALSE, IP_LIST.pool); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Created ip list %s default (deny)\n", tmp_name); + switch_network_list_add_cidr(rfc_list, "10.0.0.0/8", SWITCH_TRUE); + switch_network_list_add_cidr(rfc_list, "172.16.0.0/12", SWITCH_TRUE); + switch_network_list_add_cidr(rfc_list, "192.168.0.0/16", SWITCH_TRUE); + switch_core_hash_insert(IP_LIST.hash, tmp_name, rfc_list); + + tmp_name = "nat.auto"; + switch_network_list_create(&rfc_list, tmp_name, SWITCH_FALSE, IP_LIST.pool); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Created ip list %s default (deny)\n", tmp_name); + switch_network_list_add_cidr(rfc_list, "10.0.0.0/8", SWITCH_TRUE); + switch_network_list_add_cidr(rfc_list, "172.16.0.0/12", SWITCH_TRUE); + switch_network_list_add_cidr(rfc_list, "192.168.0.0/16", SWITCH_TRUE); + switch_core_hash_insert(IP_LIST.hash, tmp_name, rfc_list); + + tmp_name = "localnet.auto"; + switch_network_list_create(&list, tmp_name, SWITCH_FALSE, IP_LIST.pool); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Created ip list %s default (deny)\n", tmp_name); + + if (switch_network_list_add_host_mask(list, guess_ip, guess_mask, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, + "Adding %s/%s (allow) to list %s\n", guess_ip, guess_mask, tmp_name); + } + switch_core_hash_insert(IP_LIST.hash, tmp_name, list); + + switch_inet_pton(AF_INET, guess_ip, &ip_tmp); + ip_tmp = htonl(ip_tmp); + tmp_name = "nat.auto"; + + if (switch_network_list_validate_ip_token(rfc_list, ip_tmp, NULL)) { + switch_network_list_add_host_mask(rfc_list, guess_ip, guess_mask, SWITCH_FALSE); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, + "Adding %s/%s (deny) to list %s\n", guess_ip, guess_mask, tmp_name); + } + + if ((xml = switch_xml_open_cfg("acl.conf", &cfg, NULL))) { if ((x_lists = switch_xml_child(cfg, "network-lists"))) { for (x_list = switch_xml_child(x_lists, "list"); x_list; x_list = x_list->next) { @@ -893,7 +940,7 @@ default_type = switch_true(dft); } - if (switch_network_list_create(&list, default_type, IP_LIST.pool) != SWITCH_STATUS_SUCCESS) { + if (switch_network_list_create(&list, name, default_type, IP_LIST.pool) != SWITCH_STATUS_SUCCESS) { abort(); } @@ -1075,6 +1122,7 @@ switch_uuid_t uuid; char guess_ip[256]; char *dir_path; + int mask = 0; memset(&runtime, 0, sizeof(runtime)); @@ -1128,16 +1176,21 @@ runtime.flags = flags; runtime.sps_total = 30; - switch_find_local_ip(guess_ip, sizeof(guess_ip), AF_INET); + switch_find_local_ip(guess_ip, sizeof(guess_ip), &mask, AF_INET); switch_core_set_variable("local_ip_v4", guess_ip); - switch_find_local_ip(guess_ip, sizeof(guess_ip), AF_INET6); + switch_core_set_variable("local_mask_v4", inet_ntoa(*(struct in_addr *)&mask)); + + + switch_find_local_ip(guess_ip, sizeof(guess_ip), NULL, AF_INET6); switch_core_set_variable("local_ip_v6", guess_ip); switch_core_set_variable("base_dir", SWITCH_GLOBAL_dirs.base_dir); switch_core_set_serial(); switch_event_init(runtime.memory_pool); - switch_nat_init(runtime.memory_pool); + if (switch_test_flag((&runtime), SCF_USE_AUTO_NAT)) { + switch_nat_init(runtime.memory_pool); + } if (switch_xml_init(runtime.memory_pool, err) != SWITCH_STATUS_SUCCESS) { apr_terminate(); @@ -1559,7 +1612,9 @@ switch_scheduler_task_thread_stop(); switch_rtp_shutdown(); - switch_nat_shutdown(); + if (switch_test_flag((&runtime), SCF_USE_AUTO_NAT)) { + switch_nat_shutdown(); + } switch_xml_destroy(); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Closing Event Engine.\n"); Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Tue Jun 2 11:55:10 2009 @@ -574,8 +574,8 @@ switch_threadattr_create(&thd_attr, pool); gethostname(hostname, sizeof(hostname)); - switch_find_local_ip(guess_ip_v4, sizeof(guess_ip_v4), AF_INET); - switch_find_local_ip(guess_ip_v6, sizeof(guess_ip_v6), AF_INET6); + switch_find_local_ip(guess_ip_v4, sizeof(guess_ip_v4), NULL, AF_INET); + switch_find_local_ip(guess_ip_v6, sizeof(guess_ip_v6), NULL, AF_INET6); switch_queue_create(&EVENT_QUEUE[0], POOL_COUNT_MAX + 10, THRUNTIME_POOL); Modified: freeswitch/trunk/src/switch_nat.c ============================================================================== --- freeswitch/trunk/src/switch_nat.c (original) +++ freeswitch/trunk/src/switch_nat.c Tue Jun 2 11:55:10 2009 @@ -144,7 +144,7 @@ memset(&nat_globals, 0, sizeof(nat_globals)); nat_globals.pool = pool; - switch_find_local_ip(nat_globals.pvt_addr, sizeof(nat_globals.pvt_addr), AF_INET); + switch_find_local_ip(nat_globals.pvt_addr, sizeof(nat_globals.pvt_addr), NULL, AF_INET); init_pmp(); Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Tue Jun 2 11:55:10 2009 @@ -44,6 +44,7 @@ uint32_t bits; switch_bool_t ok; char *token; + char *str; struct switch_network_node *next; }; typedef struct switch_network_node switch_network_node_t; @@ -52,6 +53,7 @@ struct switch_network_node *node_head; switch_bool_t default_type; switch_memory_pool_t *pool; + char *name; }; #ifndef WIN32 @@ -119,7 +121,7 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_DECLARE(switch_status_t) switch_network_list_create(switch_network_list_t **list, switch_bool_t default_type, switch_memory_pool_t *pool) +SWITCH_DECLARE(switch_status_t) switch_network_list_create(switch_network_list_t **list, const char *name, switch_bool_t default_type, switch_memory_pool_t *pool) { switch_network_list_t *new_list; @@ -130,6 +132,7 @@ new_list = switch_core_alloc(pool, sizeof(**list)); new_list->pool = pool; new_list->default_type = default_type; + new_list->name = switch_core_strdup(new_list->pool, name); *list = new_list; @@ -176,6 +179,7 @@ node->mask = mask; node->ok = ok; node->bits = bits; + node->str = switch_core_strdup(list->pool, cidr_str); if (!switch_strlen_zero(token)) { node->token = switch_core_strdup(list->pool, token); @@ -197,15 +201,16 @@ node = switch_core_alloc(list->pool, sizeof(*node)); - node->ip = ip; - node->mask = mask; + node->ip = ntohl(ip); + node->mask = ntohl(mask); node->ok = ok; /* http://graphics.stanford.edu/~seander/bithacks.html */ mask = mask - ((mask >> 1) & 0x55555555); mask = (mask & 0x33333333) + ((mask >> 2) & 0x33333333); node->bits = (((mask + (mask >> 4)) & 0xF0F0F0F) * 0x1010101) >> 24; - + node->str = switch_core_sprintf(list->pool, "%s:%s", host, mask_str); + node->next = list->node_head; list->node_head = node; @@ -735,7 +740,33 @@ return NULL; } -SWITCH_DECLARE(switch_status_t) switch_find_local_ip(char *buf, int len, int family) +#ifndef WIN32 +#include <ifaddrs.h> + +static int get_netmask(struct sockaddr_in *me, int *mask) +{ + struct ifaddrs *ifaddrs, *i = NULL; + + if (getifaddrs(&ifaddrs) < 0) { + return -1; + } + + for(i = ifaddrs; i; i = i->ifa_next) { + struct sockaddr_in *s = (struct sockaddr_in *)i->ifa_addr; + struct sockaddr_in *m = (struct sockaddr_in *)i->ifa_netmask; + + if (s->sin_addr.s_addr == me->sin_addr.s_addr) { + *mask = m->sin_addr.s_addr; + return 0; + } + } + + + return -2; +} +#endif + +SWITCH_DECLARE(switch_status_t) switch_find_local_ip(char *buf, int len, int *mask, int family) { switch_status_t status = SWITCH_STATUS_FALSE; char *base; @@ -758,7 +789,6 @@ if (len < 16) { return status; } - switch (family) { case AF_INET: @@ -790,6 +820,10 @@ return status; } + if (mask) { + *mask = 0; // find the right one + } + closesocket(tmp_socket); freeaddrinfo(address_info); @@ -832,6 +866,10 @@ } switch_copy_string(buf, get_addr(abuf, sizeof(abuf), (struct sockaddr*)&iface_out, sizeof(iface_out)), len); + if (mask) { + get_netmask((struct sockaddr_in*)&iface_out, mask); + } + status = SWITCH_STATUS_SUCCESS; } break;

1 0

[commit] r13548 - freeswitch/trunk/src/mod/xml_int/mod_xml_rpc
by FreeSWITCH SVN 02 Jun '09

02 Jun '09

Author: anthm Date: Tue Jun 2 11:48:24 2009 New Revision: 13548 Log: XML-2 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Tue Jun 2 11:48:24 2009 @@ -217,7 +217,7 @@ } switch_event_destroy(&params); - box = switch_xml_attr_soft(x_user, "number-alias"); + box = switch_xml_attr(x_user, "number-alias"); if ((x_params = switch_xml_child(x_domain, "params"))) {

1 0

[commit] r13547 - freeswitch/trunk/src/mod/applications/mod_lcr
by FreeSWITCH SVN 02 Jun '09

02 Jun '09

Author: rupa Date: Tue Jun 2 11:39:54 2009 New Revision: 13547 Log: use origination_caller_id_number instead Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Tue Jun 2 11:39:54 2009 @@ -259,7 +259,7 @@ cid = ""; if (!switch_strlen_zero(cur_route->cid)) { - cid = switch_core_sprintf(pool, ",effective_caller_id_number=%s", + cid = switch_core_sprintf(pool, ",origination_caller_id_number=%s", do_cid(pool, cur_route->cid, caller_id)); }

1 0

[commit] r13546 - freeswitch/trunk/src/mod/applications/mod_lcr
by FreeSWITCH SVN 02 Jun '09

02 Jun '09

Author: rupa Date: Tue Jun 2 11:38:29 2009 New Revision: 13546 Log: MODAPP-281 - add extra sip headers Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Tue Jun 2 11:38:29 2009 @@ -132,6 +132,7 @@ switch_bool_t reorder_by_rate; switch_bool_t quote_in_list; + switch_bool_t info_in_headers; }; typedef struct profile_obj profile_t; @@ -219,7 +220,7 @@ return number; } -static char *get_bridge_data(switch_memory_pool_t *pool, char *dialed_number, char *caller_id, lcr_route cur_route) +static char *get_bridge_data(switch_memory_pool_t *pool, char *dialed_number, char *caller_id, lcr_route cur_route, profile_t *profile) { size_t lstrip; size_t tstrip; @@ -228,6 +229,7 @@ char *orig_destination_number = NULL; char *codec = NULL; char *cid = NULL; + char *header = NULL; orig_destination_number = destination_number = switch_core_strdup(pool, dialed_number); @@ -261,9 +263,16 @@ do_cid(pool, cur_route->cid, caller_id)); } - data = switch_core_sprintf(pool, "[lcr_carrier=%s,lcr_rate=%s%s%s]%s%s%s%s%s" + header = ""; + if (profile->info_in_headers) { + header = switch_core_sprintf(pool, ",sip_h_X-LCR-INFO=lcr_rate=%s;lcr_carrier=%s", + cur_route->rate_str, + cur_route->carrier_name); + } + + data = switch_core_sprintf(pool, "[lcr_carrier=%s,lcr_rate=%s%s%s%s]%s%s%s%s%s" , cur_route->carrier_name, cur_route->rate_str - , codec, cid + , codec, cid, header , cur_route->gw_prefix, cur_route->prefix , destination_number, cur_route->suffix, cur_route->gw_suffix); @@ -546,7 +555,7 @@ if (argc > LCR_CID_PLACE) { additional->cid = switch_core_strdup(pool, switch_str_nil(argv[LCR_CID_PLACE])); } - additional->dialstring = get_bridge_data(pool, cbt->lookup_number, cbt->cid, additional); + additional->dialstring = get_bridge_data(pool, cbt->lookup_number, cbt->cid, additional, cbt->profile); if (cbt->head == NULL) { key = switch_core_sprintf(pool, "%s:%s", additional->gw_prefix, additional->gw_suffix); @@ -783,6 +792,7 @@ switch_stream_handle_t *thisorder = NULL; char *reorder_by_rate = NULL; char *quote_in_list = NULL; + char *info_in_headers = NULL; char *id_s = NULL; char *custom_sql = NULL; int argc, x = 0; @@ -835,6 +845,8 @@ custom_sql = val; } else if (!strcasecmp(var, "reorder_by_rate") && !switch_strlen_zero(val)) { reorder_by_rate = val; + } else if (!strcasecmp(var, "info_in_headers") && !switch_strlen_zero(val)) { + info_in_headers = val; } else if (!strcasecmp(var, "quote_in_list") && !switch_strlen_zero(val)) { quote_in_list = val; } @@ -913,6 +925,10 @@ profile->reorder_by_rate = switch_true(reorder_by_rate); } + if (!switch_strlen_zero(info_in_headers)) { + profile->info_in_headers = switch_true(info_in_headers); + } + if (!switch_strlen_zero(quote_in_list)) { profile->quote_in_list = switch_true(quote_in_list); } @@ -1207,7 +1223,7 @@ current = cb_struct.head; while (current) { - dialstring = get_bridge_data(pool, cb_struct.lookup_number, cb_struct.cid, current); + dialstring = get_bridge_data(pool, cb_struct.lookup_number, cb_struct.cid, current, cb_struct.profile); stream->write_function(stream, " | %s", current->digit_str); str_repeat((maximum_lengths.digit_str - current->digit_len), " ", stream); @@ -1300,6 +1316,8 @@ } stream->write_function(stream, " Reorder rate:\t%s\n", profile->reorder_by_rate ? "enabled" : "disabled"); + stream->write_function(stream, " Info in headers:\t%s\n", + profile->info_in_headers ? "enabled" : "disabled"); stream->write_function(stream, " Quote IN() List:\t%s\n", profile->quote_in_list ? "enabled" : "disabled"); stream->write_function(stream, "\n");

1 0