- Freeswitch-svn - FreeSWITCH Mailing Lists

[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

[commit] r13545 - in freeswitch/trunk/libs/spandsp/src: . spandsp
by FreeSWITCH SVN 02 Jun '09

02 Jun '09

Author: mikej Date: Tue Jun 2 09:42:16 2009 New Revision: 13545 Log: use __cdecl calling convention for callback functions Modified: freeswitch/trunk/libs/spandsp/src/fsk.c freeswitch/trunk/libs/spandsp/src/hdlc.c freeswitch/trunk/libs/spandsp/src/modem_connect_tones.c freeswitch/trunk/libs/spandsp/src/spandsp/fsk.h freeswitch/trunk/libs/spandsp/src/spandsp/hdlc.h freeswitch/trunk/libs/spandsp/src/spandsp/modem_connect_tones.h freeswitch/trunk/libs/spandsp/src/spandsp/tone_generate.h freeswitch/trunk/libs/spandsp/src/spandsp/v27ter_tx.h freeswitch/trunk/libs/spandsp/src/spandsp/v29tx.h freeswitch/trunk/libs/spandsp/src/tone_generate.c freeswitch/trunk/libs/spandsp/src/v27ter_tx.c freeswitch/trunk/libs/spandsp/src/v29tx.c Modified: freeswitch/trunk/libs/spandsp/src/fsk.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/fsk.c (original) +++ freeswitch/trunk/libs/spandsp/src/fsk.c Tue Jun 2 09:42:16 2009 @@ -169,7 +169,7 @@ } /*- End of function --------------------------------------------------------*/ -SPAN_DECLARE(int) fsk_tx(fsk_tx_state_t *s, int16_t amp[], int len) +SPAN_DECLARE_NONSTD(int) fsk_tx(fsk_tx_state_t *s, int16_t amp[], int len) { int sample; int bit; Modified: freeswitch/trunk/libs/spandsp/src/hdlc.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/hdlc.c (original) +++ freeswitch/trunk/libs/spandsp/src/hdlc.c Tue Jun 2 09:42:16 2009 @@ -252,7 +252,7 @@ } /*- End of function --------------------------------------------------------*/ -SPAN_DECLARE(void) hdlc_rx_put_bit(hdlc_rx_state_t *s, int new_bit) +SPAN_DECLARE_NONSTD(void) hdlc_rx_put_bit(hdlc_rx_state_t *s, int new_bit) { if (new_bit < 0) { @@ -545,7 +545,7 @@ } /*- End of function --------------------------------------------------------*/ -SPAN_DECLARE(int) hdlc_tx_get_bit(hdlc_tx_state_t *s) +SPAN_DECLARE_NONSTD(int) hdlc_tx_get_bit(hdlc_tx_state_t *s) { int txbit; Modified: freeswitch/trunk/libs/spandsp/src/modem_connect_tones.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/modem_connect_tones.c (original) +++ freeswitch/trunk/libs/spandsp/src/modem_connect_tones.c Tue Jun 2 09:42:16 2009 @@ -87,7 +87,7 @@ } /*- End of function --------------------------------------------------------*/ -SPAN_DECLARE(int) modem_connect_tones_tx(modem_connect_tones_tx_state_t *s, +SPAN_DECLARE_NONSTD(int) modem_connect_tones_tx(modem_connect_tones_tx_state_t *s, int16_t amp[], int len) { Modified: freeswitch/trunk/libs/spandsp/src/spandsp/fsk.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/fsk.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/fsk.h Tue Jun 2 09:42:16 2009 @@ -175,7 +175,7 @@ \param len The number of samples to be generated. \return The number of samples actually generated. */ -SPAN_DECLARE(int) fsk_tx(fsk_tx_state_t *s, int16_t amp[], int len); +SPAN_DECLARE_NONSTD(int) fsk_tx(fsk_tx_state_t *s, int16_t amp[], int len); /*! Get the current received signal power. \param s The modem context. Modified: freeswitch/trunk/libs/spandsp/src/spandsp/hdlc.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/hdlc.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/hdlc.h Tue Jun 2 09:42:16 2009 @@ -154,7 +154,7 @@ \param s A pointer to an HDLC receiver context. \param new_bit The bit. */ -SPAN_DECLARE(void) hdlc_rx_put_bit(hdlc_rx_state_t *s, int new_bit); +SPAN_DECLARE_NONSTD(void) hdlc_rx_put_bit(hdlc_rx_state_t *s, int new_bit); /*! \brief Put a byte of data to an HDLC receiver. \param s A pointer to an HDLC receiver context. @@ -228,7 +228,7 @@ \param s A pointer to an HDLC transmitter context. \return The next bit for transmission. */ -SPAN_DECLARE(int) hdlc_tx_get_bit(hdlc_tx_state_t *s); +SPAN_DECLARE_NONSTD(int) hdlc_tx_get_bit(hdlc_tx_state_t *s); /*! \brief Get the next byte for transmission. \param s A pointer to an HDLC transmitter context. Modified: freeswitch/trunk/libs/spandsp/src/spandsp/modem_connect_tones.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/modem_connect_tones.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/modem_connect_tones.h Tue Jun 2 09:42:16 2009 @@ -125,7 +125,7 @@ \param len The number of samples to generate. \return The number of samples generated. */ -SPAN_DECLARE(int) modem_connect_tones_tx(modem_connect_tones_tx_state_t *s, +SPAN_DECLARE_NONSTD(int) modem_connect_tones_tx(modem_connect_tones_tx_state_t *s, int16_t amp[], int len); Modified: freeswitch/trunk/libs/spandsp/src/spandsp/tone_generate.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/tone_generate.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/tone_generate.h Tue Jun 2 09:42:16 2009 @@ -88,7 +88,7 @@ int d4, int repeat); -SPAN_DECLARE(int) tone_gen(tone_gen_state_t *s, int16_t amp[], int max_samples); +SPAN_DECLARE_NONSTD(int) tone_gen(tone_gen_state_t *s, int16_t amp[], int max_samples); SPAN_DECLARE(tone_gen_state_t *) tone_gen_init(tone_gen_state_t *s, tone_gen_descriptor_t *t); Modified: freeswitch/trunk/libs/spandsp/src/spandsp/v27ter_tx.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/v27ter_tx.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/v27ter_tx.h Tue Jun 2 09:42:16 2009 @@ -141,7 +141,7 @@ \param len The number of samples to be generated. \return The number of samples actually generated. */ -SPAN_DECLARE(int) v27ter_tx(v27ter_tx_state_t *s, int16_t amp[], int len); +SPAN_DECLARE_NONSTD(int) v27ter_tx(v27ter_tx_state_t *s, int16_t amp[], int len); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/v29tx.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/v29tx.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/v29tx.h Tue Jun 2 09:42:16 2009 @@ -172,7 +172,7 @@ \param len The number of samples to be generated. \return The number of samples actually generated. */ -SPAN_DECLARE(int) v29_tx(v29_tx_state_t *s, int16_t amp[], int len); +SPAN_DECLARE_NONSTD(int) v29_tx(v29_tx_state_t *s, int16_t amp[], int len); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/tone_generate.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/tone_generate.c (original) +++ freeswitch/trunk/libs/spandsp/src/tone_generate.c Tue Jun 2 09:42:16 2009 @@ -143,7 +143,7 @@ } /*- End of function --------------------------------------------------------*/ -SPAN_DECLARE(int) tone_gen(tone_gen_state_t *s, int16_t amp[], int max_samples) +SPAN_DECLARE_NONSTD(int) tone_gen(tone_gen_state_t *s, int16_t amp[], int max_samples) { int samples; int limit; Modified: freeswitch/trunk/libs/spandsp/src/v27ter_tx.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/v27ter_tx.c (original) +++ freeswitch/trunk/libs/spandsp/src/v27ter_tx.c Tue Jun 2 09:42:16 2009 @@ -244,7 +244,7 @@ } /*- End of function --------------------------------------------------------*/ -SPAN_DECLARE(int) v27ter_tx(v27ter_tx_state_t *s, int16_t amp[], int len) +SPAN_DECLARE_NONSTD(int) v27ter_tx(v27ter_tx_state_t *s, int16_t amp[], int len) { #if defined(SPANDSP_USE_FIXED_POINT) complexi_t x; Modified: freeswitch/trunk/libs/spandsp/src/v29tx.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/v29tx.c (original) +++ freeswitch/trunk/libs/spandsp/src/v29tx.c Tue Jun 2 09:42:16 2009 @@ -202,7 +202,7 @@ } /*- End of function --------------------------------------------------------*/ -SPAN_DECLARE(int) v29_tx(v29_tx_state_t *s, int16_t amp[], int len) +SPAN_DECLARE_NONSTD(int) v29_tx(v29_tx_state_t *s, int16_t amp[], int len) { #if defined(SPANDSP_USE_FIXED_POINT) complexi_t x;

1 0

[commit] r13544 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 02 Jun '09

02 Jun '09

Author: mrene Date: Mon Jun 1 19:56:14 2009 New Revision: 13544 Log: mod_sofia: its cuter that way Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 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 Jun 1 19:56:14 2009 @@ -3976,15 +3976,15 @@ /* Clean out the host part of any suffix */ if ((p = strchr(h, ':'))) { - *p = 0; + *p = '\0'; } if ((p = strchr(h, ';'))) { - *p = 0; + *p = '\0'; } if ((p = strchr(h, ' '))) { - *p = 0; + *p = '\0'; } *user = u;

1 0

[commit] r13543 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 02 Jun '09

02 Jun '09

Author: mrene Date: Mon Jun 1 19:54:38 2009 New Revision: 13543 Log: mod_sofia: Rewrite sofia_glue_get_user_host Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 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 Jun 1 19:54:38 2009 @@ -3961,20 +3961,30 @@ *user = NULL; *host = NULL; - if (!strncasecmp(u, "sip:", 4)) { - u += 4; - } - + /* First isolate the host part from the user part */ if ((h = strchr(u, '@'))) { *h++ = '\0'; } else { return 0; } - p = h + strlen(h) - 1; + /* Clean out the user part of its protocol prefix (if any) */ + if ((p = strchr(u, ':'))) { + *p++ = '\0'; + u = p; + } - if (p && (*p == ':' || *p == ';' || *p == ' ')) { - *p = '\0'; + /* Clean out the host part of any suffix */ + if ((p = strchr(h, ':'))) { + *p = 0; + } + + if ((p = strchr(h, ';'))) { + *p = 0; + } + + if ((p = strchr(h, ' '))) { + *p = 0; } *user = u;

1 0

[commit] r13542 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta
by FreeSWITCH SVN 01 Jun '09

01 Jun '09

Author: mikej Date: Mon Jun 1 17:51:27 2009 New Revision: 13542 Log: Thu May 14 13:05:11 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * nta_outgoing_tcreate(): log offending tag Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Mon Jun 1 17:51:27 2009 @@ -1 +1 @@ -Mon Jun 1 17:50:41 CDT 2009 +Mon Jun 1 17:51:14 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Mon Jun 1 17:51:27 2009 @@ -7196,6 +7196,7 @@ sip_t *sip; nta_outgoing_t *orq = NULL; ta_list ta; + tagi_t const *tagi; if (leg == NULL) return NULL; @@ -7209,8 +7210,15 @@ ta_start(ta, tag, value); - if (sip_add_tl(msg, sip, ta_tags(ta)) < 0) - ; + tagi = ta_args(ta); + + if (sip_add_tagis(msg, sip, &tagi) < 0) { + if (tagi && tagi->t_tag) { + tag_type_t t = tagi->t_tag; + SU_DEBUG_5(("%s(): bad tag %s::%s\n", __func__, + t->tt_ns ? t->tt_ns : "", t->tt_name ? t->tt_name : "")); + } + } else if (route_url == NULL && leg->leg_route && leg->leg_loose_route && !(route_url = (url_string_t *)leg->leg_route->r_url))

1 0

[commit] r13541 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta
by FreeSWITCH SVN 01 Jun '09

01 Jun '09

Author: mikej Date: Mon Jun 1 17:50:59 2009 New Revision: 13541 Log: Thu May 14 09:05:13 CDT 2009 Aleksander Morgado <aleksander(a)es.gnu.org> * extra_100 parameter at transaction level Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Mon Jun 1 17:50:59 2009 @@ -1 +1 @@ -Mon Jun 1 17:49:52 CDT 2009 +Mon Jun 1 17:50:41 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Mon Jun 1 17:50:59 2009 @@ -440,6 +440,7 @@ unsigned irq_reliable_tp:1; /**< Transport is reliable */ unsigned irq_sigcomp_zap:1; /**< Reset SigComp */ unsigned irq_must_100rel:1; /**< 100rel is required */ + unsigned irq_extra_100:1; /**< 100 Trying should be sent */ unsigned irq_tag_set:1; /**< Tag is not from request */ unsigned :0; @@ -5274,6 +5275,7 @@ } irq->irq_branch = sip->sip_via->v_branch; irq->irq_reliable_tp = tport_is_reliable(tport); + irq->irq_extra_100 = 1; /* Sending extra 100 trying true by default */ if (sip->sip_timestamp) irq->irq_timestamp = sip_timestamp_copy(home, sip->sip_timestamp); @@ -6016,8 +6018,9 @@ sip->sip_request->rq_method_name, irq->irq_status)); incoming_retransmit_reply(irq, tport); } - else if (irq->irq_agent->sa_extra_100) { - /* Answer automatically with 100 Trying */ + else if (irq->irq_agent->sa_extra_100 && + irq->irq_extra_100) { + /* Agent and Irq configured to answer automatically with 100 Trying */ if (irq->irq_method == sip_method_invite || /* * Send 100 trying to non-invite if at least half of T2 has expired @@ -6184,11 +6187,11 @@ /**Set server transaction parameters. * - * Sets the server transaction parameters. The parameters determine the way + * Sets the server transaction parameters. Among others, parameters determine the way * the SigComp compression is handled. * * @TAGS - * NTATAG_COMP(), and NTATAG_SIGCOMP_CLOSE(). + * NTATAG_COMP(), NTATAG_SIGCOMP_CLOSE() and NTATAG_EXTRA_100(). * * @retval number of set parameters when succesful * @retval -1 upon an error @@ -6234,6 +6237,9 @@ else if (tptag_compartment == tt) cc = (void *)t->t_value, retval++; + + else if (ntatag_extra_100 == tt) + irq->irq_extra_100 = t->t_value != 0, retval++; } if (cc != NONE) { @@ -6848,9 +6854,16 @@ } else { /* Timer N1 */ - SU_DEBUG_5(("nta: timer N1 fired, sending %u %s\n", SIP_100_TRYING)); incoming_reset_timer(irq); - nta_incoming_treply(irq, SIP_100_TRYING, TAG_END()); + + if(irq->irq_extra_100) { + SU_DEBUG_5(("nta: timer N1 fired, sending %u %s\n", SIP_100_TRYING)); + nta_incoming_treply(irq, SIP_100_TRYING, TAG_END()); + } + else { + SU_DEBUG_5(("nta: timer N1 fired, but avoided sending %u %s\n", + SIP_100_TRYING)); + } } } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c Mon Jun 1 17:50:59 2009 @@ -967,9 +967,17 @@ * to a request within half of the SIP T2 (the default value for T2 is 4000 * milliseconds, so the extra <i>100 Trying</i> would be sent after 2 seconds). * + * At agent level, this option applies to retransmissions of both non-INVITE + * and INVITE transactions. + * + * At incoming request level, this option can disable sending the 100 Trying for + * both retransmissions (if set at agent level) and N1 firings, for just a given + * incoming request. + * * @par Used with * nua_create(), nua_set_params(), - * nta_agent_create(), nta_agent_set_params() + * nta_agent_create(), nta_agent_set_params(), + * nta_incoming_set_params() * * @par Parameter type * boolean: true (non-zero or non-NULL pointer) @@ -979,9 +987,12 @@ * - true - send extra 100 Trying if application does not respond * - false - do not send 100 Trying * - * @par Default Value + * @par Default Value at Agent level * - 0 (false, do not respond with 100 Trying to retransmissions) - + * + * @par Default Value at incoming transaction level + * - 1 (true, respond with 100 Trying to retransmissions and when N1 fired) + * * @sa @RFC4320, NTATAG_PASS_408(), NTATAG_TIMEOUT_408() */ tag_typedef_t ntatag_extra_100 = BOOLTAG_TYPEDEF(extra_100);

1 0