mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-11-14 21:38:34 +00:00
merge fixes to sofia-sip including double free causing segfault or assert in sres
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4201 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris committed
1 parent
4099d4c351
commit
215b751d92
9 files changed
+126
-131
No files matched your search
@@ -31,40 +31,22 @@ TESTS = test_auth_digest
|
||||
|
||||
BUILT_SOURCES = auth_tag_ref.c
|
||||
|
||||
HTTP_SRC = auth_module_http.c
|
||||
if HAVE_NTH
|
||||
USE_HTTP_SRC = $(HTTP_SRC)
|
||||
OPT_LDDD = ../http/libhttp.la
|
||||
endif
|
||||
|
||||
nobase_include_sofia_HEADERS = \
|
||||
sofia-sip/auth_common.h \
|
||||
sofia-sip/auth_client.h sofia-sip/auth_digest.h \
|
||||
sofia-sip/auth_module.h sofia-sip/auth_plugin.h \
|
||||
sofia-sip/auth_client_plugin.h \
|
||||
$(NTLM_HEADER)
|
||||
sofia-sip/auth_client_plugin.h
|
||||
|
||||
libiptsec_la_SOURCES = iptsec_debug.h \
|
||||
auth_client.c auth_common.c auth_digest.c \
|
||||
auth_module.c auth_tag.c auth_tag_ref.c \
|
||||
auth_plugin.c auth_plugin_delayed.c \
|
||||
auth_module_sip.c \
|
||||
$(NTLM_SOURCE) \
|
||||
$(USE_HTTP_SOURCE) \
|
||||
iptsec_debug.c
|
||||
|
||||
NTLM_HEADER = sofia-sip/auth_ntlm.h
|
||||
if HAVE_NTLM
|
||||
NTLM_SOURCE = auth_ntlm.c auth_client_ntlm.c auth_plugin_ntlm.c
|
||||
endif
|
||||
|
||||
EXTRA_libiptsec_la_SOURCES = \
|
||||
auth_ntlm.c auth_client_ntlm.c auth_plugin_ntlm.c
|
||||
|
||||
COVERAGE_INPUT = $(libiptsec_la_SOURCES) $(include_sofia_HEADERS)
|
||||
|
||||
LDADD = libiptsec.la \
|
||||
$(OPT_LDADD) \
|
||||
../nta/libnta.la \
|
||||
../sip/libsip.la \
|
||||
../msg/libmsg.la \
|
||||
@@ -75,11 +57,28 @@ LDADD = libiptsec.la \
|
||||
|
||||
test_auth_digest_LDFLAGS = -static
|
||||
|
||||
if HAVE_NTLM
|
||||
nobase_include_sofia_HEADERS += $(NTLM_HEADER)
|
||||
libiptsec_la_SOURCES += $(NTLM_SOURCE)
|
||||
endif
|
||||
|
||||
if HAVE_NTH
|
||||
libiptsec_la_SOURCES += $(HTTP_SOURCE)
|
||||
LDADD += ../http/libhttp.la
|
||||
endif
|
||||
|
||||
HTTP_SOURCE = auth_module_http.c
|
||||
|
||||
NTLM_HEADER = sofia-sip/auth_ntlm.h
|
||||
NTLM_SOURCE = auth_ntlm.c auth_client_ntlm.c auth_plugin_ntlm.c
|
||||
|
||||
EXTRA_libiptsec_la_SOURCES = \
|
||||
$(NTLM_HEADER) $(NTLM_SOURCE) $(HTTP_SOURCE)
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Install and distribution rules
|
||||
|
||||
EXTRA_DIST = Doxyfile iptsec.docs testpasswd \
|
||||
auth_module_sip.c $(HTTP_SRC) $(BUILT_SOURCES)
|
||||
EXTRA_DIST = Doxyfile iptsec.docs testpasswd $(BUILT_SOURCES)
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Sofia specific rules
|
||||
|
||||
@@ -79,12 +79,17 @@ build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
target_triplet = @target@
|
||||
check_PROGRAMS = test_auth_digest$(EXEEXT)
|
||||
DIST_COMMON = $(nobase_include_sofia_HEADERS) $(srcdir)/Makefile.am \
|
||||
$(srcdir)/Makefile.in $(top_srcdir)/rules/sofia.am \
|
||||
$(top_srcdir)/rules/valcheck.am ChangeLog
|
||||
@HAVE_NTLM_TRUE@am__append_1 = $(NTLM_HEADER)
|
||||
@HAVE_NTLM_TRUE@am__append_2 = $(NTLM_SOURCE)
|
||||
@HAVE_NTH_TRUE@am__append_3 = $(HTTP_SOURCE)
|
||||
@HAVE_NTH_TRUE@am__append_4 = ../http/libhttp.la
|
||||
DIST_COMMON = $(am__nobase_include_sofia_HEADERS_DIST) \
|
||||
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
|
||||
$(top_srcdir)/rules/sofia.am $(top_srcdir)/rules/valcheck.am \
|
||||
ChangeLog
|
||||
|
||||
# Use with --enable-ndebug
|
||||
@NDEBUG_TRUE@am__append_1 = -DNDEBUG
|
||||
@NDEBUG_TRUE@am__append_5 = -DNDEBUG
|
||||
subdir = libsofia-sip-ua/iptsec
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/m4/sac-general.m4 \
|
||||
@@ -102,21 +107,25 @@ libiptsec_la_LIBADD =
|
||||
am__libiptsec_la_SOURCES_DIST = iptsec_debug.h auth_client.c \
|
||||
auth_common.c auth_digest.c auth_module.c auth_tag.c \
|
||||
auth_tag_ref.c auth_plugin.c auth_plugin_delayed.c \
|
||||
auth_module_sip.c auth_ntlm.c auth_client_ntlm.c \
|
||||
auth_plugin_ntlm.c iptsec_debug.c
|
||||
@HAVE_NTLM_TRUE@am__objects_1 = auth_ntlm.lo auth_client_ntlm.lo \
|
||||
@HAVE_NTLM_TRUE@ auth_plugin_ntlm.lo
|
||||
auth_module_sip.c iptsec_debug.c auth_ntlm.c \
|
||||
auth_client_ntlm.c auth_plugin_ntlm.c auth_module_http.c
|
||||
am__objects_1 = auth_ntlm.lo auth_client_ntlm.lo auth_plugin_ntlm.lo
|
||||
@HAVE_NTLM_TRUE@am__objects_2 = $(am__objects_1)
|
||||
am__objects_3 = auth_module_http.lo
|
||||
@HAVE_NTH_TRUE@am__objects_4 = $(am__objects_3)
|
||||
am_libiptsec_la_OBJECTS = auth_client.lo auth_common.lo auth_digest.lo \
|
||||
auth_module.lo auth_tag.lo auth_tag_ref.lo auth_plugin.lo \
|
||||
auth_plugin_delayed.lo auth_module_sip.lo $(am__objects_1) \
|
||||
iptsec_debug.lo
|
||||
auth_plugin_delayed.lo auth_module_sip.lo iptsec_debug.lo \
|
||||
$(am__objects_2) $(am__objects_4)
|
||||
libiptsec_la_OBJECTS = $(am_libiptsec_la_OBJECTS)
|
||||
test_auth_digest_SOURCES = test_auth_digest.c
|
||||
test_auth_digest_OBJECTS = test_auth_digest.$(OBJEXT)
|
||||
test_auth_digest_LDADD = $(LDADD)
|
||||
@HAVE_NTH_TRUE@am__DEPENDENCIES_1 = ../http/libhttp.la
|
||||
test_auth_digest_DEPENDENCIES = libiptsec.la ../nta/libnta.la \
|
||||
../sip/libsip.la ../msg/libmsg.la ../url/liburl.la \
|
||||
../bnf/libbnf.la ../ipt/libipt.la ../su/libsu.la
|
||||
../bnf/libbnf.la ../ipt/libipt.la ../su/libsu.la \
|
||||
$(am__DEPENDENCIES_1)
|
||||
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/libsofia-sip-ua/su/sofia-sip
|
||||
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
||||
am__depfiles_maybe = depfiles
|
||||
@@ -132,6 +141,10 @@ SOURCES = $(libiptsec_la_SOURCES) $(EXTRA_libiptsec_la_SOURCES) \
|
||||
test_auth_digest.c
|
||||
DIST_SOURCES = $(am__libiptsec_la_SOURCES_DIST) \
|
||||
$(EXTRA_libiptsec_la_SOURCES) test_auth_digest.c
|
||||
am__nobase_include_sofia_HEADERS_DIST = sofia-sip/auth_common.h \
|
||||
sofia-sip/auth_client.h sofia-sip/auth_digest.h \
|
||||
sofia-sip/auth_module.h sofia-sip/auth_plugin.h \
|
||||
sofia-sip/auth_client_plugin.h sofia-sip/auth_ntlm.h
|
||||
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
|
||||
am__vpath_adj = case $$p in \
|
||||
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
|
||||
@@ -314,50 +327,31 @@ TESTS = test_auth_digest
|
||||
# ----------------------------------------------------------------------
|
||||
# Rules for building the targets
|
||||
BUILT_SOURCES = auth_tag_ref.c
|
||||
HTTP_SRC = auth_module_http.c
|
||||
@HAVE_NTH_TRUE@USE_HTTP_SRC = $(HTTP_SRC)
|
||||
@HAVE_NTH_TRUE@OPT_LDDD = ../http/libhttp.la
|
||||
nobase_include_sofia_HEADERS = \
|
||||
sofia-sip/auth_common.h \
|
||||
sofia-sip/auth_client.h sofia-sip/auth_digest.h \
|
||||
sofia-sip/auth_module.h sofia-sip/auth_plugin.h \
|
||||
sofia-sip/auth_client_plugin.h \
|
||||
$(NTLM_HEADER)
|
||||
|
||||
libiptsec_la_SOURCES = iptsec_debug.h \
|
||||
auth_client.c auth_common.c auth_digest.c \
|
||||
auth_module.c auth_tag.c auth_tag_ref.c \
|
||||
auth_plugin.c auth_plugin_delayed.c \
|
||||
auth_module_sip.c \
|
||||
$(NTLM_SOURCE) \
|
||||
$(USE_HTTP_SOURCE) \
|
||||
iptsec_debug.c
|
||||
|
||||
NTLM_HEADER = sofia-sip/auth_ntlm.h
|
||||
@HAVE_NTLM_TRUE@NTLM_SOURCE = auth_ntlm.c auth_client_ntlm.c auth_plugin_ntlm.c
|
||||
EXTRA_libiptsec_la_SOURCES = \
|
||||
auth_ntlm.c auth_client_ntlm.c auth_plugin_ntlm.c
|
||||
|
||||
nobase_include_sofia_HEADERS = sofia-sip/auth_common.h \
|
||||
sofia-sip/auth_client.h sofia-sip/auth_digest.h \
|
||||
sofia-sip/auth_module.h sofia-sip/auth_plugin.h \
|
||||
sofia-sip/auth_client_plugin.h $(am__append_1)
|
||||
libiptsec_la_SOURCES = iptsec_debug.h auth_client.c auth_common.c \
|
||||
auth_digest.c auth_module.c auth_tag.c auth_tag_ref.c \
|
||||
auth_plugin.c auth_plugin_delayed.c auth_module_sip.c \
|
||||
iptsec_debug.c $(am__append_2) $(am__append_3)
|
||||
COVERAGE_INPUT = $(libiptsec_la_SOURCES) $(include_sofia_HEADERS)
|
||||
LDADD = libiptsec.la \
|
||||
$(OPT_LDADD) \
|
||||
../nta/libnta.la \
|
||||
../sip/libsip.la \
|
||||
../msg/libmsg.la \
|
||||
../url/liburl.la \
|
||||
../bnf/libbnf.la \
|
||||
../ipt/libipt.la \
|
||||
../su/libsu.la
|
||||
|
||||
LDADD = libiptsec.la ../nta/libnta.la ../sip/libsip.la \
|
||||
../msg/libmsg.la ../url/liburl.la ../bnf/libbnf.la \
|
||||
../ipt/libipt.la ../su/libsu.la $(am__append_4)
|
||||
test_auth_digest_LDFLAGS = -static
|
||||
HTTP_SOURCE = auth_module_http.c
|
||||
NTLM_HEADER = sofia-sip/auth_ntlm.h
|
||||
NTLM_SOURCE = auth_ntlm.c auth_client_ntlm.c auth_plugin_ntlm.c
|
||||
EXTRA_libiptsec_la_SOURCES = \
|
||||
$(NTLM_HEADER) $(NTLM_SOURCE) $(HTTP_SOURCE)
|
||||
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Install and distribution rules
|
||||
EXTRA_DIST = Doxyfile iptsec.docs testpasswd \
|
||||
auth_module_sip.c $(HTTP_SRC) $(BUILT_SOURCES)
|
||||
|
||||
EXTRA_DIST = Doxyfile iptsec.docs testpasswd $(BUILT_SOURCES)
|
||||
AM_CFLAGS = $(CWFLAG) $(SOFIA_COVERAGE) $(SOFIA_CFLAGS) \
|
||||
$(am__append_1)
|
||||
$(am__append_5)
|
||||
DISTCLEANFILES = $(BUILT_SOURCES)
|
||||
|
||||
# rules for building tag files
|
||||
@@ -452,6 +446,7 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth_common.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth_digest.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth_module.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth_module_http.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth_module_sip.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth_ntlm.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth_plugin.Plo@am__quote@
|
||||
|
||||
Reference in new issue
Block a user