- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r4731 - in freeswitch/trunk/libs: codec/gsm libteletone
by Freeswitch SVN 22 Mar '07

22 Mar '07

Author: mikej Date: Thu Mar 22 11:57:12 2007 New Revision: 4731 Modified: freeswitch/trunk/libs/codec/gsm/configure.in freeswitch/trunk/libs/libteletone/configure.in Log: some little cleanup Modified: freeswitch/trunk/libs/codec/gsm/configure.in ============================================================================== --- freeswitch/trunk/libs/codec/gsm/configure.in (original) +++ freeswitch/trunk/libs/codec/gsm/configure.in Thu Mar 22 11:57:12 2007 @@ -5,7 +5,6 @@ AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS) AM_INIT_AUTOMAKE(libgsm,0.1) AC_CONFIG_SRCDIR([src]) -#AC_CONFIG_HEADER([]) # Checks for programs. AC_PROG_CC Modified: freeswitch/trunk/libs/libteletone/configure.in ============================================================================== --- freeswitch/trunk/libs/libteletone/configure.in (original) +++ freeswitch/trunk/libs/libteletone/configure.in Thu Mar 22 11:57:12 2007 @@ -6,7 +6,6 @@ AC_CONFIG_AUX_DIR(build) AM_INIT_AUTOMAKE(libteletone,0.1) AC_CONFIG_SRCDIR([src]) -#AC_CONFIG_HEADER([]) # Checks for programs. AC_PROG_CC

1 0

[commit] r4730 - freeswitch/trunk
by Freeswitch SVN 22 Mar '07

22 Mar '07

