March 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r4627 - freeswitch/trunk
by Freeswitch SVN 17 Mar '07

17 Mar '07

Author: mikej Date: Fri Mar 16 23:06:50 2007 New Revision: 4627 Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/Makefile.in Log: we don't need to be so noisy Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Fri Mar 16 23:06:50 2007 @@ -12,7 +12,7 @@ LIBTOOL=$(switch_builddir)/libtool LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) -TOUCH_TARGET=if test -f "$@" ; then touch "$@" ; fi ; +TOUCH_TARGET=@if test -f "$@" ; then touch "$@" ; fi ; if CRASHPROT AM_CFLAGS += -DCRASH_PROT Modified: freeswitch/trunk/Makefile.in ============================================================================== --- freeswitch/trunk/Makefile.in (original) +++ freeswitch/trunk/Makefile.in Fri Mar 16 23:06:50 2007 @@ -299,7 +299,7 @@ BASE = $(switch_srcdir) OSARCH = `uname -s` LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) -TOUCH_TARGET = if test -f "$@" ; then touch "$@" ; fi ; +TOUCH_TARGET = @if test -f "$@" ; then touch "$@" ; fi ; libfreeswitch_la_SOURCES = \ src/switch_apr.c \ src/switch_buffer.c \

1 0

[commit] r4626 - freeswitch/trunk/libs/pcre
by Freeswitch SVN 17 Mar '07

17 Mar '07

