- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r9550 - freeswitch/trunk/src
by Freeswitch SVN 12 Sep '08

12 Sep '08

Author: anthm Date: Fri Sep 12 17:55:47 2008 New Revision: 9550 Modified: freeswitch/trunk/src/switch_ivr_bridge.c Log: fix rare transfer super duper uuid_bridge roller coaster thing for panchi Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Fri Sep 12 17:55:47 2008 @@ -585,7 +585,7 @@ switch_ivr_multi_threaded_bridge(session, other_session, NULL, NULL, NULL); state = switch_channel_get_state(channel); - if (state < CS_HANGUP && state != CS_ROUTING && state != CS_PARK) { + if (!switch_channel_test_flag(channel, CF_TRANSFER) && state < CS_HANGUP && state != CS_ROUTING && state != CS_PARK) { switch_channel_set_state(channel, CS_EXECUTE); } switch_core_session_rwunlock(other_session);

1 0

[commit] r9549 - freeswitch/trunk/libs/sofia-sip/tests
by Freeswitch SVN 12 Sep '08

12 Sep '08

Author: mikej Date: Fri Sep 12 17:48:10 2008 New Revision: 9549 Modified: freeswitch/trunk/libs/sofia-sip/tests/test_100rel.c Log: Fri Sep 12 16:55:08 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * test_100rel.c: fixed timing problem w/ failing PRACK case Modified: freeswitch/trunk/libs/sofia-sip/tests/test_100rel.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/tests/test_100rel.c (original) +++ freeswitch/trunk/libs/sofia-sip/tests/test_100rel.c Fri Sep 12 17:48:10 2008 @@ -719,9 +719,9 @@ TEST(callstate(e->data->e_tags), nua_callstate_terminating); { - int bye = 1, cancel = 1, invite = 1; + int bye = 1, cancel = 1, invite = 1, state = 1; - while (bye || cancel || invite) { + while (bye || cancel || invite || state) { TEST_1(e = e->next); if (e->data->e_event == nua_r_bye) { TEST_E(e->data->e_event, nua_r_bye); @@ -739,9 +739,18 @@ TEST_1(e->data->e_status == 200 || e->data->e_status == 481); cancel = 0; } + else if (e->data->e_event == nua_i_state) { + TEST_E(e->data->e_event, nua_i_state); + TEST(callstate(e->data->e_tags), nua_callstate_terminated); + state = 0; + } + } + if (e->next) { + /* 2nd terminated? */ + TEST_1(e = e->next); + TEST_E(e->data->e_event, nua_i_state); + TEST(callstate(e->data->e_tags), nua_callstate_terminated); } - TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state); - TEST(callstate(e->data->e_tags), nua_callstate_terminated); } TEST_1(!e->next); @@ -799,7 +808,7 @@ static int prack_until_terminated(CONDITION_PARAMS) { - static int terminated, bye_responded; + static int terminated, bye_responded, invite_responded, cancel_responded; if (!check_handle(ep, call, nh, SIP_500_INTERNAL_SERVER_ERROR)) return 0; @@ -825,7 +834,13 @@ if (event == nua_r_bye && status >= 200) bye_responded = 1; - return terminated && bye_responded; + if (event == nua_r_invite && status >= 200) + invite_responded = 1; + + if (event == nua_r_cancel && status >= 200) + cancel_responded = 1; + + return terminated && bye_responded && invite_responded && cancel_responded; } int respond_483_to_prack(CONDITION_PARAMS)

1 0

[commit] r9548 - freeswitch/trunk/src
by Freeswitch SVN 12 Sep '08

12 Sep '08

Author: anthm Date: Fri Sep 12 15:23:45 2008 New Revision: 9548 Modified: freeswitch/trunk/src/switch_event.c Log: doh Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Fri Sep 12 15:23:45 2008 @@ -83,7 +83,7 @@ static int SYSTEM_RUNNING = 0; static switch_queue_t *EVENT_RECYCLE_QUEUE = NULL; static switch_queue_t *EVENT_HEADER_RECYCLE_QUEUE = NULL; -static void launch_dispatch_threads(int max, int len, switch_memory_pool_t *pool); +static void launch_dispatch_threads(uint32_t max, int len, switch_memory_pool_t *pool); static char *my_dup(const char *s) { @@ -245,7 +245,7 @@ static void *SWITCH_THREAD_FUNC switch_event_thread(switch_thread_t *thread, void *obj) { switch_queue_t *queue = (switch_queue_t *) obj; - int index = 0; + uint32_t index = 0; int my_id = 0; switch_mutex_lock(EVENT_QUEUE_MUTEX); @@ -462,7 +462,7 @@ return SWITCH_STATUS_SUCCESS; } -static void launch_dispatch_threads(int max, int len, switch_memory_pool_t *pool) +static void launch_dispatch_threads(uint32_t max, int len, switch_memory_pool_t *pool) { switch_thread_t *thread; switch_threadattr_t *thd_attr;

1 0

[commit] r9547 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 12 Sep '08

12 Sep '08

Author: brian Date: Fri Sep 12 15:05:33 2008 New Revision: 9547 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: lead to a real conf Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Sep 12 15:05:33 2008 @@ -243,7 +243,7 @@  <action application="conference_set_auto_outcall" data="sofia/gateway/asterlink.com/19184238080"/> - <action application="conference_set_auto_outcall" data="sofia/default/42(a)conference.freeswitch.org"/> + <action application="conference_set_auto_outcall" data="sofia/default/888(a)conference.freeswitch.org"/> <action application="conference" data="cool@default"/> </condition>

1 0

[commit] r9546 - freeswitch/trunk/conf/lang/en
by Freeswitch SVN 12 Sep '08

12 Sep '08

Author: brian Date: Fri Sep 12 14:19:32 2008 New Revision: 9546 Modified: freeswitch/trunk/conf/lang/en/en.xml Log: update comments now that the sound file version exists as to not mislead Modified: freeswitch/trunk/conf/lang/en/en.xml ============================================================================== --- freeswitch/trunk/conf/lang/en/en.xml (original) +++ freeswitch/trunk/conf/lang/en/en.xml Fri Sep 12 14:19:32 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/*.xml"/>  -  - <X-PRE-PROCESS cmd="include" data="vm/sounds.xml"/> +  + <X-PRE-PROCESS cmd="include" data="vm/sounds.xml"/>  </language> </include>

1 0

[commit] r9545 - freeswitch/trunk/src
by Freeswitch SVN 12 Sep '08

12 Sep '08

Author: anthm Date: Fri Sep 12 14:04:58 2008 New Revision: 9545 Modified: freeswitch/trunk/src/switch_event.c Log: fix FSCORE-188 Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Fri Sep 12 14:04:58 2008 @@ -34,7 +34,7 @@ #include <switch.h> #include <switch_event.h> -#define MAX_DISPATCH 20 + #define DISPATCH_QUEUE_LEN 5000 //#define DEBUG_DISPATCH_QUEUES @@ -61,7 +61,9 @@ char *name; }; -static int SOFT_MAX_DISPATCH = 0; +#define MAX_DISPATCH_VAL 20 +static unsigned int MAX_DISPATCH = MAX_DISPATCH_VAL; +static unsigned int SOFT_MAX_DISPATCH = 0; static char hostname[128] = ""; static char guess_ip_v4[80] = ""; static char guess_ip_v6[80] = ""; @@ -73,7 +75,7 @@ static switch_memory_pool_t *THRUNTIME_POOL = NULL; #define NUMBER_OF_QUEUES 3 static switch_queue_t *EVENT_QUEUE[NUMBER_OF_QUEUES] = { 0 }; -static switch_queue_t *EVENT_DISPATCH_QUEUE[MAX_DISPATCH] = { 0 }; +static switch_queue_t *EVENT_DISPATCH_QUEUE[MAX_DISPATCH_VAL] = { 0 }; static int POOL_COUNT_MAX = SWITCH_CORE_QUEUE_LEN; static switch_mutex_t *EVENT_QUEUE_MUTEX = NULL; static switch_hash_t *CUSTOM_HASH = NULL; @@ -416,7 +418,8 @@ SWITCH_DECLARE(switch_status_t) switch_event_shutdown(void) { - int x = 0, last = 0; + uint32_t x = 0; + int last = 0; switch_hash_index_t *hi; const void *var; void *val; @@ -463,7 +466,7 @@ { switch_thread_t *thread; switch_threadattr_t *thd_attr; - int index = 0; + uint32_t index = 0; if (max > MAX_DISPATCH) { return;

1 0

[commit] r9544 - freeswitch/trunk/src
by Freeswitch SVN 12 Sep '08

12 Sep '08

Author: anthm Date: Fri Sep 12 12:43:29 2008 New Revision: 9544 Modified: freeswitch/trunk/src/switch_ivr_bridge.c Log: add option for bridge to generate comfort noise to the A leg when there is no audio on the B leg Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Fri Sep 12 12:43:29 2008 @@ -170,7 +170,7 @@ silence_val = 0; } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setup generated silence at %d\n", silence_val); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setup generated silence from %s to %s at %d\n", switch_channel_get_name(chan_a), switch_channel_get_name(chan_b), silence_val); silence_frame.codec = &silence_codec; silence_frame.data = silence_data; silence_frame.buflen = sizeof(silence_data);

1 0

[commit] r9543 - freeswitch/trunk/src
by Freeswitch SVN 12 Sep '08

12 Sep '08

Author: anthm Date: Fri Sep 12 12:38:43 2008 New Revision: 9543 Modified: freeswitch/trunk/src/switch_ivr_bridge.c Log: add option for bridge to generate comfort noise to the A leg when there is no audio on the B leg Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Fri Sep 12 12:38:43 2008 @@ -100,6 +100,11 @@ const char *app_name = NULL, *app_arg = NULL; const char *hook_var = NULL; int inner_bridge = 0; + switch_codec_t silence_codec = { 0 }; + switch_frame_t silence_frame = { 0 }; + int16_t silence_data[SWITCH_RECOMMENDED_BUFFER_SIZE/2] = { 0 }; + const char *silence_var; + int silence_val = 0; #ifdef SWITCH_VIDEO_IN_THREADS struct vid_helper vh = { 0 }; uint32_t vid_launch = 0; @@ -136,7 +141,45 @@ goto end_of_bridge_loop; } + if ((silence_var = switch_channel_get_variable(chan_a, "bridge_generate_comfort_noise"))) { + switch_codec_t *read_codec = NULL; + + if (!(read_codec = switch_core_session_get_read_codec(session_a))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Channel has no media!\n"); + goto end_of_bridge_loop; + } + if (switch_true(silence_var)) { + silence_val = 1400; + } else { + if ((silence_val = atoi(silence_var)) < 0) { + silence_val = 0; + } + } + + if (silence_val) { + if (switch_core_codec_init(&silence_codec, + "L16", + NULL, + read_codec->implementation->actual_samples_per_second, + read_codec->implementation->microseconds_per_frame / 1000, + 1, + SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, + NULL, + switch_core_session_get_pool(session_a)) != SWITCH_STATUS_SUCCESS) { + + silence_val = 0; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setup generated silence at %d\n", silence_val); + silence_frame.codec = &silence_codec; + silence_frame.data = silence_data; + silence_frame.buflen = sizeof(silence_data); + silence_frame.datalen = read_codec->implementation->bytes_per_frame; + silence_frame.samples = silence_frame.datalen / sizeof(int16_t); + } + } + } + for (;;) { switch_channel_state_t b_state; switch_status_t status; @@ -273,9 +316,14 @@ if (SWITCH_READ_ACCEPTABLE(status)) { if (switch_test_flag(read_frame, SFF_CNG)) { - continue; + if (silence_val) { + switch_generate_sln_silence((int16_t *) silence_frame.data, silence_frame.samples, silence_val); + read_frame = &silence_frame; + } else { + continue; + } } - + if (status != SWITCH_STATUS_BREAK && !switch_channel_test_flag(chan_a, CF_HOLD)) { if (switch_core_session_write_frame(session_b, read_frame, SWITCH_IO_FLAG_NONE, stream_id) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, @@ -291,7 +339,11 @@ } } - end_of_bridge_loop: + end_of_bridge_loop: + + if (silence_val) { + switch_core_codec_destroy(&silence_codec); + } #ifdef SWITCH_VIDEO_IN_THREADS

1 0

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

12 Sep '08

Author: mikej Date: Fri Sep 12 12:28:10 2008 New Revision: 9542 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c Log: Fri Sep 12 12:25:18 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * nua_stack.c: keep reference when destroying un-ACKed INVITE Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri Sep 12 12:28:10 2008 @@ -1 +1 @@ -Fri Sep 12 12:27:38 EDT 2008 +Fri Sep 12 12:28:02 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 Fri Sep 12 12:28:10 2008 @@ -2188,9 +2188,12 @@ nua_client_request_complete(nua_client_request_t *cr) { if (cr->cr_orq) { + nua_client_request_ref(cr); if (cr && cr->cr_methods->crm_complete) cr->cr_methods->crm_complete(cr); nua_client_request_clean(cr); + if (nua_client_request_unref(cr)) + return 1; } return nua_client_request_remove(cr); @@ -2224,8 +2227,7 @@ cr->cr_msg = NULL, cr->cr_sip = NULL; if (cr->cr_orq) - nta_outgoing_destroy(cr->cr_orq); - cr->cr_orq = NULL; + nta_outgoing_destroy(cr->cr_orq), cr->cr_orq = NULL; if (cr->cr_target) su_free(nh->nh_home, cr->cr_target);

1 0

[commit] r9541 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/msg libsofia-sip-ua/msg/sofia-sip
by Freeswitch SVN 12 Sep '08

12 Sep '08

Author: mikej Date: Fri Sep 12 12:27:43 2008 New Revision: 9541 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_header.h Log: Wed Sep 3 13:35:21 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * sofia-sip/msg_header.h: added msg_header_add_format(() Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri Sep 12 12:27:43 2008 @@ -1 +1 @@ -Fri Sep 12 12:06:16 EDT 2008 +Fri Sep 12 12:27:38 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser.c Fri Sep 12 12:27:43 2008 @@ -2732,6 +2732,44 @@ return msg_header_add(msg, pub, hh, h); } +/** Add formatting result to message. + * + * Parse result from printf-formatted params as a given header field and add + * result to the message. + */ +int msg_header_add_format(msg_t *msg, + msg_pub_t *pub, + msg_hclass_t *hc, + char const *fmt, + ...) +{ + msg_header_t *h, **hh; + va_list va; + + if (msg == NULL) + return -1; + if (pub == NULL) + pub = msg->m_object; + + hh = msg_hclass_offset(msg->m_class, pub, hc); + + if (hh == NULL) + return -1; + + if (!fmt) + return 0; + + va_start(va, fmt); + h = msg_header_vformat(msg_home(msg), hc, fmt, va); + va_end(va); + + if (!h) + return -1; + + return msg_header_add(msg, pub, hh, h); +} + + /**Add string contents to message. * * Duplicate a string containing headers (or a message body, if the string Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_header.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_header.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_header.h Fri Sep 12 12:27:43 2008 @@ -142,6 +142,12 @@ msg_hclass_t *hc, char const *s); +SOFIAPUBFUN int msg_header_add_format(msg_t *msg, + msg_pub_t *pub, + msg_hclass_t *hc, + char const *fmt, + ...); + SOFIAPUBFUN int msg_header_prepend(msg_t *msg, msg_pub_t *pub, msg_header_t **hh,

1 0