April 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r8024 - freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc
by Freeswitch SVN 04 Apr '08

04 Apr '08

Author: mikej Date: Fri Apr 4 15:49:03 2008 New Revision: 8024 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c Log: add close to ODBC MODLANG-55 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c Fri Apr 4 15:49:03 2008 @@ -79,15 +79,15 @@ static void destroy_odbc_obj(odbc_obj_t ** objp) { odbc_obj_t *obj = *objp; - + if (obj == NULL) return; if (obj->stmt) { SQLFreeHandle(SQL_HANDLE_STMT, obj->stmt); } - if (obj->handle) { - switch_odbc_handle_destroy(&obj->handle); - } - switch_safe_free(obj->colbuf); - switch_safe_free(obj->code); + if (obj->handle) { + switch_odbc_handle_destroy(&obj->handle); + } + switch_safe_free(obj->colbuf); + switch_safe_free(obj->code); switch_safe_free(obj); } @@ -156,11 +156,13 @@ static void odbc_destroy(JSContext * cx, JSObject * obj) { - odbc_obj_t *odbc_obj = (odbc_obj_t *) JS_GetPrivate(cx, obj); - + odbc_obj_t *odbc_obj; + if (obj == NULL) return; + odbc_obj = (odbc_obj_t *) JS_GetPrivate(cx, obj); if (odbc_obj) { destroy_odbc_obj(&odbc_obj); - } + JS_SetPrivate(cx, obj, NULL); + } } static JSBool odbc_connect(JSContext * cx, JSObject * obj, uintN argc, jsval *argv, jsval *rval) @@ -405,6 +407,12 @@ } +static JSBool odbc_close(JSContext * cx, JSObject * obj, uintN argc, jsval *argv, jsval *rval) +{ + odbc_destroy(cx, obj); + return JS_TRUE; +} + enum odbc_tinyid { odbc_NAME }; @@ -417,6 +425,7 @@ {"numRows", odbc_num_rows, 1}, {"nextRow", odbc_next_row, 1}, {"getData", odbc_get_data, 1}, + {"close", odbc_close, 1}, {0} };

1 0

[commit] r8023 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 04 Apr '08

04 Apr '08

Author: mikej Date: Fri Apr 4 14:53:24 2008 New Revision: 8023 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: Avoid deadlock, don't leak on duplicate gateway name, error on duplicate gateway name Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Fri Apr 4 14:53:24 2008 @@ -737,6 +737,14 @@ name = "anonymous"; } + switch_mutex_lock(mod_sofia_globals.hash_mutex); + if ((gp = switch_core_hash_find(mod_sofia_globals.gateway_hash, name))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Ignoring duplicate gateway '%s'\n", name); + switch_mutex_unlock(mod_sofia_globals.hash_mutex); + goto skip; + } + switch_mutex_unlock(mod_sofia_globals.hash_mutex); + if ((gateway = switch_core_alloc(profile->pool, sizeof(*gateway)))) { char *register_str = "true", *scheme = "Digest", *realm = NULL, @@ -893,14 +901,9 @@ } gateway->freq -= 2; - if ((gp = sofia_reg_find_gateway(gateway->name))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Ignoring duplicate gateway '%s'\n", gateway->name); - sofia_reg_release_gateway(gp); - } else { - gateway->next = profile->gateways; - profile->gateways = gateway; - sofia_reg_add_gateway(gateway->name, gateway); - } + gateway->next = profile->gateways; + profile->gateways = gateway; + sofia_reg_add_gateway(gateway->name, gateway); } skip: 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 Fri Apr 4 14:53:24 2008 @@ -2285,7 +2285,8 @@ switch_mutex_lock(mod_sofia_globals.hash_mutex); if ((profile = (sofia_profile_t *) switch_core_hash_find(mod_sofia_globals.profile_hash, key))) { if (!(profile->pflags & PFLAG_RUNNING)) { - return NULL; + profile = NULL; + goto done; } if (switch_thread_rwlock_tryrdlock(profile->rwlock) != SWITCH_STATUS_SUCCESS) { #ifdef SOFIA_DEBUG_RWLOCKS @@ -2303,6 +2304,8 @@ switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, SWITCH_LOG_ERROR, "XXXXXXXXXXXXXX LOCK %s\n", profile->name); } #endif + + done: switch_mutex_unlock(mod_sofia_globals.hash_mutex); return profile; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Fri Apr 4 14:53:24 2008 @@ -1149,7 +1149,8 @@ switch_mutex_lock(mod_sofia_globals.hash_mutex); if ((gateway = (sofia_gateway_t *) switch_core_hash_find(mod_sofia_globals.gateway_hash, key))) { if (!(gateway->profile->pflags & PFLAG_RUNNING)) { - return NULL; + gateway = NULL; + goto done; } if (switch_thread_rwlock_tryrdlock(gateway->profile->rwlock) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_ERROR, "Profile %s is locked\n", gateway->profile->name); @@ -1161,6 +1162,8 @@ switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, SWITCH_LOG_ERROR, "XXXXXXXXXXXXXX GW LOCK %s\n", gateway->profile->name); #endif } + + done: switch_mutex_unlock(mod_sofia_globals.hash_mutex); return gateway; }

