May 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r8568 - in freeswitch/trunk/src: . include
by Freeswitch SVN 24 May '08

24 May '08

Author: anthm Date: Fri May 23 21:43:12 2008 New Revision: 8568 Modified: freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr.c Log: update Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Fri May 23 21:43:12 2008 @@ -44,6 +44,8 @@ switch_time_t profile_created; switch_time_t created; switch_time_t answered; + switch_time_t progress; + switch_time_t progress_media; switch_time_t hungup; switch_time_t transferred; struct switch_channel_timetable *next; Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Fri May 23 21:43:12 2008 @@ -1141,6 +1141,8 @@ if (channel->caller_profile && channel->caller_profile->times) { channel->caller_profile->times->transferred = caller_profile->times->profile_created; caller_profile->times->answered = channel->caller_profile->times->answered; + caller_profile->times->progress = channel->caller_profile->times->progress; + caller_profile->times->progress_media = channel->caller_profile->times->progress_media; caller_profile->times->created = channel->caller_profile->times->created; caller_profile->times->hungup = channel->caller_profile->times->hungup; } else { @@ -1373,6 +1375,12 @@ return SWITCH_STATUS_SUCCESS; } + if (channel->caller_profile && channel->caller_profile->times) { + switch_mutex_lock(channel->profile_mutex); + channel->caller_profile->times->progress = switch_timestamp_now(); + switch_mutex_unlock(channel->profile_mutex); + } + return SWITCH_STATUS_FALSE; } @@ -1394,6 +1402,12 @@ switch_event_fire(&event); } + if (channel->caller_profile && channel->caller_profile->times) { + switch_mutex_lock(channel->profile_mutex); + channel->caller_profile->times->progress_media = switch_timestamp_now(); + switch_mutex_unlock(channel->profile_mutex); + } + /* if we're the child of another channel and the other channel is in a blocking read they will never realize we have answered so send a SWITCH_SIG_BREAK to interrupt any blocking reads on that channel */ @@ -1922,10 +1936,10 @@ switch_caller_profile_t *caller_profile, *ocp; switch_app_log_t *app_log, *ap; char *last_app = NULL, *last_arg = NULL; - char start[80] = "", answer[80] = "", end[80] = "", tmp[80] = "", profile_start[80] = ""; + char start[80] = "", answer[80] = "", progress[80] = "", progress_media[80] = "", end[80] = "", tmp[80] = "", profile_start[80] = ""; int32_t duration = 0, legbillsec = 0, billsec = 0, mduration = 0, billmsec = 0, legbillmsec = 0; switch_time_t uduration = 0, legbillusec = 0, billusec = 0; - time_t tt_created = 0, tt_answered = 0, tt_hungup = 0, mtt_created = 0, mtt_answered = 0, mtt_hungup = 0, tt_prof_created, mtt_prof_created; + time_t tt_created = 0, tt_answered = 0, tt_progress = 0, tt_progress_media = 0, tt_hungup = 0, mtt_created = 0, mtt_answered = 0, mtt_hungup = 0, tt_prof_created, mtt_prof_created, mtt_progress = 0 , mtt_progress_media = 0; if (!(caller_profile = switch_channel_get_caller_profile(channel)) || !channel->variables) { return SWITCH_STATUS_FALSE; @@ -1968,6 +1982,18 @@ switch_channel_set_variable(channel, "answer_stamp", answer); } + if (caller_profile->times->progress) { + switch_time_exp_lt(&tm, caller_profile->times->progress); + switch_strftime(progress, &retsize, sizeof(progress), fmt, &tm); + switch_channel_set_variable(channel, "progress_stamp", progress); + } + + if (caller_profile->times->progress_media) { + switch_time_exp_lt(&tm, caller_profile->times->progress_media); + switch_strftime(progress_media, &retsize, sizeof(progress_media), fmt, &tm); + switch_channel_set_variable(channel, "progress_media_stamp", progress_media); + } + switch_time_exp_lt(&tm, caller_profile->times->hungup); switch_strftime(end, &retsize, sizeof(end), fmt, &tm); switch_channel_set_variable(channel, "end_stamp", end); @@ -1993,6 +2019,20 @@ switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->answered); switch_channel_set_variable(channel, "answer_uepoch", tmp); + tt_progress = (time_t) (caller_profile->times->progress / 1000000); + mtt_progress = (time_t) (caller_profile->times->progress / 1000); + switch_snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, tt_progress); + switch_channel_set_variable(channel, "answer_epoch", tmp); + switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->progress); + switch_channel_set_variable(channel, "answer_uepoch", tmp); + + tt_progress_media = (time_t) (caller_profile->times->progress_media / 1000000); + mtt_progress_media = (time_t) (caller_profile->times->progress_media / 1000); + switch_snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, tt_progress_media); + switch_channel_set_variable(channel, "answer_epoch", tmp); + switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->progress_media); + switch_channel_set_variable(channel, "answer_uepoch", tmp); + tt_hungup = (time_t) (caller_profile->times->hungup / 1000000); mtt_hungup = (time_t) (caller_profile->times->hungup / 1000); Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Fri May 23 21:43:12 2008 @@ -1583,6 +1583,19 @@ switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->profile_created); switch_xml_set_txt_d(time_tag, tmp); + if (!(time_tag = switch_xml_add_child_d(x_times, "progress_time", t_off++))) { + goto error; + } + switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->progress); + switch_xml_set_txt_d(time_tag, tmp); + + + if (!(time_tag = switch_xml_add_child_d(x_times, "progress_media_time", t_off++))) { + goto error; + } + switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->progress_media); + switch_xml_set_txt_d(time_tag, tmp); + if (!(time_tag = switch_xml_add_child_d(x_times, "answered_time", t_off++))) { goto error; }

