April 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r12921 - in freeswitch/trunk: libs/esl/perl/ESL src
by FreeSWITCH SVN 06 Apr '09

06 Apr '09

Author: mikej Date: Mon Apr 6 14:25:02 2009 New Revision: 12921 Log: fix play_and_get_digits to unset the var if the regex didn't match. and fix ESL/IVR to include the regex Modified: freeswitch/trunk/libs/esl/perl/ESL/IVR.pm freeswitch/trunk/src/switch_ivr_play_say.c Modified: freeswitch/trunk/libs/esl/perl/ESL/IVR.pm ============================================================================== --- freeswitch/trunk/libs/esl/perl/ESL/IVR.pm (original) +++ freeswitch/trunk/libs/esl/perl/ESL/IVR.pm Mon Apr 6 14:25:02 2009 @@ -75,13 +75,13 @@ sub playAndGetDigits($;) { my $self = shift; - my ($min, $max, $tries, $to, $term, $file, $invalid_file, $var) = @_; + my ($min, $max, $tries, $to, $term, $file, $invalid_file, $var, $regex) = @_; if (!$self->{_esl}->connected()) { return undef; } - $self->execute("play_and_get_digits", "$min $max $tries $to $term $file $invalid_file $var"); + $self->execute("play_and_get_digits", "$min $max $tries $to $term $file $invalid_file $var $regex"); return $self->getVar($var); 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 Mon Apr 6 14:25:02 2009 @@ -1561,6 +1561,8 @@ } if (switch_regex_match(digit_buffer, digits_regex) == SWITCH_STATUS_SUCCESS) { return SWITCH_STATUS_SUCCESS; + } else { + switch_channel_set_variable(channel, var_name, NULL); } } }

1 0

[commit] r12920 - freeswitch/trunk/debian
by FreeSWITCH SVN 06 Apr '09

06 Apr '09

Author: mikej Date: Mon Apr 6 14:02:19 2009 New Revision: 12920 Log: build: add python build dependency to debian package build (FSBUILD-145) Modified: freeswitch/trunk/debian/control Modified: freeswitch/trunk/debian/control ============================================================================== --- freeswitch/trunk/debian/control (original) +++ freeswitch/trunk/debian/control Mon Apr 6 14:02:19 2009 @@ -2,7 +2,7 @@ Maintainer: Michal Bielicki <michal.bielicki(a)voiceworks.pl> Section: net Priority: extra -Build-Depends: debhelper (>= 5), fakeroot, wget, automake1.9, autoconf, libtool, unixodbc-dev, libasound2-dev, libcurl3-openssl-dev|libcurl4-openssl-dev, libssl-dev, ncurses-dev, libogg-dev, libvorbis-dev, libperl-dev, libgdbm-dev, libdb-dev, libgnutls-dev, libtiff4-dev +Build-Depends: debhelper (>= 5), fakeroot, wget, automake1.9, autoconf, libtool, unixodbc-dev, libasound2-dev, libcurl3-openssl-dev|libcurl4-openssl-dev, libssl-dev, ncurses-dev, libogg-dev, libvorbis-dev, libperl-dev, libgdbm-dev, libdb-dev, libgnutls-dev, libtiff4-dev, python Standards-Version: 3.7.3 Package: freeswitch

1 0

[commit] r12919 - in freeswitch/trunk/src: include mod/languages/mod_lua
by FreeSWITCH SVN 06 Apr '09

06 Apr '09

