- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r10583 - freeswitch/trunk/src/mod/xml_int/mod_xml_curl
by FreeSWITCH SVN 03 Dec '08

03 Dec '08

Author: anthm Date: Wed Dec 3 15:12:55 2008 New Revision: 10583 Log: update Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Wed Dec 3 15:12:55 2008 @@ -155,7 +155,7 @@ switch_assert(data); if (binding->use_dynamic_url) { - switch_event_add_header_string(params, SWITCH_STACK_TOP, "hostname", switch_str_nil(hostname)); + switch_event_add_header_string(params, SWITCH_STACK_TOP, "hostname", hostname); switch_event_add_header_string(params, SWITCH_STACK_TOP, "section", switch_str_nil(section)); switch_event_add_header_string(params, SWITCH_STACK_TOP, "tag_name", switch_str_nil(tag_name)); switch_event_add_header_string(params, SWITCH_STACK_TOP, "key_name", switch_str_nil(key_name));

1 0

[commit] r10582 - in freeswitch/trunk/src/mod: endpoints/mod_sofia event_handlers/mod_cdr_csv
by FreeSWITCH SVN 03 Dec '08

03 Dec '08

Author: anthm Date: Wed Dec 3 15:10:54 2008 New Revision: 10582 Log: misc fixes Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Wed Dec 3 15:10:54 2008 @@ -1819,7 +1819,7 @@ tech_pvt->remote_sdp_audio_port, tech_pvt->agreed_pt, tech_pvt->read_codec.implementation->microseconds_per_packet / 1000); } - switch_snprintf(tmp, sizeof(tmp), "%d", tech_pvt->remote_sdp_audio_port); + switch_snprintf(tmp, sizeof(tmp), "%d", tech_pvt->local_sdp_audio_port); switch_channel_set_variable(tech_pvt->channel, SWITCH_LOCAL_MEDIA_IP_VARIABLE, tech_pvt->adv_sdp_audio_ip); switch_channel_set_variable(tech_pvt->channel, SWITCH_LOCAL_MEDIA_PORT_VARIABLE, tmp); Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Wed Dec 3 15:10:54 2008 @@ -199,7 +199,7 @@ if (globals.debug) { switch_event_t *event; - if (switch_event_create(&event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) { + if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_DATA) == SWITCH_STATUS_SUCCESS) { char *buf; switch_channel_event_set_data(channel, event); switch_event_serialize(event, &buf, SWITCH_FALSE);

1 0

[commit] r10581 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 03 Dec '08

03 Dec '08

Author: anthm Date: Wed Dec 3 14:55:05 2008 New Revision: 10581 Log: doh Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 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 Wed Dec 3 14:55:05 2008 @@ -2546,6 +2546,7 @@ case nua_callstate_ready: case nua_callstate_completed: case nua_callstate_received: + case nua_callstate_proceeding: if (!(session && channel && tech_pvt)) goto done; break; default:

1 0

[commit] r10580 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by FreeSWITCH SVN 03 Dec '08

03 Dec '08

Author: anthm Date: Wed Dec 3 14:25:49 2008 New Revision: 10580 Log: tweak codec ptime bs Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_core_io.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Dec 3 14:25:49 2008 @@ -722,8 +722,6 @@ tech_pvt->mismatch_count++; } - tech_pvt->last_codec_ms = codec_ms; - if (tech_pvt->mismatch_count > MAX_MISMATCH_FRAMES) { if (switch_rtp_ready(tech_pvt->rtp_session) && codec_ms != tech_pvt->codec_ms) { const char *val; Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Wed Dec 3 14:25:49 2008 @@ -610,7 +610,7 @@ if ((session->write_codec && frame->codec && session->write_codec->implementation != frame->codec->implementation)) { if (session->write_codec->implementation->codec_id == frame->codec->implementation->codec_id) { ptime_mismatch = TRUE; - if (!need_codec) { + if (switch_test_flag(frame->codec, SWITCH_CODEC_FLAG_PASSTHROUGH) || switch_test_flag(session->read_codec, SWITCH_CODEC_FLAG_PASSTHROUGH)) { status = perform_write(session, frame, flags, stream_id); goto error; }

1 0

[commit] r10579 - freeswitch/trunk/libs/spandsp/src
by FreeSWITCH SVN 03 Dec '08

03 Dec '08

Author: mikej Date: Wed Dec 3 13:39:05 2008 New Revision: 10579 Log: fix spandsp osx build Modified: freeswitch/trunk/libs/spandsp/src/t31.c freeswitch/trunk/libs/spandsp/src/t38_terminal.c Modified: freeswitch/trunk/libs/spandsp/src/t31.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/t31.c (original) +++ freeswitch/trunk/libs/spandsp/src/t31.c Wed Dec 3 13:39:05 2008 @@ -42,7 +42,6 @@ #include <memory.h> #include <string.h> #include <ctype.h> -#include <malloc.h> #include "floating_fudge.h" #if defined(HAVE_TGMATH_H) #include <tgmath.h> Modified: freeswitch/trunk/libs/spandsp/src/t38_terminal.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/t38_terminal.c (original) +++ freeswitch/trunk/libs/spandsp/src/t38_terminal.c Wed Dec 3 13:39:05 2008 @@ -37,7 +37,6 @@ #include <fcntl.h> #include <time.h> #include <string.h> -#include <malloc.h> #include "floating_fudge.h" #if defined(HAVE_TGMATH_H) #include <tgmath.h>

1 0

[commit] r10578 - freeswitch/trunk/src/mod/applications/mod_fax
by FreeSWITCH SVN 03 Dec '08

03 Dec '08

Author: mikej Date: Wed Dec 3 13:38:14 2008 New Revision: 10578 Log: fix spandsp install Modified: freeswitch/trunk/src/mod/applications/mod_fax/Makefile Modified: freeswitch/trunk/src/mod/applications/mod_fax/Makefile ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fax/Makefile (original) +++ freeswitch/trunk/src/mod/applications/mod_fax/Makefile Wed Dec 3 13:38:14 2008 @@ -11,3 +11,11 @@ $(SPANDSP_LA): $(SPANDSP_DIR) $(SPANDSP_DIR)/.update cd $(SPANDSP_DIR) && $(MAKE) $(TOUCH_TARGET) + + +depend_install: $(DESTDIR)$(libdir)/libspandsp.la + +$(DESTDIR)$(libdir)/libspandsp.la: $(SPANDSP_LA) + cd $(SPANDSP_DIR) && $(MAKE) install + +

1 0

[commit] r10576 - freeswitch/trunk/src/mod/applications/mod_conference
by FreeSWITCH SVN 03 Dec '08

03 Dec '08

Author: anthm Date: Wed Dec 3 12:30:56 2008 New Revision: 10576 Log: runaway thread when floor holder has no video and other people do have video Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c 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 Wed Dec 3 12:30:56 2008 @@ -788,64 +788,68 @@ continue; } - if (switch_channel_test_flag(switch_core_session_get_channel(conference->floor_holder->session), CF_VIDEO)) { - status = switch_core_session_read_video_frame(conference->floor_holder->session, &vid_frame, SWITCH_IO_FLAG_NONE, 0); - if (!SWITCH_READ_ACCEPTABLE(status)) { - conference->floor_holder = NULL; - req_iframe = 0; - continue; - } + if (!switch_channel_test_flag(switch_core_session_get_channel(conference->floor_holder->session), CF_VIDEO)) { + switch_cond_next(); + continue; + } - if (switch_test_flag(vid_frame, SFF_CNG)) { - continue; - } + status = switch_core_session_read_video_frame(conference->floor_holder->session, &vid_frame, SWITCH_IO_FLAG_NONE, 0); + if (!SWITCH_READ_ACCEPTABLE(status)) { + conference->floor_holder = NULL; + req_iframe = 0; + continue; + } + + if (switch_test_flag(vid_frame, SFF_CNG)) { + continue; + } - if (conference->floor_holder != last_member) { - int iframe = 0; + if (conference->floor_holder != last_member) { + int iframe = 0; #if 0 - switch_core_session_message_t msg = { 0 }; + switch_core_session_message_t msg = { 0 }; - if (!req_iframe) { - /* Tell the channel to request a fresh vid frame */ - msg.from = __FILE__; - msg.message_id = SWITCH_MESSAGE_INDICATE_VIDEO_REFRESH_REQ; - switch_core_session_receive_message(conference->floor_holder->session, &msg); - req_iframe = 1; - } + if (!req_iframe) { + /* Tell the channel to request a fresh vid frame */ + msg.from = __FILE__; + msg.message_id = SWITCH_MESSAGE_INDICATE_VIDEO_REFRESH_REQ; + switch_core_session_receive_message(conference->floor_holder->session, &msg); + req_iframe = 1; + } #endif - if (vid_frame->codec->implementation->ianacode == 34) { /* h.263 */ - //iframe = (*((int16_t *) vid_frame->data) >> 12 == 6); - iframe = 1; - } else if (vid_frame->codec->implementation->ianacode == 115) { /* h.263-1998 */ - int y = *((int8_t *) vid_frame->data + 2) & 0xfe; - iframe = (y == 0x80 || y == 0x82); - } else if (vid_frame->codec->implementation->ianacode == 99) { /* h.264 */ - iframe = (*((int16_t *) vid_frame->data) >> 5 == 0x11); - } else { /* we need more defs */ - iframe = 1; - } - - if (!iframe) { - continue; - } + if (vid_frame->codec->implementation->ianacode == 34) { /* h.263 */ + //iframe = (*((int16_t *) vid_frame->data) >> 12 == 6); + iframe = 1; + } else if (vid_frame->codec->implementation->ianacode == 115) { /* h.263-1998 */ + int y = *((int8_t *) vid_frame->data + 2) & 0xfe; + iframe = (y == 0x80 || y == 0x82); + } else if (vid_frame->codec->implementation->ianacode == 99) { /* h.264 */ + iframe = (*((int16_t *) vid_frame->data) >> 5 == 0x11); + } else { /* we need more defs */ + iframe = 1; + } - req_iframe = 0; + if (!iframe) { + continue; } - last_member = conference->floor_holder; + req_iframe = 0; + } - switch_mutex_lock(conference->member_mutex); - has_vid = 0; - for (imember = conference->members; imember; imember = imember->next) { - if (switch_channel_test_flag(switch_core_session_get_channel(imember->session), CF_VIDEO)) { - has_vid++; - switch_core_session_write_video_frame(imember->session, vid_frame, SWITCH_IO_FLAG_NONE, 0); - } + last_member = conference->floor_holder; + + switch_mutex_lock(conference->member_mutex); + has_vid = 0; + for (imember = conference->members; imember; imember = imember->next) { + if (switch_channel_test_flag(switch_core_session_get_channel(imember->session), CF_VIDEO)) { + has_vid++; + switch_core_session_write_video_frame(imember->session, vid_frame, SWITCH_IO_FLAG_NONE, 0); } - switch_mutex_unlock(conference->member_mutex); } + switch_mutex_unlock(conference->member_mutex); + } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Video thread ending for conference %s\n", conference->name); conference->video_running = 0;

1 0

[commit] r10573 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 03 Dec '08

03 Dec '08

Author: anthm Date: Wed Dec 3 12:13:02 2008 New Revision: 10573 Log: log ip and port you get reply to invite from Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 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 Wed Dec 3 12:13:02 2008 @@ -2258,9 +2258,23 @@ const char *uuid; switch_core_session_t *other_session; private_object_t *tech_pvt = switch_core_session_get_private(session); + su_addrinfo_t *my_addrinfo = msg_addrinfo(nua_current_request(nua)); + char network_ip[80]; + int network_port = 0; + switch_caller_profile_t *caller_profile = NULL; - switch_channel_clear_flag(channel, CF_REQ_MEDIA); + get_addr(network_ip, sizeof(network_ip), my_addrinfo->ai_addr, my_addrinfo->ai_addrlen); + network_port = ntohs(((struct sockaddr_in *) msg_addrinfo(nua_current_request(nua))->ai_addr)->sin_port); + + switch_channel_set_variable(channel, "sip_reply_host", network_ip); + switch_channel_set_variable_printf(channel, "sip_reply_port", "%d", network_port); + + if ((caller_profile = switch_channel_get_caller_profile(channel))) { + caller_profile->network_addr = switch_core_strdup(caller_profile->pool, network_ip); + } + switch_channel_clear_flag(channel, CF_REQ_MEDIA); + if ((status == 180 || status == 183 || status == 200)) { if (sip->sip_user_agent && sip->sip_user_agent->g_string) { switch_channel_set_variable(channel, "sip_user_agent", sip->sip_user_agent->g_string);

1 0

[commit] r10572 - freeswitch/trunk/src
by FreeSWITCH SVN 03 Dec '08

03 Dec '08

Author: anthm Date: Wed Dec 3 11:52:58 2008 New Revision: 10572 Log: update Modified: freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Wed Dec 3 11:52:58 2008 @@ -1001,18 +1001,22 @@ SWITCH_DECLARE(void) switch_rtp_break(switch_rtp_t *rtp_session) { - switch_assert(rtp_session != NULL); + if (!switch_rtp_ready(rtp_session)) { + return; + } + switch_mutex_lock(rtp_session->flag_mutex); switch_set_flag(rtp_session, SWITCH_RTP_FLAG_BREAK); + + if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_NOBLOCK)) { + switch_mutex_unlock(rtp_session->flag_mutex); + return; + } if (rtp_session->sock_input) { - char o[4] = "DOH"; - switch_size_t len; - - len = sizeof(o); - switch_socket_sendto(rtp_session->sock_input, rtp_session->local_addr, 0, (void *) o, &len); - len = sizeof(o); - switch_socket_sendto(rtp_session->sock_input, rtp_session->local_addr, 0, (void *) o, &len); + uint32_t o = UINT_MAX; + switch_size_t len = sizeof(o); + switch_socket_sendto(rtp_session->sock_input, rtp_session->local_addr, 0, (void *) &o, &len); } switch_mutex_unlock(rtp_session->flag_mutex); } @@ -1265,7 +1269,9 @@ SWITCH_DECLARE(void) rtp_flush_read_buffer(switch_rtp_t *rtp_session) { - switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_FLUSH); + if (switch_rtp_ready(rtp_session) && !switch_test_flag(rtp_session, SWITCH_RTP_FLAG_PROXY_MEDIA)) { + switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_FLUSH); + } } static void do_flush(switch_rtp_t *rtp_session) @@ -1346,7 +1352,7 @@ if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_FLUSH)) { do_flush(rtp_session); switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_FLUSH); - continue; + bytes = 0; } if (rtp_session->max_missed_packets) { @@ -1359,8 +1365,8 @@ } check = !bytes; - - if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BREAK)) { + + if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BREAK) || (bytes && bytes == 4 && *((int *)&rtp_session->recv_msg) == UINT_MAX)) { switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_BREAK); do_2833(rtp_session); rtp_flush_read_buffer(rtp_session);

