- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r9505 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua
by Freeswitch SVN 10 Sep '08

10 Sep '08

Author: mikej Date: Wed Sep 10 12:20:25 2008 New Revision: 9505 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.c Log: Wed Sep 10 09:29:17 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * test_s2.c: allow user-specified VIA in requests from s2 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.c Wed Sep 10 12:20:25 2008 @@ -230,6 +230,8 @@ *prev = e, e->prev = prev; } +/* ---------------------------------------------------------------------- */ +/* SIP messages sent by nua */ struct message * s2_remove_message(struct message *m) @@ -515,6 +517,7 @@ sip_content_length_t l[1]; tp_name_t tpn[1]; tp_magic_t *magic; + int user_via = 0; ta_start(ta, tag, value); tags = ta_args(ta); @@ -598,7 +601,7 @@ sip_cseq_init(cseq); cseq->cs_method = method; cseq->cs_method_name = name; - + if (d->invite && (method == sip_method_ack || method == sip_method_cancel)) { cseq->cs_seq = sip_object(d->invite)->sip_cseq->cs_seq; } @@ -606,7 +609,10 @@ cseq->cs_seq = ++d->lseq; } - if (d->invite && method == sip_method_cancel) { + if (sip->sip_via) { + user_via = 1; + } + else if (d->invite && method == sip_method_cancel) { *via = *sip_object(d->invite)->sip_via; } else { @@ -626,7 +632,7 @@ TAG_IF(!sip->sip_to, SIPTAG_TO(d->remote)), TAG_IF(!sip->sip_call_id, SIPTAG_CALL_ID(d->call_id)), TAG_IF(!sip->sip_cseq, SIPTAG_CSEQ(cseq)), - SIPTAG_VIA(via), + TAG_IF(!user_via, SIPTAG_VIA(via)), TAG_IF(!sip->sip_content_length, SIPTAG_CONTENT_LENGTH(l)), TAG_IF(!sip->sip_separator, SIPTAG_SEPARATOR_STR("\r\n")), TAG_END());

1 0

[commit] r9504 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by Freeswitch SVN 10 Sep '08

10 Sep '08

Author: mikej Date: Wed Sep 10 12:20:05 2008 New Revision: 9504 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c Log: Wed Sep 10 09:05:24 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * nua_session.c: fixed client request reference counting in nua_session_usage_remove() Bug reported by Della Betta Filippo. Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Sep 10 12:20:05 2008 @@ -1 +1 @@ -Wed Sep 10 12:19:39 EDT 2008 +Wed Sep 10 12:19:57 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Wed Sep 10 12:20:05 2008 @@ -258,11 +258,12 @@ if (cr == cr0) continue; + nua_client_request_ref(cr); + if (nua_invite_client_should_ack(cr)) { ss->ss_reporting = 1; nua_invite_client_ack(cr, NULL); ss->ss_reporting = 0; - nua_client_request_clean(cr); } if (cr == du->du_cr && cr->cr_orq) @@ -278,6 +279,8 @@ nua_client_request_remove(cr); + nua_client_request_unref(cr); + cr_next = ds->ds_cr; } 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 Wed Sep 10 12:20:05 2008 @@ -2154,16 +2154,23 @@ int nua_client_request_remove(nua_client_request_t *cr) { - if (cr->cr_prev) + int retval = 0; + int in_queue = cr->cr_prev != NULL; + + if (in_queue) { if ((*cr->cr_prev = cr->cr_next)) cr->cr_next->cr_prev = cr->cr_prev; + } cr->cr_prev = NULL, cr->cr_next = NULL; if (cr->cr_timer) { su_timer_destroy(cr->cr_timer), cr->cr_timer = NULL; - nua_client_request_unref(cr); + retval = nua_client_request_unref(cr); } + if (!in_queue) + return retval; + return nua_client_request_unref(cr); }

1 0

[commit] r9503 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sdp libsofia-sip-ua/sdp/sofia-sip
by Freeswitch SVN 10 Sep '08

10 Sep '08