Author: mikej Date: Mon Apr 6 13:53:43 2009 New Revision: 12919 Log: mod_lua: fix windows build (FSBUILD-149) Modified: freeswitch/trunk/src/include/switch_platform.h freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.h Modified: freeswitch/trunk/src/include/switch_platform.h ============================================================================== --- freeswitch/trunk/src/include/switch_platform.h (original) +++ freeswitch/trunk/src/include/switch_platform.h Mon Apr 6 13:53:43 2009 @@ -148,10 +148,10 @@ #define SWITCH_MOD_DECLARE(type) type __cdecl #define SWITCH_MOD_DECLARE_DATA #elif defined(MOD_EXPORTS) -#define SWITCH_MOD_DECLARE(type) __declspec(dllexport) type __cdecl +#define SWITCH_MOD_DECLARE(type) __declspec(dllexport) type __stdcall #define SWITCH_MOD_DECLARE_DATA __declspec(dllexport) #else -#define SWITCH_MOD_DECLARE(type) __declspec(dllimport) type __cdecl +#define SWITCH_MOD_DECLARE(type) __declspec(dllimport) type __stdcall #define SWITCH_MOD_DECLARE_DATA __declspec(dllimport) #endif #define SIGHUP SIGTERM Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.h (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.h Mon Apr 6 13:53:43 2009 @@ -23,7 +23,7 @@ Session(char *uuid, CoreSession *a_leg = NULL); Session(switch_core_session_t *session); ~Session(); - virtual void destroy(void); + SWITCH_MOD_DECLARE(virtual void) destroy(void); virtual bool begin_allow_threads(); virtual bool end_allow_threads();

1 0

[commit] r12918 - freeswitch/trunk/src
by FreeSWITCH SVN 06 Apr '09

06 Apr '09

Author: anthm Date: Mon Apr 6 13:34:31 2009 New Revision: 12918 Log: don't answer in this case Modified: freeswitch/trunk/src/switch_ivr_bridge.c Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Mon Apr 6 13:34:31 2009 @@ -324,12 +324,14 @@ if (ans_a != ans_b) { switch_channel_t *un = ans_a ? chan_b : chan_a; - if (switch_channel_answer(un) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Media Establishment Failed.\n", switch_channel_get_name(un)); - goto end_of_bridge_loop; + if (!switch_channel_test_flag(un, CF_OUTBOUND)) { + if (switch_channel_answer(un) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Media Establishment Failed.\n", switch_channel_get_name(un)); + goto end_of_bridge_loop; + } + + if (ans_a) ans_b = 1; else ans_a = 1; } - - if (ans_a) ans_b = 1; else ans_a = 1; }

1 0

[commit] r12917 - freeswitch/trunk/libs/esl/perl/ESL
by FreeSWITCH SVN 06 Apr '09

06 Apr '09

