- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r3218 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 27 Oct '06

27 Oct '06

Author: anthm Date: Fri Oct 27 11:20:14 2006 New Revision: 3218 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Log: sigh Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Fri Oct 27 11:20:14 2006 @@ -1229,8 +1229,8 @@ return 0; } - if (event->ring.aniii >= 0) { - snprintf(aniiistr, 5, "%.2d", event->ring.aniii); + if (event->ring.ani2 >= 0) { + snprintf(aniiistr, 5, "%.2d", event->ring.ani2); } if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session),

1 0

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

27 Oct '06

Author: mikej Date: Fri Oct 27 11:05:41 2006 New Revision: 3217 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile Log: wrong version, can't make up my mind. 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 Fri Oct 27 11:05:41 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.6.tar.gz CFLAGS += -I. -I$(PREFIX)/include/$(VERSION) LDFLAGS += -lsofia-sip-ua LINKER=$(CC)

1 0

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

27 Oct '06

Author: mikej Date: Fri Oct 27 10:51:47 2006 New Revision: 3216 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile Log: wrong version 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 Fri Oct 27 10:51:47 2006 @@ -1,6 +1,6 @@ OS_ARCH := $(subst /,_,$(shell uname -s | sed /\ /s//_/)) VERSION = sofia-sip-1.12 -TARBALL = sofia-sip-1.12.3.4.tar.gz +TARBALL = sofia-sip-1.12.3.5.tar.gz CFLAGS += -I. -I$(PREFIX)/include/$(VERSION) LDFLAGS += -lsofia-sip-ua LINKER=$(CC)

1 0

[commit] r3215 - freeswitch/branches/aimahab
by Freeswitch SVN 27 Oct '06

27 Oct '06

Author: sphere Date: Fri Oct 27 03:19:02 2006 New Revision: 3215 Added: freeswitch/branches/aimahab/ Log: Creating empty folder for aimahab

1 0

[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] r3209 - freeswitch/branches/mtehfe
by Freeswitch SVN 26 Oct '06

26 Oct '06

Author: sphere Date: Thu Oct 26 08:39:05 2006 New Revision: 3209 Added: freeswitch/branches/mtehfe/ Log: Creating empty folder for mtehfe

1 0