October 2006 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r3214 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 26 Oct '06

26 Oct '06

Author: anthm Date: Thu Oct 26 16:02:57 2006 New Revision: 3214 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile Thu Oct 26 16:02:57 2006 @@ -1,6 +1,6 @@ OS_ARCH := $(subst /,_,$(shell uname -s | sed /\ /s//_/)) VERSION = sofia-sip-1.12 -TARBALL = sofia-sip-1.12.3.5.tar.gz +TARBALL = sofia-sip-1.12.3.4.tar.gz CFLAGS += -I. -I$(PREFIX)/include/$(VERSION) LDFLAGS += -lsofia-sip-ua LINKER=$(CC) 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 Thu Oct 26 16:02:57 2006 @@ -1145,17 +1145,13 @@ tech_pvt = (private_object_t *) switch_core_session_get_private(session); assert(tech_pvt != NULL); - if (switch_test_flag(tech_pvt, TFLAG_BYE)) { - return SWITCH_STATUS_SUCCESS; - } - cause = switch_channel_get_cause(channel); sip_cause = hangup_cause_to_sip(cause); deactivate_rtp(tech_pvt); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel %s hanging up, cause: %s\n", - switch_channel_get_name(channel), switch_channel_cause2str(cause), sip_cause); + switch_channel_get_name(channel), switch_channel_cause2str(cause), sip_cause); if (tech_pvt->hash_key) { switch_core_hash_delete(tech_pvt->profile->chat_hash, tech_pvt->hash_key); @@ -1181,16 +1177,14 @@ nua_cancel(tech_pvt->nh, TAG_END()); } } + switch_set_flag_locked(tech_pvt, TFLAG_BYE); } - nua_handle_destroy(tech_pvt->nh); - tech_pvt->nh = NULL; } if (tech_pvt->from_str) { switch_safe_free(tech_pvt->from_str); } - switch_set_flag_locked(tech_pvt, TFLAG_BYE); switch_clear_flag_locked(tech_pvt, TFLAG_IO); if (tech_pvt->home) { @@ -1425,14 +1419,14 @@ switch_channel_get_name(channel), tech_pvt->local_sdp_str); nua_respond(tech_pvt->nh, SIP_200_OK, - SIPTAG_CONTACT_STR(tech_pvt->profile->url), + SIPTAG_CONTACT_STR(tech_pvt->profile->url), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); } - } + } return SWITCH_STATUS_SUCCESS; } @@ -1877,7 +1871,7 @@ #endif } - switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, (char*) "%s", data); + switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_CONSOLE, (char*) "%s", data); free(data); } @@ -2435,6 +2429,7 @@ switch_channel_set_variable(channel, "endpoint_disposition", "RECEIVED"); switch_channel_set_state(channel, CS_INIT); switch_set_flag_locked(tech_pvt, TFLAG_READY); + //sofia_answer_channel(session);//XXX TMP switch_core_session_thread_launch(session); if (replaces_str && (replaces = sip_replaces_make(tech_pvt->home, replaces_str)) && (bnh = nua_handle_by_replaces(nua, replaces))) { @@ -2573,14 +2568,16 @@ switch_set_flag_locked(tech_pvt, TFLAG_BYE); if (switch_test_flag(tech_pvt, TFLAG_NOHUP)) { switch_clear_flag_locked(tech_pvt, TFLAG_NOHUP); - nua_handle_destroy(tech_pvt->nh); - tech_pvt->nh = NULL; } else { snprintf(st, sizeof(st), "%d", status); switch_channel_set_variable(channel, "sip_term_status", st); terminate_session(&session, sip_cause_to_freeswitch(status), __LINE__); } } + tech_pvt->nh = NULL; + } + if (nh) { + nua_handle_destroy(nh); } break; }

1 0

[commit] r3213 - freeswitch/trunk/src
by Freeswitch SVN 26 Oct '06

26 Oct '06

Author: anthm Date: Thu Oct 26 12:31:05 2006 New Revision: 3213 Modified: freeswitch/trunk/src/switch_ivr.c Log: update Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Thu Oct 26 12:31:05 2006 @@ -1932,7 +1932,8 @@ if ((time(NULL) - start) > (time_t)timelimit_sec) { to++; - break; + idx = IDX_CANCEL; + goto notready; } switch_yield(1000); } @@ -1978,7 +1979,8 @@ check_channel_status(peer_channels, peer_sessions, and_argc, &idx, file, key)) { if ((to = (uint8_t)((time(NULL) - start) >= (time_t)timelimit_sec))) { - break; + idx = IDX_CANCEL; + goto notready; } if (session && or_argc == 1 && and_argc == 1) { /* when there is only 1 channel to call and bridge */

1 0

[commit] r3212 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by Freeswitch SVN 26 Oct '06

26 Oct '06

Author: anthm Date: Thu Oct 26 12:13:48 2006 New Revision: 3212 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Thu Oct 26 12:13:48 2006 @@ -147,10 +147,7 @@ last = switch_time_now() - waitsec; if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { - /* Turn on the device */ - engage_device(tech_pvt); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL INIT %d %d\n", switch_channel_get_name(channel), switch_channel_get_state(channel), switch_test_flag(tech_pvt, TFLAG_ANSWER)); @@ -172,6 +169,11 @@ last = switch_time_now(); } switch_yield(50000); + } + + if (switch_channel_ready(channel)) { + /* Turn on the device */ + engage_device(tech_pvt); } }

1 0

[commit] r3211 - freeswitch/trunk/src
by Freeswitch SVN 26 Oct '06

26 Oct '06

Author: anthm Date: Thu Oct 26 11:52:11 2006 New Revision: 3211 Modified: freeswitch/trunk/src/switch_ivr.c Log: update Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Thu Oct 26 11:52:11 2006 @@ -1927,7 +1927,7 @@ } if (caller_channel && !switch_channel_ready(caller_channel)) { - break; + goto notready; } if ((time(NULL) - start) > (time_t)timelimit_sec) { @@ -2010,6 +2010,8 @@ } } + + notready: if (!switch_channel_ready(caller_channel)) { idx = IDX_CANCEL;

1 0

[commit] r3210 - in freeswitch/trunk/src: . mod/endpoints/mod_portaudio
by Freeswitch SVN 26 Oct '06

26 Oct '06

Author: anthm Date: Thu Oct 26 11:00:46 2006 New Revision: 3210 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/switch_ivr.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Thu Oct 26 11:00:46 2006 @@ -823,7 +823,11 @@ } else { switch_core_codec_destroy(&tech_pvt->read_codec); switch_core_codec_destroy(&tech_pvt->write_codec); - switch_core_session_destroy(&tech_pvt->session); + if (switch_core_session_running(tech_pvt->session)) { + switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + } else { + switch_core_session_destroy(&tech_pvt->session); + } } return SWITCH_STATUS_FALSE; Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Thu Oct 26 11:00:46 2006 @@ -2101,6 +2101,9 @@ if (idx == IDX_CANCEL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Originate Cancelled by originator termination Cause: %d [%s]\n", *cause, switch_channel_cause2str(*cause)); + if (peer_channel) { + switch_channel_hangup(peer_channel, SWITCH_CAUSE_ORIGINATOR_CANCEL); + } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Originate Resulted in Error Cause: %d [%s]\n", *cause, switch_channel_cause2str(*cause));

1 0

[commit] r3208 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 26 Oct '06

26 Oct '06

Author: mikej Date: Thu Oct 26 07:47:22 2006 New Revision: 3208 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: make sofia a bit more stable after an outbound register. Please note, we are working on some issues in sofia, revisions after last weekend are currently not considered stable under some conditions. 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 Thu Oct 26 07:47:22 2006 @@ -1425,6 +1425,7 @@ switch_channel_get_name(channel), tech_pvt->local_sdp_str); nua_respond(tech_pvt->nh, SIP_200_OK, + SIPTAG_CONTACT_STR(tech_pvt->profile->url), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1),

