[#2605] Update to PJSIP 1.5.5

sflphone-common/globals.mak

@@ -14,15 +14,15 @@ PJSIP_LIBS= \
 			-L$(src)/libs/pjproject/pjlib/lib/ \
 			-L$(src)/libs/pjproject/pjlib-util/lib/ \
 			-L$(src)/libs/pjproject/pjmedia/lib/ \
-			-lpjnath-sfl-$(target) \
-			-lpjsua-sfl-$(target) \
-			-lpjsip-sfl-$(target) \
-			-lpjmedia-sfl-$(target) \
-			-lpjsip-simple-sfl-$(target) \
-			-lpjsip-ua-sfl-$(target) \
-			-lpjmedia-codec-sfl-$(target) \
-			-lpjlib-util-sfl-$(target) \
-			-lpj-sfl-$(target) 
+			-lpjnath-$(target) \
+			-lpjsua-$(target) \
+			-lpjsip-$(target) \
+			-lpjmedia-$(target) \
+			-lpjsip-simple-$(target) \
+			-lpjsip-ua-$(target) \
+			-lpjmedia-codec-$(target) \
+			-lpjlib-util-$(target) \
+			-lpj-$(target) 
 
 SIP_CFLAGS=-I$(src)/libs/pjproject/pjsip/include \
 		   -I$(src)/libs/pjproject/pjlib/include \

sflphone-common/libs/pjproject/Makefile

@@ -29,17 +29,17 @@ doc:
 		fi; \
 	done
 	
-LIBS = 	pjlib/lib/libpj-sfl-$(TARGET_NAME).a \
-	pjlib-util/lib/libpjlib-util-sfl-$(TARGET_NAME).a \
-	pjnath/lib/libpjnath-sfl-$(TARGET_NAME).a \
-	pjmedia/lib/libpjmedia-sfl-$(TARGET_NAME).a \
-	pjmedia/lib/libpjmedia-audiodev-sfl-$(TARGET_NAME).a \
-	pjmedia/lib/libpjmedia-codec-sfl-$(TARGET_NAME).a \
-       	pjsip/lib/libpjsip-sfl-$(TARGET_NAME).a \
-	pjsip/lib/libpjsip-ua-sfl-$(TARGET_NAME).a \
-	pjsip/lib/libpjsip-simple-sfl-$(TARGET_NAME).a \
-	pjsip/lib/libpjsua-sfl-$(TARGET_NAME).a
-BINS = 	pjsip-apps/bin/pjsua-sfl-$(TARGET_NAME)$(HOST_EXE) 
+LIBS = 	pjlib/lib/libpj-$(TARGET_NAME).a \
+	pjlib-util/lib/libpjlib-util-$(TARGET_NAME).a \
+	pjnath/lib/libpjnath-$(TARGET_NAME).a \
+	pjmedia/lib/libpjmedia-$(TARGET_NAME).a \
+	pjmedia/lib/libpjmedia-audiodev-$(TARGET_NAME).a \
+	pjmedia/lib/libpjmedia-codec-$(TARGET_NAME).a \
+       	pjsip/lib/libpjsip-$(TARGET_NAME).a \
+	pjsip/lib/libpjsip-ua-$(TARGET_NAME).a \
+	pjsip/lib/libpjsip-simple-$(TARGET_NAME).a \
+	pjsip/lib/libpjsua-$(TARGET_NAME).a
+BINS = 	pjsip-apps/bin/pjsua-$(TARGET_NAME)$(HOST_EXE) 
 
 size:
 	@echo -n 'Date: '
@@ -70,6 +70,27 @@ xhdrid:
 		cp /tmp/id $$f; \
 	done
 
+selftest: pjlib-test pjlib-util-test pjnath-test pjmedia-test pjsip-test pjsua-test
+
+pjlib-test: pjlib/bin/pjlib-test-$(TARGET_NAME)
+	cd pjlib/build && ../bin/pjlib-test-$(TARGET_NAME)
+
+pjlib-util-test: pjlib-util/bin/pjlib-util-test-$(TARGET_NAME)
+	cd pjlib-util/build && ../bin/pjlib-util-test-$(TARGET_NAME)
+
+pjnath-test: pjnath/bin/pjnath-test-$(TARGET_NAME)
+	cd pjnath/build && ../bin/pjnath-test-$(TARGET_NAME)
+
+pjmedia-test: pjmedia/bin/pjmedia-test-$(TARGET_NAME)
+	cd pjmedia/build && ../bin/pjmedia-test-$(TARGET_NAME)
+
+pjsip-test: pjsip/bin/pjsip-test-$(TARGET_NAME)
+	cd pjsip/build && ../bin/pjsip-test-$(TARGET_NAME)
+
+pjsua-test:
+	cd tests/pjsua && python runall.py
+
+prefix = /usr/local
 install:
 	mkdir -p $(DESTDIR)$(prefix)/lib
 	cp -L $$(find . -name '*.a') $(DESTDIR)$(prefix)/lib
@@ -79,4 +100,4 @@ install:
 		ln -s $$i $$(echo $$i | sed -e "s/-$(TARGET_NAME)//");\
 	done
 	mkdir -p $(DESTDIR)$(prefix)/lib/pkgconfig
-	sed -e "s!@PREFIX@!$(DESTDIR)$(prefix)!" libpj-sfl.pc.in > $(DESTDIR)/$(prefix)/lib/pkgconfig/libpj-sfl.pc
+	sed -e "s!@PREFIX@!$(DESTDIR)$(prefix)!" libpj.pc.in > $(DESTDIR)/$(prefix)/lib/pkgconfig/libpj.pc

sflphone-common/libs/pjproject/aconfigure.ac

@@ -150,6 +150,7 @@ AC_CHECK_HEADER(netinet/ip.h,[AC_DEFINE(PJ_HAS_NETINET_IP_H,1)],[],
           	  #	include <netinet/in_systm.h>
           	  #endif
           	 ])
