May 2007 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r5237 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 31 May '07

31 May '07

Author: anthm Date: Thu May 31 12:12:44 2007 New Revision: 5237 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: update 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 Thu May 31 12:12:44 2007 @@ -162,10 +162,11 @@ } - if (switch_test_flag(tech_pvt, TFLAG_VIDEO)) { + if (switch_test_flag(tech_pvt, TFLAG_VIDEO) && tech_pvt->video_rm_encoding) { sofia_glue_tech_choose_video_port(tech_pvt); if ((v_port = tech_pvt->adv_sdp_video_port)) { snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "m=video %d RTP/AVP", v_port); + sofia_glue_tech_set_video_codec(tech_pvt, 0); @@ -955,7 +956,6 @@ if (switch_test_flag(tech_pvt, TFLAG_VIDEO) && tech_pvt->video_rm_encoding) { flags = (switch_rtp_flag_t) (SWITCH_RTP_FLAG_AUTOADJ | SWITCH_RTP_FLAG_DATAWAIT | SWITCH_RTP_FLAG_NOBLOCK | SWITCH_RTP_FLAG_RAW_WRITE); - sofia_glue_tech_set_video_codec(tech_pvt, 0); tech_pvt->video_rtp_session = switch_rtp_new(tech_pvt->local_sdp_audio_ip,

1 0

[Freeswitch-svn] [commit] r5236 - in freeswitch/trunk/src: . include include/private mod/applications/mod_commands mod/applications/mod_playback
by Freeswitch SVN 31 May '07

31 May '07

Author: anthm Date: Thu May 31 10:42:23 2007 New Revision: 5236 Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.c freeswitch/trunk/src/switch_caller.c freeswitch/trunk/src/switch_core_io.c freeswitch/trunk/src/switch_core_media_bug.c freeswitch/trunk/src/switch_ivr_async.c Log: add timout to record and time tables to all the channel events Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h ============================================================================== --- freeswitch/trunk/src/include/private/switch_core_pvt.h (original) +++ freeswitch/trunk/src/include/private/switch_core_pvt.h Thu May 31 10:42:23 2007 @@ -136,6 +136,7 @@ void *user_data; uint32_t flags; uint8_t ready; + time_t stop_time; struct switch_media_bug *next; }; Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Thu May 31 10:42:23 2007 @@ -130,7 +130,7 @@ */ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_add(switch_core_session_t *session, switch_media_bug_callback_t callback, - void *user_data, switch_media_bug_flag_t flags, switch_media_bug_t **new_bug); + void *user_data, time_t stop_time, switch_media_bug_flag_t flags, switch_media_bug_t **new_bug); /*! \brief Obtain private data from a media bug \param bug the bug to get the data from Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Thu May 31 10:42:23 2007 @@ -198,7 +198,7 @@ \param fh file handle to use (NULL for builtin one) \return SWITCH_STATUS_SUCCESS if all is well */ -SWITCH_DECLARE(switch_status_t) switch_ivr_record_session(switch_core_session_t *session, char *file, switch_file_handle_t *fh); +SWITCH_DECLARE(switch_status_t) switch_ivr_record_session(switch_core_session_t *session, char *file, uint32_t limit, switch_file_handle_t *fh); /*! \brief Stop Recording a session Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Thu May 31 10:42:23 2007 @@ -550,6 +550,7 @@ char *mycmd = NULL, *argv[4] = { 0 }; char *uuid = NULL, *action = NULL, *path = NULL; int argc = 0; + uint32_t limit = 0; if (session) { return SWITCH_STATUS_FALSE; @@ -570,7 +571,8 @@ uuid = argv[0]; action = argv[1]; path = argv[2]; - + limit = argv[3] ? atoi(argv[3]) : 0; + if (!(rsession = switch_core_session_locate(uuid))) { stream->write_function(stream, "-Error Cannot locate session!\n"); return SWITCH_STATUS_SUCCESS; @@ -581,7 +583,7 @@ } if (!strcasecmp(action, "start")) { - switch_ivr_record_session(rsession, path, NULL); + switch_ivr_record_session(rsession, path, limit, NULL); } else if (!strcasecmp(action, "stop")) { switch_ivr_stop_record_session(rsession, path); } else { @@ -1230,7 +1232,7 @@ /*.interface_name */ "session_record", /*.desc */ "session record", /*.function */ session_record_function, - /*.syntax */ "<uuid> [start|stop] <path>", + /*.syntax */ "<uuid> [start|stop] <path> [<limit>]", /*.next */ &broadcast_api_interface }; Modified: freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.c (original) +++ freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.c Thu May 31 10:42:23 2007 @@ -142,6 +142,11 @@ path = switch_core_session_strdup(session, data); if ((p = strchr(path, '+'))) { + char *q = p - 1; + while(q && *q == ' ') { + *q = '\0'; + q--; + } *p++ = '\0'; limit = atoi(p); } @@ -158,10 +163,24 @@ static void record_session_function(switch_core_session_t *session, char *data) { switch_channel_t *channel; + char *p, *path = NULL; + uint32_t limit = 0; + channel = switch_core_session_get_channel(session); assert(channel != NULL); - switch_ivr_record_session(session, data, NULL); + path = switch_core_session_strdup(session, data); + if ((p = strchr(path, '+'))) { + char *q = p - 1; + while(q && *q == ' ') { + *q = '\0'; + q--; + } + *p++ = '\0'; + limit = atoi(p); + } + + switch_ivr_record_session(session, path, limit, NULL); } Modified: freeswitch/trunk/src/switch_caller.c ============================================================================== --- freeswitch/trunk/src/switch_caller.c (original) +++ freeswitch/trunk/src/switch_caller.c Thu May 31 10:42:23 2007 @@ -193,6 +193,16 @@ snprintf(header_name, sizeof(header_name), "%s-Channel-Name", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->chan_name); } + if (caller_profile->times) { + snprintf(header_name, sizeof(header_name), "%s-Channel-Created-Time", prefix); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%" SWITCH_TIME_T_FMT, caller_profile->times->created); + snprintf(header_name, sizeof(header_name), "%s-Channel-Answered-Time", prefix); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%" SWITCH_TIME_T_FMT, caller_profile->times->answered); + snprintf(header_name, sizeof(header_name), "%s-Channel-Hangup-Time", prefix); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%" SWITCH_TIME_T_FMT, caller_profile->times->hungup); + snprintf(header_name, sizeof(header_name), "%s-Channel-Transfer-Time", prefix); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%" SWITCH_TIME_T_FMT, caller_profile->times->transferred); + } snprintf(header_name, sizeof(header_name), "%s-Screen-Bit", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, switch_test_flag(caller_profile, SWITCH_CPF_SCREEN) ? "yes" : "no"); @@ -203,7 +213,7 @@ snprintf(header_name, sizeof(header_name), "%s-Privacy-Hide-Number", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER) ? "yes" : "no"); - + } Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Thu May 31 10:42:23 2007 @@ -232,7 +232,7 @@ switch_mutex_lock(bp->read_mutex); switch_buffer_write(bp->raw_read_buffer, read_frame->data, read_frame->datalen); if (bp->callback) { - if (bp->callback(bp, bp->user_data, SWITCH_ABC_TYPE_READ) == SWITCH_FALSE) { + if (bp->callback(bp, bp->user_data, SWITCH_ABC_TYPE_READ) == SWITCH_FALSE || (bp->stop_time && bp->stop_time >= time(NULL))) { bp->ready = 0; if (last) { last->next = bp->next; @@ -505,6 +505,11 @@ } } + if (bp->stop_time && bp->stop_time >= time(NULL)) { + ok = SWITCH_FALSE; + } + + if (ok == SWITCH_FALSE) { bp->ready = 0; if (last) { Modified: freeswitch/trunk/src/switch_core_media_bug.c ============================================================================== --- freeswitch/trunk/src/switch_core_media_bug.c (original) +++ freeswitch/trunk/src/switch_core_media_bug.c Thu May 31 10:42:23 2007 @@ -144,7 +144,7 @@ #define MAX_BUG_BUFFER 1024 * 512 SWITCH_DECLARE(switch_status_t) switch_core_media_bug_add(switch_core_session_t *session, switch_media_bug_callback_t callback, - void *user_data, switch_media_bug_flag_t flags, switch_media_bug_t **new_bug) + void *user_data, time_t stop_time, switch_media_bug_flag_t flags, switch_media_bug_t **new_bug) { switch_media_bug_t *bug, *bp; switch_size_t bytes; @@ -170,6 +170,7 @@ bug->session = session; bug->flags = flags; bug->ready = 1; + bug->stop_time = stop_time; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Attaching BUG to %s\n", switch_channel_get_name(session->channel)); bytes = session->read_codec->implementation->bytes_per_frame; Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Thu May 31 10:42:23 2007 @@ -147,7 +147,7 @@ } -SWITCH_DECLARE(switch_status_t) switch_ivr_record_session(switch_core_session_t *session, char *file, switch_file_handle_t *fh) +SWITCH_DECLARE(switch_status_t) switch_ivr_record_session(switch_core_session_t *session, char *file, uint32_t limit, switch_file_handle_t *fh) { switch_channel_t *channel; switch_codec_t *read_codec; @@ -155,6 +155,7 @@ const char *vval; switch_media_bug_t *bug; switch_status_t status; + time_t to = 0; if (!fh) { if (!(fh = switch_core_session_alloc(session, sizeof(*fh)))) { @@ -220,9 +221,11 @@ switch_channel_set_variable(channel, "RECORD_DATE", NULL); } + if (limit) { + to = time(NULL) + limit; + } - - if ((status = switch_core_media_bug_add(session, record_callback, fh, SMBF_BOTH, &bug)) != SWITCH_STATUS_SUCCESS) { + if ((status = switch_core_media_bug_add(session, record_callback, fh, to, SMBF_BOTH, &bug)) != SWITCH_STATUS_SUCCESS) { switch_core_file_close(fh); return status; } @@ -312,7 +315,7 @@ switch_channel_answer(channel); - if ((status = switch_core_media_bug_add(session, inband_dtmf_callback, pvt, SMBF_READ_STREAM, &bug)) != SWITCH_STATUS_SUCCESS) { + if ((status = switch_core_media_bug_add(session, inband_dtmf_callback, pvt, 0, SMBF_READ_STREAM, &bug)) != SWITCH_STATUS_SUCCESS) { return status; } @@ -597,7 +600,7 @@ sth->session = session; sth->ah = ah; - if ((status = switch_core_media_bug_add(session, speech_callback, sth, SMBF_READ_STREAM, &sth->bug)) != SWITCH_STATUS_SUCCESS) { + if ((status = switch_core_media_bug_add(session, speech_callback, sth, 0, SMBF_READ_STREAM, &sth->bug)) != SWITCH_STATUS_SUCCESS) { switch_core_asr_close(ah, &flags); switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); return status;

1 0

[Freeswitch-svn] [commit] r5235 - freeswitch/trunk/src
by Freeswitch SVN 31 May '07

31 May '07

Author: mikej Date: Thu May 31 09:32:23 2007 New Revision: 5235 Modified: freeswitch/trunk/src/switch_core_session.c Log: declaration after code. Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Thu May 31 09:32:23 2007 @@ -718,11 +718,12 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_thread_launch(switch_core_session_t *session) { + switch_status_t status = SWITCH_STATUS_FALSE; switch_thread_t *thread; switch_threadattr_t *thd_attr;; + switch_threadattr_create(&thd_attr, session->pool); switch_threadattr_detach_set(thd_attr, 1); - switch_status_t status = SWITCH_STATUS_FALSE; switch_mutex_lock(session->mutex);

1 0

[Freeswitch-svn] [commit] r5234 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 29 May '07

29 May '07

Author: anthm Date: Tue May 29 17:02:59 2007 New Revision: 5234 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Tue May 29 17:02:59 2007 @@ -14,7 +14,7 @@ LOCAL_CFLAGS =-w -I$(WANPIPE_INCLUDE) -I$(LIBSANGOMA_DIR) -I/usr/local/include -I$(LIBPRI_DIR) -I/usr/src/linux/include -I. -I/usr/include LOCAL_CFLAGS +=-D__LINUX__ -D_REENTRANT -D_GNU_SOURCE -DAFT_A104 -DWANPIPE_TDM_API -I$(switch_srcdir)/libs/libteletone/src -D_GNUC_ -DWANPIPE_TDM_API -w -fPIC LOCAL_OBJS = ss7boost_client.o $(LIBPRI_DIR)/copy_string.o $(LIBPRI_DIR)/pri.o $(LIBPRI_DIR)/q921.o $(LIBPRI_DIR)/prisched.o $(LIBPRI_DIR)/q931.o $(LIBPRI_DIR)/pri_facility.o $(LIBSANGOMA_DIR)/libsangoma.o $(LIBSANGOMA_DIR)/sangoma_pri.o -WTF=-fPIC -w -std=gnu99 -I../../../../libs/wanpipe-3.1.0/patches/kdrivers/include -I./libsangoma -I/usr/local/include -I../../../../libs/libpri-1.2.4 -I/usr/src/linux/include -I. -I/usr/include -D__LINUX__ -D_REENTRANT -D_GNU_SOURCE -DAFT_A104 -DWANPIPE_TDM_API -I/usr/home/jontow/freeswitch-trunk-clean/libs/libteletone/src -D_GNUC_ -DWANPIPE_TDM_API -w -I/usr/home/jontow/freeswitch-trunk-clean/src/include -I/usr/home/jontow/freeswitch-trunk-clean/libs/libteletone/src -fPIC -g -O2 -Wall -D_GNU_SOURCE -DHAVE_CONFIG_H +WTF=-fPIC -w -std=gnu99 -I$(BASE)/libs/wanpipe-3.1.0/patches/kdrivers/include -I./libsangoma -I/usr/local/include -I../../../../libs/libpri-1.2.4 -I/usr/src/linux/include -I. -I/usr/include -D__LINUX__ -D_REENTRANT -D_GNU_SOURCE -DAFT_A104 -DWANPIPE_TDM_API -I$(BASE)/libs/libteletone/src -D_GNUC_ -DWANPIPE_TDM_API -w -I$(BASE)/src/include -I$(BASE)/libs/libteletone/src -fPIC -g -O2 -Wall -D_GNU_SOURCE -DHAVE_CONFIG_H

1 0

[Freeswitch-svn] [commit] r5233 - in freeswitch/trunk/src: . mod/endpoints/mod_wanpipe
by Freeswitch SVN 29 May '07

29 May '07

Author: anthm Date: Tue May 29 16:57:17 2007 New Revision: 5233 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c freeswitch/trunk/src/switch_core_session.c Log: update 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 Tue May 29 16:57:17 2007 @@ -1568,7 +1568,6 @@ ret = 0; goto done; } - switch_core_session_thread_launch(session); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create new Inbound Channel!\n"); } Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Tue May 29 16:57:17 2007 @@ -681,6 +681,7 @@ switch_core_media_bug_remove_all(*session); switch_buffer_destroy(&(*session)->raw_read_buffer); switch_buffer_destroy(&(*session)->raw_write_buffer); + switch_channel_uninit((*session)->channel); pool = (*session)->pool; @@ -721,19 +722,26 @@ switch_threadattr_t *thd_attr;; switch_threadattr_create(&thd_attr, session->pool); switch_threadattr_detach_set(thd_attr, 1); + switch_status_t status = SWITCH_STATUS_FALSE; + switch_mutex_lock(session->mutex); + if (!session->thread_running) { + session->thread_running = 1; switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); if (switch_thread_create(&thread, thd_attr, switch_core_session_thread, session, session->pool) == SWITCH_STATUS_SUCCESS) { - return SWITCH_STATUS_SUCCESS; + status = SWITCH_STATUS_SUCCESS; } else { + session->thread_running = 0; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot create thread!\n"); } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot double-launch thread!\n"); } - return SWITCH_STATUS_FALSE; + switch_mutex_unlock(session->mutex); + + return status; }

1 0

[Freeswitch-svn] [commit] r5232 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 29 May '07

29 May '07

Author: anthm Date: Tue May 29 15:51:51 2007 New Revision: 5232 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Log: g's suck Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Tue May 29 15:51:51 2007 @@ -12,12 +12,18 @@ WANPIPE_INSTALLED_KO=$(shell echo "/lib/modules/`uname -r`/kernel/drivers/net/wan/wanpipe.ko") LIBSANGOMA_DIR=./libsangoma LOCAL_CFLAGS =-w -I$(WANPIPE_INCLUDE) -I$(LIBSANGOMA_DIR) -I/usr/local/include -I$(LIBPRI_DIR) -I/usr/src/linux/include -I. -I/usr/include -LOCAL_CFLAGS +=-D__LINUX__ -D_REENTRANT -D_GNU_SOURCE -DAFT_A104 -DWANPIPE_TDM_API -I$(switch_srcdir)/libs/libteletone/src -D_GNUC_ -DWANPIPE_TDM_API -w +LOCAL_CFLAGS +=-D__LINUX__ -D_REENTRANT -D_GNU_SOURCE -DAFT_A104 -DWANPIPE_TDM_API -I$(switch_srcdir)/libs/libteletone/src -D_GNUC_ -DWANPIPE_TDM_API -w -fPIC LOCAL_OBJS = ss7boost_client.o $(LIBPRI_DIR)/copy_string.o $(LIBPRI_DIR)/pri.o $(LIBPRI_DIR)/q921.o $(LIBPRI_DIR)/prisched.o $(LIBPRI_DIR)/q931.o $(LIBPRI_DIR)/pri_facility.o $(LIBSANGOMA_DIR)/libsangoma.o $(LIBSANGOMA_DIR)/sangoma_pri.o -LOCAL_LIBADD= +WTF=-fPIC -w -std=gnu99 -I../../../../libs/wanpipe-3.1.0/patches/kdrivers/include -I./libsangoma -I/usr/local/include -I../../../../libs/libpri-1.2.4 -I/usr/src/linux/include -I. -I/usr/include -D__LINUX__ -D_REENTRANT -D_GNU_SOURCE -DAFT_A104 -DWANPIPE_TDM_API -I/usr/home/jontow/freeswitch-trunk-clean/libs/libteletone/src -D_GNUC_ -DWANPIPE_TDM_API -w -I/usr/home/jontow/freeswitch-trunk-clean/src/include -I/usr/home/jontow/freeswitch-trunk-clean/libs/libteletone/src -fPIC -g -O2 -Wall -D_GNU_SOURCE -DHAVE_CONFIG_H + + include $(BASE)/build/modmake.rules +mod_wanpipe.o: mod_wanpipe.c + @echo Compiling $<... + $(CC) $(WTF) -c -o $@ $< || exit 1 + $(LIBSANGOMA_DIR)/libsangoma.o: $(LIBSANGOMA_DIR)/libsangoma.c $(CC) -c -I$(WANPIPE_DIR) $(LOCAL_CFLAGS) $(LIBSANGOMA_DIR)/libsangoma.c -o $(LIBSANGOMA_DIR)/libsangoma.o

1 0

[Freeswitch-svn] [commit] r5231 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 29 May '07

29 May '07

Author: anthm Date: Tue May 29 15:04:41 2007 New Revision: 5231 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Tue May 29 15:04:41 2007 @@ -12,8 +12,9 @@ WANPIPE_INSTALLED_KO=$(shell echo "/lib/modules/`uname -r`/kernel/drivers/net/wan/wanpipe.ko") LIBSANGOMA_DIR=./libsangoma LOCAL_CFLAGS =-w -I$(WANPIPE_INCLUDE) -I$(LIBSANGOMA_DIR) -I/usr/local/include -I$(LIBPRI_DIR) -I/usr/src/linux/include -I. -I/usr/include -LOCAL_CFLAGS +=-D__LINUX__ -D_REENTRANT -D_GNU_SOURCE -DAFT_A104 -DWANPIPE_TDM_API -I$(switch_srcdir)/libs/libteletone/src -D_GNUC_ -DWANPIPE_TDM_API -LOCAL_OBJS = ss7boost_client.o $(LIBPRI_DIR)/copy_string.o $(LIBPRI_DIR)/pri.o $(LIBPRI_DIR)/q921.o $(LIBPRI_DIR)/prisched.o $(LIBPRI_DIR)/q931.o $(LIBPRI_DIR)/pri_facility.o $(LIBSANGOMA_DIR)/libsangoma.o $(LIBSANGOMA_DIR)/sangoma_pri.o +LOCAL_CFLAGS +=-D__LINUX__ -D_REENTRANT -D_GNU_SOURCE -DAFT_A104 -DWANPIPE_TDM_API -I$(switch_srcdir)/libs/libteletone/src -D_GNUC_ -DWANPIPE_TDM_API -w +LOCAL_OBJS = ss7boost_client.o $(LIBPRI_DIR)/copy_string.o $(LIBPRI_DIR)/pri.o $(LIBPRI_DIR)/q921.o $(LIBPRI_DIR)/prisched.o $(LIBPRI_DIR)/q931.o $(LIBPRI_DIR)/pri_facility.o $(LIBSANGOMA_DIR)/libsangoma.o $(LIBSANGOMA_DIR)/sangoma_pri.o +LOCAL_LIBADD= include $(BASE)/build/modmake.rules @@ -44,3 +45,5 @@ local_install: $(WANPIPE_INSTALLED_KO) +local_clean: + rm -f libsangoma/*.o

1 0

[Freeswitch-svn] [commit] r5230 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 29 May '07

29 May '07

Author: anthm Date: Tue May 29 14:55:37 2007 New Revision: 5230 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Tue May 29 14:55:37 2007 @@ -17,6 +17,13 @@ include $(BASE)/build/modmake.rules + +$(LIBSANGOMA_DIR)/libsangoma.o: $(LIBSANGOMA_DIR)/libsangoma.c + $(CC) -c -I$(WANPIPE_DIR) $(LOCAL_CFLAGS) $(LIBSANGOMA_DIR)/libsangoma.c -o $(LIBSANGOMA_DIR)/libsangoma.o + +$(LIBSANGOMA_DIR)/sangoma_pri.o: $(LIBSANGOMA_DIR)/sangoma_pri.c + $(CC) -c -I$(WANPIPE_DIR) $(LOCAL_CFLAGS) $(LIBSANGOMA_DIR)/sangoma_pri.c -o $(LIBSANGOMA_DIR)/sangoma_pri.o + testapp: testapp.c $(LIBSANGOMA_DIR)/libsangoma.o $(CC) -I$(WANPIPE_DIR)/api/lib $(CFLAGS) $(LOCAL_CFLAGS) lib_api.c testapp.c $(LIBSANGOMA_DIR)/libsangoma.o -o testapp

1 0

[Freeswitch-svn] [commit] r5229 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 29 May '07

29 May '07

Author: anthm Date: Tue May 29 11:16:42 2007 New Revision: 5229 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: update 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 Tue May 29 11:16:42 2007 @@ -1844,11 +1844,11 @@ if (profile->ndlb & PFLAG_NDLB_TO_IN_200_CONTACT) { tech_pvt->reply_contact = tech_pvt->to_uri; } else { - tech_pvt->reply_contact = tech_pvt->profile->url; + tech_pvt->to_uri = switch_core_session_strdup(session, profile->url); } } else { - tech_pvt->to_uri = tech_pvt->profile->url; - tech_pvt->reply_contact = tech_pvt->profile->url; + tech_pvt->to_uri = switch_core_session_strdup(session, profile->url); + tech_pvt->reply_contact = tech_pvt->to_uri; } }

1 0

[Freeswitch-svn] [commit] r5228 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 29 May '07

29 May '07

Author: anthm Date: Tue May 29 10:59:03 2007 New Revision: 5228 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: Enact the 'No device left behind' act. All stupid sip params that only help broken things *MUST* be prefixed with NDLB- 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 Tue May 29 10:59:03 2007 @@ -317,7 +317,7 @@ } nua_respond(tech_pvt->nh, SIP_200_OK, - SIPTAG_CONTACT_STR(tech_pvt->to_uri), + SIPTAG_CONTACT_STR(tech_pvt->reply_contact), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); } @@ -680,7 +680,7 @@ sofia_glue_set_local_sdp(tech_pvt, ip, atoi(port), msg->string_arg, 1); } nua_respond(tech_pvt->nh, SIP_200_OK, - SIPTAG_CONTACT_STR(tech_pvt->to_uri), + SIPTAG_CONTACT_STR(tech_pvt->reply_contact), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); switch_channel_mark_answered(channel); } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Tue May 29 10:59:03 2007 @@ -114,6 +114,11 @@ PFLAG_RESPAWN = (1 << 9) } PFLAGS; + +typedef enum { + PFLAG_NDLB_TO_IN_200_CONTACT = (1 << 1) +} sofia_NDLB_t; + typedef enum { TFLAG_IO = (1 << 0), TFLAG_CHANGE_MEDIA = (1 << 1), @@ -223,6 +228,7 @@ int dtmf_duration; unsigned int flags; unsigned int pflags; + unsigned int ndlb; uint32_t max_calls; uint32_t nonce_ttl; nua_t *nua; @@ -287,6 +293,7 @@ switch_port_t adv_sdp_audio_port; char *proxy_sdp_audio_ip; switch_port_t proxy_sdp_audio_port; + char *reply_contact; char *from_uri; char *to_uri; char *from_address; 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 Tue May 29 10:59:03 2007 @@ -789,6 +789,10 @@ if (switch_true(val)) { profile->pflags |= PFLAG_PRESENCE; } + } else if (!strcasecmp(var, "NDLB-to-in-200-contact")) { + if (switch_true(val)) { + profile->ndlb |= PFLAG_NDLB_TO_IN_200_CONTACT; + } } else if (!strcasecmp(var, "pass-rfc2833")) { if (switch_true(val)) { profile->pflags |= PFLAG_PASS_RFC2833; @@ -1837,8 +1841,14 @@ url_set_chanvars(session, sip->sip_to->a_url, sip_to); if ((val = switch_channel_get_variable(channel, "sip_to_uri"))) { tech_pvt->to_uri = switch_core_session_sprintf(session, "sip:%s", val); + if (profile->ndlb & PFLAG_NDLB_TO_IN_200_CONTACT) { + tech_pvt->reply_contact = tech_pvt->to_uri; + } else { + tech_pvt->reply_contact = tech_pvt->profile->url; + } } else { tech_pvt->to_uri = tech_pvt->profile->url; + tech_pvt->reply_contact = tech_pvt->profile->url; } } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Tue May 29 10:59:03 2007 @@ -365,7 +365,7 @@ } if (v_event && *v_event && (v_contact_str = switch_event_get_header(*v_event, "force-contact"))) { - if (!strcasecmp(v_contact_str, "nat-connectile-dysfunction")) { + if (!strcasecmp(v_contact_str, "nat-connectile-dysfunction") || !strcasecmp(v_contact_str, "NDLB-connectile-dysfunction")) { if (contact->m_url->url_params) { snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d;%s>", display, contact->m_url->url_user, network_ip, network_port, contact->m_url->url_params);

1 0