February 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7538 - in freeswitch/trunk/src: include mod/applications/mod_conference mod/endpoints/mod_sofia
by Freeswitch SVN 07 Feb '08

07 Feb '08

Author: anthm Date: Wed Feb 6 19:04:14 2008 New Revision: 7538 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: add video update req thingybob Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Wed Feb 6 19:04:14 2008 @@ -436,6 +436,7 @@ SWITCH_MESSAGE_INDICATE_BROADCAST - indicate media broadcast SWITCH_MESSAGE_INDICATE_MEDIA_REDIRECT - indicate media broadcast SWITCH_MESSAGE_INDICATE_DEFLECT - indicate deflect + SWITCH_MESSAGE_INDICATE_VIDEO_REFRESH_REQ - indicate video refresh request </pre> */ typedef enum { @@ -455,7 +456,8 @@ SWITCH_MESSAGE_INDICATE_RESPOND, SWITCH_MESSAGE_INDICATE_BROADCAST, SWITCH_MESSAGE_INDICATE_MEDIA_REDIRECT, - SWITCH_MESSAGE_INDICATE_DEFLECT + SWITCH_MESSAGE_INDICATE_DEFLECT, + SWITCH_MESSAGE_INDICATE_VIDEO_REFRESH_REQ } switch_core_session_message_types_t; 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 Feb 6 19:04:14 2008 @@ -736,7 +736,7 @@ conference_member_t *imember, *last_member = NULL; switch_frame_t *vid_frame; switch_status_t status; - int has_vid = 1; + int has_vid = 1, req_iframe = 0; conference->video_running = 1; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Video thread started for conference %s\n", conference->name); @@ -752,6 +752,7 @@ if (!SWITCH_READ_ACCEPTABLE(status)) { conference->floor_holder = NULL; + req_iframe = 0; continue; } @@ -759,9 +760,23 @@ continue; } + if (!conference->floor_holder) { + req_iframe = 0; + continue; + } + if (conference->floor_holder != last_member) { int iframe = 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 (vid_frame->codec->implementation->ianacode == 34) { /* h.263 */ iframe = (*((int16_t*)vid_frame->data) >> 12 == 6); } else if (vid_frame->codec->implementation->ianacode == 115) { /* h.263-1998 */ @@ -776,6 +791,8 @@ if (!iframe) { continue; } + + req_iframe = 0; } last_member = conference->floor_holder; @@ -1500,7 +1517,8 @@ switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER); switch_mutex_lock(member->conference->member_mutex); if (!member->conference->floor_holder || - !switch_test_flag(member->conference->floor_holder, MFLAG_TALKING) || member->score > member->conference->floor_holder->score) { + !switch_test_flag(member->conference->floor_holder, MFLAG_TALKING) || member->score > + member->conference->floor_holder->score + 200) { if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "floor-change"); 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 Feb 6 19:04:14 2008 @@ -712,6 +712,27 @@ } switch (msg->message_id) { + case SWITCH_MESSAGE_INDICATE_VIDEO_REFRESH_REQ: + { + const char *pl = + "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\r\n" + " <media_control>\r\n" + " <vc_primitive>\r\n" + " <to_encoder>\r\n" + " <picture_fast_update>\r\n" + " </picture_fast_update>\r\n" + " </to_encoder>\r\n" + " </vc_primitive>\r\n" + " </media_control>\r\n"; + + nua_info(tech_pvt->nh, + SIPTAG_CONTENT_TYPE_STR("application/media_control+xml"), + SIPTAG_PAYLOAD_STR(pl), + TAG_END()); + + + } + break; case SWITCH_MESSAGE_INDICATE_BROADCAST: { const char *ip = NULL, *port = NULL; ip = switch_channel_get_variable(channel, SWITCH_REMOTE_MEDIA_IP_VARIABLE);

1 0

[commit] r7537 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 06 Feb '08

06 Feb '08