1 0

[commit] r8567 - in freeswitch/trunk: build/config conf/dialplan debian src src/mod/endpoints/mod_sofia
by Freeswitch SVN 24 May '08

24 May '08

Author: anthm Date: Fri May 23 21:27:19 2008 New Revision: 8567 Modified: freeswitch/trunk/build/config/config.sub freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/dialplan/public.xml freeswitch/trunk/debian/files freeswitch/trunk/debian/rules freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_rtp.c Log: update Modified: freeswitch/trunk/build/config/config.sub ============================================================================== --- freeswitch/trunk/build/config/config.sub (original) +++ freeswitch/trunk/build/config/config.sub Fri May 23 21:27:19 2008 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2006-07-02' +timestamp='2008-01-16' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -72,8 +72,8 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -245,12 +245,12 @@ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore \ + | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -276,6 +276,7 @@ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ + | score \ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ @@ -284,7 +285,7 @@ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; @@ -323,7 +324,7 @@ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ @@ -367,11 +368,15 @@ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-*) ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -442,6 +447,14 @@ basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; c90) basic_machine=c90-cray os=-unicos @@ -474,8 +487,8 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16c) - basic_machine=cr16c-unknown + cr16) + basic_machine=cr16-unknown os=-elf ;; crds | unos) @@ -667,6 +680,14 @@ basic_machine=m68k-isi os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -682,6 +703,10 @@ basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -808,6 +833,14 @@ basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; @@ -909,6 +942,10 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -920,6 +957,9 @@ basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -1009,6 +1049,10 @@ basic_machine=tic6x-unknown os=-coff ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; tx39) basic_machine=mipstx39-unknown ;; @@ -1214,7 +1258,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1366,6 +1410,9 @@ # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; spu-*) os=-elf ;; @@ -1406,6 +1453,9 @@ m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri May 23 21:27:19 2008 @@ -9,6 +9,14 @@ <action application="deflect" data="${destination_number}"/> </condition> </extension> + + <extension name="set_bind_leg"> + <condition field="${leg_to_bind}" expression="^$"> + <action application="set" data="leg_to_bind=a"/> + </condition> + </extension> + +  <extension name="tod_example" continue="true"> <condition field="${strftime(%H%M)}" expression="^((09|1[0-7])[0-5][0-9]|1800)$"> @@ -140,6 +148,7 @@ <condition field="destination_number" expression="^(10[01][0-9])$"> <action application="set" data="dialed_ext=$1"/> <action application="export" data="dialed_ext=$1"/> + <action application="export" data="dialed_ext=$1"/> </condition> <condition field="destination_number" expression="^${caller_id_number}$"> <action application="set" data="voicemail_authorized=${sip_authorized}"/> @@ -147,9 +156,9 @@ <action application="sleep" data="1000"/> <action application="voicemail" data="check default $${domain} ${dialed_ext}"/>  - <anti-action application="bind_meta_app" data="1 b s execute_extension::dx XML features"/> - <anti-action application="bind_meta_app" data="2 b s record_session::$${base_dir}/recordings/${caller_id_number}.${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/> - <anti-action application="bind_meta_app" data="3 b s execute_extension::cf XML features"/> + <anti-action application="bind_meta_app" data="1 ${leg_to_bind} s execute_extension::dx XML features"/> + <anti-action application="bind_meta_app" data="2 ${leg_to_bind} s record_session::$${base_dir}/recordings/${caller_id_number}.${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/> + <anti-action application="bind_meta_app" data="3 ${leg_to_bind} s execute_extension::cf XML features"/> <anti-action application="set" data="transfer_ringback=${us-ring}"/> <anti-action application="set" data="call_timeout=30"/>  Modified: freeswitch/trunk/conf/dialplan/public.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/public.xml (original) +++ freeswitch/trunk/conf/dialplan/public.xml Fri May 23 21:27:19 2008 @@ -11,6 +11,7 @@ <extension name="public_extensions"> <condition field="destination_number" expression="^(10[01][0-9])$"> + <action application="set" data="leg_to_bind=b"/> <action application="transfer" data="$1 XML default"/> </condition> </extension> Modified: freeswitch/trunk/debian/files ============================================================================== --- freeswitch/trunk/debian/files (original) +++ freeswitch/trunk/debian/files Fri May 23 21:27:19 2008 @@ -1,10 +1,12 @@ -freeswitch_1.0~rc5-1_i386.deb net extra -freeswitch-spidermonkey_1.0~rc5-1_i386.deb net extra -freeswitch-dev_1.0~rc5-1_i386.deb net extra -freeswitch-codec-passthru-g7231_1.0~rc5-1_i386.deb net extra -freeswitch-codec-passthru-amr_1.0~rc5-1_i386.deb net extra -freeswitch-codec-passthru-g729_1.0~rc5-1_i386.deb net extra -freeswitch-lang-en_1.0~rc5-1_i386.deb net extra -freeswitch-lang-de_1.0~rc5-1_i386.deb net extra -freeswitch-lang-fr_1.0~rc5-1_i386.deb net extra -freeswitch-lang-it_1.0~rc5-1_i386.deb net extra +freeswitch_1.0~rc6-1_i386.deb net extra +freeswitch-dev_1.0~rc6-1_i386.deb net extra +freeswitch-spidermonkey_1.0~rc6-1_i386.deb net extra +freeswitch-perl_1.0~rc6-1_i386.deb net extra +freeswitch-lua_1.0~rc6-1_i386.deb net extra +freeswitch-codec-passthru-g7231_1.0~rc6-1_i386.deb net extra +freeswitch-codec-passthru-amr_1.0~rc6-1_i386.deb net extra +freeswitch-codec-passthru-g729_1.0~rc6-1_i386.deb net extra +freeswitch-lang-en_1.0~rc6-1_i386.deb net extra +freeswitch-lang-de_1.0~rc6-1_i386.deb net extra +freeswitch-lang-fr_1.0~rc6-1_i386.deb net extra +freeswitch-lang-it_1.0~rc6-1_i386.deb net extra Modified: freeswitch/trunk/debian/rules ============================================================================== --- freeswitch/trunk/debian/rules (original) +++ freeswitch/trunk/debian/rules Fri May 23 21:27:19 2008 @@ -71,7 +71,7 @@ dh_testroot rm -f build-stamp - -$(MAKE) clean megaclean + -$(MAKE) update-clean ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub build/config/config.sub endif 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 Fri May 23 21:27:19 2008 @@ -2048,6 +2048,7 @@ goto done; } } + if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE)) && (other_session = switch_core_session_locate(uuid))) { other_channel = switch_core_session_get_channel(other_session); 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 May 23 21:27:19 2008 @@ -522,8 +522,10 @@ switch_port_t sdp_port; char tmp[50]; - if ((!force && (switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MODE) || switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MEDIA))) || tech_pvt->adv_sdp_video_port) { - return SWITCH_STATUS_SUCCESS; + if (!force) { + if (switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MODE) || switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MEDIA) || tech_pvt->local_sdp_video_port) { + return SWITCH_STATUS_SUCCESS; + } } if (tech_pvt->local_sdp_video_port) { @@ -1753,9 +1755,9 @@ sofia_glue_check_video_codecs(tech_pvt); - if (switch_test_flag(tech_pvt, TFLAG_VIDEO) && tech_pvt->video_rm_encoding) { + if (switch_test_flag(tech_pvt, TFLAG_VIDEO) && tech_pvt->video_rm_encoding && tech_pvt->remote_sdp_video_port) { if (!tech_pvt->local_sdp_video_port) { - sofia_glue_tech_choose_video_port(tech_pvt, 0); + sofia_glue_tech_choose_video_port(tech_pvt, 1); } flags = (switch_rtp_flag_t) (SWITCH_RTP_FLAG_USE_TIMER | SWITCH_RTP_FLAG_AUTOADJ | Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri May 23 21:27:19 2008 @@ -765,7 +765,7 @@ } if (!tx_port) { - *err = "Missing local port"; + *err = "Missing remote port"; goto end; }