Author: mikej Date: Fri Mar 16 23:04:51 2007 New Revision: 4626 Modified: freeswitch/trunk/libs/pcre/INSTALL Log: ignore this commit.. for testing lib rebuilds. Modified: freeswitch/trunk/libs/pcre/INSTALL ============================================================================== --- freeswitch/trunk/libs/pcre/INSTALL (original) +++ freeswitch/trunk/libs/pcre/INSTALL Fri Mar 16 23:04:51 2007 @@ -183,3 +183,4 @@ script, and exit. `configure' also accepts some other, not widely useful, options. + \ No newline at end of file

1 0

[commit] r4625 - freeswitch/trunk
by Freeswitch SVN 17 Mar '07

17 Mar '07

Author: mikej Date: Fri Mar 16 23:00:30 2007 New Revision: 4625 Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/Makefile.in Log: rebuild core libraries if the directory or the .update file changes Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Fri Mar 16 23:00:30 2007 @@ -12,6 +12,7 @@ LIBTOOL=$(switch_builddir)/libtool LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) +TOUCH_TARGET=if test -f "$@" ; then touch "$@" ; fi ; if CRASHPROT AM_CFLAGS += -DCRASH_PROT @@ -85,8 +86,6 @@ libfreeswitch_la_LIBADD = $(CORE_LIBS) nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h -$(libfreeswitch_la_SOURCES): $(CORE_LIBS) $(library_include_HEADERS) - MOD_LINK = $(BASE)/libfreeswitch.la CLEANFILES = src/include/switch_version.h @@ -144,16 +143,35 @@ yesdepends: rm .nodepends -$(CORE_LIBS): - cd libs/sqlite && $(MAKE) +libs/apr/libapr-1.la: libs/apr libs/apr/.update cd libs/apr && $(MAKE) + $(TOUCH_TARGET) + +libs/apr-util/libaprutil-1.la: libs/apr-util libs/apr-util/.update cd libs/apr-util && $(MAKE) + $(TOUCH_TARGET) + +libs/sqlite/libsqlite3.la: libs/sqlite libs/sqlite/.update + cd libs/sqlite && $(MAKE) + $(TOUCH_TARGET) + +libs/pcre/libpcre.la: libs/pcre libs/pcre/.update cd libs/pcre && $(MAKE) + $(TOUCH_TARGET) + +libs/srtp/libsrtp.la: libs/srtp libs/srtp/.update cd libs/srtp && $(MAKE) - cd libs/libresample && $(MAKE) + $(TOUCH_TARGET) + +libs/libteletone/libteletone.la: libs/libteletone libs/libteletone/.update cd libs/libteletone && $(MAKE) + $(TOUCH_TARGET) + +libs/libresample/libresample.la: libs/libresample libs/libresample/.update + cd libs/libresample && $(MAKE) + $(TOUCH_TARGET) -core: $(CORE_LIBS) libfreeswitch.la +core: libfreeswitch.la install_core: install-libLTLIBRARIES Modified: freeswitch/trunk/Makefile.in ============================================================================== --- freeswitch/trunk/Makefile.in (original) +++ freeswitch/trunk/Makefile.in Fri Mar 16 23:00:30 2007 @@ -299,6 +299,7 @@ BASE = $(switch_srcdir) OSARCH = `uname -s` LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) +TOUCH_TARGET = if test -f "$@" ; then touch "$@" ; fi ; libfreeswitch_la_SOURCES = \ src/switch_apr.c \ src/switch_buffer.c \ @@ -1085,8 +1086,6 @@ uninstall-libLTLIBRARIES uninstall-library_includeHEADERS -$(libfreeswitch_la_SOURCES): $(CORE_LIBS) $(library_include_HEADERS) - install-data-local: @echo Installing $(NAME) @for x in conf mod db log log/xml_cdr bin scripts htdocs grammar ; do \ @@ -1133,16 +1132,35 @@ yesdepends: rm .nodepends -$(CORE_LIBS): - cd libs/sqlite && $(MAKE) +libs/apr/libapr-1.la: libs/apr libs/apr/.update cd libs/apr && $(MAKE) + $(TOUCH_TARGET) + +libs/apr-util/libaprutil-1.la: libs/apr-util libs/apr-util/.update cd libs/apr-util && $(MAKE) + $(TOUCH_TARGET) + +libs/sqlite/libsqlite3.la: libs/sqlite libs/sqlite/.update + cd libs/sqlite && $(MAKE) + $(TOUCH_TARGET) + +libs/pcre/libpcre.la: libs/pcre libs/pcre/.update cd libs/pcre && $(MAKE) + $(TOUCH_TARGET) + +libs/srtp/libsrtp.la: libs/srtp libs/srtp/.update cd libs/srtp && $(MAKE) - cd libs/libresample && $(MAKE) + $(TOUCH_TARGET) + +libs/libteletone/libteletone.la: libs/libteletone libs/libteletone/.update cd libs/libteletone && $(MAKE) + $(TOUCH_TARGET) + +libs/libresample/libresample.la: libs/libresample libs/libresample/.update + cd libs/libresample && $(MAKE) + $(TOUCH_TARGET) -core: $(CORE_LIBS) libfreeswitch.la +core: libfreeswitch.la install_core: install-libLTLIBRARIES

1 0

[commit] r4624 - in freeswitch/trunk/src: . mod/endpoints/mod_dingaling
by Freeswitch SVN 17 Mar '07

17 Mar '07

Author: anthm Date: Fri Mar 16 21:52:05 2007 New Revision: 4624 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/switch_rtp.c Log: fix some minor RTP issues 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 Fri Mar 16 21:52:05 2007 @@ -778,6 +778,8 @@ switch_rtp_enable_vad(tech_pvt->rtp_session, tech_pvt->session, &tech_pvt->read_codec, SWITCH_VAD_FLAG_TALKING); switch_set_flag_locked(tech_pvt, TFLAG_VAD); } + switch_rtp_set_cng_pt(tech_pvt->rtp_session, 13); + switch_rtp_set_telephony_event(tech_pvt->rtp_session, 101); } return 1; Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Mar 16 21:52:05 2007 @@ -134,6 +134,7 @@ void *private_data; uint32_t ts; uint32_t last_write_ts; + uint32_t last_write_samplecount; uint16_t last_write_seq; uint32_t last_write_ssrc; uint32_t flags; @@ -157,11 +158,12 @@ switch_mutex_t *flag_mutex; switch_timer_t timer; uint8_t ready; + uint8_t cn; switch_time_t last_time; }; static int global_init = 0; -static int rtp_common_write(switch_rtp_t *rtp_session, void *data, uint32_t datalen, uint8_t m, switch_payload_t payload, switch_frame_flag_t *flags); +static int rtp_common_write(switch_rtp_t *rtp_session, void *data, uint32_t datalen, switch_payload_t payload, switch_frame_flag_t *flags); static switch_status_t ice_out(switch_rtp_t *rtp_session) { @@ -431,9 +433,10 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Activating Secure RTP!\n"); } + rtp_session->seq = (uint16_t) rand(); rtp_session->send_msg.header.ssrc = htonl(ssrc); rtp_session->send_msg.header.ts = 0; - rtp_session->send_msg.header.seq = (uint16_t) rand(); + //rtp_session->send_msg.header.seq = (uint16_t) rand(); rtp_session->send_msg.header.m = 0; rtp_session->send_msg.header.pt = (switch_payload_t)htonl(payload); rtp_session->send_msg.header.version = 2; @@ -451,7 +454,6 @@ rtp_session->recv_msg.header.x = 0; rtp_session->recv_msg.header.cc = 0; - rtp_session->seq = (uint16_t)rtp_session->send_msg.header.seq; rtp_session->payload = payload; rtp_session->ms_per_packet = ms_per_packet; rtp_session->samples_per_interval = rtp_session->conf_samples_per_interval = samples_per_interval; @@ -825,17 +827,12 @@ check = (uint8_t)(switch_core_timer_check(&rtp_session->timer) == SWITCH_STATUS_SUCCESS); if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTO_CNG) && - rtp_session->timer.samplecount >= (rtp_session->last_write_ts + (rtp_session->samples_per_interval * 50))) { + rtp_session->timer.samplecount >= (rtp_session->last_write_samplecount + (rtp_session->samples_per_interval * 50))) { uint8_t data[2] = {0}; switch_frame_flag_t flags = SFF_NONE; - data[0] = 127; - rtp_session->last_write_ts = rtp_session->timer.samplecount; - rtp_session->seq = ntohs(rtp_session->seq) + 1; - rtp_session->seq = htons(rtp_session->seq); - rtp_session->send_msg.header.seq = rtp_session->seq; - rtp_session->send_msg.header.ts = htonl(rtp_session->last_write_ts); - - rtp_common_write(rtp_session, (void *) data, sizeof(data), 0, rtp_session->cng_pt, &flags); + data[0] = 65; + rtp_session->cn++; + rtp_common_write(rtp_session, (void *) data, sizeof(data), rtp_session->cng_pt, &flags); } } @@ -1142,7 +1139,7 @@ return SWITCH_STATUS_SUCCESS; } -static int rtp_common_write(switch_rtp_t *rtp_session, void *data, uint32_t datalen, uint8_t m, switch_payload_t payload, switch_frame_flag_t *flags) +static int rtp_common_write(switch_rtp_t *rtp_session, void *data, uint32_t datalen, switch_payload_t payload, switch_frame_flag_t *flags) { switch_size_t bytes; uint8_t fwd = 0; @@ -1154,14 +1151,27 @@ } fwd = (uint8_t)(!flags || (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_RAW_WRITE) && (*flags & SFF_RAW_RTP))); - + if (fwd) { bytes = datalen; send_msg = (rtp_msg_t *) data; } else { + uint8_t m = 0; + if (rtp_session->ts > rtp_session->last_write_ts + rtp_session->samples_per_interval || rtp_session->ts == rtp_session->samples_per_interval) { + m++; + } + if (rtp_session->cn && payload != rtp_session->cng_pt) { + rtp_session->cn = 0; + m++; + } + send_msg = &rtp_session->send_msg; send_msg->header.pt = payload; send_msg->header.m = m ? 1 : 0; + rtp_session->seq++; + rtp_session->send_msg.header.seq = htons(rtp_session->seq); + rtp_session->send_msg.header.ts = htonl(rtp_session->ts); + memcpy(send_msg->body, data, datalen); bytes = datalen + rtp_header_len; } @@ -1297,15 +1307,19 @@ } } - rtp_session->last_write_ts = ntohl(send_msg->header.ts); rtp_session->last_write_ssrc = ntohl(send_msg->header.ssrc); - rtp_session->last_write_seq = ntohs((u_short)send_msg->header.seq); + rtp_session->last_write_seq = rtp_session->seq; + if (rtp_session->last_write_seq <= rtp_session->dtmf_data.out_digit_seq) { send = 0; } if (send) { + if (rtp_session->timer.interval) { + switch_core_timer_check(&rtp_session->timer); + rtp_session->last_write_samplecount = rtp_session->timer.samplecount; + } switch_socket_sendto(rtp_session->sock, rtp_session->remote_addr, 0, (void*)send_msg, &bytes); } @@ -1381,7 +1395,6 @@ SWITCH_DECLARE(int) switch_rtp_write(switch_rtp_t *rtp_session, void *data, uint32_t datalen, uint32_t ts, switch_frame_flag_t *flags) { - uint8_t mark = 0; if (!switch_rtp_ready(rtp_session)) { return -1; @@ -1404,16 +1417,7 @@ rtp_session->ts += rtp_session->samples_per_interval; } - if (rtp_session->ts > rtp_session->last_write_ts + rtp_session->samples_per_interval || rtp_session->ts == rtp_session->samples_per_interval) { - mark++; - } - - rtp_session->seq = ntohs(rtp_session->seq) + 1; - rtp_session->seq = htons(rtp_session->seq); - rtp_session->send_msg.header.seq = rtp_session->seq; - rtp_session->send_msg.header.ts = htonl(rtp_session->ts); - - return rtp_common_write(rtp_session, data, datalen, mark, rtp_session->payload, flags); + return rtp_common_write(rtp_session, data, datalen, rtp_session->payload, flags); } @@ -1423,7 +1427,6 @@ uint8_t packetize = 0; void *data; uint32_t len; - uint8_t mark = 0; switch_payload_t payload; @@ -1467,18 +1470,9 @@ } else { rtp_session->ts += rtp_session->samples_per_interval; } - - if (rtp_session->ts > rtp_session->last_write_ts + rtp_session->samples_per_interval || rtp_session->ts == rtp_session->samples_per_interval) { - mark++; - } - - rtp_session->seq = ntohs(rtp_session->seq) + 1; - rtp_session->seq = htons(rtp_session->seq); - rtp_session->send_msg.header.seq = rtp_session->seq; - rtp_session->send_msg.header.ts = htonl(rtp_session->ts); } - return rtp_common_write(rtp_session, data, len, mark, payload, &frame->flags); + return rtp_common_write(rtp_session, data, len, payload, &frame->flags); }

1 0

[commit] r4623 - in freeswitch/trunk: . src/mod
by Freeswitch SVN 17 Mar '07

17 Mar '07

Author: mikej Date: Fri Mar 16 21:45:13 2007 New Revision: 4623 Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/Makefile.in freeswitch/trunk/src/mod/Makefile.in Log: fix make megaclean target Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Fri Mar 16 21:45:13 2007 @@ -198,4 +198,4 @@ rm -f *.tar *.tgz *.gz megaclean: eclean modclean - rm -fr .depend `find . -name .complete` + rm -f `find ./libs -name \*.la` Modified: freeswitch/trunk/Makefile.in ============================================================================== --- freeswitch/trunk/Makefile.in (original) +++ freeswitch/trunk/Makefile.in Fri Mar 16 21:45:13 2007 @@ -1187,7 +1187,7 @@ rm -f *.tar *.tgz *.gz megaclean: eclean modclean - rm -fr .depend `find . -name .complete` + rm -f `find ./libs -name \*.la` # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: Modified: freeswitch/trunk/src/mod/Makefile.in ============================================================================== --- freeswitch/trunk/src/mod/Makefile.in (original) +++ freeswitch/trunk/src/mod/Makefile.in Fri Mar 16 21:45:13 2007 @@ -33,6 +33,8 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ subdir = src/mod DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -58,6 +60,7 @@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ +AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -70,15 +73,22 @@ CRASHPROT_FALSE = @CRASHPROT_FALSE@ CRASHPROT_TRUE = @CRASHPROT_TRUE@ CURL = @CURL@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNAMIC_LIB_EXTEN = @DYNAMIC_LIB_EXTEN@ +ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ GETLIB = @GETLIB@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -96,6 +106,8 @@ LIBCURL_DEPS = @LIBCURL_DEPS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ OBJEXT = @OBJEXT@ @@ -107,6 +119,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PRTDIAG = @PRTDIAG@ +RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLINK = @SOLINK@ @@ -121,20 +134,34 @@ WGET = @WGET@ ZCAT = @ZCAT@ _libcurl_config = @_libcurl_config@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ +build = @build@ build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ datadir = @datadir@ exec_prefix = @exec_prefix@ +host = @host@ host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -203,6 +230,15 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool uninstall-info-am: tags: TAGS TAGS: @@ -264,11 +300,11 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -clean-am: clean-generic mostlyclean-am +clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic +distclean-am: clean-am distclean-generic distclean-libtool dvi: dvi-am @@ -296,7 +332,7 @@ mostlyclean: mostlyclean-am -mostlyclean-am: mostlyclean-generic +mostlyclean-am: mostlyclean-generic mostlyclean-libtool pdf: pdf-am @@ -308,13 +344,14 @@ uninstall-am: uninstall-info-am -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-exec install-exec-am \ + install-info install-info-am install-man install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ uninstall-info-am

1 0

[commit] r4622 - in freeswitch/trunk/libs: apr apr-util codec/g726 codec/g7xx codec/gsm codec/ilbc codec/lpc10 curl iksemel js/nsprpub libetpan libresample libsndfile libspeakup libteletone pcre portaudio speex srtp udns xmlrpc-c
by Freeswitch SVN 16 Mar '07

16 Mar '07

Author: mikej Date: Fri Mar 16 17:22:04 2007 New Revision: 4622 Added: freeswitch/trunk/libs/apr-util/.update freeswitch/trunk/libs/apr/.update freeswitch/trunk/libs/codec/g726/.update freeswitch/trunk/libs/codec/g7xx/.update freeswitch/trunk/libs/codec/gsm/.update freeswitch/trunk/libs/codec/ilbc/.update freeswitch/trunk/libs/codec/lpc10/.update freeswitch/trunk/libs/curl/.update freeswitch/trunk/libs/iksemel/.update freeswitch/trunk/libs/js/nsprpub/.update freeswitch/trunk/libs/libetpan/.update freeswitch/trunk/libs/libresample/.update freeswitch/trunk/libs/libsndfile/.update freeswitch/trunk/libs/libspeakup/.update freeswitch/trunk/libs/libteletone/.update freeswitch/trunk/libs/pcre/.update freeswitch/trunk/libs/portaudio/.update freeswitch/trunk/libs/speex/.update freeswitch/trunk/libs/srtp/.update freeswitch/trunk/libs/udns/.update freeswitch/trunk/libs/xmlrpc-c/.update Log: add .update files to the libs that we can use to force rebuilds of libs Added: freeswitch/trunk/libs/apr-util/.update ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/apr-util/.update Fri Mar 16 17:22:04 2007 @@ -0,0 +1 @@ +Fri Mar 16 17:12:43 EDT 2007 Added: freeswitch/trunk/libs/apr/.update ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/apr/.update Fri Mar 16 17:22:04 2007 @@ -0,0 +1 @@ +Fri Mar 16 17:12:07 EDT 2007 Added: freeswitch/trunk/libs/codec/g726/.update ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/codec/g726/.update Fri Mar 16 17:22:04 2007 @@ -0,0 +1 @@ +Fri Mar 16 17:13:05 EDT 2007 Added: freeswitch/trunk/libs/codec/g7xx/.update ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/codec/g7xx/.update Fri Mar 16 17:22:04 2007 @@ -0,0 +1 @@ +Fri Mar 16 17:13:27 EDT 2007 Added: freeswitch/trunk/libs/codec/gsm/.update ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/codec/gsm/.update Fri Mar 16 17:22:04 2007 @@ -0,0 +1 @@ +Fri Mar 16 17:13:43 EDT 2007 Added: freeswitch/trunk/libs/codec/ilbc/.update ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/codec/ilbc/.update Fri Mar 16 17:22:04 2007 @@ -0,0 +1 @@ +Fri Mar 16 17:14:01 EDT 2007 Added: freeswitch/trunk/libs/codec/lpc10/.update ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/codec/lpc10/.update Fri Mar 16 17:22:04 2007 @@ -0,0 +1 @@ +Fri Mar 16 17:14:20 EDT 2007 Added: freeswitch/trunk/libs/curl/.update ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/curl/.update Fri Mar 16 17:22:04 2007 @@ -0,0 +1 @@ +Fri Mar 16 17:14:45 EDT 2007 Added: freeswitch/trunk/libs/iksemel/.update ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/iksemel/.update Fri Mar 16 17:22:04 2007 @@ -0,0 +1 @@ +Fri Mar 16 17:15:40 EDT 2007 Added: freeswitch/trunk/libs/js/nsprpub/.update ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/js/nsprpub/.update Fri Mar 16 17:22:04 2007 @@ -0,0 +1 @@ +Fri Mar 16 17:16:13 EDT 2007 Added: freeswitch/trunk/libs/libetpan/.update ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/libetpan/.update Fri Mar 16 17:22:04 2007 @@ -0,0 +1 @@ +Fri Mar 16 17:17:12 EDT 2007 Added: freeswitch/trunk/libs/libresample/.update ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/libresample/.update Fri Mar 16 17:22:04 2007 @@ -0,0 +1 @@ +Fri Mar 16 17:17:33 EDT 2007 Added: freeswitch/trunk/libs/libsndfile/.update ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/libsndfile/.update Fri Mar 16 17:22:04 2007 @@ -0,0 +1 @@ +Fri Mar 16 17:17:51 EDT 2007 Added: freeswitch/trunk/libs/libspeakup/.update ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/libspeakup/.update Fri Mar 16 17:22:04 2007 @@ -0,0 +1 @@ +Fri Mar 16 17:18:10 EDT 2007 Added: freeswitch/trunk/libs/libteletone/.update ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/libteletone/.update Fri Mar 16 17:22:04 2007 @@ -0,0 +1 @@ +Fri Mar 16 17:18:25 EDT 2007 Added: freeswitch/trunk/libs/pcre/.update ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/pcre/.update Fri Mar 16 17:22:04 2007 @@ -0,0 +1 @@ +Fri Mar 16 17:18:44 EDT 2007 Added: freeswitch/trunk/libs/portaudio/.update ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/portaudio/.update Fri Mar 16 17:22:04 2007 @@ -0,0 +1 @@ +Fri Mar 16 17:19:02 EDT 2007 Added: freeswitch/trunk/libs/speex/.update ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/speex/.update Fri Mar 16 17:22:04 2007 @@ -0,0 +1 @@ +Fri Mar 16 17:19:52 EDT 2007 Added: freeswitch/trunk/libs/srtp/.update ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/srtp/.update Fri Mar 16 17:22:04 2007 @@ -0,0 +1 @@ +Fri Mar 16 17:20:27 EDT 2007 Added: freeswitch/trunk/libs/udns/.update ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/udns/.update Fri Mar 16 17:22:04 2007 @@ -0,0 +1 @@ +Fri Mar 16 17:20:44 EDT 2007 Added: freeswitch/trunk/libs/xmlrpc-c/.update ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/xmlrpc-c/.update Fri Mar 16 17:22:04 2007 @@ -0,0 +1 @@ +Fri Mar 16 17:21:00 EDT 2007

1 0

[commit] r4621 - freeswitch/trunk/src/include
by Freeswitch SVN 16 Mar '07

16 Mar '07

Author: mikej Date: Fri Mar 16 17:03:38 2007 New Revision: 4621 Modified: freeswitch/trunk/src/include/switch_apr.h freeswitch/trunk/src/include/switch_platform.h Log: use _snprintf instead of switch_snprintf on windows for now.. snprintf seems to be having issues handling anything that uses the #define'd format strings for time t and 64 bit ints on windows. Modified: freeswitch/trunk/src/include/switch_apr.h ============================================================================== --- freeswitch/trunk/src/include/switch_apr.h (original) +++ freeswitch/trunk/src/include/switch_apr.h Fri Mar 16 17:03:38 2007 @@ -131,10 +131,6 @@ * @{ */ -#ifndef snprintf -#define snprintf switch_snprintf -#endif - SWITCH_DECLARE(int) switch_snprintf(char *buf, switch_size_t len, const char *format, ...); SWITCH_DECLARE(int) switch_vasprintf(char **buf, const char *format, va_list ap); Modified: freeswitch/trunk/src/include/switch_platform.h ============================================================================== --- freeswitch/trunk/src/include/switch_platform.h (original) +++ freeswitch/trunk/src/include/switch_platform.h Fri Mar 16 17:03:38 2007 @@ -101,6 +101,10 @@ #include <io.h> #define strcasecmp(s1, s2) stricmp(s1, s2) #define strncasecmp(s1, s2, n) strnicmp(s1, s2, n) +#ifndef snprintf +#define snprintf _snprintf +#endif + #else /* packed attribute */ #ifndef PACKED @@ -199,31 +203,31 @@ #ifdef WIN32 #ifdef WIN64 -#define SWITCH_SSIZE_T_FMT "%I64d" -#define SWITCH_SIZE_T_FMT "%I64d" +#define SWITCH_SSIZE_T_FMT "I64d" +#define SWITCH_SIZE_T_FMT "I64d" #else -#define SWITCH_SSIZE_T_FMT "%d" -#define SWITCH_SIZE_T_FMT "%d" +#define SWITCH_SSIZE_T_FMT "d" +#define SWITCH_SIZE_T_FMT "d" #endif -#define SWITCH_INT64_T_FMT "%I64d" -#define SWITCH_UINT64_T_FMT "%I64u" +#define SWITCH_INT64_T_FMT "I64d" +#define SWITCH_UINT64_T_FMT "I64u" #else #ifndef SWITCH_SSIZE_T_FMT -#define SWITCH_SSIZE_T_FMT (sizeof (switch_ssize_t) == sizeof (long) ? "%ld" : sizeof (switch_ssize_t) == sizeof (int) ? "%d" : "%lld") +#define SWITCH_SSIZE_T_FMT (sizeof (switch_ssize_t) == sizeof (long) ? "ld" : sizeof (switch_ssize_t) == sizeof (int) ? "d" : "lld") #endif #ifndef SWITCH_SIZE_T_FMT -#define SWITCH_SIZE_T_FMT (sizeof (switch_size_t) == sizeof (long) ? "%lu" : sizeof (switch_size_t) == sizeof (int) ? "%u" : "%llu") +#define SWITCH_SIZE_T_FMT (sizeof (switch_size_t) == sizeof (long) ? "lu" : sizeof (switch_size_t) == sizeof (int) ? "u" : "llu") #endif #ifndef SWITCH_INT64_T_FMT -#define SWITCH_INT64_T_FMT (sizeof (long) == 8 ? "%ld" : "%lld") +#define SWITCH_INT64_T_FMT (sizeof (long) == 8 ? "ld" : "lld") #endif #ifndef SWITCH_UINT64_T_FMT -#define SWITCH_UINT64_T_FMT (sizeof (long) == 8 ? "%lu" : "%llu") +#define SWITCH_UINT64_T_FMT (sizeof (long) == 8 ? "lu" : "llu") #endif #endif

1 0

[commit] r4620 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 16 Mar '07

16 Mar '07

Author: mikej Date: Fri Mar 16 17:02:23 2007 New Revision: 4620 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: fix windows build error Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Fri Mar 16 17:02:23 2007 @@ -769,7 +769,7 @@ conference->async_fnode->done++; } else { if (has_file_data) { - int x; + switch_size_t x; for (x = 0; x < file_sample_len; x++) { int32_t z; int16_t *bptr, *muxed;

1 0

[commit] r4619 - freeswitch/trunk/build
by Freeswitch SVN 16 Mar '07

16 Mar '07

Author: mikej Date: Fri Mar 16 16:21:33 2007 New Revision: 4619 Modified: freeswitch/trunk/build/modmake.rules.in Log: make the main mod sourcfile recompile on core header file changes Modified: freeswitch/trunk/build/modmake.rules.in ============================================================================== --- freeswitch/trunk/build/modmake.rules.in (original) +++ freeswitch/trunk/build/modmake.rules.in Fri Mar 16 16:21:33 2007 @@ -111,6 +111,65 @@ .cpp.lo: $(LTCXXCOMPILE) -c -o $@ $< +$(MODNAME).o: $(SOURCEFILE) \ + $(switch_srcdir)/src/include/switch.h $(switch_srcdir)/src/include/switch_am_config.h \ + $(switch_srcdir)/src/include/switch_types.h $(switch_srcdir)/src/include/switch_apr.h \ + $(switch_srcdir)/src/include/switch_core_db.h $(switch_srcdir)/src/include/switch_regex.h \ + $(switch_srcdir)/src/include/switch_core.h $(switch_srcdir)/src/include/switch_loadable_module.h \ + $(switch_srcdir)/src/include/switch_console.h $(switch_srcdir)/src/include/switch_utils.h \ + $(switch_srcdir)/src/include/switch_caller.h $(switch_srcdir)/src/include/switch_config.h \ + $(switch_srcdir)/src/include/switch_frame.h $(switch_srcdir)/src/include/switch_module_interfaces.h \ + $(switch_srcdir)/src/include/switch_channel.h $(switch_srcdir)/src/include/switch_buffer.h \ + $(switch_srcdir)/src/include/switch_event.h $(switch_srcdir)/src/include/switch_resample.h \ + $(switch_srcdir)/src/include/switch_ivr.h $(switch_srcdir)/src/include/switch_rtp.h \ + $(switch_srcdir)/src/include/switch_stun.h $(switch_srcdir)/src/include/switch_log.h \ + $(switch_srcdir)/src/include/switch_xml.h + +$(switch_srcdir)/src/include/switch.h: + +$(switch_srcdir)/src/include/switch_am_config.h: + +$(switch_srcdir)/src/include/switch_types.h: + +$(switch_srcdir)/src/include/switch_apr.h: + +$(switch_srcdir)/src/include/switch_core_db.h: + +$(switch_srcdir)/src/include/switch_regex.h: + +$(switch_srcdir)/src/include/switch_core.h: + +$(switch_srcdir)/src/include/switch_loadable_module.h: + +$(switch_srcdir)/src/include/switch_console.h: + +$(switch_srcdir)/src/include/switch_utils.h: + +$(switch_srcdir)/src/include/switch_caller.h: + +$(switch_srcdir)/src/include/switch_config.h: + +$(switch_srcdir)/src/include/switch_frame.h: + +$(switch_srcdir)/src/include/switch_module_interfaces.h: + +$(switch_srcdir)/src/include/switch_channel.h: + +$(switch_srcdir)/src/include/switch_buffer.h: + +$(switch_srcdir)/src/include/switch_event.h: + +$(switch_srcdir)/src/include/switch_resample.h: + +$(switch_srcdir)/src/include/switch_ivr.h: + +$(switch_srcdir)/src/include/switch_rtp.h: + +$(switch_srcdir)/src/include/switch_stun.h: + +$(switch_srcdir)/src/include/switch_log.h: + +$(switch_srcdir)/src/include/switch_xml.h: .PHONY: all depend clean local_all local_depend \ install depend_install local_install mod_install \

1 0

[commit] r4618 - freeswitch/trunk/build
by Freeswitch SVN 16 Mar '07

16 Mar '07

Author: anthm Date: Fri Mar 16 16:03:12 2007 New Revision: 4618 Modified: freeswitch/trunk/build/modmake.rules.in Log: make modules re-link after core change Modified: freeswitch/trunk/build/modmake.rules.in ============================================================================== --- freeswitch/trunk/build/modmake.rules.in (original) +++ freeswitch/trunk/build/modmake.rules.in Fri Mar 16 16:03:12 2007 @@ -70,7 +70,7 @@ $(CURLLA): cd $(CURL_DIR) && $(MAKE) -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(LOCAL_LIBADD) $(OUR_DEPS) $(LOCAL_OBJS) $(SOURCEFILE) $(MODNAME).o +$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(LIBS) $(LOCAL_LIBADD) $(OUR_DEPS) $(LOCAL_OBJS) $(SOURCEFILE) $(MODNAME).o @if test -f $(CSOURCEFILE); then \ echo $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(LOCAL_LIBADD); \ $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(LOCAL_LIBADD); \

1 0