Author: mikej Date: Wed Sep 10 12:19:45 2008 New Revision: 9503 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sofia-sip/sdp.h Log: Wed Sep 3 14:37:06 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * sdp: updated documentation Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Sep 10 12:19:45 2008 @@ -1 +1 @@ -Wed Sep 3 14:31:22 EDT 2008 +Wed Sep 10 12:19:39 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp.c Wed Sep 10 12:19:45 2008 @@ -174,11 +174,14 @@ /**Duplicate an SDP origin description. * * The function sdp_origin_dup() duplicates (deeply copies) an SDP origin - * description�@a o allocating memory using memory @a home. + * description @a o allocating memory using memory @a home. * * @param h Memory home * @param o SDP origin description to be duplicated * + * @note The duplicated structure is allocated using a single call to + * su_alloc() and it can be freed with su_free(). + * * @return * If successful, a pointer to newly allocated sdp_origin_t structure is * returned, otherwise NULL is returned. @@ -190,12 +193,15 @@ /**Duplicate an SDP connection description. * - * The function sdp_connection_dup() duplicates (deeply copies) an SDP - * connection description�@a c allocating memory using memory @a home. + * The function sdp_connection_dup() duplicates (deeply copies) a list of + * SDP connection description @a c allocating memory using memory @a home. * * @param h Memory home * @param c SDP connection description to be duplicated * + * @note The duplicated list is allocated using a single call to + * su_alloc() and it can be freed with su_free(). + * * @return * If successful, a pointer to newly allocated sdp_connection_t structure is * returned, otherwise NULL is returned. @@ -207,12 +213,15 @@ /**Duplicate an SDP bandwidth description. * - * The function sdp_bandwidth_dup() duplicates (deeply copies) an SDP - * bandwidth description�@a b allocating memory using memory @a home. + * The function sdp_bandwidth_dup() duplicates (deeply copies) a list of SDP + * bandwidth descriptions @a b allocating memory using memory @a home. * * @param h Memory home * @param b SDP bandwidth description to be duplicated * + * @note The duplicated list is allocated using a single call to + * su_alloc() and it can be freed with su_free(). + * * @return * If successful, a pointer to newly allocated sdp_bandwidth_t structure is * returned, otherwise NULL is returned. @@ -224,12 +233,15 @@ /**Duplicate an SDP time description. * - * The function sdp_time_dup() duplicates (deeply copies) an SDP time - * description�@a t allocating memory using memory @a home. + * The function sdp_time_dup() duplicates (deeply copies) a list of SDP time + * descriptions @a t allocating memory using memory @a home. * * @param h Memory home * @param t SDP time description to be duplicated * + * @note The duplicated list is allocated using a single call to + * su_alloc() and it can be freed with su_free(). + * * @return * If successful, a pointer to newly allocated sdp_time_t structure is * returned, otherwise NULL is returned. @@ -242,11 +254,14 @@ /**Duplicate an SDP repeat description. * * The function sdp_repeat_dup() duplicates (deeply copies) an SDP repeat - * description�@a r allocating memory using memory @a home. + * description @a r allocating memory using memory @a home. * * @param h Memory home * @param r SDP repeat description to be duplicated * + * @note The duplicated structure is allocated using a single call to + * su_alloc() and it can be freed with su_free(). + * * @return * If successful, a pointer to newly allocated sdp_repeat_t structure is * returned, otherwise NULL is returned. @@ -259,11 +274,14 @@ /**Duplicate an SDP zone description. * * The function sdp_zone_dup() duplicates (deeply copies) an SDP zone - * description�@a z allocating memory using memory @a home. + * description @a z allocating memory using memory @a home. * * @param h Memory home * @param z SDP zone description to be duplicated * + * @note The duplicated structure is allocated using a single call to + * su_alloc() and it can be freed with su_free(). + * * @return * If successful, a pointer to newly allocated sdp_zone_t structure is * returned, otherwise NULL is returned. @@ -276,11 +294,14 @@ /**Duplicate an SDP key description. * * The function sdp_key_dup() duplicates (deeply copies) an SDP key - * description�@a k allocating memory using memory @a home. + * description @a k allocating memory using memory @a home. * * @param h Memory home * @param k SDP key description to be duplicated * + * @note The duplicated structure is allocated using a single call to + * su_alloc() and it can be freed with su_free(). + * * @return * If successful, a pointer to newly allocated sdp_key_t structure is * returned, otherwise NULL is returned. @@ -298,6 +319,9 @@ * @param h Memory home * @param a SDP attribute description to be duplicated * + * @note The duplicated structure is allocated using a single call to + * su_alloc() and it can be freed with su_free(). + * * @return * If successful, a pointer to newly allocated sdp_attribute_t structure is * returned, otherwise NULL is returned. @@ -315,6 +339,9 @@ * @param h Memory home * @param l SDP list description to be duplicated * + * @note The duplicated structure is allocated using a single call to + * su_alloc() and it can be freed with su_free(). + * * @return * If successful, a pointer to newly allocated sdp_list_t structure is * returned, otherwise NULL is returned. @@ -332,6 +359,9 @@ * @param h Memory home * @param rm SDP rtpmap description to be duplicated * + * @note The duplicated structure is allocated using a single call to + * su_alloc() and it can be freed with su_free(). + * * @return * If successful, a pointer to newly allocated sdp_rtpmap_t structure is * returned, otherwise NULL is returned. @@ -344,13 +374,16 @@ /**Duplicate an SDP media description. * * The function sdp_media_dup() duplicates (deeply copies) an SDP media - * description�@a m allocating memory using memory @a home. + * description @a m allocating memory using memory @a home. * * @param h Memory home * @param m SDP media description to be duplicated * @param sdp SDP session description to which the newly allocated * media description is linked * + * @note The duplicated structure is allocated using a single call to + * su_alloc() and it can be freed with su_free(). + * * @return * If successful, a pointer to newly allocated sdp_media_t structure is * returned, otherwise NULL is returned. @@ -369,13 +402,16 @@ /**Duplicate an SDP media description. * * The function sdp_media_dup_all() duplicates (deeply copies) a list of SDP - * media descriptions�@a m allocating memory using memory @a home. + * media descriptions @a m allocating memory using memory @a home. * * @param h Memory home * @param m list of SDP media descriptions to be duplicated * @param sdp SDP session description to which the newly allocated * media descriptions are linked * + * @note The duplicated list is allocated using a single call to + * su_alloc() and it can be freed with su_free(). + * * @return * If successful, a pointer to a newly allocated list of sdp_media_t * structures is returned, otherwise NULL is returned. @@ -944,11 +980,14 @@ /**Duplicate an SDP session description. * * The function sdp_session_dup() duplicates (deeply copies) an SDP - * session description�@a sdp allocating memory using memory @a home. + * session description @a sdp allocating memory using memory @a home. * * @param h Memory home * @param sdp SDP session description to be duplicated * + * @note The duplicated structure is allocated using a single call to + * su_alloc() and it can be freed with su_free(). + * * @return * If successful, a pointer to newly allocated sdp_session_t structure is * returned, otherwise NULL is returned. @@ -1017,12 +1056,15 @@ /**Duplicate an SDP session description without media descriptions. * * The function sdp_session_dup() duplicates (deeply copies) an SDP session - * description�@a sdp allocating memory using memory @a home. It does not + * description @a sdp allocating memory using memory @a home. It does not * copy the media descriptions, however. * * @param h memory h * @param sdp SDP session description to be duplicated * + * @note The duplicated structure is allocated using a single call to + * su_alloc() and it can be freed with su_free(). + * * @return * If successful, a pointer to newly allocated sdp_session_t structure is * returned, otherwise NULL is returned. Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sofia-sip/sdp.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sofia-sip/sdp.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sofia-sip/sdp.h Wed Sep 10 12:19:45 2008 @@ -229,7 +229,8 @@ sdp_media_data, /**< Bulk data transfer */ sdp_media_control, /**< Additional conference control */ sdp_media_message, /**< Messaging sessions*/ - sdp_media_image, /**< Image browsing sessions for JPIP, and T.38 */ + sdp_media_image, /**< Image browsing sessions, + * e.g., JPIP or T.38. */ sdp_media_red /**< Redundancy. @NEW_1_12_4. */ } sdp_media_e; @@ -334,31 +335,31 @@ /** Duplicate an SDP connection structure. */ SOFIAPUBFUN -sdp_connection_t *sdp_connection_dup(su_home_t *home, sdp_connection_t const *); +sdp_connection_t *sdp_connection_dup(su_home_t *, sdp_connection_t const *); /** Duplicate an SDP bandwidth structure. */ SOFIAPUBFUN -sdp_bandwidth_t *sdp_bandwidth_dup(su_home_t *home, sdp_bandwidth_t const *); +sdp_bandwidth_t *sdp_bandwidth_dup(su_home_t *, sdp_bandwidth_t const *); /** Duplicate an SDP time structure. */ SOFIAPUBFUN -sdp_time_t *sdp_time_dup(su_home_t *home, sdp_time_t const *); +sdp_time_t *sdp_time_dup(su_home_t *, sdp_time_t const *); /** Duplicate an SDP repeat structure. */ SOFIAPUBFUN -sdp_repeat_t *sdp_repeat_dup(su_home_t *home, sdp_repeat_t const *); +sdp_repeat_t *sdp_repeat_dup(su_home_t *, sdp_repeat_t const *); /** Duplicate an SDP timezone structure. */ SOFIAPUBFUN -sdp_zone_t *sdp_zone_dup(su_home_t *home, sdp_zone_t const *); +sdp_zone_t *sdp_zone_dup(su_home_t *, sdp_zone_t const *); /** Duplicate an SDP key structure. */ SOFIAPUBFUN -sdp_key_t *sdp_key_dup(su_home_t *home, sdp_key_t const *); +sdp_key_t *sdp_key_dup(su_home_t *, sdp_key_t const *); /** Duplicate an SDP attribute structure. */ SOFIAPUBFUN -sdp_attribute_t *sdp_attribute_dup(su_home_t *home, sdp_attribute_t const *); +sdp_attribute_t *sdp_attribute_dup(su_home_t *, sdp_attribute_t const *); /** Duplicate an SDP media description structure. */ SOFIAPUBFUN @@ -372,11 +373,11 @@ /** Duplicate a list structure. */ SOFIAPUBFUN -sdp_list_t *sdp_list_dup(su_home_t *home, sdp_list_t const *); +sdp_list_t *sdp_list_dup(su_home_t *, sdp_list_t const *); /** Duplicate an rtpmap structure. */ SOFIAPUBFUN -sdp_rtpmap_t *sdp_rtpmap_dup(su_home_t *home, sdp_rtpmap_t const *); +sdp_rtpmap_t *sdp_rtpmap_dup(su_home_t *, sdp_rtpmap_t const *); /** Compare two session descriptions. */ SOFIAPUBFUN int sdp_session_cmp(sdp_session_t const *a, @@ -450,13 +451,13 @@ /** Find a mapped attribute. */ SOFIAPUBFUN -sdp_attribute_t *sdp_attribute_mapped_find(sdp_attribute_t const *a, - char const *name, +sdp_attribute_t *sdp_attribute_mapped_find(sdp_attribute_t const *a, + char const *name, int pt, char **return_result); /** Append a attribute to a list of attributes. */ SOFIAPUBFUN void sdp_attribute_append(sdp_attribute_t **list, - sdp_attribute_t const *a); + sdp_attribute_t const *a); /** Replace a attribute within a list of attributes. */ SOFIAPUBFUN int sdp_attribute_replace(sdp_attribute_t **list, @@ -546,8 +547,9 @@ typedef struct sdp_printer_s sdp_printer_t; typedef sdp_printer_t *sdp_printer; -SOFIAPUBFUN sdp_printer_t *sdp_print(su_home_t *, sdp_session_t const *session, - char msgbuf[], isize_t maxmsgsize, int flags); +SOFIAPUBFUN sdp_printer_t *sdp_print(su_home_t *, sdp_session_t const *, + char msgbuf[], isize_t maxmsgsize, + int flags); SOFIAPUBFUN char const *sdp_printing_error(sdp_printer_t *p); SOFIAPUBFUN char const *sdp_message(sdp_printer_t *p); SOFIAPUBFUN isize_t sdp_message_size(sdp_printer_t *p);

1 0

[commit] r9502 - freeswitch/trunk/src/mod/formats/mod_shout
by Freeswitch SVN 10 Sep '08

10 Sep '08

Author: anthm Date: Wed Sep 10 11:32:35 2008 New Revision: 9502 Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Log: fix MODFORM-12 Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Wed Sep 10 11:32:35 2008 @@ -91,6 +91,11 @@ int len; int16_t blank[2048] = {0}, *r = NULL; + + if (context->channels == 2) { + r = blank; + } + len = lame_encode_buffer(context->gfp, blank, r, sizeof(blank) / 2, mp3buffer, sizeof(mp3buffer)); if (len) {

1 0

[commit] r9501 - freeswitch/trunk/scripts/lua
by Freeswitch SVN 10 Sep '08

10 Sep '08

Author: brian Date: Wed Sep 10 10:05:48 2008 New Revision: 9501 Added: freeswitch/trunk/scripts/lua/callback.lua Log: create example of using the inputcallback to influence the playback of a file. Added: freeswitch/trunk/scripts/lua/callback.lua ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/lua/callback.lua Wed Sep 10 10:05:48 2008 @@ -0,0 +1,57 @@ +function all_done(s, how) + io.write("done: " .. how .. "\n"); +end + +function my_cb(s, type, obj, arg) + if (arg) then + io.write("type: " .. type .. "\n" .. "arg: " .. arg .. "\n"); + else + io.write("type: " .. type .. "\n"); + end + + if (type == "dtmf") then + io.write("digit: [" .. obj['digit'] .. "]\nduration: [" .. obj['duration'] .. "]\n"); + + if (obj['digit'] == "1") then + return "pause"; + end + + if (obj['digit'] == "2") then + return "seek:+3000"; + end + + if (obj['digit'] == "3") then + return "seek:-3000"; + end + + if (obj['digit'] == "4") then + return "seek:+3000"; + end + + if (obj['digit'] == "5") then + return "speed:+1"; + end + if (obj['digit'] == "6") then + return "speed:0"; + end + if (obj['digit'] == "7") then + return "speed:-1"; + end + + if (obj['digit'] == "8") then + return "stop"; + end + + if (obj['digit'] == "9") then + return "break"; + end + else + io.write(obj:serialize("xml")); + + end +end + +blah = "args"; +session:setHangupHook("all_done"); +session:setInputCallback("my_cb", "blah"); +session:streamFile("/tmp/swimp.raw");

1 0

[commit] r9499 - freeswitch/trunk/src
by Freeswitch SVN 09 Sep '08

09 Sep '08

Author: anthm Date: Tue Sep 9 19:14:15 2008 New Revision: 9499 Modified: freeswitch/trunk/src/switch_xml.c Log: declinatio mortuus obfirmo! Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Tue Sep 9 19:14:15 2008 @@ -138,9 +138,11 @@ static switch_xml_binding_t *BINDINGS = NULL; static switch_xml_t MAIN_XML_ROOT = NULL; -static switch_memory_pool_t *XML_MEMORY_POOL; -static switch_thread_rwlock_t *RWLOCK; -static switch_thread_rwlock_t *B_RWLOCK; +static switch_memory_pool_t *XML_MEMORY_POOL = NULL; +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_COUNT_LOCK = NULL; static uint32_t lock_count = 0; struct xml_section_t { @@ -1522,7 +1524,9 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_root(void) { + switch_mutex_lock(XML_COUNT_LOCK); lock_count++; + switch_mutex_unlock(XML_COUNT_LOCK); switch_thread_rwlock_rdlock(RWLOCK); return MAIN_XML_ROOT; } @@ -1572,13 +1576,13 @@ uint8_t hasmain = 0, errcnt = 0; switch_xml_t new_main; - //switch_mutex_lock(XML_LOCK); + switch_mutex_lock(XML_LOCK); if (MAIN_XML_ROOT) { hasmain++; if (!reload) { - //switch_mutex_unlock(XML_LOCK); + switch_mutex_unlock(XML_LOCK); return switch_xml_root(); } switch_thread_rwlock_wrlock(RWLOCK); @@ -1610,7 +1614,8 @@ if (hasmain) { switch_thread_rwlock_unlock(RWLOCK); } - //switch_mutex_unlock(XML_LOCK); + + switch_mutex_unlock(XML_LOCK); if (errcnt == 0) { switch_event_t *event; @@ -1631,7 +1636,8 @@ XML_MEMORY_POOL = pool; *err = "Success"; - //switch_mutex_init(&XML_LOCK, SWITCH_MUTEX_NESTED, XML_MEMORY_POOL); + switch_mutex_init(&XML_LOCK, SWITCH_MUTEX_NESTED, XML_MEMORY_POOL); + switch_mutex_init(&XML_COUNT_LOCK, SWITCH_MUTEX_NESTED, XML_MEMORY_POOL); switch_thread_rwlock_create(&RWLOCK, XML_MEMORY_POOL); switch_thread_rwlock_create(&B_RWLOCK, XML_MEMORY_POOL); @@ -1924,10 +1930,12 @@ return; if (switch_test_flag(xml, SWITCH_XML_ROOT)) { + switch_mutex_lock(XML_COUNT_LOCK); if (lock_count > 0) { switch_thread_rwlock_unlock(RWLOCK); lock_count--; } + switch_mutex_unlock(XML_COUNT_LOCK); } if (xml == MAIN_XML_ROOT) {

1 0

[commit] r9498 - freeswitch/trunk/src
by Freeswitch SVN 09 Sep '08

09 Sep '08

Author: anthm Date: Tue Sep 9 18:47:37 2008 New Revision: 9498 Modified: freeswitch/trunk/src/switch_xml.c Log: change xml hooks to rwlock Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Tue Sep 9 18:47:37 2008 @@ -139,8 +139,8 @@ static switch_xml_binding_t *BINDINGS = NULL; static switch_xml_t MAIN_XML_ROOT = NULL; static switch_memory_pool_t *XML_MEMORY_POOL; -static switch_mutex_t *XML_LOCK; static switch_thread_rwlock_t *RWLOCK; +static switch_thread_rwlock_t *B_RWLOCK; static uint32_t lock_count = 0; struct xml_section_t { @@ -186,7 +186,8 @@ switch_xml_binding_t *ptr, *last = NULL; switch_status_t status = SWITCH_STATUS_FALSE; - switch_mutex_lock(XML_LOCK); + + switch_thread_rwlock_wrlock(B_RWLOCK); for (ptr = BINDINGS; ptr; ptr = ptr->next) { if (ptr == *binding) { if (last) { @@ -199,7 +200,7 @@ } last = ptr; } - switch_mutex_unlock(XML_LOCK); + switch_thread_rwlock_unlock(B_RWLOCK); return status; } @@ -209,7 +210,7 @@ switch_xml_binding_t *ptr, *last = NULL; switch_status_t status = SWITCH_STATUS_FALSE; - switch_mutex_lock(XML_LOCK); + switch_thread_rwlock_wrlock(B_RWLOCK); for (ptr = BINDINGS; ptr; ptr = ptr->next) { if (ptr->function == function) { if (last) { @@ -221,7 +222,7 @@ } last = ptr; } - switch_mutex_unlock(XML_LOCK); + switch_thread_rwlock_unlock(B_RWLOCK); return status; } @@ -239,7 +240,7 @@ binding->sections = sections; binding->user_data = user_data; - switch_mutex_lock(XML_LOCK); + switch_thread_rwlock_wrlock(B_RWLOCK); for (ptr = BINDINGS; ptr && ptr->next; ptr = ptr->next); if (ptr) { @@ -247,7 +248,7 @@ } else { BINDINGS = binding; } - switch_mutex_unlock(XML_LOCK); + switch_thread_rwlock_unlock(B_RWLOCK); return SWITCH_STATUS_SUCCESS; } @@ -1363,7 +1364,7 @@ switch_xml_binding_t *binding; uint8_t loops = 0; - switch_mutex_lock(XML_LOCK); + switch_thread_rwlock_rdlock(B_RWLOCK); for (binding = BINDINGS; binding; binding = binding->next) { switch_xml_section_t sections = switch_xml_parse_section_string(section); @@ -1398,7 +1399,7 @@ } } } - switch_mutex_unlock(XML_LOCK); + switch_thread_rwlock_unlock(B_RWLOCK); for (;;) { if (!xml) { @@ -1571,13 +1572,13 @@ uint8_t hasmain = 0, errcnt = 0; switch_xml_t new_main; - switch_mutex_lock(XML_LOCK); + //switch_mutex_lock(XML_LOCK); if (MAIN_XML_ROOT) { hasmain++; if (!reload) { - switch_mutex_unlock(XML_LOCK); + //switch_mutex_unlock(XML_LOCK); return switch_xml_root(); } switch_thread_rwlock_wrlock(RWLOCK); @@ -1609,7 +1610,7 @@ if (hasmain) { switch_thread_rwlock_unlock(RWLOCK); } - switch_mutex_unlock(XML_LOCK); + //switch_mutex_unlock(XML_LOCK); if (errcnt == 0) { switch_event_t *event; @@ -1630,8 +1631,9 @@ XML_MEMORY_POOL = pool; *err = "Success"; - switch_mutex_init(&XML_LOCK, SWITCH_MUTEX_NESTED, XML_MEMORY_POOL); + //switch_mutex_init(&XML_LOCK, SWITCH_MUTEX_NESTED, XML_MEMORY_POOL); switch_thread_rwlock_create(&RWLOCK, XML_MEMORY_POOL); + switch_thread_rwlock_create(&B_RWLOCK, XML_MEMORY_POOL); assert(pool != NULL);

1 0

[commit] r9497 - freeswitch/trunk/src/include
by Freeswitch SVN 09 Sep '08

09 Sep '08

Author: anthm Date: Tue Sep 9 18:47:03 2008 New Revision: 9497 Modified: freeswitch/trunk/src/include/switch_utils.h Log: add switch_safe_strdup Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Tue Sep 9 18:47:03 2008 @@ -285,6 +285,15 @@ */ #define switch_safe_free(it) if (it) {free(it);it=NULL;} +static inline char *switch_safe_strdup(const char *it) +{ + if (it) { + return strdup(it); + } + + return NULL; +} + /*! \brief Test if one string is inside another with extra case checking

1 0

[commit] r9496 - in freeswitch/trunk/src: . mod/applications/mod_conference mod/applications/mod_voicemail
by Freeswitch SVN 09 Sep '08

09 Sep '08

Author: anthm Date: Tue Sep 9 14:24:13 2008 New Revision: 9496 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr_play_say.c Log: cleanup 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 Sep 9 14:24:13 2008 @@ -4372,6 +4372,9 @@ buf, sizeof(pin_buf) - strlen(pin_buf), strlen(conference->pin) - strlen(pin_buf), "#", &term, 10000, 0, 0); + if (status == SWITCH_STATUS_TIMEOUT) { + status = SWITCH_STATUS_SUCCESS; + } } pin_valid = (status == SWITCH_STATUS_SUCCESS && strcmp(pin_buf, conference->pin) == 0); Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Tue Sep 9 14:24:13 2008 @@ -929,8 +929,12 @@ if (maxlen == 0 || maxlen > buflen - 1) { maxlen = buflen - 1; } + if (bslen < maxlen) { status = switch_ivr_collect_digits_count(session, buf + bslen, buflen, maxlen - bslen, term_chars, terminator_key, timeout, 0, 0); + if (status == SWITCH_STATUS_TIMEOUT) { + status = SWITCH_STATUS_SUCCESS; + } } return status; Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Sep 9 14:24:13 2008 @@ -1482,6 +1482,7 @@ if (status == SWITCH_STATUS_SUCCESS) { switch_channel_perform_mark_pre_answered(channel, file, func, line); + status = switch_ivr_sleep(channel->session, 250, NULL); } else { switch_channel_hangup(channel, SWITCH_CAUSE_INCOMPATIBLE_DESTINATION); } @@ -1598,10 +1599,13 @@ if (status == SWITCH_STATUS_SUCCESS) { switch_channel_perform_mark_answered(channel, file, func, line); + status = switch_ivr_sleep(channel->session, 250, NULL); } else { switch_channel_hangup(channel, SWITCH_CAUSE_INCOMPATIBLE_DESTINATION); } + + return status; } Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Tue Sep 9 14:24:13 2008 @@ -101,6 +101,8 @@ switch_channel_t *channel = switch_core_session_get_channel(session); uint8_t done = 0; int matches = 0; + const char *pause_val; + int pause = 100; if (!macro_name) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No phrase macro specified.\n"); @@ -182,7 +184,7 @@ old_sound_prefix = p; switch_channel_set_variable(channel, "sound_prefix", sound_path); } - + if (!(macro = switch_xml_child(language, "macro"))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "can't find any macro tags.\n"); goto done; @@ -200,6 +202,13 @@ goto done; } + if ((pause_val = switch_xml_attr(macro, "pause"))) { + int tmp = atoi(pause_val); + if (tmp >= 0) { + pause = tmp; + } + } + if (!(input = switch_xml_child(macro, "input"))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "can't find any input tags.\n"); goto done; @@ -316,6 +325,8 @@ status = switch_ivr_speak_text(session, my_tts_engine, my_tts_voice, odata, args); } } + + switch_ivr_sleep(session, pause, NULL); } } @@ -1497,7 +1508,10 @@ /* Try to grab some more digits for the timeout period */ status = switch_ivr_collect_digits_count(session, digit_buffer, digit_buffer_length, max_digits, valid_terminators, &terminator, timeout, 0, 0); - + if (status == SWITCH_STATUS_TIMEOUT) { + status = SWITCH_STATUS_SUCCESS; + } + /* Make sure we made it out alive */ if (status != SWITCH_STATUS_SUCCESS) { /* Bail */

1 0

[commit] r9495 - freeswitch/trunk/src
by Freeswitch SVN 09 Sep '08

09 Sep '08

Author: anthm Date: Tue Sep 9 13:47:01 2008 New Revision: 9495 Modified: freeswitch/trunk/src/switch_ivr_menu.c Log: fix FSCORE-181 Modified: freeswitch/trunk/src/switch_ivr_menu.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_menu.c (original) +++ freeswitch/trunk/src/switch_ivr_menu.c Tue Sep 9 13:47:01 2008 @@ -494,12 +494,17 @@ if (*menu->buf) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "IVR menu '%s' caught invalid input '%s'\n", menu->name, menu->buf); if (menu->invalid_sound) { - play_and_collect(session, menu, menu->invalid_sound, 0); + status = play_and_collect(session, menu, menu->invalid_sound, 0); } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "IVR menu '%s' no input detected\n", menu->name); } errs++; + + if (status == SWITCH_STATUS_TIMEOUT) { + status = SWITCH_STATUS_SUCCESS; + } + if (status == SWITCH_STATUS_SUCCESS) { status = switch_ivr_sleep(session, 1000, NULL); } @@ -512,7 +517,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "exit-sound '%s'\n", menu->exit_sound); if (!switch_strlen_zero(menu->exit_sound)) { - play_and_collect(session, menu, menu->exit_sound, 0); + status = play_and_collect(session, menu, menu->exit_sound, 0); } switch_safe_free(menu->buf);

1 0