1 0

[commit] r8564 - freeswitch/trunk/src
by Freeswitch SVN 24 May '08

24 May '08

Author: brian Date: Fri May 23 20:02:18 2008 New Revision: 8564 Modified: freeswitch/trunk/src/switch_ivr_play_say.c Log: fix gentones on_dtmf callback 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 Fri May 23 20:02:18 2008 @@ -589,6 +589,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_gentones(switch_core_session_t *session, char *script, int32_t loops, switch_input_args_t *args) { teletone_generation_session_t ts; + switch_dtmf_t dtmf = {0}; switch_buffer_t *audio_buffer; switch_frame_t *read_frame = NULL; switch_codec_t *read_codec = NULL, write_codec = { 0 }; @@ -624,6 +625,7 @@ } for(;;) { + int done = 0; switch_status_t status; if (!switch_channel_ready(channel)) { @@ -643,8 +645,37 @@ break; } - if (args && (args->read_frame_callback)) { - if (args->read_frame_callback(session, read_frame, args->user_data) != SWITCH_STATUS_SUCCESS) { + if (args && (args->input_callback || args->buf || args->buflen)) { + /* + dtmf handler function you can hook up to be executed when a digit is dialed during gentones + if you return anything but SWITCH_STATUS_SUCCESS the playback will stop. + */ + if (switch_channel_has_dtmf(channel)) { + if (!args->input_callback && !args->buf) { + status = SWITCH_STATUS_BREAK; + done = 1; + break; + } + switch_channel_dequeue_dtmf(channel, &dtmf); + if (args->input_callback) { + status = args->input_callback(session, (void *)&dtmf, SWITCH_INPUT_TYPE_DTMF, args->buf, args->buflen); + } else { + *((char *)args->buf) = dtmf.digit; + status = SWITCH_STATUS_BREAK; + } + } + + if (args->input_callback) { + switch_event_t *event; + + if (switch_core_session_dequeue_event(session, &event) == SWITCH_STATUS_SUCCESS) { + status = args->input_callback(session, event, SWITCH_INPUT_TYPE_EVENT, args->buf, args->buflen); + switch_event_destroy(&event); + } + } + + if (status != SWITCH_STATUS_SUCCESS) { + done = 1; break; } }

1 0

[commit] r8563 - freeswitch/trunk/src
by Freeswitch SVN 23 May '08

23 May '08

Author: anthm Date: Fri May 23 19:53:10 2008 New Revision: 8563 Modified: freeswitch/trunk/src/switch_rtp.c Log: more nat goodies for proxy media mode Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri May 23 19:53:10 2008 @@ -1130,7 +1130,34 @@ goto end; } - if (bytes > 0) { + if (bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOADJ) && switch_sockaddr_get_port(rtp_session->from_addr)) { + const char *tx_host; + const char *old_host; + char bufa[30], bufb[30]; + tx_host = switch_get_addr(bufa, sizeof(bufa), rtp_session->from_addr); + old_host = switch_get_addr(bufb, sizeof(bufb), rtp_session->remote_addr); + if ((switch_sockaddr_get_port(rtp_session->from_addr) != rtp_session->remote_port) || strcmp(tx_host, old_host)) { + const char *err; + uint32_t old = rtp_session->remote_port; + + if (!switch_strlen_zero(tx_host) && switch_sockaddr_get_port(rtp_session->from_addr) > 0) { + if (++rtp_session->autoadj_tally >= 10) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, + "Auto Changing port from %s:%u to %s:%u\n", old_host, old, tx_host, + switch_sockaddr_get_port(rtp_session->from_addr)); + switch_rtp_set_remote_address(rtp_session, tx_host, switch_sockaddr_get_port(rtp_session->from_addr), &err); + } + } + } + } + + if (bytes && rtp_session->autoadj_window) { + if (--rtp_session->autoadj_window == 0) { + switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_AUTOADJ); + } + } + + if (bytes) { rtp_session->missed_count = 0; } @@ -1372,33 +1399,6 @@ goto end; } - if (bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOADJ) && switch_sockaddr_get_port(rtp_session->from_addr)) { - const char *tx_host; - const char *old_host; - char bufa[30], bufb[30]; - tx_host = switch_get_addr(bufa, sizeof(bufa), rtp_session->from_addr); - old_host = switch_get_addr(bufb, sizeof(bufb), rtp_session->remote_addr); - if ((switch_sockaddr_get_port(rtp_session->from_addr) != rtp_session->remote_port) || strcmp(tx_host, old_host)) { - const char *err; - uint32_t old = rtp_session->remote_port; - - if (!switch_strlen_zero(tx_host) && switch_sockaddr_get_port(rtp_session->from_addr) > 0) { - if (++rtp_session->autoadj_tally >= 10) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, - "Auto Changing port from %s:%u to %s:%u\n", old_host, old, tx_host, - switch_sockaddr_get_port(rtp_session->from_addr)); - switch_rtp_set_remote_address(rtp_session, tx_host, switch_sockaddr_get_port(rtp_session->from_addr), &err); - } - } - } - } - - if (rtp_session->autoadj_window) { - if (--rtp_session->autoadj_window == 0) { - switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_AUTOADJ); - } - } - if (bytes && rtp_session->cng_pt && rtp_session->recv_msg.header.pt == rtp_session->cng_pt) { goto do_continue; }

