team-telnyx · damirn · Aug 24, 2024 · Jan 2, 2025 · Aug 24, 2024 · Jan 2, 2025
diff --git a/.gitignore b/.gitignore
@@ -145,18 +145,15 @@ Release/
 /src/mod/applications/mod_nibblebill/Makefile
 /src/mod/applications/mod_osp/Makefile
 /src/mod/applications/mod_osp/Makefile.in
-/src/mod/applications/mod_rss/Makefile
 /src/mod/applications/mod_snipe_hunt/Makefile
 /src/mod/applications/mod_test/test/Makefile
 /src/mod/applications/mod_test/test/Makefile.in
 /src/mod/codecs/mod_com_g729/Makefile
 /src/mod/codecs/mod_com_g729/Makefile.in
-/src/mod/codecs/mod_dahdi_codec/Makefile
 /src/mod/dialplans/mod_dialplan_directory/Makefile
 /src/mod/formats/mod_shell_stream/Makefile
 /src/mod/languages/mod_lua/mod_lua_wrap.cpp.orig
 /src/mod/languages/mod_perl/mod_perl_wrap.cpp.orig
-/src/mod/languages/mod_python/mod_python_wrap.cpp.orig
 /src/mod/languages/mod_python3/mod_python_wrap.cpp.orig
 /src/mod/say/mod_say_de/Makefile
 /src/mod/say/mod_say_es/Makefile
@@ -175,7 +172,6 @@ BuildLog.htm
 
 !/libs/win32/
 !/libs/speex/win32/
-!/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/
 *.suo
 *.sdf
 x64/
@@ -255,9 +251,6 @@ libs/sofia-sip*
 
 src/mod/applications/mod_test/test/test_asr
 src/mod/applications/mod_test/test/test_tts
-src/mod/event_handlers/mod_rayo/test/test_iks
-src/mod/event_handlers/mod_rayo/test/test_nlsml
-src/mod/event_handlers/mod_rayo/test/test_srgs
 src/mod/applications/mod_http_cache/test/Makefile
 src/mod/applications/mod_http_cache/test/Makefile.in
 src/mod/applications/mod_http_cache/test/test-suite.log
@@ -266,7 +259,6 @@ src/mod/applications/mod_http_cache/test/test_aws.log
 src/mod/applications/mod_http_cache/test/test_aws.trs
 src/mod/formats/mod_sndfile/test/test_sndfile
 src/mod/formats/mod_sndfile/test/test_sndfile_conf
-src/mod/formats/mod_ssml/test/test_tts_format
 src/mod/*/*/test/*.log
 src/mod/*/*/test/*.trs
 src/mod/*/*/test/[0-9]*/*
@@ -283,3 +275,4 @@ src/mod/codecs/mod_amrwb/test/test_amrwb
 src/mod/endpoints/mod_sofia/test/sipp-based-tests
 
 DEBBUILD/
+.DS_Store
diff --git a/Freeswitch.2017.sln b/Freeswitch.2017.sln
diff --git a/LICENSE b/LICENSE
@@ -1202,10 +1202,6 @@ Files: src/include/switch_cpp.h
 Copyright: 2007 Yossi Neiman <freeswitch@cartissolutions.com>
 License: MPL-1.1  (well, maybe -- it refers to a COPYING file, so probably docs/COPYING, in which case MPL-1.1)
 
-Files: libs/iksemel/*
-Copyright: 2000-2007 Gurer Ozen <madcat@e-kolay.net>
-License: LGPL-2.1
-
 Files: libs/apr*/*
 Copyright: 2000-2005 The Apache Software Foundation or its licensors
  1991-1992, RSA Data Security, Inc.
@@ -1308,32 +1304,10 @@ Files: src/mod/applications/mod_cluechoo/sl.h
 Copyright: 1993 Toyoda Masashi
 License: FIXME
 