Author: mikej Date: Thu Mar 22 11:21:31 2007 New Revision: 4730 Modified: freeswitch/trunk/bootstrap.sh Log: only require 1.5.14. More changes on this coming very soon Modified: freeswitch/trunk/bootstrap.sh ============================================================================== --- freeswitch/trunk/bootstrap.sh (original) +++ freeswitch/trunk/bootstrap.sh Thu Mar 22 11:21:31 2007 @@ -60,7 +60,7 @@ lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` if test -z "$lt_pversion"; then echo "bootstrap: libtool not found." -echo " You need libtool version 1.5.7 or newer installed" +echo " You need libtool version 1.5.14 or newer installed" echo " to build FreeSWITCH from SVN." exit 1 fi @@ -68,16 +68,18 @@ IFS=.; set $lt_version; IFS=' ' lt_status="good" -if test "$1" = "1"; then - if test "$2" -lt "5" -o "$2" = "5" -a "$3" -lt "22" || test ; then +if test "$1" -lt "2"; then + if test "$2" -lt "5" -o "$2" = "5" -a "$3" -lt "14" ; then lt_status="bad" fi +else + lt_status="bad" fi if test $lt_status = "good"; then echo "bootstrap: libtool version $lt_pversion (ok)" else echo "bootstrap: libtool version $lt_pversion found." -echo " You need libtool version 1.5.7 or newer installed" +echo " You need libtool version 1.5.14 or newer installed" echo " to build FreeSWITCH from SVN." exit 1

1 0

[commit] r4727 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 22 Mar '07

22 Mar '07

Author: anthm Date: Wed Mar 21 21:00:11 2007 New Revision: 4727 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 Wed Mar 21 21:00:11 2007 @@ -3,7 +3,7 @@ LIBPRI=libpri-1.2.4 LIBPRI_FILE=$(LIBPRI).tar.gz LIBPRI_DIR=$(BASE)/libs/$(LIBPRI) -WANPIPE=wanpipe-3.1.0.p12 +WANPIPE=wanpipe-3.1.0.p13 WANPIPE_HOST=ftp://ftp.sangoma.com/linux/custom/3.1 WANPIPE_FILE=$(WANPIPE).tgz WANPIPE_DIR=$(BASE)/libs/$(WANPIPE)

1 0

[commit] r4726 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 22 Mar '07

22 Mar '07

Author: anthm Date: Wed Mar 21 20:57:08 2007 New Revision: 4726 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 Wed Mar 21 20:57:08 2007 @@ -24,7 +24,7 @@ $(GETLIB) $(LIBPRI_HOST) $(LIBPRI_FILE) cd $(LIBPRI_DIR) -$(LIBSANGOMA_MAKEFILE): +$(LIBSANGOMA_MAKEFILE): $(LIBPRI_DIR) cd $(LIBSANGOMA_DIR) && CFLAGS="-I$(WANPIPE_INCLUDE)" ./configure $(OPTS) $(LIBSANGOMA_LA): $(LIBSANGOMA_MAKEFILE) @@ -37,6 +37,6 @@ cd $(WANPIPE_DIR) && $(MAKE) && $(MAKE) install rm -f $(LIBSANGOMA_MAKEFILE) -local_depend: $(LIBPRI_DIR) $(WANPIPE_KO) +local_depend: $(WANPIPE_KO)

1 0

[commit] r4725 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 22 Mar '07

22 Mar '07

Author: anthm Date: Wed Mar 21 20:52:13 2007 New Revision: 4725 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 Wed Mar 21 20:52:13 2007 @@ -3,7 +3,6 @@ LIBPRI=libpri-1.2.4 LIBPRI_FILE=$(LIBPRI).tar.gz LIBPRI_DIR=$(BASE)/libs/$(LIBPRI) -LIBPRI_A=$(LIBPRI_DIR)/libpri.a WANPIPE=wanpipe-3.1.0.p12 WANPIPE_HOST=ftp://ftp.sangoma.com/linux/custom/3.1 WANPIPE_FILE=$(WANPIPE).tgz @@ -16,16 +15,14 @@ LOCAL_CFLAGS =-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 LOCAL_CFLAGS +=-w -LOCAL_OBJS=ss7boost_client.o $(BASE)/libs/libteletone/libteletone.la $(LIBSANGOMA_LA) $(LIBPRI_A) +LOCAL_OBJS=ss7boost_client.o $(BASE)/libs/libteletone/libteletone.la $(LIBSANGOMA_LA) OPTS=--prefix=$(PREFIX) --with-libpri=../../../$(LIBPRI) --disable-shared - +LOCAL_OBJS +=$(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 include $(BASE)/build/modmake.rules $(LIBPRI_DIR): $(GETLIB) $(LIBPRI_HOST) $(LIBPRI_FILE) - cd $(LIBPRI_DIR) && $(MAKE) - -$(LIBPRI_A): $(LIBPRI_DIR) + cd $(LIBPRI_DIR) $(LIBSANGOMA_MAKEFILE): cd $(LIBSANGOMA_DIR) && CFLAGS="-I$(WANPIPE_INCLUDE)" ./configure $(OPTS) @@ -40,6 +37,6 @@ cd $(WANPIPE_DIR) && $(MAKE) && $(MAKE) install rm -f $(LIBSANGOMA_MAKEFILE) -local_depend: $(WANPIPE_KO) +local_depend: $(LIBPRI_DIR) $(WANPIPE_KO)

1 0

[commit] r4724 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 22 Mar '07

22 Mar '07

Author: anthm Date: Wed Mar 21 20:19:29 2007 New Revision: 4724 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 Wed Mar 21 20:19:29 2007 @@ -9,13 +9,13 @@ WANPIPE_FILE=$(WANPIPE).tgz WANPIPE_DIR=$(BASE)/libs/$(WANPIPE) WANPIPE_INCLUDE=$(WANPIPE_DIR)/patches/kdrivers/include +WANPIPE_KO=$(WANPIPE_DIR)/patches/kdrivers/src/net/wanpipe.ko LIBSANGOMA_DIR=$(WANPIPE_DIR)/api/libsangoma LIBSANGOMA_LA=$(LIBSANGOMA_DIR)/.libs/libsangoma.la LIBSANGOMA_MAKEFILE=$(LIBSANGOMA_DIR)/Makefile LOCAL_CFLAGS =-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 LOCAL_CFLAGS +=-w -#LOCAL_LDFLAGS= LOCAL_OBJS=ss7boost_client.o $(BASE)/libs/libteletone/libteletone.la $(LIBSANGOMA_LA) $(LIBPRI_A) OPTS=--prefix=$(PREFIX) --with-libpri=../../../$(LIBPRI) --disable-shared @@ -35,10 +35,11 @@ $(WANPIPE_DIR): $(GETLIB) $(WANPIPE_HOST) $(WANPIPE_FILE) + +$(WANPIPE_KO): $(WANPIPE_DIR) cd $(WANPIPE_DIR) && $(MAKE) && $(MAKE) install rm -f $(LIBSANGOMA_MAKEFILE) - $(TOUCH_TARGET) -local_depend: $(WANPIPE_DIR) -#MOD_CFLAGS="-I$(WANPIPE_INCLUDE)" MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) libsangoma $(OPTS) +local_depend: $(WANPIPE_KO) +

1 0

[commit] r4723 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 21 Mar '07

21 Mar '07

Author: anthm Date: Wed Mar 21 19:58:54 2007 New Revision: 4723 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Log: update wanpipe to be fully automated 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 Wed Mar 21 19:58:54 2007 @@ -17,7 +17,7 @@ LOCAL_CFLAGS +=-w #LOCAL_LDFLAGS= LOCAL_OBJS=ss7boost_client.o $(BASE)/libs/libteletone/libteletone.la $(LIBSANGOMA_LA) $(LIBPRI_A) -OPTS=--prefix=$(PREFIX) --with-libpri=$(LIBPRI_DIR) --disable-shared +OPTS=--prefix=$(PREFIX) --with-libpri=../../../$(LIBPRI) --disable-shared include $(BASE)/build/modmake.rules

1 0

[commit] r4722 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 21 Mar '07

21 Mar '07

Author: anthm Date: Wed Mar 21 19:44:55 2007 New Revision: 4722 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Log: update wanpipe to be fully automated 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 Wed Mar 21 19:44:55 2007 @@ -36,6 +36,7 @@ $(WANPIPE_DIR): $(GETLIB) $(WANPIPE_HOST) $(WANPIPE_FILE) cd $(WANPIPE_DIR) && $(MAKE) && $(MAKE) install + rm -f $(LIBSANGOMA_MAKEFILE) $(TOUCH_TARGET) local_depend: $(WANPIPE_DIR)

1 0

[commit] r4721 - in freeswitch/trunk: build src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 21 Mar '07

21 Mar '07

Author: anthm Date: Wed Mar 21 19:42:16 2007 New Revision: 4721 Modified: freeswitch/trunk/build/getlib.sh.in freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Log: update wanpipe to be fully automated Modified: freeswitch/trunk/build/getlib.sh.in ============================================================================== --- freeswitch/trunk/build/getlib.sh.in (original) +++ freeswitch/trunk/build/getlib.sh.in Wed Mar 21 19:42:16 2007 @@ -13,8 +13,14 @@ fi fi -base=http://svn.freeswitch.org/downloads/libs +base=http://svn.freeswitch.org/downloads/libs/ tarfile=$1 +url=`echo $tarfile | grep "://"` + +if [ ! -z $url ] ; then + base=$tarfile/ + tarfile=$2 +fi if [ ! -d $tarfile ] ; then uncompressed=`echo $tarfile | sed "s/\.tar\.gz//g"` @@ -22,7 +28,7 @@ if [ ! -f $tarfile ] ; then rm -fr $uncompressed - $DOWNLOAD_CMD $base/$tarfile + $DOWNLOAD_CMD $base$tarfile if [ ! -f $tarfile ] ; then echo cannot find $tarfile exit 1 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 Wed Mar 21 19:42:16 2007 @@ -1,10 +1,43 @@ BASE=../../../.. -LOCAL_CFLAGS =-I/usr/local/include -I/usr/src/libpri -I/usr/src/linux/include -I. -I/usr/include +LIBPRI_HOST=http://ftp.digium.com/pub/libpri +LIBPRI=libpri-1.2.4 +LIBPRI_FILE=$(LIBPRI).tar.gz +LIBPRI_DIR=$(BASE)/libs/$(LIBPRI) +LIBPRI_A=$(LIBPRI_DIR)/libpri.a +WANPIPE=wanpipe-3.1.0.p12 +WANPIPE_HOST=ftp://ftp.sangoma.com/linux/custom/3.1 +WANPIPE_FILE=$(WANPIPE).tgz +WANPIPE_DIR=$(BASE)/libs/$(WANPIPE) +WANPIPE_INCLUDE=$(WANPIPE_DIR)/patches/kdrivers/include +LIBSANGOMA_DIR=$(WANPIPE_DIR)/api/libsangoma +LIBSANGOMA_LA=$(LIBSANGOMA_DIR)/.libs/libsangoma.la +LIBSANGOMA_MAKEFILE=$(LIBSANGOMA_DIR)/Makefile +LOCAL_CFLAGS =-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 LOCAL_CFLAGS +=-w -LOCAL_LDFLAGS=-lsangoma $(BASE)/libs/libteletone/libteletone.la -LOCAL_OBJS=ss7boost_client.o +#LOCAL_LDFLAGS= +LOCAL_OBJS=ss7boost_client.o $(BASE)/libs/libteletone/libteletone.la $(LIBSANGOMA_LA) $(LIBPRI_A) +OPTS=--prefix=$(PREFIX) --with-libpri=$(LIBPRI_DIR) --disable-shared + include $(BASE)/build/modmake.rules -local_depend: - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libsangoma --prefix=$(PREFIX) --with-libpri=/usr/src/libpri +$(LIBPRI_DIR): + $(GETLIB) $(LIBPRI_HOST) $(LIBPRI_FILE) + cd $(LIBPRI_DIR) && $(MAKE) + +$(LIBPRI_A): $(LIBPRI_DIR) + +$(LIBSANGOMA_MAKEFILE): + cd $(LIBSANGOMA_DIR) && CFLAGS="-I$(WANPIPE_INCLUDE)" ./configure $(OPTS) + +$(LIBSANGOMA_LA): $(LIBSANGOMA_MAKEFILE) + cd $(LIBSANGOMA_DIR) && $(MAKE) + +$(WANPIPE_DIR): + $(GETLIB) $(WANPIPE_HOST) $(WANPIPE_FILE) + cd $(WANPIPE_DIR) && $(MAKE) && $(MAKE) install + $(TOUCH_TARGET) + +local_depend: $(WANPIPE_DIR) +#MOD_CFLAGS="-I$(WANPIPE_INCLUDE)" MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) libsangoma $(OPTS) +

1 0

[commit] r4720 - in freeswitch/trunk/src: . mod/endpoints/mod_iax
by Freeswitch SVN 21 Mar '07

21 Mar '07

Author: anthm Date: Wed Mar 21 17:23:40 2007 New Revision: 4720 Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr.c Log: cleanup 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 21 17:23:40 2007 @@ -587,9 +587,7 @@ default: break; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL KILL\n", switch_channel_get_name(channel)); - - + return SWITCH_STATUS_SUCCESS; } @@ -649,7 +647,8 @@ private_t *tech_pvt = NULL; switch_time_t started = switch_time_now(); unsigned int elapsed; - + switch_byte_t *data; + channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -703,12 +702,14 @@ return SWITCH_STATUS_FALSE; cng: - tech_pvt->read_frame.datalen = 13; - memset(tech_pvt->read_frame.data, 0, 13); + data = (switch_byte_t *) tech_pvt->read_frame.data; + data[0] = 65; + data[1] = 0; + tech_pvt->read_frame.datalen = 2; tech_pvt->read_frame.flags = SFF_CNG; *frame = &tech_pvt->read_frame; return SWITCH_STATUS_SUCCESS; - + } static switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout, Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Wed Mar 21 17:23:40 2007 @@ -1036,10 +1036,10 @@ switch_event_fire(&event); } - /* if we're in a bridge and the other channel is in a blocking read they will never realize we have answered so send + /* 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 */ - if ((uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE)) && (other_session = switch_core_session_locate(uuid))) { + if ((uuid = switch_channel_get_variable(channel, SWITCH_ORIGINATOR_VARIABLE)) && (other_session = switch_core_session_locate(uuid))) { switch_core_session_kill_channel(other_session, SWITCH_SIG_BREAK); switch_core_session_rwunlock(other_session); } @@ -1075,7 +1075,7 @@ msg.message_id = SWITCH_MESSAGE_INDICATE_PROGRESS; msg.from = channel->name; status = switch_core_session_message_send(uuid, &msg); - + if (status == SWITCH_STATUS_SUCCESS) { status = switch_channel_perform_mark_pre_answered(channel, file, func, line); } @@ -1148,11 +1148,11 @@ switch_channel_event_set_data(channel, event); switch_event_fire(&event); } - - /* if we're in a bridge and the other channel is in a blocking read they will never realize we have answered so send + + /* 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 */ - if ((uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE)) && (other_session = switch_core_session_locate(uuid))) { + if ((uuid = switch_channel_get_variable(channel, SWITCH_ORIGINATOR_VARIABLE)) && (other_session = switch_core_session_locate(uuid))) { switch_core_session_kill_channel(other_session, SWITCH_SIG_BREAK); switch_core_session_rwunlock(other_session); } Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Wed Mar 21 17:23:40 2007 @@ -2048,9 +2048,8 @@ switch_channel_answer(chan_a); ans_a++; } else if (!pre_b && switch_channel_test_flag(chan_b, CF_EARLY_MEDIA)) { - if (switch_channel_pre_answer(chan_a) == SWITCH_STATUS_SUCCESS) { - pre_b++; - } + switch_channel_pre_answer(chan_a); + pre_b++; } if (!pre_b) { switch_yield(10000);

1 0