1 0

[commit] r8562 - freeswitch/trunk
by Freeswitch SVN 23 May '08

23 May '08

Author: anthm Date: Fri May 23 19:09:08 2008 New Revision: 8562 Modified: freeswitch/trunk/bootstrap.sh freeswitch/trunk/configure.in Log: don't configure xmlrpc-c anymore (we will merge with ours Modified: freeswitch/trunk/bootstrap.sh ============================================================================== --- freeswitch/trunk/bootstrap.sh (original) +++ freeswitch/trunk/bootstrap.sh Fri May 23 19:09:08 2008 @@ -5,7 +5,7 @@ LIBDIR=${BASEDIR}/libs; SUBDIRS="codec/ilbc curl iksemel voipcodecs \ js js/nsprpub libdingaling libedit libresample libsndfile pcre sofia-sip \ - speex sqlite srtp xmlrpc-c openzap"; + speex sqlite srtp openzap"; if [ ! -f modules.conf ]; then Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Fri May 23 19:09:08 2008 @@ -608,7 +608,6 @@ AC_CONFIG_SUBDIRS(libs/libsndfile) AC_CONFIG_SUBDIRS(libs/sofia-sip) AC_CONFIG_SUBDIRS(libs/speex) -AC_CONFIG_SUBDIRS(libs/xmlrpc-c) AC_CONFIG_SUBDIRS(libs/portaudio) AC_CONFIG_SUBDIRS(libs/openmrcp) AC_CONFIG_SUBDIRS(libs/openzap)

