March 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r7940 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by Freeswitch SVN 20 Mar '08

20 Mar '08

Author: anthm Date: Wed Mar 19 20:32:28 2008 New Revision: 7940 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: signal_lock sux on gtalk Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Wed Mar 19 20:32:28 2008 @@ -2538,8 +2538,6 @@ if ((session = ldl_session_get_private(dlsession))) { - - switch_core_session_signal_lock(session); tech_pvt = switch_core_session_get_private(session); switch_assert(tech_pvt != NULL); @@ -2561,7 +2559,6 @@ } if ((session = switch_core_session_request(dingaling_endpoint_interface, NULL)) != 0) { switch_core_session_add_stream(session, NULL); - switch_core_session_signal_lock(session); if ((tech_pvt = (struct private_object *) switch_core_session_alloc(session, sizeof(struct private_object))) != 0) { char *exten; @@ -2946,11 +2943,9 @@ break; } + done: - if (session) { - switch_core_session_signal_unlock(session); - } return status; }

1 0

[commit] r7939 - in freeswitch/trunk/src/mod: applications/mod_fifo endpoints/mod_iax endpoints/mod_sofia
by Freeswitch SVN 20 Mar '08

20 Mar '08

Author: mikej Date: Wed Mar 19 20:27:04 2008 New Revision: 7939 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.vcproj freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: build tweaks. Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Wed Mar 19 20:27:04 2008 @@ -326,7 +326,7 @@ return; } else if (!strcasecmp(argv[1], "out")) { - void *pop; + void *pop = NULL; switch_frame_t *read_frame; switch_status_t status; char *uuid; Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Wed Mar 19 20:27:04 2008 @@ -559,16 +559,14 @@ static switch_status_t channel_waitfor_read(switch_core_session_t *session, int ms, int stream_id) { - private_t *tech_pvt = switch_core_session_get_private(session); - switch_assert(tech_pvt != NULL); + assert(switch_core_session_get_private(session)); return SWITCH_STATUS_SUCCESS; } static switch_status_t channel_waitfor_write(switch_core_session_t *session, int ms, int stream_id) { - private_t *tech_pvt = switch_core_session_get_private(session); - switch_assert(tech_pvt != NULL); + assert(switch_core_session_get_private(session)); return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.vcproj ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.vcproj (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.vcproj Wed Mar 19 20:27:04 2008 @@ -105,6 +105,7 @@ /> <Tool Name="VCCLCompilerTool" + Optimization="0" AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\su";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nua";"$(InputDir)..\..\..\..\libs\sofia-sip\win32";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\url";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\sip";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\msg";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\sdp";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nta";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nea";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\soa";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\iptsec";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\bnf";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\tport"" PreprocessorDefinitions="LIBSOFIA_SIP_UA_STATIC;PTW32_STATIC_LIB" UsePrecompiledHeader="0" Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Wed Mar 19 20:27:04 2008 @@ -2288,11 +2288,9 @@ if (session) { /* Get the channel */ switch_channel_t *channel = switch_core_session_get_channel(session); - /* make sure we have our privates */ - struct private_object *tech_pvt = switch_core_session_get_private(session); - - /* Barf if we didn't get it */ - switch_assert(tech_pvt != NULL); + + /* Barf if we didn't get our private */ + assert(switch_core_session_get_private(session)); if (sip && sip->sip_content_type && sip->sip_content_type->c_type && sip->sip_content_type->c_subtype && sip->sip_payload && sip->sip_payload->pl_data) {

1 0

[commit] r7938 - freeswitch/trunk/src
by Freeswitch SVN 19 Mar '08

19 Mar '08

Author: anthm Date: Wed Mar 19 18:52:16 2008 New Revision: 7938 Modified: freeswitch/trunk/src/switch_ivr_bridge.c Log: running out of bugs to fix Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Wed Mar 19 18:52:16 2008 @@ -157,10 +157,15 @@ msg.message_id = SWITCH_MESSAGE_INDICATE_BRIDGE; switch_core_session_receive_message(session_a, &msg); switch_channel_clear_flag(chan_b, CF_SUSPEND); + switch_core_session_kill_channel(session_b, SWITCH_SIG_BREAK); } - + if (!nosuspend && (switch_channel_test_flag(chan_a, CF_SUSPEND) || switch_channel_test_flag(chan_b, CF_SUSPEND))) { - switch_yield(10000); + status = switch_core_session_read_frame(session_a, &read_frame, -1, stream_id); + + if (!SWITCH_READ_ACCEPTABLE(status)) { + goto end_of_bridge_loop; + } continue; }

1 0

[commit] r7937 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 19 Mar '08

19 Mar '08

Author: mikej Date: Wed Mar 19 17:43:13 2008 New Revision: 7937 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: allow hold timeout when regular rtp timeout is not set Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Wed Mar 19 17:43:13 2008 @@ -1822,7 +1822,7 @@ switch_set_flag_locked(tech_pvt, TFLAG_SIP_HOLD); switch_channel_presence(tech_pvt->channel, "unknown", "hold"); - if (tech_pvt->max_missed_packets) { + if (tech_pvt->max_missed_hold_packets) { switch_rtp_set_max_missed_packets(tech_pvt->rtp_session, tech_pvt->max_missed_hold_packets); }

1 0

[commit] r7936 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 19 Mar '08

19 Mar '08

Author: anthm Date: Wed Mar 19 15:02:26 2008 New Revision: 7936 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: tweak Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Wed Mar 19 15:02:26 2008 @@ -325,11 +325,11 @@ const char *ocodec = NULL; if (switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MODE) || switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MEDIA)) { - goto end; + return; } if (tech_pvt->num_codecs) { - goto end; + return; } switch_assert(tech_pvt->session != NULL); @@ -365,8 +365,8 @@ tech_pvt->num_codecs = switch_loadable_module_get_codecs(tech_pvt->codecs, sizeof(tech_pvt->codecs) / sizeof(tech_pvt->codecs[0])); } - end: - sofia_glue_check_video_codecs(tech_pvt); + + } void sofia_glue_check_video_codecs(private_object_t *tech_pvt) @@ -882,6 +882,7 @@ cid_name = caller_profile->caller_id_name; cid_num = caller_profile->caller_id_number; sofia_glue_tech_prepare_codecs(tech_pvt); + sofia_glue_check_video_codecs(tech_pvt); check_decode(cid_name, session); check_decode(cid_num, session); @@ -2156,6 +2157,7 @@ switch_channel_set_variable(tech_pvt->channel, "sip_video_fmtp", tech_pvt->video_rm_fmtp); switch_snprintf(tmp, sizeof(tmp), "%d", tech_pvt->video_agreed_pt); switch_channel_set_variable(tech_pvt->channel, "sip_video_pt", tmp); + sofia_glue_check_video_codecs(tech_pvt); break; } else { vmatch = 0;

1 0

[commit] r7935 - freeswitch/trunk/build
by Freeswitch SVN 19 Mar '08

19 Mar '08

Author: mikej Date: Wed Mar 19 14:36:56 2008 New Revision: 7935 Modified: freeswitch/trunk/build/freeswitch.sysconfig Log: we moved this to the init file instead as you allways need it Modified: freeswitch/trunk/build/freeswitch.sysconfig ============================================================================== --- freeswitch/trunk/build/freeswitch.sysconfig (original) +++ freeswitch/trunk/build/freeswitch.sysconfig Wed Mar 19 14:36:56 2008 @@ -4,6 +4,5 @@ ## ServiceRestart: freeswitch # # if not empty: parameters for freeswitch -# for example FREESWITCH_PARAMS="-nc" # -FREESWITCH_PARAMS="-nc" +FREESWITCH_PARAMS=""

1 0

[commit] r7934 - in freeswitch/trunk: libs/curl/lib libs/libresample libs/xmlrpc-c src src/mod/endpoints/mod_iax
by Freeswitch SVN 19 Mar '08

19 Mar '08

Author: anthm Date: Wed Mar 19 13:56:27 2008 New Revision: 7934 Modified: freeswitch/trunk/libs/curl/lib/config.h.in freeswitch/trunk/libs/libresample/configure.in freeswitch/trunk/libs/xmlrpc-c/xmlrpc_amconfig.h.in freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/switch_ivr_bridge.c freeswitch/trunk/src/switch_rtp.c Log: deal with MODENDP-99 Modified: freeswitch/trunk/libs/curl/lib/config.h.in ============================================================================== --- freeswitch/trunk/libs/curl/lib/config.h.in (original) +++ freeswitch/trunk/libs/curl/lib/config.h.in Wed Mar 19 13:56:27 2008 @@ -621,16 +621,16 @@ /* Define to the function return type for send. */ #undef SEND_TYPE_RETV -/* The size of `curl_off_t', as computed by sizeof. */ +/* The size of a `curl_off_t', as computed by sizeof. */ #undef SIZEOF_CURL_OFF_T -/* The size of `long', as computed by sizeof. */ +/* The size of a `long', as computed by sizeof. */ #undef SIZEOF_LONG -/* The size of `size_t', as computed by sizeof. */ +/* The size of a `size_t', as computed by sizeof. */ #undef SIZEOF_SIZE_T -/* The size of `time_t', as computed by sizeof. */ +/* The size of a `time_t', as computed by sizeof. */ #undef SIZEOF_TIME_T /* Define to 1 if you have the ANSI C header files. */ @@ -685,7 +685,7 @@ /* type to use in place of in_addr_t if not defined */ #undef in_addr_t -/* Define to `unsigned int' if <sys/types.h> does not define. */ +/* Define to `unsigned' if <sys/types.h> does not define. */ #undef size_t /* type to use in place of socklen_t if not defined */ Modified: freeswitch/trunk/libs/libresample/configure.in ============================================================================== --- freeswitch/trunk/libs/libresample/configure.in (original) +++ freeswitch/trunk/libs/libresample/configure.in Wed Mar 19 13:56:27 2008 @@ -45,6 +45,8 @@ AM_CONDITIONAL([WANT_DEBUG],[test "${enable_debug}" = "yes"]) +echo host $host +echo ax_cv_c_compiler_vendor ${ax_cv_c_compiler_vendor} case "$host" in *-solaris2*) if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then Modified: freeswitch/trunk/libs/xmlrpc-c/xmlrpc_amconfig.h.in ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/xmlrpc_amconfig.h.in (original) +++ freeswitch/trunk/libs/xmlrpc-c/xmlrpc_amconfig.h.in Wed Mar 19 13:56:27 2008 @@ -81,5 +81,5 @@ /* Version number of package */ #undef VERSION -/* Define to `unsigned int' if <sys/types.h> does not define. */ +/* Define to `unsigned' if <sys/types.h> does not define. */ #undef size_t Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Wed Mar 19 13:56:27 2008 @@ -87,6 +87,8 @@ switch_codec_t write_codec; switch_frame_t read_frame; unsigned char databuf[SWITCH_RECOMMENDED_BUFFER_SIZE]; + switch_frame_t cng_frame; + unsigned char cng_databuf[10]; switch_core_session_t *session; struct iax_session *iax_session; switch_caller_profile_t *caller_profile; @@ -441,6 +443,10 @@ { tech_pvt->read_frame.data = tech_pvt->databuf; tech_pvt->read_frame.buflen = sizeof(tech_pvt->databuf); + tech_pvt->cng_frame.data = tech_pvt->cng_databuf; + tech_pvt->cng_frame.buflen = sizeof(tech_pvt->cng_databuf); + switch_set_flag((&tech_pvt->cng_frame), SFF_CNG); + tech_pvt->cng_frame.datalen = 2; switch_mutex_init(&tech_pvt->mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); switch_core_session_set_private(session, tech_pvt); @@ -604,6 +610,12 @@ return SWITCH_STATUS_FALSE; } + if (switch_test_flag(tech_pvt, TFLAG_IO) && switch_test_flag(tech_pvt, TFLAG_DTMF)) { + switch_clear_flag_locked(tech_pvt, TFLAG_DTMF); + *frame = &tech_pvt->cng_frame; + return SWITCH_STATUS_SUCCESS; + } + if (switch_test_flag(tech_pvt, TFLAG_IO) && switch_test_flag(tech_pvt, TFLAG_VOICE)) { switch_clear_flag_locked(tech_pvt, TFLAG_VOICE); if (!tech_pvt->read_frame.datalen) { @@ -1107,7 +1119,10 @@ if (globals.debug) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%c DTMF %s\n", dtmf.digit, switch_channel_get_name(channel)); } + switch_mutex_lock(tech_pvt->flag_mutex); switch_channel_queue_dtmf(channel, &dtmf); + switch_set_flag(tech_pvt, TFLAG_DTMF); + switch_mutex_unlock(tech_pvt->flag_mutex); } break; Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Wed Mar 19 13:56:27 2008 @@ -178,7 +178,7 @@ switch_dtmf_t dtmf = { 0, 0 }; if (switch_channel_dequeue_dtmf(chan_a, &dtmf) == SWITCH_STATUS_SUCCESS) { int send_dtmf = 1; - + if (input_callback) { switch_status_t cb_status = input_callback(session_a, (void *)&dtmf, SWITCH_INPUT_TYPE_DTMF, user_data, 0); Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Wed Mar 19 13:56:27 2008 @@ -1098,7 +1098,7 @@ { switch_size_t bytes = 0; switch_status_t status; - uint8_t check = 1; + uint8_t check = 0; stfu_frame_t *jb_frame; int ret = -1; @@ -1125,6 +1125,7 @@ if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BREAK)) { switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_BREAK); + do_2833(rtp_session); bytes = 0; do_cng = 1; goto cng; @@ -1154,8 +1155,8 @@ } else if (bytes) { check++; } - - if (check) { + + if (check || bytes) { do_2833(rtp_session); }

1 0

[commit] r7933 - freeswitch/trunk/build
by Freeswitch SVN 19 Mar '08

19 Mar '08

Author: mikej Date: Wed Mar 19 13:48:05 2008 New Revision: 7933 Modified: freeswitch/trunk/build/freeswitch.init.redhat Log: let sysconfig override Modified: freeswitch/trunk/build/freeswitch.init.redhat ============================================================================== --- freeswitch/trunk/build/freeswitch.init.redhat (original) +++ freeswitch/trunk/build/freeswitch.init.redhat Wed Mar 19 13:48:05 2008 @@ -14,11 +14,6 @@ # Source function library. . /etc/init.d/functions -# Source options file -if [ -f /etc/sysconfig/freeswitch ]; then - . /etc/sysconfig/freeswitch -fi - PROG_NAME=freeswitch PID_FILE=/opt/freeswitch/log/freeswitch.pid FS_USER=freeswitch @@ -27,6 +22,11 @@ FREESWITCH_ARGS="-nc" RETVAL=0 +# Source options file +if [ -f /etc/sysconfig/freeswitch ]; then + . /etc/sysconfig/freeswitch +fi + # <define any local shell functions used by the code that follows> start() {

1 0

[commit] r7932 - freeswitch/trunk/build
by Freeswitch SVN 19 Mar '08

19 Mar '08

Author: mikej Date: Wed Mar 19 13:37:18 2008 New Revision: 7932 Modified: freeswitch/trunk/build/freeswitch.init.redhat Log: cleanup Modified: freeswitch/trunk/build/freeswitch.init.redhat ============================================================================== --- freeswitch/trunk/build/freeswitch.init.redhat (original) +++ freeswitch/trunk/build/freeswitch.init.redhat Wed Mar 19 13:37:18 2008 @@ -11,7 +11,6 @@ # pidfile: /opt/freeswitch/log/freeswitch.pid # -export PATH=$PATH:/opt/freeswitch/bin # Source function library. . /etc/init.d/functions @@ -25,6 +24,7 @@ FS_USER=freeswitch FS_FILE=/opt/freeswitch/bin/freeswitch LOCK_FILE=/var/lock/subsys/freeswitch +FREESWITCH_ARGS="-nc" RETVAL=0 # <define any local shell functions used by the code that follows> @@ -32,7 +32,7 @@ start() { echo -n "Starting $PROG_NAME: " if [ -e $LOCK_FILE ]; then - if [ -e $PID_FILE ] && [ -e /proc/`$PID_FILE` ]; then + if [ -e $PID_FILE ] && [ -e /proc/`cat $PID_FILE` ]; then echo echo -n $"$PROG_NAME is already running."; failure $"$PROG_NAME is already running."; @@ -41,10 +41,11 @@ fi fi - daemon --user $FS_USER --pidfile $PID_FILE "$FS_FILE $FREESWITCH_PARAMS >/dev/null 2>&1" + daemon --user $FS_USER --pidfile $PID_FILE "$FS_FILE $FREESWITCH_ARGS $FREESWITCH_PARAMS >/dev/null 2>&1" echo RETVAL=$? [ $RETVAL -eq 0 ] && touch $LOCK_FILE; + echo return $RETVAL }

1 0

[commit] r7931 - freeswitch/trunk/build
by Freeswitch SVN 19 Mar '08

19 Mar '08

Author: mikej Date: Wed Mar 19 13:21:30 2008 New Revision: 7931 Modified: freeswitch/trunk/build/freeswitch.init.redhat Log: cleanup Modified: freeswitch/trunk/build/freeswitch.init.redhat ============================================================================== --- freeswitch/trunk/build/freeswitch.init.redhat (original) +++ freeswitch/trunk/build/freeswitch.init.redhat Wed Mar 19 13:21:30 2008 @@ -4,7 +4,7 @@ # # The FreeSwitch Open Source Voice Platform # -# chkconfig: - 89 14 +# chkconfig: 345 89 14 # description: Starts and stops the freeswitch server daemon # processname: freeswitch # config: /opt/freeswitch/conf/freeswitch.conf @@ -33,8 +33,9 @@ echo -n "Starting $PROG_NAME: " if [ -e $LOCK_FILE ]; then if [ -e $PID_FILE ] && [ -e /proc/`$PID_FILE` ]; then - echo -n $"cannot start freeswitch: freeswitch is already running."; - failure $"cannot start freeswitch: freeswitch already running."; + echo + echo -n $"$PROG_NAME is already running."; + failure $"$PROG_NAME is already running."; echo return 1 fi @@ -50,13 +51,14 @@ stop() { echo -n "Shutting down $PROG_NAME: " if [ ! -e $LOCK_FILE ]; then + echo echo -n $"cannot stop $PROG_NAME: $PROG_NAME is not running." failure $"cannot stop $PROG_NAME: $PROG_NAME is not running." echo return 1; fi - /opt/freeswitch/bin/freeswitch -stop > /dev/null 2>&1 - killproc freeswitch + $FS_FILE -stop > /dev/null 2>&1 + killproc $PROG_NAME RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f $LOCK_FILE;

1 0