-Files: src/mod/event_handlers/mod_cdr_mongodb/*
-Copyright: 2009-2012 10gen Inc.
- 2001 Unicode, Inc.
-License: Apache-2.0
-
-Files: src/mod/applications/mod_stress/FFTReal.h
- src/mod/applications/mod_stress/FFTReal.cpp
-Copyright: 1999 Laurent de Soras
-License: unclear
-
 Files: src/mod/loggers/mod_syslog/mod_syslog.c
 Copyright: 2005-2010, James Martelletti <james@nerdc0re.com>
 License: MPL-1.1
 
-Files: src/mod/event_handlers/mod_cdr_mongodb/mod_cdr_mongodb.c
-Copyright: 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
-License: MPL-1.1
-
-Files: src/mod/event_handlers/mod_cdr_mongodb/driver/src/md5.[ch]
-Copyright: 1999, 2000, 2002 Aladdin Enterprises.
-License: zlib/libpng
-
-Files: src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.h
-Copyright: 2006, Author: Yossi Neiman of Cartis Solutions, Inc. <freeswitch AT cartissolutions.com>
-License: MPL-1.1
-
 Files: src/mod/say/mod_say_??/mod_say_??.c
  scripts/c/socket2me/socket2me.c
  src/mod/xml_int/mod_xml_scgi/xml_scgi_server.pl
@@ -1497,18 +1471,6 @@ Copyright: 2010 Ilnitskiy Mixim (max.h323@gmail.com)
  2010 Georgiewskiy Yuriy (bottleman@icf.org.ru)
 License: MPL-1.1
 
-Files: src/mod/endpoints/mod_khomp/*
-Copyright: 2007-2010 Khomp Ind. & Com.
-License: MPL-1.1 or LGPL-2.1+
-
-Files: src/mod/endpoints/mod_khomp/mod_khomp.cpp
-Copyright: 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
-License: MPL-1.1
-
-Files: src/mod/endpoints/mod_khomp/commons/base/atomic.hpp
-Copyright: 1998 Doug Rabson
-License: BSD-2-clause
-
 Files: src/mod/languages/mod_java/modjava.c
 Copyright: 2007, Damjan Jovanovic <d a m j a n d o t j o v a t g m a i l d o t c o m>
 License: MPL-1.1
@@ -1517,22 +1479,6 @@ Files: src/mod/languages/mod_managed/*
 Copyright: 2008, Michael Giagnocavo <mgg@giagnocavo.net>
 License: MPL-1.1
 
-Files: src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/*
- src/mod/languages/mod_lua/lua-mode.el
- libs/iksemel/ltmain.sh
-Copyright: 1995-2007 Free Software Foundation, Inc.
-License: GPL-2+
-
-Files: src/mod/endpoints/mod_gsmopen/libctb-0.16/*
-Copyright: 2001-2010 Joachim Buermann
-License: wxWindows
-
-Files: src/mod/endpoints/mod_gsmopen/libctb-0.16/src/win32/getopt.cpp
-Copyright: 2001 ?
-License: clueless and unacceptable
- FIXME -- this cannot go in Debian -- the license is stated as:
-  (I think Open Source)
-
 Files: src/mod/endpoints/mod_rtmp/libamf/src/types.[ch]
 Copyright: 2007, 2008 Marc Noirot <marc.noirot AT gmail.com>
 License: GPL-2+
@@ -1544,10 +1490,6 @@ Files: src/mod/endpoints/mod_rtmp/rtmp.c
 Copyright: 2011-2012, Barracuda Networks Inc.
 License: MPL-1.1
 
-Files: src/mod/endpoints/mod_gsmopen/asterisk/celliax_spandsp.[ch]
-Copyright: 2001-2006 Steve Underwood
-License: GPL-2
-
 Files: src/mod/endpoints/mod_skinny/*
  src/mod/asr_tts/mod_tts_commandline/mod_tts_commandline.c
 Copyright: 2009-2010, Mathieu Parent <math.parent@gmail.com>
@@ -1557,15 +1499,6 @@ Files: src/mod/endpoints/mod_skinny/*.p[lm]
 Copyright: 2010, Mathieu Parent <math.parent@gmail.com>
 License: Perl
 
-Files: src/mod/endpoints/mod_portaudio/*
-Copyright: 1999-2000 Ross Bencina and Phil Burk
- 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
-License: MIT/X11 (BSD like)
-
-Files: src/mod/endpoints/mod_portaudio/mod_portaudio.c
-Copyright: 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
-License: MPL-1.1
-
 Files: src/mod/endpoints/mod_sofia/sip-dig.c
 Copyright: 2006 Nokia Corporation
 License: LGPL-2.1+
@@ -1606,20 +1539,11 @@ Files: libs/libcodec2/src/pack.c
 Copyright: 2010 Perens LLC <bruce@perens.com>
 License: GPL-3+
 
-Files: src/mod/codecs/mod_sangoma_codec/mod_sangoma_codec.c
- src/include/switch_profile.h
+Files: src/include/switch_profile.h
  src/switch_profile.c
 Copyright: 2009,2010, Sangoma Technologies
 License: BSD-3-clause
 
-Files: src/mod/codecs/mod_isac/*
-Copyright: 2011-2012 The WebRTC project authors
-License: BSD-3-clause
-
-Files: src/mod/codecs/mod_isac/mod_isac.c
-Copyright: 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
-License: MPL-1.1
-
 Files: libs/srtp/*
 Copyright: 2001-2006, Cisco Systems, Inc.
  2005 Ingate Systems AB

diff --git a/Makefile.am b/Makefile.am
@@ -235,9 +235,9 @@ CORE_LIBS+=libfreeswitch_libyuv.la
 endif
 
 lib_LTLIBRARIES	         = libfreeswitch.la
-libfreeswitch_la_CFLAGS  = $(CORE_CFLAGS) $(SQLITE_CFLAGS) $(GUMBO_CFLAGS) $(FVAD_CFLAGS) $(FREETYPE_CFLAGS) $(CURL_CFLAGS) $(PCRE_CFLAGS) $(SPEEX_CFLAGS) $(LIBEDIT_CFLAGS) $(openssl_CFLAGS) $(SOFIA_SIP_CFLAGS) $(AM_CFLAGS) $(TPL_CFLAGS)
+libfreeswitch_la_CFLAGS  = $(CORE_CFLAGS) $(SQLITE_CFLAGS) $(GUMBO_CFLAGS) $(FVAD_CFLAGS) $(FREETYPE_CFLAGS) $(CURL_CFLAGS) $(PCRE2_CFLAGS) $(SPEEX_CFLAGS) $(LIBEDIT_CFLAGS) $(openssl_CFLAGS) $(SOFIA_SIP_CFLAGS) $(AM_CFLAGS) $(TPL_CFLAGS)
 libfreeswitch_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS) $(PLATFORM_CORE_LDFLAGS) -no-undefined
-libfreeswitch_la_LIBADD  = $(CORE_LIBS) $(APR_LIBS) $(SQLITE_LIBS) $(GUMBO_LIBS) $(FVAD_LIBS) $(FREETYPE_LIBS) $(CURL_LIBS) $(PCRE_LIBS) $(SPEEX_LIBS) $(LIBEDIT_LIBS) $(SYSTEMD_LIBS) $(openssl_LIBS) $(PLATFORM_CORE_LIBS) $(TPL_LIBS) $(SPANDSP_LIBS) $(SOFIA_SIP_LIBS)
+libfreeswitch_la_LIBADD  = $(CORE_LIBS) $(APR_LIBS) $(SQLITE_LIBS) $(GUMBO_LIBS) $(FVAD_LIBS) $(FREETYPE_LIBS) $(CURL_LIBS) $(PCRE2_LIBS) $(SPEEX_LIBS) $(LIBEDIT_LIBS) $(SYSTEMD_LIBS) $(openssl_LIBS) $(PLATFORM_CORE_LIBS) $(TPL_LIBS) $(SPANDSP_LIBS) $(SOFIA_SIP_LIBS)
 libfreeswitch_la_DEPENDENCIES = $(BUILT_SOURCES)
 
 if HAVE_PNG
@@ -405,7 +405,8 @@ libfreeswitch_la_SOURCES = \
 	libs/miniupnpc/minissdpc.c \
 	libs/miniupnpc/upnperrors.c \
 	libs/libnatpmp/natpmp.c \
-	libs/libnatpmp/getgateway.c
+	libs/libnatpmp/getgateway.c \
+	src/switch_uuidv7.c
 
 if ENABLE_CPP
 libfreeswitch_la_SOURCES += src/switch_cpp.cpp
@@ -623,10 +624,6 @@ libs/srtp/libsrtp.la: libs/srtp libs/srtp/.update $(SRTP_SRC)
 ##
 ## helper targets
 ##
-yaml-files:
-	@echo `mkdir $(DESTDIR)$(confdir)/yaml 2>/dev/null`
-	$(INSTALL) -m 644 $(switch_srcdir)/conf/default/yaml/*.yaml $(DESTDIR)$(confdir)/yaml
-
 vm-sync:
 	test -d $(DESTDIR)$(confdir) || $(mkinstalldirs) $(DESTDIR)$(confdir)
 	test -d $(DESTDIR)$(confdir)/lang || $(mkinstalldirs) $(DESTDIR)$(confdir)/lang
@@ -703,9 +700,6 @@ nodepends: .nodepends
 yesdepends:
 	rm .nodepends
 
-iksemel-dep:
-	make -C src/mod/formats/mod_ssml deps
-
 core: $(switch_builddir)/modules.conf src/include/switch_version.h $(CORE_LIBS) 
 	$(MAKE) $(AM_MAKEFLAGS) libfreeswitch.la
 
@@ -748,7 +742,7 @@ pristine:
 	git clean -fdx
 	git reset --hard
 
-update-clean: clean python-reconf python3-reconf
+update-clean: clean python3-reconf
 	cd libs/esl && $(MAKE) clean
 	cd libs/srtp && $(MAKE) clean
 
@@ -761,10 +755,6 @@ sndfile-reconf:
 	cd libs/libsndfile && ./config.status --recheck
 	cd libs/libsndfile && ./config.status
 
-python-reconf:
-	rm -f src/mod/languages/mod_python/Makefile
-	./config.status
-
 python3-reconf:
 	rm -f src/mod/languages/mod_python3/Makefile
 	./config.status
@@ -779,13 +769,6 @@ srtp-reconf:
 	cd libs/srtp && sh ./config.status --recheck
 	cd libs/srtp && sh ./config.status
 
-
-iks-reconf:
-	cd libs/iksemel && $(MAKE) clean
-	cd libs/iksemel && autoreconf -fi
-	cd libs/iksemel && sh ./configure.gnu $(MY_DEFAULT_ARGS)
-	$(MAKE) mod_ssml-clean
-
 cluecon:
 	@clear
 	@echo Thank you for updating. This is going to take a while so relax.

diff --git a/acinclude.m4 b/acinclude.m4
@@ -13,4 +13,3 @@ m4_include([build/config/sac-pkg-config.m4])
 m4_include([build/config/sac-openssl.m4])
 m4_include([build/config/sched_setaffinity.m4])
 m4_include([libs/apr/build/apr_common.m4])
-m4_include([libs/iksemel/build/libgnutls.m4])
diff --git a/bootstrap.sh b/bootstrap.sh
@@ -10,7 +10,7 @@ BGJOB=false
 VERBOSE=false
 BASEDIR=`pwd`;
 LIBDIR=${BASEDIR}/libs;
-SUBDIRS="apr iksemel srtp fs";
+SUBDIRS="apr srtp fs";
 
 while getopts 'jhd:v' o; do 
   case "$o" in

diff --git a/build/Makefile.centos5 b/build/Makefile.centos5
@@ -13,7 +13,7 @@ DOWNLOAD=http://files.freeswitch.org/downloads/libs
 JPEG=v8d
 OPENSSL=1.0.1l
 SQLITE=autoconf-3080403
-PCRE=8.35
+PCRE2=10.42
 CURL=7.40.0
 SPEEX=1.2rc1
 LIBEDIT=20140618-3.1
@@ -45,7 +45,7 @@ has-git:
 	@git --version || (echo "please install git by running 'make install-git'" && false)
 
 clean:
-	@rm -rf openssl* ldns* jpeg* pcre* perl* pkg-config* speex* sqlite* libedit* curl* *~
+	@rm -rf openssl* ldns* jpeg* pcre2* perl* pkg-config* speex* sqlite* libedit* curl* *~
 	(cd freeswitch.git && git clean -fdx && git reset --hard HEAD && git pull)
 
 libjpeg: jpeg-8d/.done
@@ -66,9 +66,9 @@ sqlite-$(SQLITE):
 	(test -d $@) || (wget -4 -O $@.tar.gz $(DOWNLOAD)/$@.tar.gz && tar zxfv $@.tar.gz)
 	(cd $@ && ./configure --prefix=$(PREFIX) && make && sudo make install && touch .done_sqlite && touch .done)
 
-pcre: pcre-$(PCRE)/.done
-pcre-$(PCRE)/.done: pcre-$(PCRE)
-pcre-$(PCRE):
+pcre2: pcre2-$(PCRE2)/.done
+pcre2-$(PCRE2)/.done: pcre2-$(PCRE2)
+pcre2-$(PCRE2):
 	(test -d $@) || (wget -4 -O $@.tar.gz $(DOWNLOAD)/$@.tar.gz && tar zxfv $@.tar.gz)
 	(cd $@ && ./configure --prefix=$(PREFIX) && make && sudo make install && touch .done)
 
@@ -96,4 +96,4 @@ ldns-$(LDNS):
 	(test -d $@) || (wget -4 -O $@.tar.gz $(DOWNLOAD)/$@.tar.gz && tar zxfv $@.tar.gz)
 	(cd $@ && ./configure --with-ssl=$(PREFIX) --prefix=$(PREFIX) && make && sudo make install && touch .done)
 
-deps: libjpeg openssl sqlite pcre curl speex libedit ldns
+deps: libjpeg openssl sqlite pcre2 curl speex libedit ldns
diff --git a/build/Makefile.centos6 b/build/Makefile.centos6
@@ -6,8 +6,8 @@
 # in that same directory.
 #
 #
-RPMS=git gcc-c++ autoconf automake libtool wget python ncurses-devel zlib-devel libjpeg-devel openssl-devel e2fsprogs-devel sqlite-devel libcurl-devel pcre-devel speex-devel ldns-devel libedit-devel
-DEBS=git build-essential automake autoconf 'libtool-bin|libtool' wget python uuid-dev zlib1g-dev 'libjpeg8-dev|libjpeg62-turbo-dev' libncurses5-dev libssl-dev libpcre3-dev libcurl4-openssl-dev libldns-dev libedit-dev libspeexdsp-dev  libspeexdsp-dev libsqlite3-dev perl libgdbm-dev libdb-dev bison libvlc-dev pkg-config
+RPMS=git gcc-c++ autoconf automake libtool wget ncurses-devel zlib-devel libjpeg-devel openssl-devel e2fsprogs-devel sqlite-devel libcurl-devel pcre2-devel speex-devel ldns-devel libedit-devel
+DEBS=git build-essential automake autoconf 'libtool-bin|libtool' wget uuid-dev zlib1g-dev 'libjpeg8-dev|libjpeg62-turbo-dev' libncurses5-dev libssl-dev libpcre2-dev libcurl4-openssl-dev libldns-dev libedit-dev libspeexdsp-dev  libspeexdsp-dev libsqlite3-dev perl libgdbm-dev libdb-dev bison libvlc-dev pkg-config
 
 freeswitch: deps has-git freeswitch.git/Makefile
 	cd freeswitch.git && make

diff --git a/build/Makefile.openbsd b/build/Makefile.openbsd
@@ -7,7 +7,7 @@
 #
 #
 
-PKG=rsync-3.1.0 git automake-1.14.1 autoconf-2.69p1 libtool gmake bzip2 jpeg wget pcre speex libldns
+PKG=rsync-3.1.0 git automake-1.14.1 autoconf-2.69p1 libtool gmake bzip2 jpeg wget pcre2 speex libldns
 PREFIX=/usr/local/freeswitch
 DOWNLOAD=http://files.freeswitch.org/downloads/libs
 OPENSSL=1.0.1j

diff --git a/build/Makefile.solaris11 b/build/Makefile.solaris11
@@ -12,7 +12,7 @@ DOWNLOAD=http://files.freeswitch.org/downloads/libs
 JP=v8d
 SSL=1.0.1j
 SQLITE=autoconf-3080403
-PCRE=8.35
+PCRE2=10.42
 CURL=7.35.0
 SPEEX=1.2rc1
 LIBEDIT=20140618-3.1
@@ -43,7 +43,7 @@ has-git:
 	@git --version || (echo "please install git by running 'gmake install-git'" && false)
 
 clean:
-	@rm -rf openssl* ldns* jpeg* pcre* perl* pkg-config* speex* sqlite* libedit* curl* *~
+	@rm -rf openssl* ldns* jpeg* pcre2* perl* pkg-config* speex* sqlite* libedit* curl* *~
 	(cd freeswitch.git && git clean -fdx && git reset --hard HEAD && git pull)
 
 libjpeg: jpeg-8d/.done
@@ -64,9 +64,9 @@ sqlite-$(SQLITE):
 	(test -d $@) || (wget -4 -O $@.tar.gz $(DOWNLOAD)/$@.tar.gz && tar zxfv $@.tar.gz)
 	(cd $@ && CFLAGS=-m64 LDFLAGS=-m64 ./configure --prefix=$(PREFIX) && gmake && sudo gmake install && touch .done)
 
-pcre: pcre-$(PCRE)/.done
-pcre-$(PCRE)/.done: pcre-$(PCRE)
-pcre-$(PCRE):
+pcre2: pcre2-$(PCRE2)/.done
+pcre2-$(PCRE2)/.done: pcre2-$(PCRE2)
+pcre2-$(PCRE2):
 	(test -d $@) || (wget -4 -O $@.tar.gz $(DOWNLOAD)/$@.tar.gz && tar zxfv $@.tar.gz)
 	(cd $@ && CXXFLAGS=-m64 CFLAGS=-m64 LDFLAGS=-m64 ./configure --prefix=$(PREFIX) && gmake && sudo gmake install && touch .done)
 
@@ -107,4 +107,4 @@ perl-$(PERL):
 	(test -d $@) || (wget -4 -O $@.tar.gz $(DOWNLOAD)/$@.tar.gz && tar zxfv $@.tar.gz)
 	(cd $@ && CFLAGS=-m64 LDFLAGS=-m64 ./configure.gnu -Dcc=gcc --prefix=$(PREFIX) && gmake && sudo gmake install && touch .done)
 
-deps: has-git libjpeg openssl sqlite pcre curl speex libedit ldns pkg-config perl
+deps: has-git libjpeg openssl sqlite pcre2 curl speex libedit ldns pkg-config perl
diff --git a/build/modmake.rulesam b/build/modmake.rulesam
@@ -17,5 +17,4 @@ extraclean-modules: extraclean
 
 print_tests:
 	@set +e; \
-	test -z "$(TESTS)" || for i in $(TESTS); do echo $(subdir)/$$i; done;
-
+	test -z "$(TESTS)" || for i in $(TESTS); do echo $(subdir)/$$i; done; echo;