Author: anthm Date: Wed Feb 6 18:25:18 2008 New Revision: 7537 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: update 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 Feb 6 18:25:18 2008 @@ -841,7 +841,7 @@ break; } switch_mutex_lock(conference->mutex); - ready = total = 0; + ready = has_file_data = total = 0; /* Read one frame of audio from each member channel and save it for redistribution */ for (imember = conference->members; imember; imember = imember->next) { @@ -891,14 +891,12 @@ if (file_sample_len <= 0) { conference->fnode->done++; + } else { + has_file_data = 1; } - } - has_file_data = 1; - ready++; - } else { - has_file_data = 0; + } } - + if (conference->async_fnode) { /* Lead in time */ if (conference->async_fnode->leadin) { @@ -924,13 +922,12 @@ } else { memcpy(file_frame, async_file_frame, file_sample_len * 2); has_file_data = 1; - ready++; } } } } - if (ready) { + if (ready || has_file_data) { int nt = 0; /* Build a muxed frame for every member that contains the mixed audio of everyone else */ for (omember = conference->members; omember; omember = omember->next) {

1 0

[commit] r7536 - freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr
by Freeswitch SVN 06 Feb '08

06 Feb '08

Author: cparker Date: Wed Feb 6 12:18:46 2008 New Revision: 7536 Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Log: Lower non-error messages to DEBUG per MODEVENT-14 in jira Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Wed Feb 6 12:18:46 2008 @@ -133,7 +133,7 @@ char *uuid_str; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] Entering my_on_ring\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "[mod_radius_cdr] Entering my_on_ring\n"); rad_config = my_radius_init(); @@ -285,7 +285,7 @@ } if(rc_acct(rad_config, client_port, send) == OK_RC) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] RADIUS Accounting OK\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "[mod_radius_cdr] RADIUS Accounting OK\n"); retval = SWITCH_STATUS_SUCCESS; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] RADIUS Accounting Failed\n");

1 0

[commit] r7535 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 06 Feb '08

06 Feb '08

Author: anthm Date: Tue Feb 5 20:07:47 2008 New Revision: 7535 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: look for iframes in the video to know when to switch (needs more) 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 5 20:07:47 2008 @@ -737,8 +737,9 @@ switch_frame_t *vid_frame; switch_status_t status; int has_vid = 1; - + conference->video_running = 1; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Video thread started for conference %s\n", conference->name); while (has_vid && conference->video_running == 1 && globals.running && !switch_test_flag(conference, CFLAG_DESTRUCT)) { if (!conference->floor_holder) { @@ -758,6 +759,25 @@ continue; } + if (conference->floor_holder != last_member) { + int iframe = 0; + + if (vid_frame->codec->implementation->ianacode == 34) { /* h.263 */ + iframe = (*((int16_t*)vid_frame->data) >> 12 == 6); + } 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; + } + } + last_member = conference->floor_holder; switch_mutex_lock(conference->member_mutex); @@ -771,7 +791,7 @@ 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; return NULL; @@ -807,8 +827,8 @@ while (globals.running && !switch_test_flag(conference, CFLAG_DESTRUCT)) { switch_size_t file_sample_len = samples; switch_size_t file_data_len = samples * 2; - int has_file_data = 0; - + int has_file_data = 0, members_with_video = 0; + if (conference->perpetual_sound && !conference->async_fnode) { conference_play_file(conference, conference->perpetual_sound, CONF_DEFAULT_LEADIN, NULL, 1); } else if (conference->moh_sound && conference->count == 1 && !conference->async_fnode) { @@ -829,6 +849,10 @@ total++; imember->read = 0; + if (switch_channel_test_flag(switch_core_session_get_channel(imember->session), CF_VIDEO)) { + members_with_video++; + } + switch_clear_flag_locked(imember, MFLAG_HAS_AUDIO); switch_mutex_lock(imember->audio_in_mutex); @@ -841,6 +865,10 @@ switch_mutex_unlock(imember->audio_in_mutex); } + if (members_with_video && conference->video_running != 1) { + launch_conference_video_thread(conference); + } + /* If a file or speech event is being played */ if (conference->fnode) { /* Lead in time */ @@ -1676,11 +1704,6 @@ switch_size_t file_data_len = file_sample_len * 2; - if (switch_channel_test_flag(channel, CF_VIDEO) && member->conference->video_running != 1) { - launch_conference_video_thread(member->conference); - } - - switch_mutex_lock(member->flag_mutex);

1 0

[commit] r7534 - in freeswitch/trunk/src: . mod/applications/mod_dptools
by Freeswitch SVN 06 Feb '08

06 Feb '08