Author: mikej Date: Mon Apr 6 12:39:07 2009 New Revision: 12917 Log: add ESL::IVR::setVar from intralanman Modified: freeswitch/trunk/libs/esl/perl/ESL/IVR.pm Modified: freeswitch/trunk/libs/esl/perl/ESL/IVR.pm ============================================================================== --- freeswitch/trunk/libs/esl/perl/ESL/IVR.pm (original) +++ freeswitch/trunk/libs/esl/perl/ESL/IVR.pm Mon Apr 6 12:39:07 2009 @@ -55,6 +55,24 @@ } +sub setVar($;) { + my $self = shift; + my ($var, $val) = @_; + my $e = $self->api("uuid_setvar", "$self->{_uuid} $var $val"); + my $input; + if ($e) { + $input = $e->getBody() . "\n"; + if ($input eq "_undef_") { + $input = undef; + } + } + + chomp $input; + + return $input; + +} + sub playAndGetDigits($;) { my $self = shift; my ($min, $max, $tries, $to, $term, $file, $invalid_file, $var) = @_;

1 0

[commit] r12916 - in freeswitch/trunk: conf/autoload_configs src/mod/applications/mod_voicemail
by FreeSWITCH SVN 06 Apr '09

06 Apr '09

Author: mrene Date: Mon Apr 6 11:36:33 2009 New Revision: 12916 Log: MODAPP-251 Modified: freeswitch/trunk/conf/autoload_configs/voicemail.conf.xml freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Modified: freeswitch/trunk/conf/autoload_configs/voicemail.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/voicemail.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/voicemail.conf.xml Mon Apr 6 11:36:33 2009 @@ -15,6 +15,7 @@ <param name="callback-context" value="default"/> <param name="play-new-messages-key" value="1"/> <param name="play-saved-messages-key" value="2"/> + <param name="login-keys" value="0"/> <param name="main-menu-key" value="0"/> <param name="config-menu-key" value="5"/> <param name="record-greeting-key" value="1"/> 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 Mon Apr 6 11:36:33 2009 @@ -73,6 +73,7 @@ char play_new_messages_key[2]; char play_saved_messages_key[2]; + char login_keys[16]; char main_menu_key[2]; char skip_greet_key[2]; char config_menu_key[2]; @@ -283,6 +284,7 @@ char *play_new_messages_key = "1"; char *play_saved_messages_key = "2"; + char *login_keys = "0"; char *main_menu_key = "0"; char *skip_greet_key = "#"; char *config_menu_key = "5"; @@ -464,6 +466,8 @@ play_new_messages_key = val; } else if (!strcasecmp(var, "play-saved-messages-key") && !switch_strlen_zero(val)) { play_saved_messages_key = val; + } else if (!strcasecmp(var, "login-keys") && !switch_strlen_zero(val)) { + login_keys = val; } else if (!strcasecmp(var, "main-menu-key") && !switch_strlen_zero(val)) { main_menu_key = val; } else if (!strcasecmp(var, "skip-greet-key") && val && (!*val || is_dtmf(*val))) { @@ -762,6 +766,7 @@ *profile->terminator_key = *terminator_key; *profile->play_new_messages_key = *play_new_messages_key; *profile->play_saved_messages_key = *play_saved_messages_key; + switch_set_string(profile->login_keys, login_keys); *profile->main_menu_key = *main_menu_key; *profile->skip_greet_key = *skip_greet_key; *profile->config_menu_key = *config_menu_key; @@ -2925,7 +2930,7 @@ if (*buf != '\0') { greet_key_press: - if (!strcasecmp(buf, profile->main_menu_key)) { + if (switch_stristr(buf, profile->login_keys)) { voicemail_check_main(session, profile_name, domain_name, id, 0); } else if (!strcasecmp(buf, profile->operator_key) && !switch_strlen_zero(profile->operator_key)) { int argc;

1 0

[commit] r12915 - freeswitch/trunk/src/mod/applications/mod_voicemail
by FreeSWITCH SVN 06 Apr '09

06 Apr '09

Author: anthm Date: Mon Apr 6 10:01:02 2009 New Revision: 12915 Log: MODAPP-250 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c 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 Mon Apr 6 10:01:02 2009 @@ -3176,7 +3176,7 @@ } } - switch_safe_free(id); + switch_safe_free(dup); } if (!strcasecmp(how, "saved")) {

1 0

[commit] r12914 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su
by FreeSWITCH SVN 03 Apr '09

03 Apr '09

Author: mikej Date: Fri Apr 3 18:04:42 2009 New Revision: 12914 Log: libsofiasip: fix buffer overrun (SFSIP-136) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c Fri Apr 3 18:04:42 2009 @@ -212,8 +212,9 @@ #endif #endif +#define SIZEOF_NODE 6 static -void init_node(uint8_t node[6]) +void init_node(uint8_t node[SIZEOF_NODE]) { #if HAVE_GETIFADDRS && HAVE_SOCKADDR_LL struct ifaddrs *ifa, *results; @@ -234,7 +235,7 @@ continue; } - memcpy(node, sll->sll_addr, sizeof node); + memcpy(node, sll->sll_addr, SIZEOF_NODE); break; #endif @@ -247,16 +248,16 @@ } #endif - su_randmem(node, 6); + su_randmem(node, SIZEOF_NODE); node[0] |= 1; /* "multicast" address */ } -static unsigned char node[6]; +static unsigned char node[SIZEOF_NODE]; size_t su_node_identifier(void *address, size_t addrlen) { - if (addrlen > sizeof node) - addrlen = sizeof node; + if (addrlen > SIZEOF_NODE) + addrlen = SIZEOF_NODE; su_guid_generate(NULL); memcpy(address, node, addrlen);

1 0

[commit] r12913 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia
by FreeSWITCH SVN 03 Apr '09

03 Apr '09

Author: anthm Date: Fri Apr 3 16:48:52 2009 New Revision: 12913 Log: add a couple, two tree stats Modified: freeswitch/trunk/src/include/switch_rtp.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/include/switch_rtp.h ============================================================================== --- freeswitch/trunk/src/include/switch_rtp.h (original) +++ freeswitch/trunk/src/include/switch_rtp.h Fri Apr 3 16:48:52 2009 @@ -433,6 +433,8 @@ SWITCH_DECLARE(void) switch_rtp_intentional_bugs(switch_rtp_t *rtp_session, switch_rtp_bug_flag_t bugs); +SWITCH_DECLARE(switch_rtp_stats_t *) switch_rtp_get_stats(switch_rtp_t *rtp_session, switch_memory_pool_t *pool); + /*! \} */ Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Fri Apr 3 16:48:52 2009 @@ -426,6 +426,24 @@ } switch_vad_flag_enum_t; typedef uint32_t switch_vad_flag_t; +typedef struct { + switch_size_t raw_bytes; + switch_size_t media_bytes; + switch_size_t packet_count; + switch_size_t media_packet_count; + switch_size_t skip_packet_count; + switch_size_t jb_packet_count; + switch_size_t dtmf_packet_count; + switch_size_t cng_packet_count; + switch_size_t flush_packet_count; +} switch_rtp_numbers_t; + +typedef struct { + switch_rtp_numbers_t in; + switch_rtp_numbers_t out; +} switch_rtp_stats_t; + + #define SWITCH_RTP_CNG_PAYLOAD 13 /*! 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 Fri Apr 3 16:48:52 2009 @@ -1689,6 +1689,40 @@ } } + +#define add_stat(_i, _s) \ + switch_snprintf(var_name, sizeof(var_name), "rtp_%s_%s", switch_str_nil(prefix), _s) ; \ + switch_snprintf(var_val, sizeof(var_val), "%" SWITCH_SIZE_T_FMT, _i); \ + switch_channel_set_variable(tech_pvt->channel, var_name, var_val) + +static void set_stats(switch_rtp_t *rtp_session, private_object_t *tech_pvt, const char *prefix) +{ + switch_rtp_stats_t *stats = switch_rtp_get_stats(rtp_session, NULL); + char var_name[256] = "", var_val[35] = ""; + + if (stats) { + + add_stat(stats->in.raw_bytes, "in_raw_bytes"); + add_stat(stats->in.media_bytes, "in_media_bytes"); + add_stat(stats->in.packet_count, "in_packet_count"); + add_stat(stats->in.media_packet_count, "in_media_packet_count"); + add_stat(stats->in.skip_packet_count, "in_skip_packet_count"); + add_stat(stats->in.jb_packet_count, "in_jb_packet_count"); + add_stat(stats->in.dtmf_packet_count, "in_dtmf_packet_count"); + add_stat(stats->in.cng_packet_count, "in_cng_packet_count"); + add_stat(stats->in.cng_packet_count, "in_flush_packet_count"); + + add_stat(stats->out.raw_bytes, "out_raw_bytes"); + add_stat(stats->out.media_bytes, "out_media_bytes"); + add_stat(stats->out.packet_count, "out_packet_count"); + add_stat(stats->out.media_packet_count, "out_media_packet_count"); + add_stat(stats->out.skip_packet_count, "out_skip_packet_count"); + add_stat(stats->out.dtmf_packet_count, "out_dtmf_packet_count"); + add_stat(stats->out.cng_packet_count, "out_cng_packet_count"); + + } +} + void sofia_glue_deactivate_rtp(private_object_t *tech_pvt) { int loops = 0; @@ -1700,12 +1734,14 @@ } if (tech_pvt->rtp_session) { + set_stats(tech_pvt->rtp_session, tech_pvt, "audio"); switch_rtp_destroy(&tech_pvt->rtp_session); } else if (tech_pvt->local_sdp_audio_port) { switch_rtp_release_port(tech_pvt->profile->rtpip, tech_pvt->local_sdp_audio_port); } if (tech_pvt->video_rtp_session) { + set_stats(tech_pvt->video_rtp_session, tech_pvt, "video"); switch_rtp_destroy(&tech_pvt->video_rtp_session); } else if (tech_pvt->local_sdp_video_port) { switch_rtp_release_port(tech_pvt->profile->rtpip, tech_pvt->local_sdp_video_port); Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Apr 3 16:48:52 2009 @@ -202,6 +202,7 @@ int from_auto; uint32_t cng_count; switch_rtp_bug_flag_t rtp_bugs; + switch_rtp_stats_t stats; }; static int global_init = 0; @@ -1246,8 +1247,14 @@ rtp_session->dtmf_data.out_digit_packet[3] = (unsigned char) rtp_session->dtmf_data.out_digit_sub_sofar; for (x = 0; x < loops; x++) { - switch_rtp_write_manual(rtp_session, - rtp_session->dtmf_data.out_digit_packet, 4, 0, rtp_session->te, rtp_session->dtmf_data.timestamp_dtmf, &flags); + switch_size_t wrote = switch_rtp_write_manual(rtp_session, + rtp_session->dtmf_data.out_digit_packet, 4, 0, + rtp_session->te, rtp_session->dtmf_data.timestamp_dtmf, &flags); + + rtp_session->stats.out.raw_bytes += wrote; + rtp_session->stats.out.dtmf_packet_count++; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Send %s packet for [%c] ts=%u dur=%d/%d/%d seq=%d\n", loops == 1 ? "middle" : "end", rtp_session->dtmf_data.out_digit, rtp_session->dtmf_data.timestamp_dtmf, @@ -1281,7 +1288,7 @@ if (switch_queue_trypop(rtp_session->dtmf_data.dtmf_queue, &pop) == SWITCH_STATUS_SUCCESS) { switch_dtmf_t *rdigit = pop; int64_t offset; - + switch_size_t wrote; rtp_session->sending_dtmf = 1; memset(rtp_session->dtmf_data.out_digit_packet, 0, 4); @@ -1302,12 +1309,15 @@ rtp_session->dtmf_data.timestamp_dtmf = (uint32_t) (rtp_session->dtmf_data.timestamp_dtmf + offset); } } - - switch_rtp_write_manual(rtp_session, - rtp_session->dtmf_data.out_digit_packet, - 4, - rtp_session->rtp_bugs & RTP_BUG_CISCO_SKIP_MARK_BIT_2833 ? 0 : 1, - rtp_session->te, rtp_session->dtmf_data.timestamp_dtmf, &flags); + + wrote =switch_rtp_write_manual(rtp_session, + rtp_session->dtmf_data.out_digit_packet, + 4, + rtp_session->rtp_bugs & RTP_BUG_CISCO_SKIP_MARK_BIT_2833 ? 0 : 1, + rtp_session->te, rtp_session->dtmf_data.timestamp_dtmf, &flags); + + rtp_session->stats.out.raw_bytes += wrote; + rtp_session->stats.out.dtmf_packet_count++; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Send start packet for [%c] ts=%u dur=%d/%d/%d seq=%d\n", rtp_session->dtmf_data.out_digit, @@ -1350,6 +1360,11 @@ if (switch_rtp_ready(rtp_session)) { bytes = sizeof(rtp_msg_t); status = switch_socket_recvfrom(rtp_session->from_addr, rtp_session->sock_input, 0, (void *) &rtp_session->recv_msg, &bytes); + if (bytes) { + rtp_session->stats.in.raw_bytes += bytes; + rtp_session->stats.in.flush_packet_count++; + rtp_session->stats.in.packet_count++; + } } else { break; } @@ -1376,6 +1391,20 @@ *bytes = sizeof(rtp_msg_t); status = switch_socket_recvfrom(rtp_session->from_addr, rtp_session->sock_input, 0, (void *) &rtp_session->recv_msg, bytes); + if (*bytes) { + rtp_session->stats.in.raw_bytes += *bytes; + if (rtp_session->te && rtp_session->recv_msg.header.pt == rtp_session->te) { + rtp_session->stats.in.dtmf_packet_count++; + } else if (rtp_session->cng_pt && (rtp_session->recv_msg.header.pt == rtp_session->cng_pt || rtp_session->recv_msg.header.pt == 13)) { + rtp_session->stats.in.cng_packet_count++; + } else { + rtp_session->stats.in.media_packet_count++; + rtp_session->stats.in.media_bytes += *bytes; + } + + rtp_session->stats.in.packet_count++; + } + if (rtp_session->jb && rtp_session->recv_msg.header.version == 2 && *bytes) { if (rtp_session->recv_msg.header.m && rtp_session->recv_msg.header.pt != rtp_session->te) { stfu_n_reset(rtp_session->jb); @@ -1391,6 +1420,8 @@ memcpy(rtp_session->recv_msg.body, jb_frame->data, jb_frame->dlen); if (jb_frame->plc) { *flags |= SFF_PLC; + } else { + rtp_session->stats.in.jb_packet_count++; } *bytes = jb_frame->dlen + rtp_header_len; rtp_session->recv_msg.header.ts = htonl(jb_frame->ts); @@ -1741,6 +1772,7 @@ *flags |= SFF_CNG; *payload_type = (switch_payload_t) rtp_session->recv_msg.header.pt; ret = 2 + rtp_header_len; + rtp_session->stats.in.skip_packet_count++; goto end; } @@ -2193,6 +2225,16 @@ goto end; } + rtp_session->stats.out.raw_bytes += bytes; + rtp_session->stats.out.packet_count++; + + if (send_msg->header.pt == rtp_session->cng_pt) { + rtp_session->stats.out.cng_packet_count++; + } else { + rtp_session->stats.out.media_packet_count++; + rtp_session->stats.out.media_bytes += bytes; + } + if (rtp_session->timer.interval) { rtp_session->last_write_samplecount = rtp_session->timer.samplecount; } else { @@ -2303,6 +2345,12 @@ if (switch_socket_sendto(rtp_session->sock_output, rtp_session->remote_addr, 0, frame->packet, &bytes) != SWITCH_STATUS_SUCCESS) { return -1; } + + rtp_session->stats.out.raw_bytes += bytes; + rtp_session->stats.out.media_bytes += bytes; + rtp_session->stats.out.media_packet_count++; + rtp_session->stats.out.packet_count++; + return (int) bytes; } @@ -2318,7 +2366,13 @@ } if (switch_test_flag(frame, SFF_RTP_HEADER)) { - return switch_rtp_write_manual(rtp_session, frame->data, frame->datalen, frame->m, frame->payload, (uint32_t) (frame->timestamp), &frame->flags); + switch_size_t wrote = switch_rtp_write_manual(rtp_session, frame->data, frame->datalen, + frame->m, frame->payload, (uint32_t) (frame->timestamp), &frame->flags); + + rtp_session->stats.out.raw_bytes += wrote; + rtp_session->stats.out.media_bytes += wrote; + rtp_session->stats.out.media_packet_count++; + rtp_session->stats.out.packet_count++; } if (fwd) { @@ -2337,6 +2391,20 @@ return rtp_common_write(rtp_session, send_msg, data, len, payload, ts, &frame->flags); } +SWITCH_DECLARE(switch_rtp_stats_t *) switch_rtp_get_stats(switch_rtp_t *rtp_session, switch_memory_pool_t *pool) +{ + switch_rtp_stats_t *s; + + if (pool) { + s = switch_core_alloc(pool, sizeof(*s)); + *s = rtp_session->stats; + } else { + s = &rtp_session->stats; + } + + return s; +} + SWITCH_DECLARE(int) switch_rtp_write_manual(switch_rtp_t *rtp_session, void *data, uint32_t datalen, uint8_t m, switch_payload_t payload, uint32_t ts, switch_frame_flag_t *flags) {

1 0

[commit] r12912 - in freeswitch/trunk: . build
by FreeSWITCH SVN 03 Apr '09

03 Apr '09

Author: mikej Date: Fri Apr 3 15:38:47 2009 New Revision: 12912 Log: revert r12899 Modified: freeswitch/trunk/bootstrap.sh freeswitch/trunk/build/modmake.rules.in Modified: freeswitch/trunk/bootstrap.sh ============================================================================== --- freeswitch/trunk/bootstrap.sh (original) +++ freeswitch/trunk/bootstrap.sh Fri Apr 3 15:38:47 2009 @@ -87,7 +87,7 @@ # output is multiline from 1.5 onwards # Require libtool 1.4 or newer -libtool=${LIBTOOL:-`${LIBDIR}/apr/build/PrintPath glibtool libtool libtool15 libtool14`} +libtool=`${LIBDIR}/apr/build/PrintPath glibtool libtool libtool15 libtool14` lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` if test -z "$lt_pversion"; then echo "bootstrap: libtool not found." @@ -103,11 +103,8 @@ if test -z "$1"; then a=0 ; else a=$1;fi if test -z "$2"; then b=0 ; else b=$2;fi if test -z "$3"; then c=0 ; else c=$3;fi -lt_major=$a -if test "$a" -eq "2"; then - lt_status="good" -elif test "$a" -lt "2"; then +if test "$a" -lt "2"; then if test "$b" -lt "5" -o "$b" = "5" -a "$c" -lt "14" ; then lt_status="bad" fi @@ -124,43 +121,6 @@ exit 1 fi -# check libtoolize availability -if [ -n "${LIBTOOL}" ]; then - libtoolize=${LIBTOOLIZE:-`dirname "${libtool}"`/libtoolize} -else - libtoolize=${LIBTOOLIZE:-`${LIBDIR}/apr/build/PrintPath glibtoolize libtoolize15 libtoolize14 libtoolize`} -fi -if [ "x$libtoolize" = "x" ]; then - echo "libtoolize not found in path" - exit 1 -fi -if [ ! -x "$libtoolize" ]; then - echo "$libtoolize does not exist or ist not executable" - exit 1 -fi - -# compare libtool and libtoolize version -ltl_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` -ltl_version=`echo $ltl_pversion|sed -e 's/$[a-z]*$$/.\1/'` -IFS=.; set $ltl_version; IFS=' ' - -if [ "x${lt_version}" != "x${ltl_version}" ]; then - echo "$libtool and $libtoolize have different versions" - exit 1 -fi - - -# -# Info output -# -echo "Bootstrapping using:" -echo " autoconf : ${AUTOCONF:-`which autoconf`}" -echo " automake : ${AUTOMAKE:-`which automake`}" -echo " aclocal : ${ACLOCAL:-`which aclocal`}" -echo " libtool : ${libtool} (${lt_version})" -echo " libtoolize: ${libtoolize}" -echo - echo "Entering directory ${LIBDIR}/apr" cd ${LIBDIR}/apr @@ -184,6 +144,13 @@ # bootstrap: Build the support scripts needed to compile from a # checked-out version of the source code. + +libtoolize=`build/PrintPath glibtoolize libtoolize15 libtoolize14 libtoolize` +if [ "x$libtoolize" = "x" ]; then + echo "libtoolize not found in path" + exit 1 +fi + # Create the libtool helper files # # Note: we copy (rather than link) them to simplify distribution. @@ -196,30 +163,21 @@ # and libtool 1.4 by simply rerunning the bootstrap script. (cd build ; rm -f ltconfig ltmain.sh libtool.m4) -if ${libtoolize} -n --install 2>&1 >/dev/null ; then - $libtoolize --force --copy --install -else - $libtoolize --force --copy -fi +$libtoolize --copy --automake if [ -f libtool.m4 ]; then ltfile=`pwd`/libtool.m4 else - if [ $lt_major -eq 2 ]; then - ltfindcmd="`sed -n \"/aclocaldir=/{s/.*=/echo /p;q;}\" < $libtoolize`" - ltfile=${LIBTOOL_M4-`eval "$ltfindcmd"`/libtool.m4} - else - ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \ - < $libtoolize`" - ltfile=${LIBTOOL_M4-`eval "$ltfindcmd"`} - fi + ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \ + < $libtoolize`" + ltfile=${LIBTOOL_M4-`eval "$ltfindcmd"`} # Expecting the code above to be very portable, but just in case... if [ -z "$ltfile" -o ! -f "$ltfile" ]; then ltpath=`dirname $libtoolize` ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4 fi fi - + if [ ! -f $ltfile ]; then echo "$ltfile not found" exit 1 @@ -238,6 +196,19 @@ # Clean up any leftovers rm -f aclocal.m4 libtool.m4 +# +# Generate the autoconf header and ./configure +# +echo "Creating include/arch/unix/apr_private.h.in ..." +${AUTOHEADER:-autoheader} + +echo "Creating configure ..." +### do some work to toss config.cache? +${AUTOCONF:-autoconf} + +# Remove autoconf 2.5x's cache directory +rm -rf autom4te*.cache + # fix for FreeBSD (at least): # libtool.m4 is in share/aclocal, while e.g. aclocal19 only looks in share/aclocal19 # get aclocal's default directory and include the libtool.m4 directory via -I if @@ -249,24 +220,6 @@ ACLOCAL_OPTS="-I `dirname ${ltfile}`" fi -### run aclocal -echo "Re-creating aclocal.m4 ..." -${ACLOCAL:-aclocal} ${ACLOCAL_OPTS} - -### do some work to toss config.cache? -echo "Creating configure ..." -${AUTOCONF:-autoconf} - -# -# Generate the autoconf header -# -echo "Creating include/arch/unix/apr_private.h.in ..." -${AUTOHEADER:-autoheader} - - -# Remove autoconf 2.5x's cache directory -rm -rf autom4te*.cache - echo "Entering directory ${LIBDIR}/apr-util" cd ${LIBDIR}/apr-util ./buildconf @@ -298,11 +251,7 @@ #only run if AC_PROG_LIBTOOL is in configure.in/configure.ac if [ ! -z "${LTTEST}" -o "${LTTEST2}" ] ; then echo "Running libtoolize..." - if ${libtoolize} -n --install 2>&1 >/dev/null ; then - $libtoolize --force --copy --install - else - $libtoolize --force --copy - fi + $libtoolize --force --copy ; fi echo "Creating configure" Modified: freeswitch/trunk/build/modmake.rules.in ============================================================================== --- freeswitch/trunk/build/modmake.rules.in (original) +++ freeswitch/trunk/build/modmake.rules.in Fri Apr 3 15:38:47 2009 @@ -10,7 +10,7 @@ INSTALL=@INSTALL@ GETLIB=@GETLIB@ LIBTOOL=@LIBTOOL@ -LTINSTALL=$(LIBTOOL) --quiet --mode=install $(INSTALL) +LTINSTALL=$(LIBTOOL) --mode=install $(INSTALL) LTUNINSTALL=$(LIBTOOL) --mode=uninstall rm -f CCLD = $(CC) CXXLD = $(CXX) @@ -29,8 +29,7 @@ DYLD_LIBRARY_PATH=@libdir@:$DYLD_LIBRARY_PATH LD_LIBRARY_PATH=@libdir@:$LD_LIBRARY_PATH OSARCH=`uname -s` -DYNAMIC_LIB_EXTEN = la -#DYNAMIC_LIB_EXTEN = @DYNAMIC_LIB_EXTEN@ +DYNAMIC_LIB_EXTEN = @DYNAMIC_LIB_EXTEN@ SOLINK = @SOLINK@ LDFLAGS=@SWITCH_AM_LDFLAGS@ @LDFLAGS@ $(OUR_LDFLAGS) @@ -40,11 +39,11 @@ COMPILE = $(CC) $(ALL_CFLAGS) $(DEFS) LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(COMPILE) -LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(ALL_CFLAGS) $(LDFLAGS) -shared -module -avoid-version -rpath $(MODINSTDIR) -o $@ +LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(ALL_CFLAGS) $(LDFLAGS) -o $@ CXXCOMPILE = $(CXX) $(ALL_CXXFLAGS) $(DEFS) LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXXCOMPILE) -CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(ALL_CXXFLAGS) $(LDFLAGS) -shared -module -avoid-version -rpath $(MODINSTDIR) -o $@ +CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(ALL_CXXFLAGS) $(LDFLAGS) -o $@ CSOURCEFILE=$(MODNAME).c CXXSOURCEFILE=$(MODNAME).cpp @@ -108,14 +107,14 @@ exit 1 ;\ fi -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(LIBS) $(LOCAL_LIBADD) $(OUR_DEPS) $(LOCAL_OBJS) $(OUR_OBJS) $(SOURCEFILE) $(MODNAME).lo +$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(LIBS) $(LOCAL_LIBADD) $(OUR_DEPS) $(LOCAL_OBJS) $(OUR_OBJS) $(SOURCEFILE) $(MODNAME).o @echo Creating $@... @test -d .libs || mkdir .libs @error="";\ if test -f $(CSOURCEFILE); then \ - $(LINK) $(SOLINK) $(MODNAME).lo $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\ + $(LINK) $(SOLINK) $(MODNAME).o $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\ else \ - $(CXXLINK) $(SOLINK) $(MODNAME).lo $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\ + $(CXXLINK) $(SOLINK) $(MODNAME).o $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\ fi; mod_clean:

1 0