1 0

[commit] r3206 - in freeswitch/trunk: libs src/mod/languages/mod_spidermonkey
by Freeswitch SVN 25 Oct '06

25 Oct '06

Author: anthm Date: Wed Oct 25 16:05:16 2006 New Revision: 3206 Modified: freeswitch/trunk/libs/mozilla.build.sh freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile Log: update Modified: freeswitch/trunk/libs/mozilla.build.sh ============================================================================== --- freeswitch/trunk/libs/mozilla.build.sh (original) +++ freeswitch/trunk/libs/mozilla.build.sh Wed Oct 25 16:05:16 2006 @@ -49,5 +49,5 @@ cd nsprpub && CFLAGS=$cflags LDFLAGS=$ldflags ./configure $opts && $MAKE -cd ../js/src && CFLAGS=$cflags LDFLAGS=$ldflags JS_THREADSAFE=1 JS_HAS_FILE_OBJECT=1 OTHER_LIBS="-L../../../mozilla/nsprpub/dist/lib" INCLUDES="-I../../../mozilla/nsprpub/dist/include/nspr" $MAKE -f Makefile.ref `find . -name libjs.a` +cd ../js/src && CFLAGS=$cflags BUILD_OPT=$BUILD_OPT LDFLAGS=$ldflags JS_THREADSAFE=1 JS_HAS_FILE_OBJECT=1 OTHER_LIBS="-L../../../mozilla/nsprpub/dist/lib" INCLUDES="-I../../../mozilla/nsprpub/dist/include/nspr" $MAKE -f Makefile.ref `find . -name libjs.a` Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile Wed Oct 25 16:05:16 2006 @@ -1,6 +1,10 @@ # This is all used to make sure we use the right options during build and link. OS_ARCH := $(subst /,_,$(shell uname -s | sed /\ /s//_/)) +#VER=DBG +#BO=0 +VER=OPT +BO=1 # Attempt to differentiate between SunOS 5.4 and x86 5.4 OS_CPUARCH := $(shell uname -m) @@ -59,16 +63,16 @@ endif endif -CFLAGS += -I$(BASE)/libs/mozilla/js/src -Wall -Wno-format -g -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG -DDEBUG_root -DJS_THREADSAFE -I$(BASE)/libs/mozilla/js/src -I$(BASE)/libs/mozilla/js/src/$(OS_CONFIG)_DBG.OBJ -Wall -Wno-format -g -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG -DDEBUG_root -DJS_THREADSAFE -I$(BASE)/libs/mozilla/nsprpub/dist/include/nspr -I$(OS_CONFIG)_DBG.OBJ +CFLAGS += -I$(BASE)/libs/mozilla/js/src -Wall -Wno-format -g -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG -DDEBUG_root -DJS_THREADSAFE -I$(BASE)/libs/mozilla/js/src -I$(BASE)/libs/mozilla/js/src/$(OS_CONFIG)_$(VER).OBJ -Wall -Wno-format -g -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG -DDEBUG_root -DJS_THREADSAFE -I$(BASE)/libs/mozilla/nsprpub/dist/include/nspr -I$(OS_CONFIG)_$(VER).OBJ LDFLAGS +=-DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG -DDEBUG_root -DJS_THREADSAFE -I$(BASE)/libs/mozilla/nsprpub/dist/include/nspr -Wall -Wno-format -g -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG -DDEBUG_root -DJS_THREADSAFE -I$(BASE)/libs/mozilla/nsprpub/dist/include/nspr -lteletone -OBJS=$(BASE)/libs/mozilla/js/src/$(OS_CONFIG)_DBG.OBJ/libjs.a $(BASE)/libs/mozilla/nsprpub/dist/lib/libnspr4.a -lcurl -letpan +OBJS=$(BASE)/libs/mozilla/js/src/$(OS_CONFIG)_$(VER).OBJ/libjs.a $(BASE)/libs/mozilla/nsprpub/dist/lib/libnspr4.a -lcurl -letpan LINKER=$(CC) all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) depends: - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) mozilla.tar.gz --prefix=$(PREFIX) + BUILD_OPT=$(BO) MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) mozilla.tar.gz --prefix=$(PREFIX) MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install curl-7.15.2.tar.gz --prefix=$(PREFIX) --without-libidn MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libetpan-0.45.tar.gz --prefix=$(PREFIX)