1 0

[commit] r8561 - freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc_transport
by Freeswitch SVN 23 May '08

23 May '08

Author: anthm Date: Fri May 23 18:59:41 2008 New Revision: 8561 Modified: freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc_transport/xmlrpc_transport.c Log: remove GNU_SOURCE from c file (we push from build system instead Modified: freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc_transport/xmlrpc_transport.c ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc_transport/xmlrpc_transport.c (original) +++ freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc_transport/xmlrpc_transport.c Fri May 23 18:59:41 2008 @@ -2,7 +2,7 @@ an XML-RPC call. */ -#define _GNU_SOURCE +//#define _GNU_SOURCE #include <stdlib.h> #include <stdio.h>

1 0

[commit] r8560 - freeswitch/trunk/src/mod/xml_int/mod_xml_rpc
by Freeswitch SVN 23 May '08

23 May '08

Author: anthm Date: Fri May 23 18:59:08 2008 New Revision: 8560 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile Log: update makefile to new lib build Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile Fri May 23 18:59:08 2008 @@ -1,18 +1,78 @@ BASE=../../../.. XMLRPC_DIR=$(BASE)/libs/xmlrpc-c -#XMLRPCLAS = $(XMLRPC_DIR)/src/libxmlrpc.la +LOCAL_OBJS = $(XMLRPC_DIR)/lib/libutil/asprintf.o\ +$(XMLRPC_DIR)/lib/util/casprintf.o\ +$(XMLRPC_DIR)/lib/abyss/src/channel.o\ +$(XMLRPC_DIR)/lib/abyss/src/chanswitch.o\ +$(XMLRPC_DIR)/lib/util/cmdline_parser.o\ +$(XMLRPC_DIR)/lib/abyss/src/conf.o\ +$(XMLRPC_DIR)/lib/abyss/src/conn.o\ +$(XMLRPC_DIR)/lib/abyss/src/data.o\ +$(XMLRPC_DIR)/lib/abyss/src/date.o\ +$(XMLRPC_DIR)/src/double.o\ +$(XMLRPC_DIR)/lib/libutil/error.o\ +$(XMLRPC_DIR)/lib/abyss/src/file.o\ +$(XMLRPC_DIR)/lib/expat/gennmtab/gennmtab.o\ +$(XMLRPC_DIR)/lib/util/getoptx.o\ +$(XMLRPC_DIR)/lib/abyss/src/handler.o\ +$(XMLRPC_DIR)/lib/abyss/src/http.o\ +$(XMLRPC_DIR)/lib/abyss/src/init.o\ +$(XMLRPC_DIR)/lib/libutil/make_printable.o\ +$(XMLRPC_DIR)/lib/libutil/memblock.o\ +$(XMLRPC_DIR)/src/method.o\ +$(XMLRPC_DIR)/src/parse_value.o\ +$(XMLRPC_DIR)/src/registry.o\ +$(XMLRPC_DIR)/src/resource.o\ +$(XMLRPC_DIR)/lib/abyss/src/response.o\ +$(XMLRPC_DIR)/lib/libutil/select.o\ +$(XMLRPC_DIR)/lib/abyss/src/server.o\ +$(XMLRPC_DIR)/lib/abyss/src/session.o\ +$(XMLRPC_DIR)/lib/libutil/sleep.o\ +$(XMLRPC_DIR)/lib/abyss/src/socket.o\ +$(XMLRPC_DIR)/lib/abyss/src/socket_unix.o\ +$(XMLRPC_DIR)/lib/util/string_parser.o\ +$(XMLRPC_DIR)/lib/util/stripcaseeq.o\ +$(XMLRPC_DIR)/src/system_method.o\ +$(XMLRPC_DIR)/lib/abyss/src/thread_pthread.o\ +$(XMLRPC_DIR)/lib/libutil/time.o\ +$(XMLRPC_DIR)/lib/abyss/src/token.o\ +$(XMLRPC_DIR)/src/trace.o\ +$(XMLRPC_DIR)/lib/abyss/src/trace.o\ +$(XMLRPC_DIR)/lib/libutil/utf8.o\ +$(XMLRPC_DIR)/src/version.o\ +$(XMLRPC_DIR)/lib/expat/xmlparse/xmlparse.o\ +$(XMLRPC_DIR)/lib/expat/xmltok/xmlrole.o\ +$(XMLRPC_DIR)/src/xmlrpc_array.o\ +$(XMLRPC_DIR)/src/xmlrpc_authcookie.o\ +$(XMLRPC_DIR)/src/xmlrpc_base64.o\ +$(XMLRPC_DIR)/src/xmlrpc_build.o\ +$(XMLRPC_DIR)/src/xmlrpc_data.o\ +$(XMLRPC_DIR)/src/xmlrpc_datetime.o\ +$(XMLRPC_DIR)/src/xmlrpc_decompose.o\ +$(XMLRPC_DIR)/src/xmlrpc_expat.o\ +$(XMLRPC_DIR)/src/xmlrpc_parse.o\ +$(XMLRPC_DIR)/src/xmlrpc_serialize.o\ +$(XMLRPC_DIR)/src/xmlrpc_server_abyss.o\ +$(XMLRPC_DIR)/src/xmlrpc_server_cgi.o\ +$(XMLRPC_DIR)/src/xmlrpc_string.o\ +$(XMLRPC_DIR)/src/xmlrpc_struct.o\ +$(XMLRPC_DIR)/lib/expat/xmltok/xmltok.o + +#XMLRPCLAS = $(XMLRPC_DIR)/src/libxmlrpc.a #dont ask... -XMLRPCLAS = $(XMLRPC_DIR)/src/*.o -XMLRPCLAS += $(XMLRPC_DIR)/src/libxmlrpc_server.la -XMLRPCLAS += $(XMLRPC_DIR)/src/libxmlrpc_server_abyss.la $(XMLRPC_DIR)/lib/abyss/src/libxmlrpc_abyss.la -XMLRPCLAS += $(XMLRPC_DIR)/lib/expat/xmlparse/libxmlrpc_xmlparse.la $(XMLRPC_DIR)/lib/expat/xmltok/libxmlrpc_xmltok.la +#XMLRPCLAS = $(XMLRPC_DIR)/src/*.o +#XMLRPCLAS += $(XMLRPC_DIR)/src/libxmlrpc_server.so $(XMLRPC_DIR)/src/libxmlrpc.so +#XMLRPCLAS += $(XMLRPC_DIR)/src/libxmlrpc_server_abyss.so $(XMLRPC_DIR)/lib/abyss/src/libxmlrpc_abyss.so +#XMLRPCLAS += $(XMLRPC_DIR)/lib/expat/xmlparse/libxmlrpc_xmlparse.so $(XMLRPC_DIR)/lib/expat/xmltok/libxmlrpc_xmltok.so LOCAL_LIBADD =$(XMLRPCLAS) -LOCAL_CFLAGS=-I$(XMLRPC_DIR)/include +LOCAL_CFLAGS=-w -I$(XMLRPC_DIR)/lib/expat/xmlparse -I$(XMLRPC_DIR)/lib/expat/xmltok -I$(XMLRPC_DIR) -I$(XMLRPC_DIR)/include -I../../../../libs/xmlrpc-c/lib/abyss/src -I../../../../libs/xmlrpc-c/lib/util/include include $(BASE)/build/modmake.rules $(XMLRPCLAS): $(XMLRPC_DIR) $(XMLRPC_DIR)/.update cd $(XMLRPC_DIR) && $(MAKE) $(TOUCH_TARGET) + +

1 0

[commit] r8559 - freeswitch/trunk/libs/xmlrpc-c
by Freeswitch SVN 23 May '08

23 May '08

Author: anthm Date: Fri May 23 18:55:40 2008 New Revision: 8559 Modified: freeswitch/trunk/libs/xmlrpc-c/configure.in Log: not supposed to do that in a conditional Modified: freeswitch/trunk/libs/xmlrpc-c/configure.in ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/configure.in (original) +++ freeswitch/trunk/libs/xmlrpc-c/configure.in Fri May 23 18:55:40 2008 @@ -198,9 +198,7 @@ dnl ======================================================================= AC_PROG_CC -if test x"$enable_cplusplus" != xno; then - AC_PROG_CXX -fi +AC_PROG_CXX dnl =======================================================================

1 0

[commit] r8558 - in freeswitch/trunk/libs/xmlrpc-c: lib/libutil lib/util tools/lib tools/xmlrpc
by Freeswitch SVN 23 May '08

23 May '08

Author: anthm Date: Fri May 23 18:54:19 2008 New Revision: 8558 Modified: freeswitch/trunk/libs/xmlrpc-c/lib/libutil/asprintf.c freeswitch/trunk/libs/xmlrpc-c/lib/libutil/make_printable.c freeswitch/trunk/libs/xmlrpc-c/lib/util/casprintf.c freeswitch/trunk/libs/xmlrpc-c/lib/util/stripcaseeq.c freeswitch/trunk/libs/xmlrpc-c/tools/lib/dumpvalue.c freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc/xmlrpc.c Log: remove GNU_SOURCE from c files, push from build system instead Modified: freeswitch/trunk/libs/xmlrpc-c/lib/libutil/asprintf.c ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/lib/libutil/asprintf.c (original) +++ freeswitch/trunk/libs/xmlrpc-c/lib/libutil/asprintf.c Fri May 23 18:54:19 2008 @@ -1,4 +1,4 @@ -#define _GNU_SOURCE +//#define _GNU_SOURCE #include <stdarg.h> #include <stdio.h> #include <stdlib.h> Modified: freeswitch/trunk/libs/xmlrpc-c/lib/libutil/make_printable.c ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/lib/libutil/make_printable.c (original) +++ freeswitch/trunk/libs/xmlrpc-c/lib/libutil/make_printable.c Fri May 23 18:54:19 2008 @@ -1,4 +1,4 @@ -#define _GNU_SOURCE +//#define _GNU_SOURCE #include <stdarg.h> #include <string.h> Modified: freeswitch/trunk/libs/xmlrpc-c/lib/util/casprintf.c ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/lib/util/casprintf.c (original) +++ freeswitch/trunk/libs/xmlrpc-c/lib/util/casprintf.c Fri May 23 18:54:19 2008 @@ -1,4 +1,4 @@ -#define _GNU_SOURCE +//#define _GNU_SOURCE #include <stdarg.h> #include <stdio.h> #include <stdlib.h> Modified: freeswitch/trunk/libs/xmlrpc-c/lib/util/stripcaseeq.c ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/lib/util/stripcaseeq.c (original) +++ freeswitch/trunk/libs/xmlrpc-c/lib/util/stripcaseeq.c Fri May 23 18:54:19 2008 @@ -1,4 +1,4 @@ -#define _GNU_SOURCE +//#define _GNU_SOURCE #include <ctype.h> #include "bool.h" Modified: freeswitch/trunk/libs/xmlrpc-c/tools/lib/dumpvalue.c ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/tools/lib/dumpvalue.c (original) +++ freeswitch/trunk/libs/xmlrpc-c/tools/lib/dumpvalue.c Fri May 23 18:54:19 2008 @@ -5,7 +5,7 @@ used for debugging purposes in other places. */ -#define _GNU_SOURCE +//#define _GNU_SOURCE #include <stdlib.h> #include <stdio.h> Modified: freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc/xmlrpc.c ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc/xmlrpc.c (original) +++ freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc/xmlrpc.c Fri May 23 18:54:19 2008 @@ -35,7 +35,7 @@ */ -#define _GNU_SOURCE +//#define _GNU_SOURCE #include <stdlib.h> #include <stdio.h>

1 0

[commit] r8557 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 23 May '08

23 May '08

Author: anthm Date: Fri May 23 18:30:50 2008 New Revision: 8557 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: fix 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 May 23 18:30:50 2008 @@ -767,27 +767,29 @@ tech_pvt->remote_sdp_video_ip = switch_core_session_strdup(tech_pvt->session, rip); tech_pvt->remote_sdp_video_port = (switch_port_t) atoi(rvp); } - - if (!strcmp(tech_pvt->remote_sdp_video_ip, rip) && atoi(rvp) == tech_pvt->remote_sdp_video_port) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Remote video address:port [%s:%d] has not changed.\n", - tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port); - } else { - switch_set_flag_locked(tech_pvt, TFLAG_VIDEO); - switch_channel_set_flag(tech_pvt->channel, CF_VIDEO); - if (switch_rtp_ready(tech_pvt->video_rtp_session)) { - if (switch_rtp_set_remote_address(tech_pvt->video_rtp_session, tech_pvt->remote_sdp_video_ip, tech_pvt->remote_sdp_video_port, &err) != - SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "VIDEO RTP REPORTS ERROR: [%s]\n", err); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "VIDEO RTP CHANGING DEST TO: [%s:%d]\n", - tech_pvt->remote_sdp_video_ip, tech_pvt->remote_sdp_video_port); - /* Reactivate the NAT buster flag. */ - switch_rtp_set_flag(tech_pvt->video_rtp_session, SWITCH_RTP_FLAG_AUTOADJ); + + if (tech_pvt->remote_sdp_video_ip && tech_pvt->remote_sdp_video_port) { + if (!strcmp(tech_pvt->remote_sdp_video_ip, rip) && atoi(rvp) == tech_pvt->remote_sdp_video_port) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Remote video address:port [%s:%d] has not changed.\n", + tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port); + } else { + switch_set_flag_locked(tech_pvt, TFLAG_VIDEO); + switch_channel_set_flag(tech_pvt->channel, CF_VIDEO); + if (switch_rtp_ready(tech_pvt->video_rtp_session)) { + if (switch_rtp_set_remote_address(tech_pvt->video_rtp_session, tech_pvt->remote_sdp_video_ip, tech_pvt->remote_sdp_video_port, &err) != + SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "VIDEO RTP REPORTS ERROR: [%s]\n", err); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "VIDEO RTP CHANGING DEST TO: [%s:%d]\n", + tech_pvt->remote_sdp_video_ip, tech_pvt->remote_sdp_video_port); + /* Reactivate the NAT buster flag. */ + switch_rtp_set_flag(tech_pvt->video_rtp_session, SWITCH_RTP_FLAG_AUTOADJ); + } } } } - if (!strcmp(tech_pvt->remote_sdp_audio_ip, rip) && atoi(rp) == tech_pvt->remote_sdp_audio_port) { + if (tech_pvt->remote_sdp_audio_ip && !strcmp(tech_pvt->remote_sdp_audio_ip, rip) && atoi(rp) == tech_pvt->remote_sdp_audio_port) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Remote address:port [%s:%d] has not changed.\n", tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port); return SWITCH_STATUS_SUCCESS;

1 0