1 0

[commit] r8022 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/tport m4
by Freeswitch SVN 04 Apr '08

04 Apr '08

Author: mikej Date: Fri Apr 4 13:39:38 2008 New Revision: 8022 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c freeswitch/trunk/libs/sofia-sip/m4/sac-su2.m4 Log: Fri Apr 4 11:15:04 EDT 2008 Pekka.Pessi(a)nokia.com * tport_type_udp.c: use IP_MTU_DISCOVER socket option to turn off DF flag Added check for IP_MTU_DISCOVER in m4/sac-su2.m4 Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri Apr 4 13:39:38 2008 @@ -1 +1 @@ -Thu Apr 3 18:33:26 EDT 2008 +Fri Apr 4 13:39:32 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c Fri Apr 4 13:39:38 2008 @@ -162,6 +162,17 @@ } #endif +#if HAVE_IP_MTU_DISCOVER + { + /* Turn off DF flag on Linux */ + int dont = IP_PMTUDISC_DONT; + if (setsockopt(s, IPPROTO_IP, IP_MTU_DISCOVER, &dont, sizeof(dont)) < 0) { + SU_DEBUG_3(("setsockopt(%s): %s\n", + "IP_MTU_DISCOVER", su_strerror(su_errno()))); + } + } +#endif + #if HAVE_IP_RECVERR if (ai->ai_family == AF_INET || ai->ai_family == AF_INET6) { if (setsockopt(s, IPPROTO_IP, IP_RECVERR, &one, sizeof(one)) < 0) { Modified: freeswitch/trunk/libs/sofia-sip/m4/sac-su2.m4 ============================================================================== --- freeswitch/trunk/libs/sofia-sip/m4/sac-su2.m4 (original) +++ freeswitch/trunk/libs/sofia-sip/m4/sac-su2.m4 Fri Apr 4 13:39:38 2008 @@ -317,6 +317,13 @@ #include <sys/socket.h> #include <netinet/in.h>]) +AC_CHECK_DECL([IP_MTU_DISCOVER], +AC_DEFINE([HAVE_IP_MTU_DISCOVER],1, +[Define to 1 if you have IP_MTU_DISCOVER]),,[ +#include <sys/types.h> +#include <sys/socket.h> +#include <netinet/in.h>]) + AC_CACHE_CHECK([for struct addrinfo], [ac_cv_struct_addrinfo],[ ac_cv_struct_addrinfo=no

1 0

[commit] r8021 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su
by Freeswitch SVN 04 Apr '08

04 Apr '08

