- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r12269 - freeswitch/trunk/src
by FreeSWITCH SVN 25 Feb '09

25 Feb '09

Author: anthm Date: Tue Feb 24 18:56:17 2009 New Revision: 12269 Log: FSCORE-309 Modified: freeswitch/trunk/src/switch_xml.c Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Tue Feb 24 18:56:17 2009 @@ -142,6 +142,7 @@ static switch_thread_rwlock_t *RWLOCK = NULL; static switch_thread_rwlock_t *B_RWLOCK = NULL; static switch_mutex_t *XML_LOCK = NULL; +static switch_mutex_t *XML_GEN_LOCK = NULL; struct xml_section_t { @@ -1553,12 +1554,12 @@ if ((conf = switch_xml_find_child(xml, "section", "name", section)) && (tag = switch_xml_find_child(conf, tag_name, key_name, key_value))) { if (clone) { char *x; - switch_mutex_lock(XML_LOCK); + switch_mutex_lock(XML_GEN_LOCK); x = switch_xml_toxml(tag, SWITCH_FALSE); + switch_mutex_unlock(XML_GEN_LOCK); switch_assert(x); *root = switch_xml_parse_str(x, strlen(x)); *node = *root; - switch_mutex_unlock(XML_LOCK); switch_xml_free(xml); } else { *node = tag; @@ -1904,6 +1905,7 @@ *err = "Success"; switch_mutex_init(&XML_LOCK, SWITCH_MUTEX_NESTED, XML_MEMORY_POOL); + switch_mutex_init(&XML_GEN_LOCK, SWITCH_MUTEX_NESTED, XML_MEMORY_POOL); switch_thread_rwlock_create(&RWLOCK, XML_MEMORY_POOL); switch_thread_rwlock_create(&B_RWLOCK, XML_MEMORY_POOL);

1 0

[commit] r12268 - freeswitch/trunk/src
by FreeSWITCH SVN 25 Feb '09

25 Feb '09

Author: anthm Date: Tue Feb 24 18:46:51 2009 New Revision: 12268 Log: FSCORE-309 Modified: freeswitch/trunk/src/switch_xml.c Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Tue Feb 24 18:46:51 2009 @@ -1552,10 +1552,13 @@ if ((conf = switch_xml_find_child(xml, "section", "name", section)) && (tag = switch_xml_find_child(conf, tag_name, key_name, key_value))) { if (clone) { - char *x = switch_xml_toxml(tag, SWITCH_FALSE); + char *x; + switch_mutex_lock(XML_LOCK); + x = switch_xml_toxml(tag, SWITCH_FALSE); switch_assert(x); *root = switch_xml_parse_str(x, strlen(x)); *node = *root; + switch_mutex_unlock(XML_LOCK); switch_xml_free(xml); } else { *node = tag;

1 0

[commit] r12267 - freeswitch/trunk/src
by FreeSWITCH SVN 24 Feb '09

24 Feb '09

Author: anthm Date: Tue Feb 24 17:30:17 2009 New Revision: 12267 Log: IRC-000 Modified: freeswitch/trunk/src/switch_xml.c Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Tue Feb 24 17:30:17 2009 @@ -1778,6 +1778,12 @@ switch_event_destroy(&my_params); } + if (status != SWITCH_STATUS_SUCCESS && root && *root) { + switch_xml_free(*root); + *root = NULL; + *domain = NULL; + } + return status; }

1 0

[commit] r12266 - freeswitch/trunk/support-d
by FreeSWITCH SVN 24 Feb '09

24 Feb '09

Author: mrene Date: Tue Feb 24 16:07:38 2009 New Revision: 12266 Log: gdb update Modified: freeswitch/trunk/support-d/.gdbinit Modified: freeswitch/trunk/support-d/.gdbinit ============================================================================== --- freeswitch/trunk/support-d/.gdbinit (original) +++ freeswitch/trunk/support-d/.gdbinit Tue Feb 24 16:07:38 2009 @@ -11,7 +11,9 @@ end printf "Found %d sessions.\n", $i end -document list_sessions Print a list of session uuid and pointers +document list_sessions +Print a list of session uuid and pointers +end define hash_it_str dont-repeat @@ -23,7 +25,10 @@ set $i = $i + 1 end end -document hash_it_str Prints the content of a hashtable displaying the key as a string and the value as pointer +document hash_it_str +Usage: hash_it_str [hashtable] +Prints the content of a hashtable displaying the key as a string and the value as pointer +end define hash_it_int dont-repeat @@ -35,7 +40,10 @@ set $i = $i + 1 end end -document hash_it_int Prints the content of a hashtable displaying the key as an int and the value as pointer +document hash_it_int +Usage: hash_it_int [hashtable] +Prints the content of a hashtable displaying the key as an int and the value as pointer +end define hash_it_str_x dont-repeat @@ -43,13 +51,16 @@ set $x=$arg0->table->first while($x != 0x0) printf "key: %s\n", $x->pKey - print (($arg1)$x->data)->$arg2 + print (($arg1*)$x->data)->$arg2 printf "\n\n" set $x = $x->next set $i = $i + 1 end end -document hash_it_str_x Prints the content of a hashtable displaying the key as a string and a specific member of the value struct. Args: hashtable value_type member +document hash_it_str_x +Usage: hash_it_str_x [hashtable] [value_type] [member] +Prints the content of a hashtable displaying the key as a string and a specific member of the value struct. Args: hashtable value_type member +end define hash_it_int_x dont-repeat @@ -57,10 +68,13 @@ set $x=$arg0->table->first while($x != 0x0) printf "key: %d\n", $x->pKey - print (($arg1)$x->data)->$arg2 + print (($arg1*)$x->data)->$arg2 printf "\n\n" set $x = $x->next set $i = $i + 1 end end -document hash_it_int_x Prints the content of a hashtable displaying the key as a string and a specific member of the value struct. Args: hashtable value_type member +document hash_it_int_x +Usage: hash_it_int_x [hashtable] [value_type] [member] +Prints the content of a hashtable displaying the key as a string and a specific member of the value struct. +end

1 0

[commit] r12265 - freeswitch/trunk/support-d
by FreeSWITCH SVN 24 Feb '09

24 Feb '09

Author: mrene Date: Tue Feb 24 16:01:10 2009 New Revision: 12265 Log: GDB goodies Modified: freeswitch/trunk/support-d/.gdbinit Modified: freeswitch/trunk/support-d/.gdbinit ============================================================================== --- freeswitch/trunk/support-d/.gdbinit (original) +++ freeswitch/trunk/support-d/.gdbinit Tue Feb 24 16:01:10 2009 @@ -1,5 +1,6 @@ # FreeSWITCH Custom GDB commands define list_sessions + dont-repeat printf "Listing sessions: \n" set $i = 0 set $x=session_manager.session_table->table->first @@ -9,4 +10,57 @@ set $i = $i + 1 end printf "Found %d sessions.\n", $i -end \ No newline at end of file +end +document list_sessions Print a list of session uuid and pointers + +define hash_it_str + dont-repeat + set $i = 0 + set $x=$arg0->table->first + while($x != 0x0) + printf "key: %s valueptr: %p\n", $x->pKey, $x->data + set $x = $x->next + set $i = $i + 1 + end +end +document hash_it_str Prints the content of a hashtable displaying the key as a string and the value as pointer + +define hash_it_int + dont-repeat + set $i = 0 + set $x=$arg0->table->first + while($x != 0x0) + printf "key: %d valueptr: %p\n", $x->pKey, $x->data + set $x = $x->next + set $i = $i + 1 + end +end +document hash_it_int Prints the content of a hashtable displaying the key as an int and the value as pointer + +define hash_it_str_x + dont-repeat + set $i = 0 + set $x=$arg0->table->first + while($x != 0x0) + printf "key: %s\n", $x->pKey + print (($arg1)$x->data)->$arg2 + printf "\n\n" + set $x = $x->next + set $i = $i + 1 + end +end +document hash_it_str_x Prints the content of a hashtable displaying the key as a string and a specific member of the value struct. Args: hashtable value_type member + +define hash_it_int_x + dont-repeat + set $i = 0 + set $x=$arg0->table->first + while($x != 0x0) + printf "key: %d\n", $x->pKey + print (($arg1)$x->data)->$arg2 + printf "\n\n" + set $x = $x->next + set $i = $i + 1 + end +end +document hash_it_int_x Prints the content of a hashtable displaying the key as a string and a specific member of the value struct. Args: hashtable value_type member

1 0

[commit] r12264 - freeswitch/trunk/src
by FreeSWITCH SVN 24 Feb '09

24 Feb '09

Author: anthm Date: Tue Feb 24 13:58:45 2009 New Revision: 12264 Log: double doh Modified: freeswitch/trunk/src/switch_ivr.c Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Feb 24 13:58:45 2009 @@ -1547,12 +1547,14 @@ SWITCH_DECLARE(void *) switch_ivr_digit_stream_parser_feed(switch_ivr_digit_stream_parser_t *parser, switch_ivr_digit_stream_t *stream, char digit) { void *result = NULL; - switch_size_t len = strlen(stream->digits); + switch_size_t len; switch_assert(parser); switch_assert(stream); switch_assert(stream->digits); + len = strlen(stream->digits); + /* handle new digit arrivals */ if (digit) { /* if it's not a terminator digit, add it to the collected digits */

1 0

[commit] r12263 - freeswitch/trunk/src
by FreeSWITCH SVN 24 Feb '09

24 Feb '09

Author: anthm Date: Tue Feb 24 13:54:54 2009 New Revision: 12263 Log: doh Modified: freeswitch/trunk/src/switch_ivr.c Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Feb 24 13:54:54 2009 @@ -1547,13 +1547,12 @@ SWITCH_DECLARE(void *) switch_ivr_digit_stream_parser_feed(switch_ivr_digit_stream_parser_t *parser, switch_ivr_digit_stream_t *stream, char digit) { void *result = NULL; + switch_size_t len = strlen(stream->digits); switch_assert(parser); switch_assert(stream); switch_assert(stream->digits); - switch_size_t len = strlen(stream->digits); - /* handle new digit arrivals */ if (digit) { /* if it's not a terminator digit, add it to the collected digits */

1 0

[commit] r12262 - in freeswitch/trunk/src: . include mod/applications/mod_conference
by FreeSWITCH SVN 24 Feb '09

24 Feb '09

Author: anthm Date: Tue Feb 24 12:36:45 2009 New Revision: 12262 Log: MODAPP-221 Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/switch_ivr.c Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Tue Feb 24 12:36:45 2009 @@ -582,7 +582,7 @@ \param stream a pointer to the stream object \return NULL if no match found or consumer data that was associated with a given digit string when matched */ -SWITCH_DECLARE(switch_status_t) switch_ivr_digit_stream_destroy(switch_ivr_digit_stream_t *stream); +SWITCH_DECLARE(switch_status_t) switch_ivr_digit_stream_destroy(switch_ivr_digit_stream_t **stream); /*! \brief Set a digit string to action mapping Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Tue Feb 24 12:36:45 2009 @@ -33,7 +33,7 @@ * */ #include <switch.h> - +//#define INTENSE_DEBUG SWITCH_MODULE_LOAD_FUNCTION(mod_conference_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_conference_shutdown); SWITCH_MODULE_DEFINITION(mod_conference, mod_conference_load, mod_conference_shutdown, NULL); @@ -1961,9 +1961,9 @@ #ifdef INTENSE_DEBUG switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, - "executing caller control '%s' param '%s' on call '%u, %s, %s, %s'\n", + "executing caller control '%s' param '%s' on call '%u, %s\n", caller_action->fndesc->key, - param ? param : "none", member->id, switch_channel_get_name(channel), profile->caller_id_name, profile->caller_id_number); + param ? param : "none", member->id, switch_channel_get_name(channel)); #endif caller_action->fndesc->handler(member, caller_action); @@ -2110,7 +2110,7 @@ } /* Rinse ... Repeat */ if (member->digit_stream != NULL) { - switch_ivr_digit_stream_destroy(member->digit_stream); + switch_ivr_digit_stream_destroy(&member->digit_stream); } switch_clear_flag_locked(member, MFLAG_RUNNING); Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Feb 24 12:36:45 2009 @@ -1388,6 +1388,7 @@ switch_memory_pool_t *pool; switch_hash_t *hash; switch_size_t maxlen; + switch_size_t buflen; switch_size_t minlen; char terminator; unsigned int digit_timeout_ms; @@ -1461,24 +1462,25 @@ switch_status_t status = SWITCH_STATUS_FALSE; /* if we have a parser object memory pool and a stream object pointer that is null */ - if (parser != NULL && parser->pool && stream != NULL && *stream == NULL) { - *stream = (switch_ivr_digit_stream_t *) switch_core_alloc(parser->pool, sizeof(switch_ivr_digit_stream_t)); - if (*stream != NULL) { - memset(*stream, 0, sizeof(switch_ivr_digit_stream_t)); - status = SWITCH_STATUS_SUCCESS; - } + if (parser && stream && *stream == NULL) { + *stream = (switch_ivr_digit_stream_t *) malloc(sizeof(**stream)); + switch_assert(*stream); + memset(*stream, 0, sizeof(**stream)); + switch_zmalloc((*stream)->digits, parser->buflen + 1); + status = SWITCH_STATUS_SUCCESS; } return status; } -SWITCH_DECLARE(switch_status_t) switch_ivr_digit_stream_destroy(switch_ivr_digit_stream_t *stream) +SWITCH_DECLARE(switch_status_t) switch_ivr_digit_stream_destroy(switch_ivr_digit_stream_t **stream) { switch_status_t status = SWITCH_STATUS_FALSE; - if (stream && stream->digits != NULL) { - free(stream->digits); - stream->digits = NULL; + if (*stream) { + switch_safe_free((*stream)->digits); + free(*stream); + *stream = NULL; status = SWITCH_STATUS_SUCCESS; } @@ -1499,6 +1501,11 @@ * figure out when a digit set is completed, therefore we * keep track of the min and max digit lengths */ + + if (len > parser->buflen) { + parser->buflen = len; + } + if (parser->terminator == '\0') { if (len > parser->maxlen) { parser->maxlen = len; @@ -1541,51 +1548,50 @@ { void *result = NULL; - if (parser != NULL && stream != NULL) { - switch_size_t len = (stream->digits != NULL ? strlen(stream->digits) : 0); - - /* handle new digit arrivals */ - if (digit != '\0') { - - /* if it's not a terminator digit, add it to the collected digits */ - if (digit != parser->terminator) { - /* if collected digits length >= the max length of the keys - * in the hash table, then left shift the digit string - */ - if (len > 0 && parser->maxlen != 0 && len >= parser->maxlen) { - char *src = stream->digits + 1; - char *dst = stream->digits; + switch_assert(parser); + switch_assert(stream); + switch_assert(stream->digits); + + switch_size_t len = strlen(stream->digits); + + /* handle new digit arrivals */ + if (digit) { + /* if it's not a terminator digit, add it to the collected digits */ + if (digit != parser->terminator) { + /* if collected digits length >= the max length of the keys + * in the hash table, then left shift the digit string + */ + if (len > 0 && parser->maxlen != 0 && len >= parser->maxlen) { + char *src = stream->digits + 1; + char *dst = stream->digits; - while (*src) { - *(dst++) = *(src++); - } - *dst = digit; - } else { - char *tmp = realloc(stream->digits, len + 2); - switch_assert(tmp); - stream->digits = tmp; - *(stream->digits + (len++)) = digit; - *(stream->digits + len) = '\0'; - stream->last_digit_time = switch_micro_time_now() / 1000; + while (*src) { + *(dst++) = *(src++); } + *dst = digit; + } else { + *(stream->digits + (len++)) = digit; + *(stream->digits + len) = '\0'; + stream->last_digit_time = switch_micro_time_now() / 1000; } } - /* don't allow collected digit string testing if there are varying sized keys until timeout */ - if (parser->maxlen - parser->minlen > 0 && (switch_micro_time_now() / 1000) - stream->last_digit_time < parser->digit_timeout_ms) { - len = 0; - } - /* if we have digits to test */ - if (len) { - result = switch_core_hash_find(parser->hash, stream->digits); - /* if we matched the digit string, or this digit is the terminator - * reset the collected digits for next digit string - */ - if (result != NULL || parser->terminator == digit) { - free(stream->digits); - stream->digits = NULL; - } + } + + /* don't allow collected digit string testing if there are varying sized keys until timeout */ + if (parser->maxlen - parser->minlen > 0 && (switch_micro_time_now() / 1000) - stream->last_digit_time < parser->digit_timeout_ms) { + len = 0; + } + /* if we have digits to test */ + if (len) { + result = switch_core_hash_find(parser->hash, stream->digits); + /* if we matched the digit string, or this digit is the terminator + * reset the collected digits for next digit string + */ + if (result != NULL || parser->terminator == digit) { + *stream->digits = '\0'; } } + return result; } @@ -1593,13 +1599,12 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_digit_stream_reset(switch_ivr_digit_stream_t *stream) { switch_status_t status = SWITCH_STATUS_FALSE; + switch_assert(stream); + switch_assert(stream->digits); - if (stream != NULL && stream->digits != NULL) { - free(stream->digits); - stream->digits = NULL; - stream->last_digit_time = 0; - status = SWITCH_STATUS_SUCCESS; - } + *stream->digits = '\0'; + stream->last_digit_time = 0; + status = SWITCH_STATUS_SUCCESS; return status; }

1 0

[commit] r12261 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sip
by FreeSWITCH SVN 24 Feb '09

24 Feb '09

Author: brian Date: Tue Feb 24 08:46:03 2009 New Revision: 12261 Log: Tue Feb 24 07:33:35 CST 2009 Pekka Pessi <first.last(a)nokia.com> * sip_parser.c: fixed sip_transport_d() Ignore-this: c14408145a269c25d00dcb20ab2391f6 sip_transport_d() was expected to canonize casing of well-known transports. Thanks for Adrian Gschwend for reporting the problem. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_parser.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/torture_sip.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Feb 24 08:46:03 2009 @@ -1 +1 @@ -Tue Feb 24 08:43:18 CST 2009 +Tue Feb 24 08:44:37 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_parser.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_parser.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_parser.c Tue Feb 24 08:46:03 2009 @@ -459,8 +459,9 @@ size_t pn_len, pv_len, pt_len; char *s = *ss; -#define TRANSPORT_MATCH(t) \ - (su_casenmatch(s + 7, t + 7, (sizeof t) - 8) && (IS_LWS(s[sizeof(t)])) \ +#define TRANSPORT_MATCH(t) \ + (su_casenmatch(s + 7, t + 7, (sizeof t) - 8) && \ + (!s[sizeof(t) - 1] || IS_LWS(s[sizeof(t) - 1])) \ && (transport = t, s += sizeof(t) - 1)) if (!su_casenmatch(s, "SIP/2.0", 7) || 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 Tue Feb 24 08:46:03 2009 @@ -711,6 +711,31 @@ } { + char *input; + char const *output = NULL; + char udp[] = "sip/2.0/udp"; + char tcp[] = "sip/2.0/tCp "; + char sctp[] = "sip/2.0/sctp\t"; + char tls[] = "sip/2.0/tls\r"; + + input = udp; + TEST(sip_transport_d(&input, &output), 0); + TEST_S(output, "SIP/2.0/UDP"); + + input = tcp; + TEST(sip_transport_d(&input, &output), 0); + TEST_S(output, "SIP/2.0/TCP"); + + input = sctp; + TEST(sip_transport_d(&input, &output), 0); + TEST_S(output, "SIP/2.0/SCTP"); + + input = tls; + TEST(sip_transport_d(&input, &output), 0); + TEST_S(output, "SIP/2.0/TLS"); + } + + { sip_expires_t *ex; TEST_1(!sip_expires_make(home, "-12+1")); @@ -2323,7 +2348,7 @@ TEST_S(www->au_scheme, "Kerberos"); TEST_1(www = www->au_next); TEST_S(www->au_scheme, "NTLM"); - + msg_destroy(msg); END();

1 0

[commit] r12260 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su/sofia-sip
by FreeSWITCH SVN 24 Feb '09

24 Feb '09

Author: brian Date: Tue Feb 24 08:43:31 2009 New Revision: 12260 Log: Fri Feb 13 09:41:52 CST 2009 Pekka Pessi <first.last(a)nokia.com> * su.h: define su_family via struct sockaddr Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su.h Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Feb 24 08:43:31 2009 @@ -1 +1 @@ -Thu Feb 12 15:29:54 CST 2009 +Tue Feb 24 08:43:18 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su.h Tue Feb 24 08:43:31 2009 @@ -163,11 +163,10 @@ short su_dummy; /**< Dummy member to initialize */ #if SU_HAVE_SOCKADDR_SA_LEN #define su_len su_sa.sa_len -#define su_family su_sa.sa_family #else #define su_len su_array[0] - short su_family; #endif +#define su_family su_sa.sa_family #define su_port su_sin.sin_port #endif

1 0