1 0

[commit] r3205 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by Freeswitch SVN 25 Oct '06

25 Oct '06

Author: anthm Date: Wed Oct 25 14:49:34 2006 New Revision: 3205 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: update 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 Oct 25 14:49:34 2006 @@ -1283,7 +1283,6 @@ if (switch_test_flag(tech_pvt, TFLAG_BYE)) { - //terminate_session(&session, __LINE__, SWITCH_CAUSE_NORMAL_CLEARING); return SWITCH_STATUS_FALSE; } @@ -1299,6 +1298,7 @@ samples = frames * tech_pvt->read_codec.implementation->samples_per_frame; if (switch_rtp_write_frame(tech_pvt->rtp_session, frame, samples) < 0) { + terminate_session(&session, __LINE__, SWITCH_CAUSE_NORMAL_CLEARING); return SWITCH_STATUS_FALSE; } tech_pvt->timestamp_send += (int) samples;

1 0

[commit] r3204 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 25 Oct '06

25 Oct '06

Author: mikej Date: Wed Oct 25 14:00:14 2006 New Revision: 3204 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: why malloc? 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 Oct 25 14:00:14 2006 @@ -3626,7 +3626,7 @@ if(signal_ptr) { struct private_object *tech_pvt = NULL; switch_channel_t *channel = NULL; - char *dtmf_digit; + char dtmf_digit[2] = {0,0}; //Get the channel channel = switch_core_session_get_channel(session); @@ -3640,26 +3640,18 @@ //Barf if we didn't get it assert(tech_pvt != NULL); - //holder for the dtmf digit - dtmf_digit = malloc(sizeof(char) * 2); - //move signal_ptr where we need it (right past Signal=) signal_ptr = signal_ptr + 7; //put the digit somewhere we can muck with strncpy(dtmf_digit, signal_ptr, 1); - //End the string - *(dtmf_digit + 1) = '\0'; - //queue it up switch_channel_queue_dtmf(channel, dtmf_digit); //print debug info switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "INFO DTMF(%s)\n", dtmf_digit); - //Give back the memory I borrowed - free(dtmf_digit); } else { //unknown info type sip_from_t const *from;

1 0

[commit] r3203 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 25 Oct '06

25 Oct '06

Author: anthm Date: Wed Oct 25 13:59:50 2006 New Revision: 3203 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: fix 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 Oct 25 13:59:50 2006 @@ -3922,7 +3922,7 @@ if (authenticate->au_params) { for(index = 0; (cur=(char*)authenticate->au_params[index]); index++) { if ((realm = strstr(cur, "realm="))) { - realm += 7; + realm += 6; break; } }

1 0