+AC_CHECK_HEADER(netinet/tcp.h,[AC_DEFINE(PJ_HAS_NETINET_TCP_H,1)])
 AC_CHECK_HEADER(ifaddrs.h,[AC_DEFINE(PJ_HAS_IFADDRS_H,1)])
 AC_CHECK_HEADER(semaphore.h,[AC_DEFINE(PJ_HAS_SEMAPHORE_H,1)])
 AC_CHECK_HEADER(setjmp.h,[AC_DEFINE(PJ_HAS_SETJMP_H,1)])
@@ -559,10 +560,6 @@ AC_ARG_ENABLE(speex-codec,
 
 dnl # Include iLBC codec
 AC_SUBST(ac_no_ilbc_codec)
-#AC_DEFINE(ac_no_ilbc_codec, 1)
-#AC_DEFINE(PJMEDIA_HAS_ILBC_CODEC, 0)
-#AC_MSG_RESULT([Checking if iLBC codec is disabled...yes])
-
 AC_ARG_ENABLE(ilbc-codec,
 	      AC_HELP_STRING([--disable-ilbc-codec],
 			     [Exclude iLBC codec in the build]),
@@ -571,9 +568,7 @@ AC_ARG_ENABLE(ilbc-codec,
 		AC_DEFINE(PJMEDIA_HAS_ILBC_CODEC,0)
 		AC_MSG_RESULT([Checking if iLBC codec is disabled...yes])
 	       fi],
-		[ac_no_ilbc_codec=1]
-		AC_DEFINE(PJMEDIA_HAS_ILBC_CODEC,0)
-	    AC_MSG_RESULT([Checking if iLBC codec is disabled...yes]))
+	      AC_MSG_RESULT([Checking if iLBC codec is disabled...no]))
 
 dnl # Include libsamplerate
 AC_ARG_ENABLE(libsamplerate,
@@ -763,7 +758,9 @@ AC_ARG_ENABLE(ssl,
 		AC_CHECK_LIB(crypto,ERR_load_BIO_strings,[libcrypto_present=1 && LIBS="$LIBS -lcrypto"])
 		if test "x$openssl_h_present" = "x1" -a "x$libssl_present" = "x1" -a "x$libcrypto_present" = "x1"; then
 	        	AC_MSG_RESULT([OpenSSL library found, SSL support enabled])
-			AC_DEFINE(PJSIP_HAS_TLS_TRANSPORT, 1)
+			# PJSIP_HAS_TLS_TRANSPORT setting follows PJ_HAS_SSL_SOCK
+			#AC_DEFINE(PJSIP_HAS_TLS_TRANSPORT, 1)
+			AC_DEFINE(PJ_HAS_SSL_SOCK, 1)
 		else
 			AC_MSG_RESULT([** OpenSSL libraries not found, disabling SSL support **])
 		fi

sflphone-common/libs/pjproject/autogen.sh

-#!/bin/bash
-#####################################################
-# File Name: autogen.sh
-#
-# Purpose :
-#
-# Author: Julien Bonjean (julien@bonjean.info) 
-#
-# Creation Date: 2009-05-26
-# Last Modified: 2009-06-01 18:25:28 -0400
-#####################################################
-
-if [ -e /usr/share/misc/config.guess ]; then
-	rm -f config.sub config.guess
-        ln -s /usr/share/misc/config.sub .
-        ln -s /usr/share/misc/config.guess .	
-elif [ -e /usr/lib/rpm/config.guess ]; then
-	rm -f config.sub config.guess
-	ln -s /usr/lib/rpm/config.sub .
-	ln -s /usr/lib/rpm/config.guess .
-else
-	aclocal --force
-	automake --add-missing --force-missing --copy	
-fi
-
-exit 0

sflphone-common/libs/pjproject/build.mak.in

@@ -10,8 +10,8 @@ export LINUX_POLL := @ac_linux_poll@
 LIB_SUFFIX = $(TARGET_NAME).a
 
 # Determine which party libraries to use
-export APP_THIRD_PARTY_LIBS := -lresample-$(TARGET_NAME) -lsrtp-$(TARGET_NAME)
-export APP_THIRD_PARTY_LIB_FILES = $(PJ_DIR)/third_party/lib/libresample-$(LIB_SUFFIX) $(PJ_DIR)/third_party/lib/libsrtp-$(LIB_SUFFIX)
+export APP_THIRD_PARTY_LIBS := -lresample-$(TARGET_NAME) -lmilenage-$(TARGET_NAME) -lsrtp-$(TARGET_NAME)
+export APP_THIRD_PARTY_LIB_FILES = $(PJ_DIR)/third_party/lib/libresample-$(LIB_SUFFIX) $(PJ_DIR)/third_party/lib/libmilenage-$(LIB_SUFFIX) $(PJ_DIR)/third_party/lib/libsrtp-$(LIB_SUFFIX)
 
 ifneq (@ac_no_gsm_codec@,1)
 APP_THIRD_PARTY_LIBS += -lgsmcodec-$(TARGET_NAME)
@@ -59,29 +59,29 @@ export APP_LDFLAGS := -L$(PJDIR)/pjlib/lib\
 	-L$(PJDIR)/pjsip/lib\
 	-L$(PJDIR)/third_party/lib\
 	@LDFLAGS@
-export APP_LDLIBS := -lpjsua-sfl-$(TARGET_NAME)\
-	-lpjsip-ua-sfl-$(TARGET_NAME)\
-	-lpjsip-simple-sfl-$(TARGET_NAME)\
-	-lpjsip-sfl-$(TARGET_NAME)\
-	-lpjmedia-codec-sfl-$(TARGET_NAME)\
-	-lpjmedia-sfl-$(TARGET_NAME)\
-	-lpjmedia-audiodev-sfl-$(TARGET_NAME)\
-	-lpjnath-sfl-$(TARGET_NAME)\
-	-lpjlib-util-sfl-$(TARGET_NAME)\
+export APP_LDLIBS := -lpjsua-$(TARGET_NAME)\
+	-lpjsip-ua-$(TARGET_NAME)\
+	-lpjsip-simple-$(TARGET_NAME)\
+	-lpjsip-$(TARGET_NAME)\
+	-lpjmedia-codec-$(TARGET_NAME)\
+	-lpjmedia-$(TARGET_NAME)\
+	-lpjmedia-audiodev-$(TARGET_NAME)\
+	-lpjnath-$(TARGET_NAME)\
+	-lpjlib-util-$(TARGET_NAME)\
 	$(APP_THIRD_PARTY_LIBS)\
-	-lpj-sfl-$(TARGET_NAME)\
+	-lpj-$(TARGET_NAME)\
 	@LIBS@
-export APP_LIB_FILES = $(PJ_DIR)/pjsip/lib/libpjsua-sfl-$(LIB_SUFFIX) \
-	$(PJ_DIR)/pjsip/lib/libpjsip-ua-sfl-$(LIB_SUFFIX) \
-	$(PJ_DIR)/pjsip/lib/libpjsip-simple-sfl-$(LIB_SUFFIX) \
-	$(PJ_DIR)/pjsip/lib/libpjsip-sfl-$(LIB_SUFFIX) \
-	$(PJ_DIR)/pjmedia/lib/libpjmedia-codec-sfl-$(LIB_SUFFIX) \
-	$(PJ_DIR)/pjmedia/lib/libpjmedia-sfl-$(LIB_SUFFIX) \
-	$(PJ_DIR)/pjmedia/lib/libpjmedia-audiodev-sfl-$(LIB_SUFFIX) \
-	$(PJ_DIR)/pjnath/lib/libpjnath-sfl-$(LIB_SUFFIX) \
-	$(PJ_DIR)/pjlib-util/lib/libpjlib-util-sfl-$(LIB_SUFFIX) \
+export APP_LIB_FILES = $(PJ_DIR)/pjsip/lib/libpjsua-$(LIB_SUFFIX) \
+	$(PJ_DIR)/pjsip/lib/libpjsip-ua-$(LIB_SUFFIX) \
+	$(PJ_DIR)/pjsip/lib/libpjsip-simple-$(LIB_SUFFIX) \
+	$(PJ_DIR)/pjsip/lib/libpjsip-$(LIB_SUFFIX) \
+	$(PJ_DIR)/pjmedia/lib/libpjmedia-codec-$(LIB_SUFFIX) \
+	$(PJ_DIR)/pjmedia/lib/libpjmedia-$(LIB_SUFFIX) \
+	$(PJ_DIR)/pjmedia/lib/libpjmedia-audiodev-$(LIB_SUFFIX) \
+	$(PJ_DIR)/pjnath/lib/libpjnath-$(LIB_SUFFIX) \
+	$(PJ_DIR)/pjlib-util/lib/libpjlib-util-$(LIB_SUFFIX) \
 	$(APP_THIRD_PARTY_LIB_FILES) \
-	$(PJ_DIR)/pjlib/lib/libpj-sfl-$(LIB_SUFFIX)
+	$(PJ_DIR)/pjlib/lib/libpj-$(LIB_SUFFIX)
 
 export PJ_DIR := $(PJDIR)
 export PJ_CC := $(APP_CC)

sflphone-common/libs/pjproject/build.symbian/bld.inf

 prj_platforms
 winscw
-//armv5
+armv5
 gcce
 
 prj_mmpfiles
@@ -30,7 +30,6 @@ libresample.mmp
 pjmedia_audiodev.mmp
 
 /* Applications */
-//pjlib_test.mmp
 //symsndtest.mmp
 symbian_ua.mmp
 ..\pjsip-apps\src\symbian_ua_gui\group\symbian_ua_gui.mmp

sflphone-common/libs/pjproject/build.symbian/libg7221codec.mmp

@@ -3,6 +3,7 @@ TARGETTYPE 	lib
 
 //OPTION		CW -lang c++
 OPTION		GCCE -O2 -fno-unit-at-a-time
+OPTION          ARMCC --gnu
 
 MACRO		PJ_M_I386=1
 MACRO		PJ_SYMBIAN=1

sflphone-common/libs/pjproject/build.symbian/libgsmcodec.mmp

@@ -19,6 +19,7 @@ TARGETTYPE 	lib
 #endif
 
 //OPTION		CW -lang c++
+OPTION          ARMCC --gnu
 
 MACRO		PJ_M_I386=1
 MACRO		PJ_SYMBIAN=1

sflphone-common/libs/pjproject/build.symbian/libpassthroughcodec.mmp

@@ -9,6 +9,7 @@ MACRO		PJ_SYMBIAN=1
 // GCCE optimization setting
 //
 OPTION		GCCE -O2 -fno-unit-at-a-time
+OPTION          ARMCC --gnu
 
 //
 // Passthrough codecs wrapper for pjmedia-codec

sflphone-common/libs/pjproject/build.symbian/libresample.mmp

@@ -7,6 +7,7 @@ SOURCEPATH	..\third_party\resample\src
 // GCCE optimization setting
 //
 OPTION		GCCE -O2 -fno-unit-at-a-time
+OPTION          ARMCC --gnu
 
 MACRO		PJ_M_I386=1
 MACRO		PJ_SYMBIAN=1

sflphone-common/libs/pjproject/build.symbian/libspeexcodec.mmp

@@ -9,6 +9,7 @@ MACRO		PJ_SYMBIAN=1
 // GCCE optimization setting
 //
 OPTION		GCCE -O2 -fno-unit-at-a-time
+OPTION          ARMCC --gnu
 
 //
 // Speex files

sflphone-common/libs/pjproject/build.symbian/libsrtp.mmp

@@ -8,6 +8,7 @@ MACRO		PJ_SYMBIAN=1
 // GCCE optimization setting
 //
 OPTION		GCCE -O2 -fno-unit-at-a-time
+OPTION          ARMCC --gnu
 
 //
 // Speex files

sflphone-common/libs/pjproject/build.symbian/null_audio.mmp

@@ -22,6 +22,7 @@ TARGETTYPE 	lib
 SOURCEPATH	..\pjmedia\src\pjmedia
 
 OPTION		CW -lang c++
+OPTION          ARMCC --gnu
 
 MACRO		PJ_M_I386=1
 MACRO		PJ_SYMBIAN=1

sflphone-common/libs/pjproject/build.symbian/pjlib.mmp

@@ -24,7 +24,7 @@ MACRO		PJ_SYMBIAN=1
 
 // Must compile as C++, otherwise exception would not work
 OPTION          CW -lang c++
-OPTION          ARMCC --cpp
+OPTION          ARMCC --cpp --gnu
 OPTION          GCC     -x c++
 OPTION          GCCE    -x c++
 
@@ -50,6 +50,7 @@ SOURCE		pool_caching.c
 SOURCE		rand.c
 SOURCE		rbtree.c
 SOURCE		sock_common.c
+SOURCE		sock_qos_common.c
 SOURCE		types.c
 
 
@@ -71,8 +72,11 @@ SOURCE		os_timestamp_common.c
 SOURCE		os_time_unix.c
 SOURCE		os_timestamp_posix.c
 SOURCE		pool_policy_new.cpp
+SOURCE		ssl_sock_common.c
+SOURCE		ssl_sock_symbian.cpp
 SOURCE		sock_symbian.cpp
 SOURCE		sock_select_symbian.cpp
+SOURCE		sock_qos_symbian.cpp
 SOURCE		timer_symbian.cpp
 SOURCE		unicode_symbian.cpp
 

sflphone-common/libs/pjproject/build.symbian/pjlib_test.mmp

@@ -10,7 +10,7 @@ MACRO		PJ_SYMBIAN=1
 
 // Must compile as C++, otherwise exception would not work
 OPTION CW -lang c++
-OPTION ARMCC --cpp
+OPTION ARMCC --cpp --gnu
 OPTION GCC -x c++
 OPTION GCCE -x c++
 
@@ -46,6 +46,7 @@ SOURCE	select.c
 SOURCE	sleep.c
 SOURCE	sock.c
 SOURCE	sock_perf.c
+SOURCE	ssl_sock.c
 SOURCE	string.c
 SOURCE	test_wrap.cpp
 SOURCE	thread.c
@@ -68,7 +69,7 @@ SYSTEMINCLUDE	..\pjlib\include
 SYSTEMINCLUDE	\epoc32\include
 SYSTEMINCLUDE	\epoc32\include\libc
 
-LIBRARY		esock.lib insock.lib charconv.lib euser.lib estlib.lib 
+LIBRARY		esock.lib insock.lib charconv.lib euser.lib estlib.lib securesocket.lib 
 #ifdef WINSCW
 STATICLIBRARY   eexe.lib ecrt0.lib
 #endif
@@ -76,3 +77,4 @@ STATICLIBRARY   eexe.lib ecrt0.lib
 // Need a bit of mem for logging in the app.
 EPOCSTACKSIZE		32768
 
+CAPABILITY	NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment

sflphone-common/libs/pjproject/build.symbian/pjlib_util.mmp

@@ -24,7 +24,7 @@ MACRO		PJ_SYMBIAN=1
 
 // Must compile as C++, otherwise exception would not work
 OPTION          CW -lang c++
-OPTION          ARMCC --cpp
+OPTION          ARMCC --cpp --gnu
 OPTION          GCC -x c++
 OPTION          GCCE -x c++
 

sflphone-common/libs/pjproject/build.symbian/pjmedia.mmp

@@ -30,7 +30,7 @@ MACRO		PJ_SYMBIAN=1
 
 // Must compile as C++, otherwise exception would not work
 OPTION          CW -lang c++
-OPTION          ARMCC --cpp
+OPTION          ARMCC --cpp --gnu
 OPTION          GCC     -x c++
 OPTION          GCCE    -x c++
 

sflphone-common/libs/pjproject/build.symbian/pjmedia_audiodev.mmp

@@ -7,6 +7,7 @@ SOURCEPATH	..\pjmedia\src\pjmedia-audiodev
 // GCCE optimization setting
 //
 //OPTION		GCCE -O2 -fno-unit-at-a-time
+OPTION          ARMCC --gnu
 
 MACRO		PJ_M_I386=1
 MACRO		PJ_SYMBIAN=1

sflphone-common/libs/pjproject/build.symbian/pjnath.mmp

@@ -17,6 +17,8 @@ TARGETTYPE 	lib
 
 #endif
 
+OPTION          ARMCC --gnu
+
 SOURCEPATH	..\pjnath\src\pjnath
 
 MACRO		PJ_M_I386=1