1 0

[commit] r10571 - freeswitch/trunk/src/mod/xml_int/mod_xml_curl
by FreeSWITCH SVN 03 Dec '08

03 Dec '08

Author: mikej Date: Wed Dec 3 11:16:49 2008 New Revision: 10571 Log: cleanup Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Wed Dec 3 11:16:49 2008 @@ -153,26 +153,19 @@ data = switch_event_build_param_string(params, basic_data, binding->vars_map); switch_assert(data); + if (binding->use_dynamic_url) { - switch_status_t ok; - - do { - ok = switch_event_add_header_string(params, SWITCH_STACK_TOP, "hostname", switch_str_nil(hostname)); - if (ok != SWITCH_STATUS_SUCCESS) break; - ok = switch_event_add_header_string(params, SWITCH_STACK_TOP, "section", switch_str_nil(section)); - if (ok != SWITCH_STATUS_SUCCESS) break; - ok = switch_event_add_header_string(params, SWITCH_STACK_TOP, "tag_name", switch_str_nil(tag_name)); - if (ok != SWITCH_STATUS_SUCCESS) break; - ok = switch_event_add_header_string(params, SWITCH_STACK_TOP, "key_name", switch_str_nil(key_name)); - if (ok != SWITCH_STATUS_SUCCESS) break; - ok = switch_event_add_header_string(params, SWITCH_STACK_TOP, "key_value", switch_str_nil(key_value)); - } while (0); - switch_assert(ok == SWITCH_STATUS_SUCCESS); + switch_event_add_header_string(params, SWITCH_STACK_TOP, "hostname", switch_str_nil(hostname)); + switch_event_add_header_string(params, SWITCH_STACK_TOP, "section", switch_str_nil(section)); + switch_event_add_header_string(params, SWITCH_STACK_TOP, "tag_name", switch_str_nil(tag_name)); + switch_event_add_header_string(params, SWITCH_STACK_TOP, "key_name", switch_str_nil(key_name)); + switch_event_add_header_string(params, SWITCH_STACK_TOP, "key_value", switch_str_nil(key_value)); dynamic_url = switch_event_expand_headers(params, binding->url); switch_assert(dynamic_url); } else { dynamic_url = binding->url; } + if (binding->use_get_style == 1) { uri = malloc(strlen(data) + strlen(dynamic_url) + 16); switch_assert(uri);

1 0