Author: anthm Date: Tue Feb 5 20:05:01 2008 New Revision: 7534 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_core_session.c Log: tweak cause code Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Tue Feb 5 20:05:01 2008 @@ -1352,6 +1352,7 @@ if (switch_xml_locate_user("id", user, domain, NULL, &xml, &x_domain, &x_user, params) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "can't find user [%s@%s]\n", user, domain); + cause = SWITCH_CAUSE_SUBSCRIBER_ABSENT; goto done; } Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Tue Feb 5 20:05:01 2008 @@ -244,9 +244,11 @@ } } - switch_assert(*new_session != NULL); - - if (*new_session) { + if (!*new_session) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "outgoing method for endpoint: [%s] returned: [%s] but there is no new session!\n", + endpoint_name, switch_channel_cause2str(cause)); + return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; + } else { switch_caller_profile_t *profile = NULL, *peer_profile = NULL, *cloned_profile = NULL; switch_event_t *event; switch_channel_t *peer_channel = switch_core_session_get_channel(*new_session);

1 0

[commit] r7533 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 05 Feb '08

05 Feb '08

Author: brian Date: Tue Feb 5 18:53:36 2008 New Revision: 7533 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: Adding extension 9995 to default.xml for delay echo example Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Tue Feb 5 18:53:36 2008 @@ -238,6 +238,13 @@ </condition> </extension> + <extension name="delay_echo"> + <condition field="destination_number" expression="^9995$"> + <action application="answer"/> + <action application="delay_echo" data="5000"/> + </condition> + </extension> + <extension name="echo"> <condition field="destination_number" expression="^9996$"> <action application="answer"/>

1 0

[commit] r7532 - freeswitch/trunk
by Freeswitch SVN 05 Feb '08

05 Feb '08

Author: cypromis Date: Tue Feb 5 17:46:41 2008 New Revision: 7532 Modified: freeswitch/trunk/freeswitch.spec Log: Some more abstractions for freeswtch.spec Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Tue Feb 5 17:46:41 2008 @@ -223,8 +223,8 @@ --with-libcurl \ %endif %endif - --with-openssl - + --with-openssl \ + %{?configure_options} #Create the version header file here cat src/include/switch_version.h.in | sed "s/@SVN_VERSION@/%{version}/g" > src/include/switch_version.h @@ -264,7 +264,9 @@ # Add a freeswitch user with group daemon %pre +%ifos linux /usr/sbin/useradd -r -g daemon -s /bin/false -c "The FreeSWITCH Open Source Voice Platform" -d %{prefix}/var freeswitch 2> /dev/null || : +%endif %post %{?run_ldconfig:%run_ldconfig}

1 0

[commit] r7531 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by Freeswitch SVN 05 Feb '08

05 Feb '08

Author: anthm Date: Tue Feb 5 16:09:52 2008 New Revision: 7531 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_ivr_async.c freeswitch/trunk/src/switch_ivr_bridge.c freeswitch/trunk/src/switch_rtp.c Log: update 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 Tue Feb 5 16:09:52 2008 @@ -1413,16 +1413,18 @@ sofia_glue_check_video_codecs(tech_pvt); if (switch_test_flag(tech_pvt, TFLAG_VIDEO) && tech_pvt->video_rm_encoding) { - flags = (switch_rtp_flag_t) (SWITCH_RTP_FLAG_AUTOADJ | SWITCH_RTP_FLAG_DATAWAIT | SWITCH_RTP_FLAG_NOBLOCK | SWITCH_RTP_FLAG_RAW_WRITE); + flags = (switch_rtp_flag_t) (SWITCH_RTP_FLAG_USE_TIMER | SWITCH_RTP_FLAG_AUTOADJ | + SWITCH_RTP_FLAG_DATAWAIT | SWITCH_RTP_FLAG_NOBLOCK | SWITCH_RTP_FLAG_RAW_WRITE); sofia_glue_tech_set_video_codec(tech_pvt, 0); + /* set video timer to 10ms so it can co-exist with audio */ tech_pvt->video_rtp_session = switch_rtp_new(tech_pvt->local_sdp_audio_ip, tech_pvt->local_sdp_video_port, tech_pvt->remote_sdp_video_ip, tech_pvt->remote_sdp_video_port, tech_pvt->video_agreed_pt, - tech_pvt->video_read_codec.implementation->samples_per_frame, - 0, + 1, + 10000, (switch_rtp_flag_t) flags, NULL, &err, Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Tue Feb 5 16:09:52 2008 @@ -33,6 +33,7 @@ #include <switch.h> +#ifdef SWITCH_VIDEO_IN_THREADS struct echo_helper { switch_core_session_t *session; int up; @@ -54,24 +55,32 @@ break; } + if (switch_test_flag(read_frame, SFF_CNG)) { + continue; + } + switch_core_session_write_video_frame(session, read_frame, -1, 0); } eh->up = 0; return NULL; } +#endif SWITCH_DECLARE(void) switch_ivr_session_echo(switch_core_session_t *session) { switch_status_t status; switch_frame_t *read_frame; - struct echo_helper eh = {0}; switch_channel_t *channel = switch_core_session_get_channel(session); +#ifdef SWITCH_VIDEO_IN_THREADS + struct echo_helper eh = {0}; switch_thread_t *thread; switch_threadattr_t *thd_attr = NULL; +#endif switch_channel_pre_answer(channel); - + +#ifdef SWITCH_VIDEO_IN_THREADS if (switch_channel_test_flag(channel, CF_VIDEO)) { eh.session = session; switch_threadattr_create(&thd_attr, switch_core_session_get_pool(session)); @@ -79,6 +88,7 @@ switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); switch_thread_create(&thread, thd_attr, echo_video_thread, &eh, switch_core_session_get_pool(session)); } +#endif while(switch_channel_ready(channel)) { status = switch_core_session_read_frame(session, &read_frame, -1, 0); @@ -86,13 +96,31 @@ break; } switch_core_session_write_frame(session, read_frame, -1, 0); + +#ifndef SWITCH_VIDEO_IN_THREADS + status = switch_core_session_read_video_frame(session, &read_frame, -1, 0); + + if (!SWITCH_READ_ACCEPTABLE(status)) { + break; + } + + if (switch_test_flag(read_frame, SFF_CNG)) { + continue; + } + + switch_core_session_write_video_frame(session, read_frame, -1, 0); +#endif + } +#ifdef SWITCH_VIDEO_IN_THREADS if (eh.up) { while(eh.up) { switch_yield(1000); } } +#endif + } typedef struct { Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Tue Feb 5 16:09:52 2008 @@ -36,6 +36,7 @@ /* Bridge Related Stuff*/ /*********************************************************************************/ +#ifdef SWITCH_VIDEO_IN_THREADS struct vid_helper { switch_core_session_t *session_a; switch_core_session_t *session_b; @@ -52,7 +53,7 @@ vh->up = 1; while(switch_channel_ready(channel) && vh->up == 1) { status = switch_core_session_read_video_frame(vh->session_a, &read_frame, -1, 0); - + if (!SWITCH_READ_ACCEPTABLE(status)) { break; } @@ -64,7 +65,6 @@ return NULL; } - static void launch_video(struct vid_helper *vh) { switch_thread_t *thread; @@ -75,7 +75,7 @@ switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); switch_thread_create(&thread, thd_attr, video_bridge_thread, vh, switch_core_session_get_pool(vh->session_a)); } - +#endif struct switch_ivr_bridge_data { switch_core_session_t *session; @@ -96,9 +96,12 @@ switch_channel_t *chan_a, *chan_b; switch_frame_t *read_frame; switch_core_session_t *session_a, *session_b; - uint32_t loop_count = 0, vid_launch = 0; + uint32_t loop_count = 0; const char *app_name = NULL, *app_arg = NULL; +#ifdef SWITCH_VIDEO_IN_THREADS struct vid_helper vh = { 0 }; + uint32_t vid_launch = 0; +#endif session_a = data->session; if (!(session_b = switch_core_session_locate(data->b_uuid))) { @@ -157,12 +160,14 @@ continue; } +#ifdef SWITCH_VIDEO_IN_THREADS if (switch_channel_test_flag(chan_a, CF_VIDEO) && switch_channel_test_flag(chan_b, CF_VIDEO) && !vid_launch) { vid_launch++; vh.session_a = session_a; vh.session_b = session_b; launch_video(&vh); } +#endif /* if 1 channel has DTMF pass it to the other */ while (switch_channel_has_dtmf(chan_a)) { @@ -216,6 +221,19 @@ } } +#ifndef SWITCH_VIDEO_IN_THREADS + if (switch_channel_test_flag(chan_a, CF_VIDEO) && switch_channel_test_flag(chan_b, CF_VIDEO)) { + /* read video from 1 channel and write it to the other */ + status = switch_core_session_read_video_frame(session_a, &read_frame, -1, 0); + + if (!SWITCH_READ_ACCEPTABLE(status)) { + break; + } + + switch_core_session_write_video_frame(session_b, read_frame, -1, 0); + } +#endif + /* read audio from 1 channel and write it to the other */ status = switch_core_session_read_frame(session_a, &read_frame, -1, stream_id); @@ -237,6 +255,7 @@ } } +#ifdef SWITCH_VIDEO_IN_THREADS if (vh.up) { vh.up = -1; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Ending video thread.\n"); @@ -244,6 +263,7 @@ switch_yield(100000); } } +#endif if (switch_channel_get_state(chan_b) >= CS_HANGUP) { Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Tue Feb 5 16:09:52 2008 @@ -1040,7 +1040,7 @@ while (switch_rtp_ready(rtp_session)) { bytes = sizeof(rtp_msg_t); status = switch_socket_recvfrom(rtp_session->from_addr, rtp_session->sock, 0, (void *) &rtp_session->recv_msg, &bytes); - + if (!SWITCH_STATUS_IS_BREAK(status) && rtp_session->timer.interval) { switch_core_timer_step(&rtp_session->timer); } @@ -1151,7 +1151,7 @@ } bytes = jb_frame->dlen + rtp_header_len; rtp_session->recv_msg.header.ts = htonl(jb_frame->ts); - } else if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_USE_TIMER)) { /* We're late! We're Late! */ + } else if (!bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_USE_TIMER)) { /* We're late! We're Late! */ uint8_t *data = (uint8_t *) rtp_session->recv_msg.body; if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_NOBLOCK) && status == SWITCH_STATUS_BREAK) {

1 0

[commit] r7530 - freeswitch/trunk/src/mod/codecs/mod_h26x
by Freeswitch SVN 05 Feb '08

05 Feb '08

Author: brian Date: Tue Feb 5 14:04:31 2008 New Revision: 7530 Modified: freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.c Log: add h263 plus video passthru Modified: freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.c Tue Feb 5 14:04:31 2008 @@ -89,6 +89,11 @@ SWITCH_CODEC_TYPE_VIDEO, 34, "H263", NULL, 90000, 90000, 0, 0, 0, 0, 0, 1, 1, 1, switch_h26x_init, switch_h26x_encode, switch_h26x_decode, switch_h26x_destroy); + SWITCH_ADD_CODEC(codec_interface, "H.263+ Video (passthru)"); + switch_core_codec_add_implementation(pool, codec_interface, + SWITCH_CODEC_TYPE_VIDEO, 115, "H263-1998", NULL, 90000, 90000, 0, + 0, 0, 0, 0, 1, 1, 1, + switch_h26x_init, switch_h26x_encode, switch_h26x_decode, switch_h26x_destroy); SWITCH_ADD_CODEC(codec_interface, "H.261 Video (passthru)"); switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_VIDEO, 31, "H261", NULL, 90000, 90000, 0,

1 0

[commit] r7529 - in freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr: . radius
by Freeswitch SVN 05 Feb '08

05 Feb '08

Author: cparker Date: Tue Feb 5 13:00:03 2008 New Revision: 7529 Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.h freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/radius/dictionary Log: Enhancements from MODEVENT-13 Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Tue Feb 5 13:00:03 2008 @@ -182,6 +182,14 @@ profile = switch_channel_get_caller_profile(channel); if(profile) { + if(profile->username) { + if (rc_avpair_add(rad_config, &send, PW_USER_NAME, (void *)profile->username, -1, 0) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding User-Name: %s\n", profile->username); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } + } if(profile->caller_id_number) { if (rc_avpair_add(rad_config, &send, PW_FS_SRC, (void *)profile->caller_id_number, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, @@ -214,6 +222,54 @@ return SWITCH_STATUS_TERM; } } + if(profile->network_addr) { + if (rc_avpair_add(rad_config, &send, PW_FRAMED_IP_ADDRESS, (void *)profile->network_addr, -1, 0) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Framed-IP-Address: %s\n", profile->network_addr); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } + } + if(profile->rdnis) { + if (rc_avpair_add(rad_config, &send, PW_FS_RDNIS, (void *)profile->rdnis, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Freeswitch-RDNIS: %s\n", profile->rdnis); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } + } + if(profile->context) { + if (rc_avpair_add(rad_config, &send, PW_FS_CONTEXT, (void *)profile->context, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Freeswitch-Context: %s\n", profile->context); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } + } + if(profile->ani) { + if (rc_avpair_add(rad_config, &send, PW_FS_ANI, (void *)profile->ani, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Freeswitch-ANI: %s\n", profile->ani); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } + } + if(profile->aniii) { + if (rc_avpair_add(rad_config, &send, PW_FS_ANIII, (void *)profile->aniii, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Freeswitch-ANIII: %s\n", profile->aniii); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } + } + if(profile->source) { + if (rc_avpair_add(rad_config, &send, PW_FS_SOURCE, (void *)profile->source, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Freeswitch-Source: %s\n", profile->source); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } + } if(profile->caller_extension && profile->caller_extension->last_application->application_name) { if (rc_avpair_add(rad_config, &send, PW_FS_LASTAPP, (void *)profile->caller_extension->last_application->application_name, -1, PW_FS_PEC) == NULL) { @@ -330,6 +386,14 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "[mod_radius_cdr] Finished calculating billable time\n"); + if(profile->username) { + if (rc_avpair_add(rad_config, &send, PW_USER_NAME, (void *)profile->username, -1, 0) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding User-Name: %s\n", profile->username); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } + } if(profile->caller_id_number) { if (rc_avpair_add(rad_config, &send, PW_FS_SRC, (void *)profile->caller_id_number, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, @@ -362,6 +426,54 @@ return SWITCH_STATUS_TERM; } } + if(profile->network_addr) { + if (rc_avpair_add(rad_config, &send, PW_FRAMED_IP_ADDRESS, (void *)profile->network_addr, -1, 0) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Framed-IP-Address: %s\n", profile->network_addr); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } + } + if(profile->rdnis) { + if (rc_avpair_add(rad_config, &send, PW_FS_RDNIS, (void *)profile->rdnis, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Freeswitch-RDNIS: %s\n", profile->rdnis); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } + } + if(profile->context) { + if (rc_avpair_add(rad_config, &send, PW_FS_CONTEXT, (void *)profile->context, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Freeswitch-Context: %s\n", profile->context); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } + } + if(profile->ani) { + if (rc_avpair_add(rad_config, &send, PW_FS_ANI, (void *)profile->ani, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Freeswitch-ANI: %s\n", profile->ani); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } + } + if(profile->aniii) { + if (rc_avpair_add(rad_config, &send, PW_FS_ANIII, (void *)profile->aniii, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Freeswitch-ANIII: %s\n", profile->aniii); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } + } + if(profile->source) { + if (rc_avpair_add(rad_config, &send, PW_FS_SOURCE, (void *)profile->source, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Freeswitch-Source: %s\n", profile->source); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } + } if(profile->caller_extension && profile->caller_extension->last_application->application_name) { if (rc_avpair_add(rad_config, &send, PW_FS_LASTAPP, (void *)profile->caller_extension->last_application->application_name, -1, PW_FS_PEC) == NULL) { Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.h ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.h (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.h Tue Feb 5 13:00:03 2008 @@ -51,9 +51,13 @@ #define PW_FS_HANGUPCAUSE 13 #define PW_FS_BILLUSEC 15 #define PW_FS_AMAFLAGS 16 +#define PW_FS_RDNIS 17 +#define PW_FS_CONTEXT 18 +#define PW_FS_SOURCE 19 #define PW_FS_CALLSTARTDATE 20 #define PW_FS_CALLANSWERDATE 21 #define PW_FS_CALLTRANSFERDATE 22 #define PW_FS_CALLENDDATE 23 + #endif Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/radius/dictionary ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/radius/dictionary (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/radius/dictionary Tue Feb 5 13:00:03 2008 @@ -266,10 +266,12 @@ ATTRIBUTE Freeswitch-Lastapp 10 string Freeswitch ATTRIBUTE Freeswitch-Lastdata 11 string Freeswitch ATTRIBUTE Freeswitch-Disposition 12 string Freeswitch -ATTRIBUTE Freeswitch-Hangupcause 13 integer Freeswitch -ATTRIBUTE Freeswitch-Billusec 15 integer Freeswitch -ATTRIBUTE Freeswitch-AMAFlags 16 integer Freeswitch - +ATTRIBUTE Freeswitch-Hangupcause 13 integer Freeswitch +ATTRIBUTE Freeswitch-Billusec 15 integer Freeswitch +ATTRIBUTE Freeswitch-AMAFlags 16 integer Freeswitch +ATTRIBUTE Freeswitch-RDNIS 17 string Freeswitch +ATTRIBUTE Freeswitch-Context 18 string Freeswitch +ATTRIBUTE Freeswitch-Source 19 string Freeswitch ATTRIBUTE Freeswitch-Callstartdate 20 string Freeswitch ATTRIBUTE Freeswitch-Callanswerdate 21 string Freeswitch ATTRIBUTE Freeswitch-Calltransferdate 22 string Freeswitch

1 0