Author: mikej Date: Fri Apr 4 13:39:18 2008 New Revision: 8021 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_addrinfo.c Log: Fri Apr 4 11:14:04 EDT 2008 Pekka.Pessi(a)nokia.com * su_addrinfo.c: avoid crash in su_freeaddrinfo() if ai is NULL Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_addrinfo.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_addrinfo.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_addrinfo.c Fri Apr 4 13:39:18 2008 @@ -805,6 +805,9 @@ { struct addrinfo *next; + if (ai == NULL) + return; + do { next = ai->ai_next; if (ai->ai_canonname)

1 0

[commit] r8020 - in freeswitch/trunk/src: . include mod/applications/mod_fifo mod/endpoints/mod_dingaling
by Freeswitch SVN 04 Apr '08

04 Apr '08

Author: anthm Date: Fri Apr 4 11:17:17 2008 New Revision: 8020 Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/switch_utils.c Log: add acl to mod_dingaling Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Fri Apr 4 11:17:17 2008 @@ -353,7 +353,7 @@ SWITCH_DECLARE(switch_status_t) switch_network_list_add_cidr(switch_network_list_t *list, const char *cidr_str, switch_bool_t ok); SWITCH_DECLARE(switch_status_t) switch_network_list_add_host_mask(switch_network_list_t *list, const char *host, const char *mask_str, switch_bool_t ok); SWITCH_DECLARE(switch_bool_t) switch_network_list_validate_ip(switch_network_list_t *list, uint32_t ip); -#define switch_test_subnet(_ip, _net, _mask) (_mask ? ((_net & _mask) == (_ip & _mask)) : _net == _ip) +#define switch_test_subnet(_ip, _net, _mask) (_mask ? ((_net & _mask) == (_ip & _mask)) : _net ? _net == _ip : 1) /* malloc or DIE macros */ Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Fri Apr 4 11:17:17 2008 @@ -467,7 +467,7 @@ while(switch_channel_ready(channel)) { int x = 0 ; pop = NULL; - + if (moh) { memset(&args, 0, sizeof(args)); args.read_frame_callback = read_frame_callback; 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 Fri Apr 4 11:17:17 2008 @@ -90,6 +90,8 @@ GFLAG_MY_CODEC_PREFS = (1 << 0) } GFLAGS; +#define MAX_ACL 100 + static struct { int debug; char *dialplan; @@ -140,6 +142,8 @@ ldl_handle_t *handle; uint32_t flags; uint32_t user_flags; + char *acl[MAX_ACL]; + uint32_t acl_count; }; typedef struct mdl_profile mdl_profile_t; @@ -1948,6 +1952,12 @@ profile->timer_name = switch_core_strdup(module_pool, val); } else if (!strcasecmp(var, "lanaddr") && !switch_strlen_zero(val)) { profile->lanaddr = switch_core_strdup(module_pool, val); + } else if (!strcasecmp(var, "candidate-acl")) { + if (profile->acl_count < MAX_ACL) { + profile->acl[profile->acl_count++] = strdup(val); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Max acl records of %d reached\n", MAX_ACL); + } } else if (!strcasecmp(var, "tls")) { if (switch_true(val)) { profile->user_flags |= LDL_FLAG_TLS; @@ -2826,7 +2836,8 @@ if (dl_signal) { ldl_candidate_t *candidates; unsigned int len = 0; - unsigned int x; + unsigned int x, choice = 0, ok = 0; + uint8_t lanaddr = 0; if (ldl_session_get_candidates(dlsession, &candidates, &len) != LDL_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Candidate Error!\n"); @@ -2843,81 +2854,110 @@ } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%u candidates\n", len); - for (x = 0; x < len; x++) { - uint8_t lanaddr = 0; + + if (profile->acl_count) { + for (x = 0; x < len; x++) { + int y = 0; + for (y = 0; y < profile->acl_count; y++) { + if (switch_check_network_list_ip(candidates[x].address, profile->acl[y])) { + choice = x; + ok = 1; + } - if (profile->lanaddr) { - lanaddr = strncasecmp(candidates[x].address, profile->lanaddr, strlen(profile->lanaddr)) ? 0 : 1; + if (ok) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "candidate %s:%d PASS ACL %s\n", + candidates[x].address, candidates[x].port, profile->acl[y]); + break; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "candidate %s:%d FAIL ACL %s\n", + candidates[x].address, candidates[x].port, profile->acl[y]); + } + } } + } else { + for (x = 0; x < len; x++) { + + if (profile->lanaddr) { + lanaddr = strncasecmp(candidates[x].address, profile->lanaddr, strlen(profile->lanaddr)) ? 0 : 1; + } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "candidates %s:%d\n", candidates[x].address, candidates[x].port); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "candidates %s:%d\n", candidates[x].address, candidates[x].port); - // 192.0.0.0 - 192.0.127.255 is marked as reserved, should we filter all of them? - if (!strcasecmp(candidates[x].protocol, "udp") && - (!strcasecmp(candidates[x].type, "local") || !strcasecmp(candidates[x].type, "stun")) && - ((profile->lanaddr && - lanaddr) || (strncasecmp(candidates[x].address, "10.", 3) && - strncasecmp(candidates[x].address, "192.168.", 8) && - strncasecmp(candidates[x].address, "127.", 4) && - strncasecmp(candidates[x].address, "255.", 4) && - strncasecmp(candidates[x].address, "0.", 2) && - strncasecmp(candidates[x].address, "1.", 2) && - strncasecmp(candidates[x].address, "2.", 2) && - strncasecmp(candidates[x].address, "172.16.", 7) && - strncasecmp(candidates[x].address, "172.17.", 7) && - strncasecmp(candidates[x].address, "172.18.", 7) && - strncasecmp(candidates[x].address, "172.19.", 7) && - strncasecmp(candidates[x].address, "172.2", 5) && - strncasecmp(candidates[x].address, "172.30.", 7) && - strncasecmp(candidates[x].address, "172.31.", 7) && - strncasecmp(candidates[x].address, "192.0.2.", 8) && - strncasecmp(candidates[x].address, "169.254.", 8) - ))) { - ldl_payload_t payloads[5]; - - memset(payloads, 0, sizeof(payloads)); - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Acceptable Candidate %s:%d\n", candidates[x].address, candidates[x].port); - - if (!switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { - switch_set_flag_locked(tech_pvt, TFLAG_TRANSPORT_ACCEPT); - ldl_session_accept_candidate(dlsession, &candidates[x]); + // 192.0.0.0 - 192.0.127.255 is marked as reserved, should we filter all of them? + if (!strcasecmp(candidates[x].protocol, "udp") && + (!strcasecmp(candidates[x].type, "local") || !strcasecmp(candidates[x].type, "stun")) && + ((profile->lanaddr && + lanaddr) || (strncasecmp(candidates[x].address, "10.", 3) && + strncasecmp(candidates[x].address, "192.168.", 8) && + strncasecmp(candidates[x].address, "127.", 4) && + strncasecmp(candidates[x].address, "255.", 4) && + strncasecmp(candidates[x].address, "0.", 2) && + strncasecmp(candidates[x].address, "1.", 2) && + strncasecmp(candidates[x].address, "2.", 2) && + strncasecmp(candidates[x].address, "172.16.", 7) && + strncasecmp(candidates[x].address, "172.17.", 7) && + strncasecmp(candidates[x].address, "172.18.", 7) && + strncasecmp(candidates[x].address, "172.19.", 7) && + strncasecmp(candidates[x].address, "172.2", 5) && + strncasecmp(candidates[x].address, "172.30.", 7) && + strncasecmp(candidates[x].address, "172.31.", 7) && + strncasecmp(candidates[x].address, "192.0.2.", 8) && + strncasecmp(candidates[x].address, "169.254.", 8) + ))) { + choice = x; + ok = 1; } + } + } - if (!strcasecmp(subject, "candidates")) { - switch_set_flag_locked(tech_pvt, TFLAG_TRANSPORT_ACCEPT); - switch_set_flag_locked(tech_pvt, TFLAG_ANSWER); - } + if (ok) { + ldl_payload_t payloads[5]; + + memset(payloads, 0, sizeof(payloads)); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, + "Acceptable Candidate %s:%d\n", candidates[choice].address, candidates[choice].port); + + if (!switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { + switch_set_flag_locked(tech_pvt, TFLAG_TRANSPORT_ACCEPT); + ldl_session_accept_candidate(dlsession, &candidates[choice]); + } - if (lanaddr) { - switch_set_flag_locked(tech_pvt, TFLAG_LANADDR); - } + if (!strcasecmp(subject, "candidates")) { + switch_set_flag_locked(tech_pvt, TFLAG_TRANSPORT_ACCEPT); + switch_set_flag_locked(tech_pvt, TFLAG_ANSWER); + } - if (!get_codecs(tech_pvt)) { - terminate_session(&session, __LINE__, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); - status = LDL_STATUS_FALSE; - goto done; - } + if (lanaddr) { + switch_set_flag_locked(tech_pvt, TFLAG_LANADDR); + } + if (!get_codecs(tech_pvt)) { + terminate_session(&session, __LINE__, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + status = LDL_STATUS_FALSE; + goto done; + } - tech_pvt->remote_ip = switch_core_session_strdup(session, candidates[x].address); - ldl_session_set_ip(dlsession, tech_pvt->remote_ip); - tech_pvt->remote_port = candidates[x].port; - tech_pvt->remote_user = switch_core_session_strdup(session, candidates[x].username); + tech_pvt->remote_ip = switch_core_session_strdup(session, candidates[choice].address); + ldl_session_set_ip(dlsession, tech_pvt->remote_ip); + tech_pvt->remote_port = candidates[choice].port; + tech_pvt->remote_user = switch_core_session_strdup(session, candidates[choice].username); - if (!switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { - if (!do_candidates(tech_pvt, 0)) { - terminate_session(&session, __LINE__, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); - status = LDL_STATUS_FALSE; - goto done; - } - } - status = LDL_STATUS_SUCCESS; - goto done; + if (!switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { + if (!do_candidates(tech_pvt, 0)) { + terminate_session(&session, __LINE__, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + status = LDL_STATUS_FALSE; + goto done; + } } + + status = LDL_STATUS_SUCCESS; } + + goto done; + } break; case LDL_SIGNAL_REJECT: Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Fri Apr 4 11:17:17 2008 @@ -76,7 +76,7 @@ switch_network_node_t *node; switch_bool_t ok = list->default_type; uint32_t bits = 0; - + for (node = list->node_head; node; node = node->next) { if (node->bits > bits && switch_test_subnet(ip, node->ip, node->mask)) { if (node->ok) {

1 0

[commit] r8019 - in freeswitch/trunk/conf: autoload_configs lang/en lang/en/demo
by Freeswitch SVN 04 Apr '08

04 Apr '08

Author: brian Date: Thu Apr 3 22:27:46 2008 New Revision: 8019 Added: freeswitch/trunk/conf/lang/en/demo/demo-ivr.xml Modified: freeswitch/trunk/conf/autoload_configs/ivr.conf.xml freeswitch/trunk/conf/lang/en/en.xml Log: add ivr demo thanks mcollins. Modified: freeswitch/trunk/conf/autoload_configs/ivr.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/ivr.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/ivr.conf.xml Thu Apr 3 22:27:46 2008 @@ -1,53 +1,47 @@ -<configuration name="ivr.conf" description="IVR menus"> - <menus> - <menu name="demo" - greet-long="soundfiles/ivr/demo/greet-long.wav" - greet-short="soundfiles/ivr/demo/greet-short.wav" - invalid-sound="soundfiles/ivr/invalid.wav" - exit-sound="soundfiles/ivr/exit.wav" timeout ="15" - max-failures="3"> - <entry action="menu-exit" digits="*"/> - <entry action="menu-play-sound" digits="1" params="soundfiles/features.wav"/> - <entry action="menu-sub" digits="2" param="demo2"/> - <entry action="menu-exec-app" digits="3" param="bridge sofia/$${domain}/888(a)conference.freeswtich.org"/> - <entry action="menu-call-transfer" digits="4" param="888"/> - <entry action="menu-sub" digits="8" param="menu8"/> - </menu> - - <menu name="demo2" - greet-long="soundfiles/ivr/demo2/greet-long.wav" - greet-short="soundfiles/ivr/demo2/greet-short.wav" - invalid-sound="soundfiles/ivr/invalid.wav" - exit-sound="soundfiles/ivr/exit.wav" - timeout ="15" - max-failures="3"> - <entry action="menu-back" digits="#"/> - <entry action="menu-top" digits="*"/> - </menu> - - <menu name="demo3" - greet-long="say:Press 1 to join the conference, Press 2 to join the other conference" - greet-short="say:Press 1 to join the conference, Press 2 to join the other conference" - invalid-sound="say:invalid extension" - exit-sound="say:exit sound" timeout ="15" - max-failures="3" - tts-voice="callie" tts-engine="cepstral"> - <entry action="menu-exit" digits="*"/> -  - <entry action="menu-call-transfer" digits="1" param="1000"/> - <entry action="menu-call-transfer" digits="2" param="1001"/> - </menu> - - <menu name="menu8" - greet-long="/soundfiles/ivr/menu8/greet-long.wav" - greet-short="/soundfiles/ivr/menu8/greet-short.wav" - invalid-sound="/soundfiles/ivr/menu8/invalid.wav" - exit-sound="/soundfiles/ivr/menu8/exit.wav" - timeout ="15" - max-failures="3"> - <entry action="menu-back" digits="#"/> - <entry action="menu-play-sound" digits="4" param="soundfiles/4.wav"/> - <entry action="menu-top" digits="*"/> - </menu> - </menus> -</configuration> +<configuration name="ivr.conf" description="IVR menus"> + <menus> +  +  + <menu name="demo_ivr" + greet-long="phrase:demo_ivr_main_menu" + greet-short="phrase:demo_ivr_main_menu_short"" + invalid-sound="voicemail/vm-hello.wav" + exit-sound="voicemail/vm-goodbye.wav" + timeout ="15" + max-failures="3"> + <entry action="menu-exec-app" digits="1" param="bridge sofia/$${domain}/888(a)conference.freeswtich.org"/> + <entry action="menu-call-transfer" digits="2" param="9996"/>  + <entry action="menu-call-transfer" digits="3" param="9999"/>  + <entry action="menu-sub" digits="4" param="demo_ivr_submenu"/>  + <entry action="menu-call-transfer" digits="5" param="1234*256"/>  + <entry action="menu-top" digits="9" param="demo_ivr"/>  + </menu> + +  + <menu name="demo_ivr_submenu" + greet-long="phrase:demo_ivr_sub_menu" + greet-short="phrase:demo_ivr_sub_menu_short" + invalid-sound="voicemail/vm-hello.wav" + exit-sound="voicemail/vm-goodbye.wav" timeout="15" + max-failures="3"> + <entry action="menu-top" digits="*"/> + </menu> + </menus> +</configuration> + + + + Added: freeswitch/trunk/conf/lang/en/demo/demo-ivr.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/lang/en/demo/demo-ivr.xml Thu Apr 3 22:27:46 2008 @@ -0,0 +1,149 @@ +<include> + + <macro name="demo_ivr_main_menu">  + <input pattern="(.*)"> + <match> +  + <action function="execute" data="answer"/> + <action function="execute" data="sleep(1000)"/> + <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/> + <action function="execute" data="sleep(250)"/> + <action function="play-file" data="ivr/ivr-this_ivr_will_let_you_test_features.wav"/> + <action function="execute" data="sleep(250)"/> + <action function="play-file" data="ivr/ivr-you_may_exit_by_hanging_up.wav"/> +  + <action function="execute" data="sleep(250)"/> +  + <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/> + <action function="execute" data="sleep(250)"/> + <action function="play-file" data="ivr/ivr-please.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="play-file" data="digits/1.wav"/> + <action function="execute" data="sleep(250)"/> +  + <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/> + <action function="execute" data="sleep(250)"/> + <action function="play-file" data="ivr/ivr-please.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="play-file" data="digits/2.wav"/> + <action function="execute" data="sleep(250)"/> +  + <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/> + <action function="execute" data="sleep(250)"/> + <action function="play-file" data="ivr/ivr-please.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="play-file" data="digits/3.wav"/> + <action function="execute" data="sleep(250)"/> +  + <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/> + <action function="execute" data="sleep(250)"/> + <action function="play-file" data="ivr/ivr-please.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="play-file" data="digits/4.wav"/> + <action function="execute" data="sleep(250)"/> +  + <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/> + <action function="execute" data="sleep(250)"/> + <action function="play-file" data="ivr/ivr-please.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="play-file" data="digits/5.wav"/> + <action function="execute" data="sleep(250)"/> +  + <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/> + <action function="execute" data="sleep(250)"/> + <action function="play-file" data="ivr/ivr-please.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="play-file" data="digits/9.wav"/> + <action function="execute" data="sleep(6000)"/> + </match> + </input> + </macro> + +  +  + <macro name="demo_ivr_main_menu_short"> + <input pattern="(.*)"> + <match> +  + <action function="execute" data="sleep(1000)"/> + <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/> + <action function="execute" data="sleep(250)"/> + <action function="play-file" data="ivr/ivr-please.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="play-file" data="digits/1.wav"/> + <action function="execute" data="sleep(250)"/> +  + <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/> + <action function="execute" data="sleep(250)"/> + <action function="play-file" data="ivr/ivr-please.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="play-file" data="digits/2.wav"/> + <action function="execute" data="sleep(250)"/> +  + <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/> + <action function="execute" data="sleep(250)"/> + <action function="play-file" data="ivr/ivr-please.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="play-file" data="digits/3.wav"/> + <action function="execute" data="sleep(250)"/> +  + <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/> + <action function="execute" data="sleep(250)"/> + <action function="play-file" data="ivr/ivr-please.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="play-file" data="digits/4.wav"/> + <action function="execute" data="sleep(250)"/> +  + <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/> + <action function="execute" data="sleep(250)"/> + <action function="play-file" data="ivr/ivr-please.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="play-file" data="digits/5.wav"/> + <action function="execute" data="sleep(250)"/> +  + <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/> + <action function="execute" data="sleep(250)"/> + <action function="play-file" data="ivr/ivr-please.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="play-file" data="digits/9.wav"/> + <action function="execute" data="sleep(6000)"/> + </match> + </input> + </macro> + +  + <macro name="demo_ivr_sub_menu"> + <input pattern="(.*)"> + <match> + <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/> + <action function="execute" data="sleep(250)"/> + <action function="play-file" data="ivr/ivr-sample_submenu.wav"/> + <action function="execute" data="sleep(250)"/> +  + <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/> + <action function="execute" data="sleep(250)"/> + <action function="play-file" data="ivr/ivr-please.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="play-file" data="digits/star.wav"/> + <action function="execute" data="sleep(250)"/> + </match> + </input> + </macro> + +  +  + <macro name="demo_ivr_sub_menu_short"> + <input pattern="(.*)"> + <match> +  + <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/> + <action function="execute" data="sleep(250)"/> + <action function="play-file" data="ivr/ivr-please.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="play-file" data="digits/star.wav"/> + <action function="execute" data="sleep(250)"/> + </match> + </input> + </macro> + +</include> Modified: freeswitch/trunk/conf/lang/en/en.xml ============================================================================== --- freeswitch/trunk/conf/lang/en/en.xml (original) +++ freeswitch/trunk/conf/lang/en/en.xml Thu Apr 3 22:27:46 2008 @@ -1,7 +1,7 @@ -<include> - <language name="en" sound-path="$${base_dir}/sounds/en/us/callie" tts-engine="cepstral" tts-voice="callie"> - <X-PRE-PROCESS cmd="include" data="demo/demo.xml"/> -  - <X-PRE-PROCESS cmd="include" data="vm/sounds.xml"/> - </language> -</include> +<include> + <language name="en" sound-path="$${base_dir}/sounds/en/us/callie" tts-engine="cepstral" tts-voice="callie"> + <X-PRE-PROCESS cmd="include" data="demo/demo*.xml"/>  +  + <X-PRE-PROCESS cmd="include" data="vm/sounds.xml"/> + </language> +</include>

1 0

[commit] r8018 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/soa
by Freeswitch SVN 03 Apr '08

03 Apr '08

Author: mikej Date: Thu Apr 3 18:33:40 2008 New Revision: 8018 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/test_soa.c Log: Thu Apr 3 11:09:19 EDT 2008 Pekka.Pessi(a)nokia.com * soa_static.c: when generating offer with ordered mode, fill gaps in session If session has m= lines that user SDP does not, the ordered mode got confused when generating 2nd offer (e.g., for re-INVITE). Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Apr 3 18:33:40 2008 @@ -1 +1 @@ -Thu Apr 3 18:33:04 EDT 2008 +Thu Apr 3 18:33:26 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c Thu Apr 3 18:33:40 2008 @@ -805,34 +805,37 @@ soa_sdp_media_upgrade_rtpmaps(ss, m, rm); } } - else if (sss->sss_ordered_user) { - /* Update session with unused media in u_media */ + else { - if (!sss->sss_reuse_rejected) { - /* Mark previously used slots */ - for (i = 0; i < Ns; i++) { - if (s_media[i]) - continue; - s_media[i] = soa_sdp_make_rejected_media(home, o_media[i], session, 0); + if (sss->sss_ordered_user) { + /* Update session with unused media in u_media */ + + if (!sss->sss_reuse_rejected) { + /* Mark previously used slots */ + for (i = 0; i < Ns; i++) { + if (s_media[i]) + continue; + s_media[i] = + soa_sdp_make_rejected_media(home, o_media[i], session, 0); + } } - } - for (j = 0; j < Nu; j++) { - if (u_media[j] == SDP_MEDIA_NONE) - continue; + for (j = 0; j < Nu; j++) { + if (u_media[j] == SDP_MEDIA_NONE) + continue; - for (i = 0; i < size - 1; i++) { - if (s_media[i] == NULL) { - s_media[i] = u_media[j], u_media[j] = SDP_MEDIA_NONE; - u2s[j] = i, s2u[i] = j; - break; + for (i = 0; i < size - 1; i++) { + if (s_media[i] == NULL) { + s_media[i] = u_media[j], u_media[j] = SDP_MEDIA_NONE; + u2s[j] = i, s2u[i] = j; + break; + } } - } - assert(i != size - 1); + assert(i != size - 1); + } } - } - else { + /* Match unused user media by media types with the existing session */ for (i = 0; i < Ns; i++) { if (s_media[i]) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/test_soa.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/test_soa.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/test_soa.c Thu Apr 3 18:33:40 2008 @@ -1389,9 +1389,6 @@ "v=0\r\n" "o=a 432432423423 2 IN IP4 127.0.0.2\r\n" "c=IN IP4 127.0.0.2\r\n" - "m=audio 5004 RTP/AVP 0 8\n" - "a=rtpmap:96 G7231/8000\n" - "a=rtpmap:97 G729/8000\n" "m=image 5556 UDPTL t38\r\n" "a=T38FaxVersion:0\r\n" "a=T38MaxBitRate:9600\r\n" @@ -1399,12 +1396,16 @@ "a=T38FaxTranscodingMMR:0\r\n" "a=T38FaxTranscodingJBIG:0\r\n" "a=T38FaxRateManagement:transferredTCF\r\n" - "a=T38FaxMaxDatagram:400\r\n"; + "a=T38FaxMaxDatagram:400\r\n" + "m=audio 5004 RTP/AVP 0 8\n" + "a=rtpmap:96 G7231/8000\n" + "a=rtpmap:97 G729/8000\n"; char const a_caps2[] = "v=0\r\n" "o=a 432432423423 2 IN IP4 127.0.0.2\r\n" "c=IN IP4 127.0.0.2\r\n" + "m=image 0 UDPTL t38\r\n" "m=image 5004 UDPTL t38\r\n" "a=T38FaxVersion:0\r\n" "a=T38MaxBitRate:9600\r\n" @@ -1464,15 +1465,15 @@ TEST(soa_is_remote_audio_active(a), SOA_ACTIVE_SENDRECV); TEST_1(a_sdp->sdp_media); - TEST_1(a_sdp->sdp_media->m_type == sdp_media_audio); + TEST_1(a_sdp->sdp_media->m_type == sdp_media_image); TEST_1(a_sdp->sdp_media->m_next); - TEST_1(a_sdp->sdp_media->m_next->m_type == sdp_media_image); + TEST_1(a_sdp->sdp_media->m_next->m_type == sdp_media_audio); /* ---------------------------------------------------------------------- */ /* Re-O/A: replace media stream */ - /* Accept media without common codecs */ + /* Do not accept media without common codecs */ TEST_1(soa_set_params(b, SOATAG_RTP_MISMATCH(0), SOATAG_USER_SDP_STR(b_caps2), TAG_END()) > 0); @@ -1481,7 +1482,7 @@ n = soa_get_local_sdp(b, &b_sdp, &offer, &offerlen); TEST(n, 1); TEST_1(offer != NULL && offer != NONE); n = soa_set_remote_sdp(a, 0, offer, offerlen); TEST(n, 1); - /*printf("offer 2:\n%s", offer);*/ + printf("offer 2:\n%s", offer); TEST_1(soa_set_params(a, SOATAG_RTP_MISMATCH(0), SOATAG_USER_SDP_STR(a_caps2), TAG_END()) > 0); @@ -1489,7 +1490,7 @@ n = soa_generate_answer(a, test_completed); TEST(n, 0); n = soa_get_local_sdp(a, &a_sdp, &answer, &answerlen); TEST(n, 1); TEST_1(answer != NULL && answer != NONE); - /*printf("answer 2:\n%s", answer);*/ + printf("answer 2:\n%s", answer); n = soa_set_remote_sdp(b, 0, answer, -1); TEST(n, 1); n = soa_process_answer(b, test_completed); TEST(n, 0); n = soa_get_local_sdp(b, &b_sdp, NULL, NULL); TEST(n, 1); @@ -1500,13 +1501,15 @@ TEST_1(soa_is_complete(b)); TEST(soa_activate(b, NULL), 0); - TEST_1(m = a_sdp->sdp_media); TEST_1(!m->m_rejected); + TEST_1(m = a_sdp->sdp_media); TEST_1(m->m_rejected); + TEST_1(m = m->m_next); TEST(m->m_type, sdp_media_image); TEST(m->m_proto, sdp_proto_udptl); TEST_1(m->m_format); TEST_S(m->m_format->l_text, "t38"); - TEST_1(m = b_sdp->sdp_media); TEST_1(!m->m_rejected); + TEST_1(m = b_sdp->sdp_media); TEST_1(m->m_rejected); + TEST_1(m = m->m_next); TEST(m->m_type, sdp_media_image); TEST(m->m_proto, sdp_proto_udptl); TEST_1(m->m_format);

1 0

[commit] r8017 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by Freeswitch SVN 03 Apr '08

03 Apr '08

Author: mikej Date: Thu Apr 3 18:33:12 2008 New Revision: 8017 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c Log: Tue Apr 1 06:49:10 EDT 2008 Pekka.Pessi(a)nokia.com * nua_stack.c: include Allow-Events in most messages initiating dialog The Allow-Events header is now included with NOTIFY, PUBLISH, REGISTER, and initial INVITE, SUBSCRIBE, REFER, and OPTIONS, and also responses to SUBSCRIBE, REFER, OPTIONS, and PUBLISH as well as responses to initial INVITE and NOTIFY. Thanks to Jerry Richards for pointing out the problem. Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Apr 3 18:33:12 2008 @@ -1 +1 @@ -Thu Apr 3 18:31:42 EDT 2008 +Thu Apr 3 18:33:04 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c Thu Apr 3 18:33:12 2008 @@ -1707,8 +1707,12 @@ sip_add_dup(msg, sip, (void *)NH_PGET(nh, allow)) < 0) ; else if (!sip->sip_allow_events && - (method == sip_method_publish || method == sip_method_subscribe) && NH_PGET(nh, allow_events) && + (method == sip_method_publish || method == sip_method_subscribe || + method == sip_method_options || method == sip_method_refer || + (sr->sr_initial && + (method == sip_method_invite || + method == sip_method_notify))) && sip_add_dup(msg, sip, (void *)NH_PGET(nh, allow_events)) < 0) ; else if (!sip->sip_contact && sr->sr_status < 300 && sr->sr_add_contact &&

1 0

[commit] r8016 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip
by Freeswitch SVN 03 Apr '08

03 Apr '08

Author: mikej Date: Thu Apr 3 18:32:46 2008 New Revision: 8016 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/torture_sip.c Log: Wed Mar 26 07:20:16 EDT 2008 Pekka.Pessi(a)nokia.com * torture_sip.c: updated tests (quoting semicolon in query/header part) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/torture_sip.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/torture_sip.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/torture_sip.c Thu Apr 3 18:32:46 2008 @@ -281,7 +281,7 @@ TAG_END()); TEST_1(s); - TEST_S(s, "to=%22Joe%22%20%3Csip%3Ajoe(a)example.com%3E;tag%3Dfoofaa" + TEST_S(s, "to=%22Joe%22%20%3Csip%3Ajoe(a)example.com%3E%3Btag%3Dfoofaa" "&subject=foo"); url = url_format(home, "sip:test@example.net?%s", s); TEST_1(url); @@ -290,19 +290,19 @@ s = sip_headers_as_url_query (home, - SIPTAG_FROM_STR("<sip:joe@example.com>"), + SIPTAG_FROM_STR("<sip:joe@example.com;user=ip>"), SIPTAG_ACCEPT_STR(""), SIPTAG_PAYLOAD_STR("hello"), SIPTAG_ACCEPT_STR(""), TAG_END()); - TEST_S(s, "from=%3Csip%3Ajoe(a)example.com%3E" + TEST_S(s, "from=%3Csip%3Ajoe(a)example.com%3Buser%3Dip%3E" "&accept=" "&body=hello" "&accept="); d = url_query_as_header_string(home, s); - TEST_S(d, "from:<sip:joe@example.com>\n" + TEST_S(d, "from:<sip:joe@example.com;user=ip>\n" "accept:\n" "accept:\n" "\n"

1 0

[commit] r8015 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sip
by Freeswitch SVN 03 Apr '08

03 Apr '08

Author: mikej Date: Thu Apr 3 18:31:57 2008 New Revision: 8015 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_tag_class.c Log: Wed Mar 26 07:18:34 EDT 2008 Bernhard Suttner * sip_tag_class.c: escape semicolons in headers section of Replaces URI Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Apr 3 18:31:57 2008 @@ -1 +1 @@ -Mon Mar 24 15:02:06 CDT 2008 +Thu Apr 3 18:31:42 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_tag_class.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_tag_class.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_tag_class.c Thu Apr 3 18:31:57 2008 @@ -342,8 +342,8 @@ } /* "[" / "]" / "/" / "?" / ":" / "+" / "$" */ -#define HNV_UNRESERVED "[]/?;+$" -#define HNV_RESERVED ":=," +#define HNV_UNRESERVED "[]/?+$" +#define HNV_RESERVED ":=,;" /* Append a string to list and url-escape it if needed */ static

1 0