diff --git a/.gitignore b/.gitignore index ccc5bb9604ef9601947060d0f4b11a847e7aada2..a0250ddf67959028b70776c674f463f8b53c4a23 100644 --- a/.gitignore +++ b/.gitignore @@ -49,18 +49,18 @@ sflphone-client-gnome/stamp-h1 # PJSIP files *.depend *i686-pc-linux-gnu -/libs/pjproject-1.0.1/pjlib-util/build/os-auto.mak -/libs/pjproject-1.0.1/pjlib/build/os-auto.mak -/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_auto.h -/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_auto.h -/libs/pjproject-1.0.1/pjlib/include/pj/config_site.h -/libs/pjproject-1.0.1/pjmedia/build/os-auto.mak -/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/config_auto.h -/libs/pjproject-1.0.1/pjmedia/include/pjmedia/config_auto.h -/libs/pjproject-1.0.1/pjsip/build/os-auto.mak -/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_autoconf.h -/libs/pjproject-1.0.1/third_party/build/os-auto.mak -/libs/pjproject-1.0.1/third_party/build/portaudio/os-auto.mak +/libs/pjproject-1.0.3/pjlib-util/build/os-auto.mak +/libs/pjproject-1.0.3/pjlib/build/os-auto.mak +/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_auto.h +/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_auto.h +/libs/pjproject-1.0.3/pjlib/include/pj/config_site.h +/libs/pjproject-1.0.3/pjmedia/build/os-auto.mak +/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/config_auto.h +/libs/pjproject-1.0.3/pjmedia/include/pjmedia/config_auto.h +/libs/pjproject-1.0.3/pjsip/build/os-auto.mak +/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_autoconf.h +/libs/pjproject-1.0.3/third_party/build/os-auto.mak +/libs/pjproject-1.0.3/third_party/build/portaudio/os-auto.mak # Makefile sflphone-common/src/Makefile diff --git a/sflphone-common/configure.ac b/sflphone-common/configure.ac index dcb00903d2210e44354ae232e3fd0c2ba33535c0..b39dc0343faa0146a480fe1388fc95212f2c7c65 100644 --- a/sflphone-common/configure.ac +++ b/sflphone-common/configure.ac @@ -409,6 +409,6 @@ AC_SUBST(DBUS_SERVICES_DIR) AC_SUBST(SFLPHONE_CFLAGS) AC_SUBST(SFLPHONE_LIBS) AC_OUTPUT - AC_MSG_NOTICE([[Configuration done! Please make sure that pjsip library (libs/pjproject-1.0.2) has already been compiled. Run `make' to build the software.]]) + AC_MSG_NOTICE([[Configuration done! Please make sure that pjsip library (libs/pjproject-1.0.3) has already been compiled. Run `make' to build the software.]]) diff --git a/sflphone-common/globals.mak b/sflphone-common/globals.mak index e6f165a1ac990f1dd0872e18d732a3e84afa8448..51fe32ac486c133abdf074e4ff5312dd3df4602a 100644 --- a/sflphone-common/globals.mak +++ b/sflphone-common/globals.mak @@ -6,7 +6,7 @@ sflplugindir=$(DESTDIR)$(libdir)/sflphone/plugins ASTYLERC="../astylerc" indent="/usr/bin/astyle" -PJSIP_VERSION="1.0.2" +PJSIP_VERSION="1.0.3" # for pjsip PJSIP_LIBS= \ diff --git a/sflphone-common/libs/pjproject-1.0.2/build/os-auto.mak b/sflphone-common/libs/pjproject-1.0.2/build/os-auto.mak deleted file mode 100644 index f88de8f7e39bf8bb66fbe8975178b957c9e01ed1..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/pjproject-1.0.2/build/os-auto.mak +++ /dev/null @@ -1,11 +0,0 @@ -# build/os-auto.mak. Generated from os-auto.mak.in by configure. - -export OS_CFLAGS := $(CC_DEF)PJ_AUTOCONF=1 -O2 - -export OS_CXXFLAGS := $(CC_DEF)PJ_AUTOCONF=1 -O2 - -export OS_LDFLAGS := -lm -luuid -lnsl -lrt -lpthread -lasound - -export OS_SOURCES := - - diff --git a/sflphone-common/libs/pjproject-1.0.2/config.log b/sflphone-common/libs/pjproject-1.0.2/config.log deleted file mode 100644 index dc4f10f2c3fed3bb85071163efb239158e1b3ec2..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/pjproject-1.0.2/config.log +++ /dev/null @@ -1,2905 +0,0 @@ -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by pjproject aconfigure 1.0, which was -generated by GNU Autoconf 2.59. Invocation command line was - - $ ./aconfigure - -## --------- ## -## Platform. ## -## --------- ## - -hostname = emilou-desktop -uname -m = x86_64 -uname -r = 2.6.28-11-generic -uname -s = Linux -uname -v = #42-Ubuntu SMP Fri Apr 17 01:58:03 UTC 2009 - -/usr/bin/uname -p = unknown -/bin/uname -X = unknown - -/bin/arch = unknown -/usr/bin/arch -k = unknown -/usr/convex/getsysinfo = unknown -hostinfo = unknown -/bin/machine = unknown -/usr/bin/oslevel = unknown -/bin/universe = unknown - -PATH: /usr/local/sbin -PATH: /usr/local/bin -PATH: /usr/sbin -PATH: /usr/bin -PATH: /sbin -PATH: /bin -PATH: /usr/games -PATH: /usr/local/share/OpenSceneGraph/bin - - -## ----------- ## -## Core tests. ## -## ----------- ## - -aconfigure:1377: checking build system type -aconfigure:1395: result: x86_64-unknown-linux-gnu -aconfigure:1403: checking host system type -aconfigure:1417: result: x86_64-unknown-linux-gnu -aconfigure:1425: checking target system type -aconfigure:1439: result: x86_64-unknown-linux-gnu -aconfigure:1513: checking for gcc -aconfigure:1529: found /usr/bin/gcc -aconfigure:1539: result: gcc -aconfigure:1783: checking for C compiler version -aconfigure:1786: gcc --version </dev/null >&5 -gcc (Ubuntu 4.3.3-5ubuntu4) 4.3.3 -Copyright (C) 2008 Free Software Foundation, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -aconfigure:1789: $? = 0 -aconfigure:1791: gcc -v </dev/null >&5 -Using built-in specs. -Target: x86_64-linux-gnu -Configured with: ../src/configure -v --with-pkgversion='Ubuntu 4.3.3-5ubuntu4' --with-bugurl=file:///usr/share/doc/gcc-4.3/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --with-gxx-include-dir=/usr/include/c++/4.3 --program-suffix=-4.3 --enable-clocale=gnu --enable-libstdcxx-debug --enable-objc-gc --enable-mpfr --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu -Thread model: posix -gcc version 4.3.3 (Ubuntu 4.3.3-5ubuntu4) -aconfigure:1794: $? = 0 -aconfigure:1796: gcc -V </dev/null >&5 -gcc: '-V' option must have argument -aconfigure:1799: $? = 1 -aconfigure:1822: checking for C compiler default output file name -aconfigure:1825: gcc -O2 conftest.c >&5 -aconfigure:1828: $? = 0 -aconfigure:1874: result: a.out -aconfigure:1879: checking whether the C compiler works -aconfigure:1885: ./a.out -aconfigure:1888: $? = 0 -aconfigure:1905: result: yes -aconfigure:1912: checking whether we are cross compiling -aconfigure:1914: result: no -aconfigure:1917: checking for suffix of executables -aconfigure:1919: gcc -o conftest -O2 conftest.c >&5 -aconfigure:1922: $? = 0 -aconfigure:1947: result: -aconfigure:1953: checking for suffix of object files -aconfigure:1974: gcc -c -O2 conftest.c >&5 -aconfigure:1977: $? = 0 -aconfigure:1999: result: o -aconfigure:2003: checking whether we are using the GNU C compiler -aconfigure:2027: gcc -c -O2 conftest.c >&5 -aconfigure:2033: $? = 0 -aconfigure:2037: test -z - || test ! -s conftest.err -aconfigure:2040: $? = 0 -aconfigure:2043: test -s conftest.o -aconfigure:2046: $? = 0 -aconfigure:2059: result: yes -aconfigure:2065: checking whether gcc accepts -g -aconfigure:2086: gcc -c -g conftest.c >&5 -aconfigure:2092: $? = 0 -aconfigure:2096: test -z - || test ! -s conftest.err -aconfigure:2099: $? = 0 -aconfigure:2102: test -s conftest.o -aconfigure:2105: $? = 0 -aconfigure:2116: result: yes -aconfigure:2133: checking for gcc option to accept ANSI C -aconfigure:2203: gcc -c -O2 conftest.c >&5 -aconfigure:2209: $? = 0 -aconfigure:2213: test -z - || test ! -s conftest.err -aconfigure:2216: $? = 0 -aconfigure:2219: test -s conftest.o -aconfigure:2222: $? = 0 -aconfigure:2240: result: none needed -aconfigure:2258: gcc -c -O2 conftest.c >&5 -conftest.c:2: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'me' -aconfigure:2264: $? = 1 -aconfigure: failed program was: -| #ifndef __cplusplus -| choke me -| #endif -aconfigure:2449: checking for g++ -aconfigure:2465: found /usr/bin/g++ -aconfigure:2475: result: g++ -aconfigure:2491: checking for C++ compiler version -aconfigure:2494: g++ --version </dev/null >&5 -g++ (Ubuntu 4.3.3-5ubuntu4) 4.3.3 -Copyright (C) 2008 Free Software Foundation, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -aconfigure:2497: $? = 0 -aconfigure:2499: g++ -v </dev/null >&5 -Using built-in specs. -Target: x86_64-linux-gnu -Configured with: ../src/configure -v --with-pkgversion='Ubuntu 4.3.3-5ubuntu4' --with-bugurl=file:///usr/share/doc/gcc-4.3/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --with-gxx-include-dir=/usr/include/c++/4.3 --program-suffix=-4.3 --enable-clocale=gnu --enable-libstdcxx-debug --enable-objc-gc --enable-mpfr --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu -Thread model: posix -gcc version 4.3.3 (Ubuntu 4.3.3-5ubuntu4) -aconfigure:2502: $? = 0 -aconfigure:2504: g++ -V </dev/null >&5 -g++: '-V' option must have argument -aconfigure:2507: $? = 1 -aconfigure:2510: checking whether we are using the GNU C++ compiler -aconfigure:2534: g++ -c -O2 conftest.cc >&5 -aconfigure:2540: $? = 0 -aconfigure:2544: test -z - || test ! -s conftest.err -aconfigure:2547: $? = 0 -aconfigure:2550: test -s conftest.o -aconfigure:2553: $? = 0 -aconfigure:2566: result: yes -aconfigure:2572: checking whether g++ accepts -g -aconfigure:2593: g++ -c -g conftest.cc >&5 -aconfigure:2599: $? = 0 -aconfigure:2603: test -z - || test ! -s conftest.err -aconfigure:2606: $? = 0 -aconfigure:2609: test -s conftest.o -aconfigure:2612: $? = 0 -aconfigure:2623: result: yes -aconfigure:2665: g++ -c -O2 conftest.cc >&5 -aconfigure:2671: $? = 0 -aconfigure:2675: test -z - || test ! -s conftest.err -aconfigure:2678: $? = 0 -aconfigure:2681: test -s conftest.o -aconfigure:2684: $? = 0 -aconfigure:2710: g++ -c -O2 conftest.cc >&5 -conftest.cc: In function 'int main()': -conftest.cc:13: error: 'exit' was not declared in this scope -aconfigure:2716: $? = 1 -aconfigure: failed program was: -| /* confdefs.h. */ -| -| #define PACKAGE_NAME "pjproject" -| #define PACKAGE_TARNAME "pjproject" -| #define PACKAGE_VERSION "1.0" -| #define PACKAGE_STRING "pjproject 1.0" -| #define PACKAGE_BUGREPORT "" -| /* end confdefs.h. */ -| -| int -| main () -| { -| exit (42); -| ; -| return 0; -| } -aconfigure:2665: g++ -c -O2 conftest.cc >&5 -conftest.cc:9: error: 'void std::exit(int)' should have been declared inside 'std' -aconfigure:2671: $? = 1 -aconfigure: failed program was: -| /* confdefs.h. */ -| -| #define PACKAGE_NAME "pjproject" -| #define PACKAGE_TARNAME "pjproject" -| #define PACKAGE_VERSION "1.0" -| #define PACKAGE_STRING "pjproject 1.0" -| #define PACKAGE_BUGREPORT "" -| /* end confdefs.h. */ -| extern "C" void std::exit (int) throw (); using std::exit; -| #include <stdlib.h> -| int -| main () -| { -| exit (42); -| ; -| return 0; -| } -aconfigure:2665: g++ -c -O2 conftest.cc >&5 -conftest.cc:9: error: 'void std::exit(int)' should have been declared inside 'std' -In file included from conftest.cc:10: -/usr/include/stdlib.h:531: error: declaration of 'void std::exit(int) throw ()' throws different exceptions -conftest.cc:9: error: from previous declaration 'void std::exit(int)' -aconfigure:2671: $? = 1 -aconfigure: failed program was: -| /* confdefs.h. */ -| -| #define PACKAGE_NAME "pjproject" -| #define PACKAGE_TARNAME "pjproject" -| #define PACKAGE_VERSION "1.0" -| #define PACKAGE_STRING "pjproject 1.0" -| #define PACKAGE_BUGREPORT "" -| /* end confdefs.h. */ -| extern "C" void std::exit (int); using std::exit; -| #include <stdlib.h> -| int -| main () -| { -| exit (42); -| ; -| return 0; -| } -aconfigure:2665: g++ -c -O2 conftest.cc >&5 -aconfigure:2671: $? = 0 -aconfigure:2675: test -z - || test ! -s conftest.err -aconfigure:2678: $? = 0 -aconfigure:2681: test -s conftest.o -aconfigure:2684: $? = 0 -aconfigure:2710: g++ -c -O2 conftest.cc >&5 -aconfigure:2716: $? = 0 -aconfigure:2720: test -z - || test ! -s conftest.err -aconfigure:2723: $? = 0 -aconfigure:2726: test -s conftest.o -aconfigure:2729: $? = 0 -aconfigure:2772: checking for pthread_create in -lpthread -aconfigure:2802: gcc -o conftest -O2 conftest.c -lpthread >&5 -aconfigure:2808: $? = 0 -aconfigure:2812: test -z - || test ! -s conftest.err -aconfigure:2815: $? = 0 -aconfigure:2818: test -s conftest -aconfigure:2821: $? = 0 -aconfigure:2834: result: yes -aconfigure:2846: checking for puts in -lwsock32 -aconfigure:2876: gcc -o conftest -O2 conftest.c -lwsock32 -lpthread >&5 -conftest.c:20: warning: conflicting types for built-in function 'puts' -/usr/bin/ld: cannot find -lwsock32 -collect2: ld returned 1 exit status -aconfigure:2882: $? = 1 -aconfigure: failed program was: -| /* confdefs.h. */ -| -| #define PACKAGE_NAME "pjproject" -| #define PACKAGE_TARNAME "pjproject" -| #define PACKAGE_VERSION "1.0" -| #define PACKAGE_STRING "pjproject 1.0" -| #define PACKAGE_BUGREPORT "" -| #ifdef __cplusplus -| extern "C" void exit (int) throw (); -| #endif -| #define HAVE_LIBPTHREAD 1 -| /* end confdefs.h. */ -| -| /* Override any gcc2 internal prototype to avoid an error. */ -| #ifdef __cplusplus -| extern "C" -| #endif -| /* We use char because int might match the return type of a gcc2 -| builtin and then its argument prototype would still apply. */ -| char puts (); -| int -| main () -| { -| puts (); -| ; -| return 0; -| } -aconfigure:2908: result: no -aconfigure:2920: checking for puts in -lws2_32 -aconfigure:2950: gcc -o conftest -O2 conftest.c -lws2_32 -lpthread >&5 -conftest.c:20: warning: conflicting types for built-in function 'puts' -/usr/bin/ld: cannot find -lws2_32 -collect2: ld returned 1 exit status -aconfigure:2956: $? = 1 -aconfigure: failed program was: -| /* confdefs.h. */ -| -| #define PACKAGE_NAME "pjproject" -| #define PACKAGE_TARNAME "pjproject" -| #define PACKAGE_VERSION "1.0" -| #define PACKAGE_STRING "pjproject 1.0" -| #define PACKAGE_BUGREPORT "" -| #ifdef __cplusplus -| extern "C" void exit (int) throw (); -| #endif -| #define HAVE_LIBPTHREAD 1 -| /* end confdefs.h. */ -| -| /* Override any gcc2 internal prototype to avoid an error. */ -| #ifdef __cplusplus -| extern "C" -| #endif -| /* We use char because int might match the return type of a gcc2 -| builtin and then its argument prototype would still apply. */ -| char puts (); -| int -| main () -| { -| puts (); -| ; -| return 0; -| } -aconfigure:2982: result: no -aconfigure:2994: checking for puts in -lole32 -aconfigure:3024: gcc -o conftest -O2 conftest.c -lole32 -lpthread >&5 -conftest.c:20: warning: conflicting types for built-in function 'puts' -/usr/bin/ld: cannot find -lole32 -collect2: ld returned 1 exit status -aconfigure:3030: $? = 1 -aconfigure: failed program was: -| /* confdefs.h. */ -| -| #define PACKAGE_NAME "pjproject" -| #define PACKAGE_TARNAME "pjproject" -| #define PACKAGE_VERSION "1.0" -| #define PACKAGE_STRING "pjproject 1.0" -| #define PACKAGE_BUGREPORT "" -| #ifdef __cplusplus -| extern "C" void exit (int) throw (); -| #endif -| #define HAVE_LIBPTHREAD 1 -| /* end confdefs.h. */ -| -| /* Override any gcc2 internal prototype to avoid an error. */ -| #ifdef __cplusplus -| extern "C" -| #endif -| /* We use char because int might match the return type of a gcc2 -| builtin and then its argument prototype would still apply. */ -| char puts (); -| int -| main () -| { -| puts (); -| ; -| return 0; -| } -aconfigure:3056: result: no -aconfigure:3068: checking for puts in -lwinmm -aconfigure:3098: gcc -o conftest -O2 conftest.c -lwinmm -lpthread >&5 -conftest.c:20: warning: conflicting types for built-in function 'puts' -/usr/bin/ld: cannot find -lwinmm -collect2: ld returned 1 exit status -aconfigure:3104: $? = 1 -aconfigure: failed program was: -| /* confdefs.h. */ -| -| #define PACKAGE_NAME "pjproject" -| #define PACKAGE_TARNAME "pjproject" -| #define PACKAGE_VERSION "1.0" -| #define PACKAGE_STRING "pjproject 1.0" -| #define PACKAGE_BUGREPORT "" -| #ifdef __cplusplus -| extern "C" void exit (int) throw (); -| #endif -| #define HAVE_LIBPTHREAD 1 -| /* end confdefs.h. */ -| -| /* Override any gcc2 internal prototype to avoid an error. */ -| #ifdef __cplusplus -| extern "C" -| #endif -| /* We use char because int might match the return type of a gcc2 -| builtin and then its argument prototype would still apply. */ -| char puts (); -| int -| main () -| { -| puts (); -| ; -| return 0; -| } -aconfigure:3130: result: no -aconfigure:3142: checking for puts in -lsocket -aconfigure:3172: gcc -o conftest -O2 conftest.c -lsocket -lpthread >&5 -conftest.c:20: warning: conflicting types for built-in function 'puts' -/usr/bin/ld: cannot find -lsocket -collect2: ld returned 1 exit status -aconfigure:3178: $? = 1 -aconfigure: failed program was: -| /* confdefs.h. */ -| -| #define PACKAGE_NAME "pjproject" -| #define PACKAGE_TARNAME "pjproject" -| #define PACKAGE_VERSION "1.0" -| #define PACKAGE_STRING "pjproject 1.0" -| #define PACKAGE_BUGREPORT "" -| #ifdef __cplusplus -| extern "C" void exit (int) throw (); -| #endif -| #define HAVE_LIBPTHREAD 1 -| /* end confdefs.h. */ -| -| /* Override any gcc2 internal prototype to avoid an error. */ -| #ifdef __cplusplus -| extern "C" -| #endif -| /* We use char because int might match the return type of a gcc2 -| builtin and then its argument prototype would still apply. */ -| char puts (); -| int -| main () -| { -| puts (); -| ; -| return 0; -| } -aconfigure:3204: result: no -aconfigure:3216: checking for puts in -lrt -aconfigure:3246: gcc -o conftest -O2 conftest.c -lrt -lpthread >&5 -conftest.c:20: warning: conflicting types for built-in function 'puts' -aconfigure:3252: $? = 0 -aconfigure:3256: test -z - || test ! -s conftest.err -aconfigure:3259: $? = 0 -aconfigure:3262: test -s conftest -aconfigure:3265: $? = 0 -aconfigure:3278: result: yes -aconfigure:3290: checking for puts in -lnsl -aconfigure:3320: gcc -o conftest -O2 conftest.c -lnsl -lrt -lpthread >&5 -conftest.c:21: warning: conflicting types for built-in function 'puts' -aconfigure:3326: $? = 0 -aconfigure:3330: test -z - || test ! -s conftest.err -aconfigure:3333: $? = 0 -aconfigure:3336: test -s conftest -aconfigure:3339: $? = 0 -aconfigure:3352: result: yes -aconfigure:3364: checking for uuid_generate in -luuid -aconfigure:3394: gcc -o conftest -O2 conftest.c -luuid -lnsl -lrt -lpthread >&5 -aconfigure:3400: $? = 0 -aconfigure:3404: test -z - || test ! -s conftest.err -aconfigure:3407: $? = 0 -aconfigure:3410: test -s conftest -aconfigure:3413: $? = 0 -aconfigure:3426: result: yes -aconfigure:3437: checking for uuid_generate in -luuid -aconfigure:3499: result: yes -aconfigure:3506: result: Setting PJ_M_NAME to x86_64 -aconfigure:3513: checking memory alignment -aconfigure:3521: result: 8 bytes -aconfigure:3535: checking whether byte ordering is bigendian -aconfigure:3562: gcc -c -O2 conftest.c >&5 -aconfigure:3568: $? = 0 -aconfigure:3572: test -z - || test ! -s conftest.err -aconfigure:3575: $? = 0 -aconfigure:3578: test -s conftest.o -aconfigure:3581: $? = 0 -aconfigure:3605: gcc -c -O2 conftest.c >&5 -conftest.c: In function 'main': -conftest.c:25: error: 'not' undeclared (first use in this function) -conftest.c:25: error: (Each undeclared identifier is reported only once -conftest.c:25: error: for each function it appears in.) -conftest.c:25: error: expected ';' before 'big' -aconfigure:3611: $? = 1 -aconfigure: failed program was: -| /* confdefs.h. */ -| -| #define PACKAGE_NAME "pjproject" -| #define PACKAGE_TARNAME "pjproject" -| #define PACKAGE_VERSION "1.0" -| #define PACKAGE_STRING "pjproject 1.0" -| #define PACKAGE_BUGREPORT "" -| #ifdef __cplusplus -| extern "C" void exit (int) throw (); -| #endif -| #define HAVE_LIBPTHREAD 1 -| #define HAVE_LIBRT 1 -| #define HAVE_LIBNSL 1 -| #define HAVE_LIBUUID 1 -| #define PJ_M_NAME "x86_64" -| #define PJ_POOL_ALIGNMENT 8 -| /* end confdefs.h. */ -| #include <sys/types.h> -| #include <sys/param.h> -| -| int -| main () -| { -| #if BYTE_ORDER != BIG_ENDIAN -| not big endian -| #endif -| -| ; -| return 0; -| } -aconfigure:3746: result: no -aconfigure:3829: result: Checking if floating point is disabled... no -aconfigure:3832: checking for fmod in -lm -aconfigure:3862: gcc -o conftest -O2 conftest.c -lm -luuid -lnsl -lrt -lpthread >&5 -conftest.c:27: warning: conflicting types for built-in function 'fmod' -aconfigure:3868: $? = 0 -aconfigure:3872: test -z - || test ! -s conftest.err -aconfigure:3875: $? = 0 -aconfigure:3878: test -s conftest -aconfigure:3881: $? = 0 -aconfigure:3894: result: yes -aconfigure:3914: checking how to run the C preprocessor -aconfigure:3949: gcc -E conftest.c -aconfigure:3955: $? = 0 -aconfigure:3987: gcc -E conftest.c -conftest.c:21:28: error: ac_nonexistent.h: No such file or directory -aconfigure:3993: $? = 1 -aconfigure: failed program was: -| /* confdefs.h. */ -| -| #define PACKAGE_NAME "pjproject" -| #define PACKAGE_TARNAME "pjproject" -| #define PACKAGE_VERSION "1.0" -| #define PACKAGE_STRING "pjproject 1.0" -| #define PACKAGE_BUGREPORT "" -| #ifdef __cplusplus -| extern "C" void exit (int) throw (); -| #endif -| #define HAVE_LIBPTHREAD 1 -| #define HAVE_LIBRT 1 -| #define HAVE_LIBNSL 1 -| #define HAVE_LIBUUID 1 -| #define PJ_M_NAME "x86_64" -| #define PJ_POOL_ALIGNMENT 8 -| #define PJ_LINUX 1 -| #define PJ_HAS_FLOATING_POINT 1 -| #define HAVE_LIBM 1 -| /* end confdefs.h. */ -| #include <ac_nonexistent.h> -aconfigure:4032: result: gcc -E -aconfigure:4056: gcc -E conftest.c -aconfigure:4062: $? = 0 -aconfigure:4094: gcc -E conftest.c -conftest.c:21:28: error: ac_nonexistent.h: No such file or directory -aconfigure:4100: $? = 1 -aconfigure: failed program was: -| /* confdefs.h. */ -| -| #define PACKAGE_NAME "pjproject" -| #define PACKAGE_TARNAME "pjproject" -| #define PACKAGE_VERSION "1.0" -| #define PACKAGE_STRING "pjproject 1.0" -| #define PACKAGE_BUGREPORT "" -| #ifdef __cplusplus -| extern "C" void exit (int) throw (); -| #endif -| #define HAVE_LIBPTHREAD 1 -| #define HAVE_LIBRT 1 -| #define HAVE_LIBNSL 1 -| #define HAVE_LIBUUID 1 -| #define PJ_M_NAME "x86_64" -| #define PJ_POOL_ALIGNMENT 8 -| #define PJ_LINUX 1 -| #define PJ_HAS_FLOATING_POINT 1 -| #define HAVE_LIBM 1 -| /* end confdefs.h. */ -| #include <ac_nonexistent.h> -aconfigure:4144: checking for egrep -aconfigure:4154: result: grep -E -aconfigure:4159: checking for ANSI C header files -aconfigure:4184: gcc -c -O2 conftest.c >&5 -aconfigure:4190: $? = 0 -aconfigure:4194: test -z - || test ! -s conftest.err -aconfigure:4197: $? = 0 -aconfigure:4200: test -s conftest.o -aconfigure:4203: $? = 0 -aconfigure:4292: gcc -o conftest -O2 conftest.c -lm -luuid -lnsl -lrt -lpthread >&5 -conftest.c: In function 'main': -conftest.c:38: warning: incompatible implicit declaration of built-in function 'exit' -aconfigure:4295: $? = 0 -aconfigure:4297: ./conftest -aconfigure:4300: $? = 0 -aconfigure:4315: result: yes -aconfigure:4339: checking for sys/types.h -aconfigure:4355: gcc -c -O2 conftest.c >&5 -aconfigure:4361: $? = 0 -aconfigure:4365: test -z - || test ! -s conftest.err -aconfigure:4368: $? = 0 -aconfigure:4371: test -s conftest.o -aconfigure:4374: $? = 0 -aconfigure:4385: result: yes -aconfigure:4339: checking for sys/stat.h -aconfigure:4355: gcc -c -O2 conftest.c >&5 -aconfigure:4361: $? = 0 -aconfigure:4365: test -z - || test ! -s conftest.err -aconfigure:4368: $? = 0 -aconfigure:4371: test -s conftest.o -aconfigure:4374: $? = 0 -aconfigure:4385: result: yes -aconfigure:4339: checking for stdlib.h -aconfigure:4355: gcc -c -O2 conftest.c >&5 -aconfigure:4361: $? = 0 -aconfigure:4365: test -z - || test ! -s conftest.err -aconfigure:4368: $? = 0 -aconfigure:4371: test -s conftest.o -aconfigure:4374: $? = 0 -aconfigure:4385: result: yes -aconfigure:4339: checking for string.h -aconfigure:4355: gcc -c -O2 conftest.c >&5 -aconfigure:4361: $? = 0 -aconfigure:4365: test -z - || test ! -s conftest.err -aconfigure:4368: $? = 0 -aconfigure:4371: test -s conftest.o -aconfigure:4374: $? = 0 -aconfigure:4385: result: yes -aconfigure:4339: checking for memory.h -aconfigure:4355: gcc -c -O2 conftest.c >&5 -aconfigure:4361: $? = 0 -aconfigure:4365: test -z - || test ! -s conftest.err -aconfigure:4368: $? = 0 -aconfigure:4371: test -s conftest.o -aconfigure:4374: $? = 0 -aconfigure:4385: result: yes -aconfigure:4339: checking for strings.h -aconfigure:4355: gcc -c -O2 conftest.c >&5 -aconfigure:4361: $? = 0 -aconfigure:4365: test -z - || test ! -s conftest.err -aconfigure:4368: $? = 0 -aconfigure:4371: test -s conftest.o -aconfigure:4374: $? = 0 -aconfigure:4385: result: yes -aconfigure:4339: checking for inttypes.h -aconfigure:4355: gcc -c -O2 conftest.c >&5 -aconfigure:4361: $? = 0 -aconfigure:4365: test -z - || test ! -s conftest.err -aconfigure:4368: $? = 0 -aconfigure:4371: test -s conftest.o -aconfigure:4374: $? = 0 -aconfigure:4385: result: yes -aconfigure:4339: checking for stdint.h -aconfigure:4355: gcc -c -O2 conftest.c >&5 -aconfigure:4361: $? = 0 -aconfigure:4365: test -z - || test ! -s conftest.err -aconfigure:4368: $? = 0 -aconfigure:4371: test -s conftest.o -aconfigure:4374: $? = 0 -aconfigure:4385: result: yes -aconfigure:4339: checking for unistd.h -aconfigure:4355: gcc -c -O2 conftest.c >&5 -aconfigure:4361: $? = 0 -aconfigure:4365: test -z - || test ! -s conftest.err -aconfigure:4368: $? = 0 -aconfigure:4371: test -s conftest.o -aconfigure:4374: $? = 0 -aconfigure:4385: result: yes -aconfigure:4407: checking arpa/inet.h usability -aconfigure:4419: gcc -c -O2 conftest.c >&5 -aconfigure:4425: $? = 0 -aconfigure:4429: test -z - || test ! -s conftest.err -aconfigure:4432: $? = 0 -aconfigure:4435: test -s conftest.o -aconfigure:4438: $? = 0 -aconfigure:4448: result: yes -aconfigure:4452: checking arpa/inet.h presence -aconfigure:4462: gcc -E conftest.c -aconfigure:4468: $? = 0 -aconfigure:4488: result: yes -aconfigure:4523: checking for arpa/inet.h -aconfigure:4530: result: yes -aconfigure:4552: checking assert.h usability -aconfigure:4564: gcc -c -O2 conftest.c >&5 -aconfigure:4570: $? = 0 -aconfigure:4574: test -z - || test ! -s conftest.err -aconfigure:4577: $? = 0 -aconfigure:4580: test -s conftest.o -aconfigure:4583: $? = 0 -aconfigure:4593: result: yes -aconfigure:4597: checking assert.h presence -aconfigure:4607: gcc -E conftest.c -aconfigure:4613: $? = 0 -aconfigure:4633: result: yes -aconfigure:4668: checking for assert.h -aconfigure:4675: result: yes -aconfigure:4697: checking ctype.h usability -aconfigure:4709: gcc -c -O2 conftest.c >&5 -aconfigure:4715: $? = 0 -aconfigure:4719: test -z - || test ! -s conftest.err -aconfigure:4722: $? = 0 -aconfigure:4725: test -s conftest.o -aconfigure:4728: $? = 0 -aconfigure:4738: result: yes -aconfigure:4742: checking ctype.h presence -aconfigure:4752: gcc -E conftest.c -aconfigure:4758: $? = 0 -aconfigure:4778: result: yes -aconfigure:4813: checking for ctype.h -aconfigure:4820: result: yes -aconfigure:4851: checking errno.h usability -aconfigure:4863: gcc -c -O2 conftest.c >&5 -aconfigure:4869: $? = 0 -aconfigure:4873: test -z - || test ! -s conftest.err -aconfigure:4876: $? = 0 -aconfigure:4879: test -s conftest.o -aconfigure:4882: $? = 0 -aconfigure:4892: result: yes -aconfigure:4896: checking errno.h presence -aconfigure:4906: gcc -E conftest.c -aconfigure:4912: $? = 0 -aconfigure:4932: result: yes -aconfigure:4967: checking for errno.h -aconfigure:4974: result: yes -aconfigure:4999: checking fcntl.h usability -aconfigure:5011: gcc -c -O2 conftest.c >&5 -aconfigure:5017: $? = 0 -aconfigure:5021: test -z - || test ! -s conftest.err -aconfigure:5024: $? = 0 -aconfigure:5027: test -s conftest.o -aconfigure:5030: $? = 0 -aconfigure:5040: result: yes -aconfigure:5044: checking fcntl.h presence -aconfigure:5054: gcc -E conftest.c -aconfigure:5060: $? = 0 -aconfigure:5080: result: yes -aconfigure:5115: checking for fcntl.h -aconfigure:5122: result: yes -aconfigure:5144: checking linux/socket.h usability -aconfigure:5156: gcc -c -O2 conftest.c >&5 -aconfigure:5162: $? = 0 -aconfigure:5166: test -z - || test ! -s conftest.err -aconfigure:5169: $? = 0 -aconfigure:5172: test -s conftest.o -aconfigure:5175: $? = 0 -aconfigure:5185: result: yes -aconfigure:5189: checking linux/socket.h presence -aconfigure:5199: gcc -E conftest.c -aconfigure:5205: $? = 0 -aconfigure:5225: result: yes -aconfigure:5260: checking for linux/socket.h -aconfigure:5267: result: yes -aconfigure:5289: checking malloc.h usability -aconfigure:5301: gcc -c -O2 conftest.c >&5 -aconfigure:5307: $? = 0 -aconfigure:5311: test -z - || test ! -s conftest.err -aconfigure:5314: $? = 0 -aconfigure:5317: test -s conftest.o -aconfigure:5320: $? = 0 -aconfigure:5330: result: yes -aconfigure:5334: checking malloc.h presence -aconfigure:5344: gcc -E conftest.c -aconfigure:5350: $? = 0 -aconfigure:5370: result: yes -aconfigure:5405: checking for malloc.h -aconfigure:5412: result: yes -aconfigure:5434: checking netdb.h usability -aconfigure:5446: gcc -c -O2 conftest.c >&5 -aconfigure:5452: $? = 0 -aconfigure:5456: test -z - || test ! -s conftest.err -aconfigure:5459: $? = 0 -aconfigure:5462: test -s conftest.o -aconfigure:5465: $? = 0 -aconfigure:5475: result: yes -aconfigure:5479: checking netdb.h presence -aconfigure:5489: gcc -E conftest.c -aconfigure:5495: $? = 0 -aconfigure:5515: result: yes -aconfigure:5550: checking for netdb.h -aconfigure:5557: result: yes -aconfigure:5579: checking netinet/in_systm.h usability -aconfigure:5591: gcc -c -O2 conftest.c >&5 -aconfigure:5597: $? = 0 -aconfigure:5601: test -z - || test ! -s conftest.err -aconfigure:5604: $? = 0 -aconfigure:5607: test -s conftest.o -aconfigure:5610: $? = 0 -aconfigure:5620: result: yes -aconfigure:5624: checking netinet/in_systm.h presence -aconfigure:5634: gcc -E conftest.c -aconfigure:5640: $? = 0 -aconfigure:5660: result: yes -aconfigure:5695: checking for netinet/in_systm.h -aconfigure:5702: result: yes -aconfigure:5724: checking netinet/in.h usability -aconfigure:5736: gcc -c -O2 conftest.c >&5 -aconfigure:5742: $? = 0 -aconfigure:5746: test -z - || test ! -s conftest.err -aconfigure:5749: $? = 0 -aconfigure:5752: test -s conftest.o -aconfigure:5755: $? = 0 -aconfigure:5765: result: yes -aconfigure:5769: checking netinet/in.h presence -aconfigure:5779: gcc -E conftest.c -aconfigure:5785: $? = 0 -aconfigure:5805: result: yes -aconfigure:5840: checking for netinet/in.h -aconfigure:5847: result: yes -aconfigure:5859: checking for netinet/ip.h -aconfigure:5878: gcc -c -O2 conftest.c >&5 -aconfigure:5884: $? = 0 -aconfigure:5888: test -z - || test ! -s conftest.err -aconfigure:5891: $? = 0 -aconfigure:5894: test -s conftest.o -aconfigure:5897: $? = 0 -aconfigure:5908: result: yes -aconfigure:5928: checking ifaddrs.h usability -aconfigure:5940: gcc -c -O2 conftest.c >&5 -aconfigure:5946: $? = 0 -aconfigure:5950: test -z - || test ! -s conftest.err -aconfigure:5953: $? = 0 -aconfigure:5956: test -s conftest.o -aconfigure:5959: $? = 0 -aconfigure:5969: result: yes -aconfigure:5973: checking ifaddrs.h presence -aconfigure:5983: gcc -E conftest.c -aconfigure:5989: $? = 0 -aconfigure:6009: result: yes -aconfigure:6044: checking for ifaddrs.h -aconfigure:6051: result: yes -aconfigure:6073: checking semaphore.h usability -aconfigure:6085: gcc -c -O2 conftest.c >&5 -aconfigure:6091: $? = 0 -aconfigure:6095: test -z - || test ! -s conftest.err -aconfigure:6098: $? = 0 -aconfigure:6101: test -s conftest.o -aconfigure:6104: $? = 0 -aconfigure:6114: result: yes -aconfigure:6118: checking semaphore.h presence -aconfigure:6128: gcc -E conftest.c -aconfigure:6134: $? = 0 -aconfigure:6154: result: yes -aconfigure:6189: checking for semaphore.h -aconfigure:6196: result: yes -aconfigure:6218: checking setjmp.h usability -aconfigure:6230: gcc -c -O2 conftest.c >&5 -aconfigure:6236: $? = 0 -aconfigure:6240: test -z - || test ! -s conftest.err -aconfigure:6243: $? = 0 -aconfigure:6246: test -s conftest.o -aconfigure:6249: $? = 0 -aconfigure:6259: result: yes -aconfigure:6263: checking setjmp.h presence -aconfigure:6273: gcc -E conftest.c -aconfigure:6279: $? = 0 -aconfigure:6299: result: yes -aconfigure:6334: checking for setjmp.h -aconfigure:6341: result: yes -aconfigure:6363: checking stdarg.h usability -aconfigure:6375: gcc -c -O2 conftest.c >&5 -aconfigure:6381: $? = 0 -aconfigure:6385: test -z - || test ! -s conftest.err -aconfigure:6388: $? = 0 -aconfigure:6391: test -s conftest.o -aconfigure:6394: $? = 0 -aconfigure:6404: result: yes -aconfigure:6408: checking stdarg.h presence -aconfigure:6418: gcc -E conftest.c -aconfigure:6424: $? = 0 -aconfigure:6444: result: yes -aconfigure:6479: checking for stdarg.h -aconfigure:6486: result: yes -aconfigure:6508: checking stddef.h usability -aconfigure:6520: gcc -c -O2 conftest.c >&5 -aconfigure:6526: $? = 0 -aconfigure:6530: test -z - || test ! -s conftest.err -aconfigure:6533: $? = 0 -aconfigure:6536: test -s conftest.o -aconfigure:6539: $? = 0 -aconfigure:6549: result: yes -aconfigure:6553: checking stddef.h presence -aconfigure:6563: gcc -E conftest.c -aconfigure:6569: $? = 0 -aconfigure:6589: result: yes -aconfigure:6624: checking for stddef.h -aconfigure:6631: result: yes -aconfigure:6653: checking stdio.h usability -aconfigure:6665: gcc -c -O2 conftest.c >&5 -aconfigure:6671: $? = 0 -aconfigure:6675: test -z - || test ! -s conftest.err -aconfigure:6678: $? = 0 -aconfigure:6681: test -s conftest.o -aconfigure:6684: $? = 0 -aconfigure:6694: result: yes -aconfigure:6698: checking stdio.h presence -aconfigure:6708: gcc -E conftest.c -aconfigure:6714: $? = 0 -aconfigure:6734: result: yes -aconfigure:6769: checking for stdio.h -aconfigure:6776: result: yes -aconfigure:6789: checking for stdint.h -aconfigure:6794: result: yes -aconfigure:6934: checking for stdlib.h -aconfigure:6939: result: yes -aconfigure:7079: checking for string.h -aconfigure:7084: result: yes -aconfigure:7233: checking sys/ioctl.h usability -aconfigure:7245: gcc -c -O2 conftest.c >&5 -aconfigure:7251: $? = 0 -aconfigure:7255: test -z - || test ! -s conftest.err -aconfigure:7258: $? = 0 -aconfigure:7261: test -s conftest.o -aconfigure:7264: $? = 0 -aconfigure:7274: result: yes -aconfigure:7278: checking sys/ioctl.h presence -aconfigure:7288: gcc -E conftest.c -aconfigure:7294: $? = 0 -aconfigure:7314: result: yes -aconfigure:7349: checking for sys/ioctl.h -aconfigure:7356: result: yes -aconfigure:7378: checking sys/select.h usability -aconfigure:7390: gcc -c -O2 conftest.c >&5 -aconfigure:7396: $? = 0 -aconfigure:7400: test -z - || test ! -s conftest.err -aconfigure:7403: $? = 0 -aconfigure:7406: test -s conftest.o -aconfigure:7409: $? = 0 -aconfigure:7419: result: yes -aconfigure:7423: checking sys/select.h presence -aconfigure:7433: gcc -E conftest.c -aconfigure:7439: $? = 0 -aconfigure:7459: result: yes -aconfigure:7494: checking for sys/select.h -aconfigure:7501: result: yes -aconfigure:7523: checking sys/socket.h usability -aconfigure:7535: gcc -c -O2 conftest.c >&5 -aconfigure:7541: $? = 0 -aconfigure:7545: test -z - || test ! -s conftest.err -aconfigure:7548: $? = 0 -aconfigure:7551: test -s conftest.o -aconfigure:7554: $? = 0 -aconfigure:7564: result: yes -aconfigure:7568: checking sys/socket.h presence -aconfigure:7578: gcc -E conftest.c -aconfigure:7584: $? = 0 -aconfigure:7604: result: yes -aconfigure:7639: checking for sys/socket.h -aconfigure:7646: result: yes -aconfigure:7668: checking sys/time.h usability -aconfigure:7680: gcc -c -O2 conftest.c >&5 -aconfigure:7686: $? = 0 -aconfigure:7690: test -z - || test ! -s conftest.err -aconfigure:7693: $? = 0 -aconfigure:7696: test -s conftest.o -aconfigure:7699: $? = 0 -aconfigure:7709: result: yes -aconfigure:7713: checking sys/time.h presence -aconfigure:7723: gcc -E conftest.c -aconfigure:7729: $? = 0 -aconfigure:7749: result: yes -aconfigure:7784: checking for sys/time.h -aconfigure:7791: result: yes -aconfigure:7813: checking sys/timeb.h usability -aconfigure:7825: gcc -c -O2 conftest.c >&5 -aconfigure:7831: $? = 0 -aconfigure:7835: test -z - || test ! -s conftest.err -aconfigure:7838: $? = 0 -aconfigure:7841: test -s conftest.o -aconfigure:7844: $? = 0 -aconfigure:7854: result: yes -aconfigure:7858: checking sys/timeb.h presence -aconfigure:7868: gcc -E conftest.c -aconfigure:7874: $? = 0 -aconfigure:7894: result: yes -aconfigure:7929: checking for sys/timeb.h -aconfigure:7936: result: yes -aconfigure:7949: checking for sys/types.h -aconfigure:7954: result: yes -aconfigure:8103: checking time.h usability -aconfigure:8115: gcc -c -O2 conftest.c >&5 -aconfigure:8121: $? = 0 -aconfigure:8125: test -z - || test ! -s conftest.err -aconfigure:8128: $? = 0 -aconfigure:8131: test -s conftest.o -aconfigure:8134: $? = 0 -aconfigure:8144: result: yes -aconfigure:8148: checking time.h presence -aconfigure:8158: gcc -E conftest.c -aconfigure:8164: $? = 0 -aconfigure:8184: result: yes -aconfigure:8219: checking for time.h -aconfigure:8226: result: yes -aconfigure:8239: checking for unistd.h -aconfigure:8244: result: yes -aconfigure:8393: checking winsock.h usability -aconfigure:8405: gcc -c -O2 conftest.c >&5 -conftest.c:93:21: error: winsock.h: No such file or directory -aconfigure:8411: $? = 1 -aconfigure: failed program was: -| /* confdefs.h. */ -| -| #define PACKAGE_NAME "pjproject" -| #define PACKAGE_TARNAME "pjproject" -| #define PACKAGE_VERSION "1.0" -| #define PACKAGE_STRING "pjproject 1.0" -| #define PACKAGE_BUGREPORT "" -| #ifdef __cplusplus -| extern "C" void exit (int) throw (); -| #endif -| #define HAVE_LIBPTHREAD 1 -| #define HAVE_LIBRT 1 -| #define HAVE_LIBNSL 1 -| #define HAVE_LIBUUID 1 -| #define PJ_M_NAME "x86_64" -| #define PJ_POOL_ALIGNMENT 8 -| #define PJ_LINUX 1 -| #define PJ_HAS_FLOATING_POINT 1 -| #define HAVE_LIBM 1 -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define PJ_HAS_ARPA_INET_H 1 -| #define PJ_HAS_ASSERT_H 1 -| #define PJ_HAS_CTYPE_H 1 -| #define PJ_HAS_ERRNO_H 1 -| #define PJ_HAS_FCNTL_H 1 -| #define PJ_HAS_LINUX_SOCKET_H 1 -| #define PJ_HAS_MALLOC_H 1 -| #define PJ_HAS_NETDB_H 1 -| #define PJ_HAS_NETINET_IN_SYSTM_H 1 -| #define PJ_HAS_NETINET_IN_H 1 -| #define PJ_HAS_NETINET_IP_H 1 -| #define PJ_HAS_IFADDRS_H 1 -| #define PJ_HAS_SEMAPHORE_H 1 -| #define PJ_HAS_SETJMP_H 1 -| #define PJ_HAS_STDARG_H 1 -| #define PJ_HAS_STDDEF_H 1 -| #define PJ_HAS_STDIO_H 1 -| #define PJ_HAS_STDINT_H 1 -| #define PJ_HAS_STDLIB_H 1 -| #define PJ_HAS_STRING_H 1 -| #define PJ_HAS_SYS_IOCTL_H 1 -| #define PJ_HAS_SYS_SELECT_H 1 -| #define PJ_HAS_SYS_SOCKET_H 1 -| #define PJ_HAS_SYS_TIME_H 1 -| #define PJ_HAS_SYS_TIMEB_H 1 -| #define PJ_HAS_SYS_TYPES_H 1 -| #define PJ_HAS_TIME_H 1 -| #define PJ_HAS_UNISTD_H 1 -| /* end confdefs.h. */ -| #include <stdio.h> -| #if HAVE_SYS_TYPES_H -| # include <sys/types.h> -| #endif -| #if HAVE_SYS_STAT_H -| # include <sys/stat.h> -| #endif -| #if STDC_HEADERS -| # include <stdlib.h> -| # include <stddef.h> -| #else -| # if HAVE_STDLIB_H -| # include <stdlib.h> -| # endif -| #endif -| #if HAVE_STRING_H -| # if !STDC_HEADERS && HAVE_MEMORY_H -| # include <memory.h> -| # endif -| # include <string.h> -| #endif -| #if HAVE_STRINGS_H -| # include <strings.h> -| #endif -| #if HAVE_INTTYPES_H -| # include <inttypes.h> -| #else -| # if HAVE_STDINT_H -| # include <stdint.h> -| # endif -| #endif -| #if HAVE_UNISTD_H -| # include <unistd.h> -| #endif -| #include <winsock.h> -aconfigure:8434: result: no -aconfigure:8438: checking winsock.h presence -aconfigure:8448: gcc -E conftest.c -conftest.c:59:21: error: winsock.h: No such file or directory -aconfigure:8454: $? = 1 -aconfigure: failed program was: -| /* confdefs.h. */ -| -| #define PACKAGE_NAME "pjproject" -| #define PACKAGE_TARNAME "pjproject" -| #define PACKAGE_VERSION "1.0" -| #define PACKAGE_STRING "pjproject 1.0" -| #define PACKAGE_BUGREPORT "" -| #ifdef __cplusplus -| extern "C" void exit (int) throw (); -| #endif -| #define HAVE_LIBPTHREAD 1 -| #define HAVE_LIBRT 1 -| #define HAVE_LIBNSL 1 -| #define HAVE_LIBUUID 1 -| #define PJ_M_NAME "x86_64" -| #define PJ_POOL_ALIGNMENT 8 -| #define PJ_LINUX 1 -| #define PJ_HAS_FLOATING_POINT 1 -| #define HAVE_LIBM 1 -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define PJ_HAS_ARPA_INET_H 1 -| #define PJ_HAS_ASSERT_H 1 -| #define PJ_HAS_CTYPE_H 1 -| #define PJ_HAS_ERRNO_H 1 -| #define PJ_HAS_FCNTL_H 1 -| #define PJ_HAS_LINUX_SOCKET_H 1 -| #define PJ_HAS_MALLOC_H 1 -| #define PJ_HAS_NETDB_H 1 -| #define PJ_HAS_NETINET_IN_SYSTM_H 1 -| #define PJ_HAS_NETINET_IN_H 1 -| #define PJ_HAS_NETINET_IP_H 1 -| #define PJ_HAS_IFADDRS_H 1 -| #define PJ_HAS_SEMAPHORE_H 1 -| #define PJ_HAS_SETJMP_H 1 -| #define PJ_HAS_STDARG_H 1 -| #define PJ_HAS_STDDEF_H 1 -| #define PJ_HAS_STDIO_H 1 -| #define PJ_HAS_STDINT_H 1 -| #define PJ_HAS_STDLIB_H 1 -| #define PJ_HAS_STRING_H 1 -| #define PJ_HAS_SYS_IOCTL_H 1 -| #define PJ_HAS_SYS_SELECT_H 1 -| #define PJ_HAS_SYS_SOCKET_H 1 -| #define PJ_HAS_SYS_TIME_H 1 -| #define PJ_HAS_SYS_TIMEB_H 1 -| #define PJ_HAS_SYS_TYPES_H 1 -| #define PJ_HAS_TIME_H 1 -| #define PJ_HAS_UNISTD_H 1 -| /* end confdefs.h. */ -| #include <winsock.h> -aconfigure:8474: result: no -aconfigure:8509: checking for winsock.h -aconfigure:8516: result: no -aconfigure:8538: checking winsock2.h usability -aconfigure:8550: gcc -c -O2 conftest.c >&5 -conftest.c:93:22: error: winsock2.h: No such file or directory -aconfigure:8556: $? = 1 -aconfigure: failed program was: -| /* confdefs.h. */ -| -| #define PACKAGE_NAME "pjproject" -| #define PACKAGE_TARNAME "pjproject" -| #define PACKAGE_VERSION "1.0" -| #define PACKAGE_STRING "pjproject 1.0" -| #define PACKAGE_BUGREPORT "" -| #ifdef __cplusplus -| extern "C" void exit (int) throw (); -| #endif -| #define HAVE_LIBPTHREAD 1 -| #define HAVE_LIBRT 1 -| #define HAVE_LIBNSL 1 -| #define HAVE_LIBUUID 1 -| #define PJ_M_NAME "x86_64" -| #define PJ_POOL_ALIGNMENT 8 -| #define PJ_LINUX 1 -| #define PJ_HAS_FLOATING_POINT 1 -| #define HAVE_LIBM 1 -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define PJ_HAS_ARPA_INET_H 1 -| #define PJ_HAS_ASSERT_H 1 -| #define PJ_HAS_CTYPE_H 1 -| #define PJ_HAS_ERRNO_H 1 -| #define PJ_HAS_FCNTL_H 1 -| #define PJ_HAS_LINUX_SOCKET_H 1 -| #define PJ_HAS_MALLOC_H 1 -| #define PJ_HAS_NETDB_H 1 -| #define PJ_HAS_NETINET_IN_SYSTM_H 1 -| #define PJ_HAS_NETINET_IN_H 1 -| #define PJ_HAS_NETINET_IP_H 1 -| #define PJ_HAS_IFADDRS_H 1 -| #define PJ_HAS_SEMAPHORE_H 1 -| #define PJ_HAS_SETJMP_H 1 -| #define PJ_HAS_STDARG_H 1 -| #define PJ_HAS_STDDEF_H 1 -| #define PJ_HAS_STDIO_H 1 -| #define PJ_HAS_STDINT_H 1 -| #define PJ_HAS_STDLIB_H 1 -| #define PJ_HAS_STRING_H 1 -| #define PJ_HAS_SYS_IOCTL_H 1 -| #define PJ_HAS_SYS_SELECT_H 1 -| #define PJ_HAS_SYS_SOCKET_H 1 -| #define PJ_HAS_SYS_TIME_H 1 -| #define PJ_HAS_SYS_TIMEB_H 1 -| #define PJ_HAS_SYS_TYPES_H 1 -| #define PJ_HAS_TIME_H 1 -| #define PJ_HAS_UNISTD_H 1 -| /* end confdefs.h. */ -| #include <stdio.h> -| #if HAVE_SYS_TYPES_H -| # include <sys/types.h> -| #endif -| #if HAVE_SYS_STAT_H -| # include <sys/stat.h> -| #endif -| #if STDC_HEADERS -| # include <stdlib.h> -| # include <stddef.h> -| #else -| # if HAVE_STDLIB_H -| # include <stdlib.h> -| # endif -| #endif -| #if HAVE_STRING_H -| # if !STDC_HEADERS && HAVE_MEMORY_H -| # include <memory.h> -| # endif -| # include <string.h> -| #endif -| #if HAVE_STRINGS_H -| # include <strings.h> -| #endif -| #if HAVE_INTTYPES_H -| # include <inttypes.h> -| #else -| # if HAVE_STDINT_H -| # include <stdint.h> -| # endif -| #endif -| #if HAVE_UNISTD_H -| # include <unistd.h> -| #endif -| #include <winsock2.h> -aconfigure:8579: result: no -aconfigure:8583: checking winsock2.h presence -aconfigure:8593: gcc -E conftest.c -conftest.c:59:22: error: winsock2.h: No such file or directory -aconfigure:8599: $? = 1 -aconfigure: failed program was: -| /* confdefs.h. */ -| -| #define PACKAGE_NAME "pjproject" -| #define PACKAGE_TARNAME "pjproject" -| #define PACKAGE_VERSION "1.0" -| #define PACKAGE_STRING "pjproject 1.0" -| #define PACKAGE_BUGREPORT "" -| #ifdef __cplusplus -| extern "C" void exit (int) throw (); -| #endif -| #define HAVE_LIBPTHREAD 1 -| #define HAVE_LIBRT 1 -| #define HAVE_LIBNSL 1 -| #define HAVE_LIBUUID 1 -| #define PJ_M_NAME "x86_64" -| #define PJ_POOL_ALIGNMENT 8 -| #define PJ_LINUX 1 -| #define PJ_HAS_FLOATING_POINT 1 -| #define HAVE_LIBM 1 -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define PJ_HAS_ARPA_INET_H 1 -| #define PJ_HAS_ASSERT_H 1 -| #define PJ_HAS_CTYPE_H 1 -| #define PJ_HAS_ERRNO_H 1 -| #define PJ_HAS_FCNTL_H 1 -| #define PJ_HAS_LINUX_SOCKET_H 1 -| #define PJ_HAS_MALLOC_H 1 -| #define PJ_HAS_NETDB_H 1 -| #define PJ_HAS_NETINET_IN_SYSTM_H 1 -| #define PJ_HAS_NETINET_IN_H 1 -| #define PJ_HAS_NETINET_IP_H 1 -| #define PJ_HAS_IFADDRS_H 1 -| #define PJ_HAS_SEMAPHORE_H 1 -| #define PJ_HAS_SETJMP_H 1 -| #define PJ_HAS_STDARG_H 1 -| #define PJ_HAS_STDDEF_H 1 -| #define PJ_HAS_STDIO_H 1 -| #define PJ_HAS_STDINT_H 1 -| #define PJ_HAS_STDLIB_H 1 -| #define PJ_HAS_STRING_H 1 -| #define PJ_HAS_SYS_IOCTL_H 1 -| #define PJ_HAS_SYS_SELECT_H 1 -| #define PJ_HAS_SYS_SOCKET_H 1 -| #define PJ_HAS_SYS_TIME_H 1 -| #define PJ_HAS_SYS_TIMEB_H 1 -| #define PJ_HAS_SYS_TYPES_H 1 -| #define PJ_HAS_TIME_H 1 -| #define PJ_HAS_UNISTD_H 1 -| /* end confdefs.h. */ -| #include <winsock2.h> -aconfigure:8619: result: no -aconfigure:8654: checking for winsock2.h -aconfigure:8661: result: no -aconfigure:8673: checking for mswsock.h -aconfigure:8694: gcc -c -O2 conftest.c >&5 -conftest.c:66:21: error: mswsock.h: No such file or directory -aconfigure:8700: $? = 1 -aconfigure: failed program was: -| /* confdefs.h. */ -| -| #define PACKAGE_NAME "pjproject" -| #define PACKAGE_TARNAME "pjproject" -| #define PACKAGE_VERSION "1.0" -| #define PACKAGE_STRING "pjproject 1.0" -| #define PACKAGE_BUGREPORT "" -| #ifdef __cplusplus -| extern "C" void exit (int) throw (); -| #endif -| #define HAVE_LIBPTHREAD 1 -| #define HAVE_LIBRT 1 -| #define HAVE_LIBNSL 1 -| #define HAVE_LIBUUID 1 -| #define PJ_M_NAME "x86_64" -| #define PJ_POOL_ALIGNMENT 8 -| #define PJ_LINUX 1 -| #define PJ_HAS_FLOATING_POINT 1 -| #define HAVE_LIBM 1 -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define PJ_HAS_ARPA_INET_H 1 -| #define PJ_HAS_ASSERT_H 1 -| #define PJ_HAS_CTYPE_H 1 -| #define PJ_HAS_ERRNO_H 1 -| #define PJ_HAS_FCNTL_H 1 -| #define PJ_HAS_LINUX_SOCKET_H 1 -| #define PJ_HAS_MALLOC_H 1 -| #define PJ_HAS_NETDB_H 1 -| #define PJ_HAS_NETINET_IN_SYSTM_H 1 -| #define PJ_HAS_NETINET_IN_H 1 -| #define PJ_HAS_NETINET_IP_H 1 -| #define PJ_HAS_IFADDRS_H 1 -| #define PJ_HAS_SEMAPHORE_H 1 -| #define PJ_HAS_SETJMP_H 1 -| #define PJ_HAS_STDARG_H 1 -| #define PJ_HAS_STDDEF_H 1 -| #define PJ_HAS_STDIO_H 1 -| #define PJ_HAS_STDINT_H 1 -| #define PJ_HAS_STDLIB_H 1 -| #define PJ_HAS_STRING_H 1 -| #define PJ_HAS_SYS_IOCTL_H 1 -| #define PJ_HAS_SYS_SELECT_H 1 -| #define PJ_HAS_SYS_SOCKET_H 1 -| #define PJ_HAS_SYS_TIME_H 1 -| #define PJ_HAS_SYS_TIMEB_H 1 -| #define PJ_HAS_SYS_TYPES_H 1 -| #define PJ_HAS_TIME_H 1 -| #define PJ_HAS_UNISTD_H 1 -| /* end confdefs.h. */ -| #if PJ_HAS_WINSOCK2_H -| # include <winsock2.h> -| #elif PJ_HAS_WINSOCK_H -| # include <winsock.h> -| #endif -| -| -| #include <mswsock.h> -aconfigure:8724: result: no -aconfigure:8744: checking ws2tcpip.h usability -aconfigure:8756: gcc -c -O2 conftest.c >&5 -conftest.c:93:22: error: ws2tcpip.h: No such file or directory -aconfigure:8762: $? = 1 -aconfigure: failed program was: -| /* confdefs.h. */ -| -| #define PACKAGE_NAME "pjproject" -| #define PACKAGE_TARNAME "pjproject" -| #define PACKAGE_VERSION "1.0" -| #define PACKAGE_STRING "pjproject 1.0" -| #define PACKAGE_BUGREPORT "" -| #ifdef __cplusplus -| extern "C" void exit (int) throw (); -| #endif -| #define HAVE_LIBPTHREAD 1 -| #define HAVE_LIBRT 1 -| #define HAVE_LIBNSL 1 -| #define HAVE_LIBUUID 1 -| #define PJ_M_NAME "x86_64" -| #define PJ_POOL_ALIGNMENT 8 -| #define PJ_LINUX 1 -| #define PJ_HAS_FLOATING_POINT 1 -| #define HAVE_LIBM 1 -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define PJ_HAS_ARPA_INET_H 1 -| #define PJ_HAS_ASSERT_H 1 -| #define PJ_HAS_CTYPE_H 1 -| #define PJ_HAS_ERRNO_H 1 -| #define PJ_HAS_FCNTL_H 1 -| #define PJ_HAS_LINUX_SOCKET_H 1 -| #define PJ_HAS_MALLOC_H 1 -| #define PJ_HAS_NETDB_H 1 -| #define PJ_HAS_NETINET_IN_SYSTM_H 1 -| #define PJ_HAS_NETINET_IN_H 1 -| #define PJ_HAS_NETINET_IP_H 1 -| #define PJ_HAS_IFADDRS_H 1 -| #define PJ_HAS_SEMAPHORE_H 1 -| #define PJ_HAS_SETJMP_H 1 -| #define PJ_HAS_STDARG_H 1 -| #define PJ_HAS_STDDEF_H 1 -| #define PJ_HAS_STDIO_H 1 -| #define PJ_HAS_STDINT_H 1 -| #define PJ_HAS_STDLIB_H 1 -| #define PJ_HAS_STRING_H 1 -| #define PJ_HAS_SYS_IOCTL_H 1 -| #define PJ_HAS_SYS_SELECT_H 1 -| #define PJ_HAS_SYS_SOCKET_H 1 -| #define PJ_HAS_SYS_TIME_H 1 -| #define PJ_HAS_SYS_TIMEB_H 1 -| #define PJ_HAS_SYS_TYPES_H 1 -| #define PJ_HAS_TIME_H 1 -| #define PJ_HAS_UNISTD_H 1 -| /* end confdefs.h. */ -| #include <stdio.h> -| #if HAVE_SYS_TYPES_H -| # include <sys/types.h> -| #endif -| #if HAVE_SYS_STAT_H -| # include <sys/stat.h> -| #endif -| #if STDC_HEADERS -| # include <stdlib.h> -| # include <stddef.h> -| #else -| # if HAVE_STDLIB_H -| # include <stdlib.h> -| # endif -| #endif -| #if HAVE_STRING_H -| # if !STDC_HEADERS && HAVE_MEMORY_H -| # include <memory.h> -| # endif -| # include <string.h> -| #endif -| #if HAVE_STRINGS_H -| # include <strings.h> -| #endif -| #if HAVE_INTTYPES_H -| # include <inttypes.h> -| #else -| # if HAVE_STDINT_H -| # include <stdint.h> -| # endif -| #endif -| #if HAVE_UNISTD_H -| # include <unistd.h> -| #endif -| #include <ws2tcpip.h> -aconfigure:8785: result: no -aconfigure:8789: checking ws2tcpip.h presence -aconfigure:8799: gcc -E conftest.c -conftest.c:59:22: error: ws2tcpip.h: No such file or directory -aconfigure:8805: $? = 1 -aconfigure: failed program was: -| /* confdefs.h. */ -| -| #define PACKAGE_NAME "pjproject" -| #define PACKAGE_TARNAME "pjproject" -| #define PACKAGE_VERSION "1.0" -| #define PACKAGE_STRING "pjproject 1.0" -| #define PACKAGE_BUGREPORT "" -| #ifdef __cplusplus -| extern "C" void exit (int) throw (); -| #endif -| #define HAVE_LIBPTHREAD 1 -| #define HAVE_LIBRT 1 -| #define HAVE_LIBNSL 1 -| #define HAVE_LIBUUID 1 -| #define PJ_M_NAME "x86_64" -| #define PJ_POOL_ALIGNMENT 8 -| #define PJ_LINUX 1 -| #define PJ_HAS_FLOATING_POINT 1 -| #define HAVE_LIBM 1 -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define PJ_HAS_ARPA_INET_H 1 -| #define PJ_HAS_ASSERT_H 1 -| #define PJ_HAS_CTYPE_H 1 -| #define PJ_HAS_ERRNO_H 1 -| #define PJ_HAS_FCNTL_H 1 -| #define PJ_HAS_LINUX_SOCKET_H 1 -| #define PJ_HAS_MALLOC_H 1 -| #define PJ_HAS_NETDB_H 1 -| #define PJ_HAS_NETINET_IN_SYSTM_H 1 -| #define PJ_HAS_NETINET_IN_H 1 -| #define PJ_HAS_NETINET_IP_H 1 -| #define PJ_HAS_IFADDRS_H 1 -| #define PJ_HAS_SEMAPHORE_H 1 -| #define PJ_HAS_SETJMP_H 1 -| #define PJ_HAS_STDARG_H 1 -| #define PJ_HAS_STDDEF_H 1 -| #define PJ_HAS_STDIO_H 1 -| #define PJ_HAS_STDINT_H 1 -| #define PJ_HAS_STDLIB_H 1 -| #define PJ_HAS_STRING_H 1 -| #define PJ_HAS_SYS_IOCTL_H 1 -| #define PJ_HAS_SYS_SELECT_H 1 -| #define PJ_HAS_SYS_SOCKET_H 1 -| #define PJ_HAS_SYS_TIME_H 1 -| #define PJ_HAS_SYS_TIMEB_H 1 -| #define PJ_HAS_SYS_TYPES_H 1 -| #define PJ_HAS_TIME_H 1 -| #define PJ_HAS_UNISTD_H 1 -| /* end confdefs.h. */ -| #include <ws2tcpip.h> -aconfigure:8825: result: no -aconfigure:8860: checking for ws2tcpip.h -aconfigure:8867: result: no -aconfigure:8889: checking uuid/uuid.h usability -aconfigure:8901: gcc -c -O2 conftest.c >&5 -aconfigure:8907: $? = 0 -aconfigure:8911: test -z - || test ! -s conftest.err -aconfigure:8914: $? = 0 -aconfigure:8917: test -s conftest.o -aconfigure:8920: $? = 0 -aconfigure:8930: result: yes -aconfigure:8934: checking uuid/uuid.h presence -aconfigure:8944: gcc -E conftest.c -aconfigure:8950: $? = 0 -aconfigure:8970: result: yes -aconfigure:9005: checking for uuid/uuid.h -aconfigure:9012: result: yes -aconfigure:9021: checking for net/if.h -aconfigure:9040: gcc -c -O2 conftest.c >&5 -aconfigure:9046: $? = 0 -aconfigure:9050: test -z - || test ! -s conftest.err -aconfigure:9053: $? = 0 -aconfigure:9056: test -s conftest.o -aconfigure:9059: $? = 0 -aconfigure:9070: result: yes -aconfigure:9081: result: Setting PJ_OS_NAME to x86_64-unknown-linux-gnu -aconfigure:9088: result: Setting PJ_HAS_ERRNO_VAR to 1 -aconfigure:9095: result: Setting PJ_HAS_HIGH_RES_TIMER to 1 -aconfigure:9102: result: Setting PJ_HAS_MALLOC to 1 -aconfigure:9109: result: Setting PJ_NATIVE_STRING_IS_UNICODE to 0 -aconfigure:9116: result: Setting PJ_ATOMIC_VALUE_TYPE to long -aconfigure:9123: checking if inet_aton() is available -aconfigure:9143: gcc -c -O2 conftest.c >&5 -aconfigure:9149: $? = 0 -aconfigure:9153: test -z - || test ! -s conftest.err -aconfigure:9156: $? = 0 -aconfigure:9159: test -s conftest.o -aconfigure:9162: $? = 0 -aconfigure:9168: result: yes -aconfigure:9179: checking if inet_pton() is available -aconfigure:9199: gcc -c -O2 conftest.c >&5 -aconfigure:9205: $? = 0 -aconfigure:9209: test -z - || test ! -s conftest.err -aconfigure:9212: $? = 0 -aconfigure:9215: test -s conftest.o -aconfigure:9218: $? = 0 -aconfigure:9224: result: yes -aconfigure:9235: checking if inet_ntop() is available -aconfigure:9255: gcc -c -O2 conftest.c >&5 -aconfigure:9261: $? = 0 -aconfigure:9265: test -z - || test ! -s conftest.err -aconfigure:9268: $? = 0 -aconfigure:9271: test -s conftest.o -aconfigure:9274: $? = 0 -aconfigure:9280: result: yes -aconfigure:9291: checking if getaddrinfo() is available -aconfigure:9311: gcc -c -O2 conftest.c >&5 -aconfigure:9317: $? = 0 -aconfigure:9321: test -z - || test ! -s conftest.err -aconfigure:9324: $? = 0 -aconfigure:9327: test -s conftest.o -aconfigure:9330: $? = 0 -aconfigure:9336: result: yes -aconfigure:9347: checking if sockaddr_in has sin_len member -aconfigure:9368: gcc -c -O2 conftest.c >&5 -conftest.c: In function 'main': -conftest.c:77: error: 'struct sockaddr_in' has no member named 'sin_len' -aconfigure:9374: $? = 1 -aconfigure: failed program was: -| /* confdefs.h. */ -| -| #define PACKAGE_NAME "pjproject" -| #define PACKAGE_TARNAME "pjproject" -| #define PACKAGE_VERSION "1.0" -| #define PACKAGE_STRING "pjproject 1.0" -| #define PACKAGE_BUGREPORT "" -| #ifdef __cplusplus -| extern "C" void exit (int) throw (); -| #endif -| #define HAVE_LIBPTHREAD 1 -| #define HAVE_LIBRT 1 -| #define HAVE_LIBNSL 1 -| #define HAVE_LIBUUID 1 -| #define PJ_M_NAME "x86_64" -| #define PJ_POOL_ALIGNMENT 8 -| #define PJ_LINUX 1 -| #define PJ_HAS_FLOATING_POINT 1 -| #define HAVE_LIBM 1 -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define PJ_HAS_ARPA_INET_H 1 -| #define PJ_HAS_ASSERT_H 1 -| #define PJ_HAS_CTYPE_H 1 -| #define PJ_HAS_ERRNO_H 1 -| #define PJ_HAS_FCNTL_H 1 -| #define PJ_HAS_LINUX_SOCKET_H 1 -| #define PJ_HAS_MALLOC_H 1 -| #define PJ_HAS_NETDB_H 1 -| #define PJ_HAS_NETINET_IN_SYSTM_H 1 -| #define PJ_HAS_NETINET_IN_H 1 -| #define PJ_HAS_NETINET_IP_H 1 -| #define PJ_HAS_IFADDRS_H 1 -| #define PJ_HAS_SEMAPHORE_H 1 -| #define PJ_HAS_SETJMP_H 1 -| #define PJ_HAS_STDARG_H 1 -| #define PJ_HAS_STDDEF_H 1 -| #define PJ_HAS_STDIO_H 1 -| #define PJ_HAS_STDINT_H 1 -| #define PJ_HAS_STDLIB_H 1 -| #define PJ_HAS_STRING_H 1 -| #define PJ_HAS_SYS_IOCTL_H 1 -| #define PJ_HAS_SYS_SELECT_H 1 -| #define PJ_HAS_SYS_SOCKET_H 1 -| #define PJ_HAS_SYS_TIME_H 1 -| #define PJ_HAS_SYS_TIMEB_H 1 -| #define PJ_HAS_SYS_TYPES_H 1 -| #define PJ_HAS_TIME_H 1 -| #define PJ_HAS_UNISTD_H 1 -| #define PJ_HAS_NET_IF_H 1 -| #define PJ_OS_NAME "x86_64-unknown-linux-gnu" -| #define PJ_HAS_ERRNO_VAR 1 -| #define PJ_HAS_HIGH_RES_TIMER 1 -| #define PJ_HAS_MALLOC 1 -| #define PJ_NATIVE_STRING_IS_UNICODE 0 -| #define PJ_ATOMIC_VALUE_TYPE long -| #define PJ_SOCK_HAS_INET_ATON 1 -| #define PJ_SOCK_HAS_INET_PTON 1 -| #define PJ_SOCK_HAS_INET_NTOP 1 -| #define PJ_SOCK_HAS_GETADDRINFO 1 -| /* end confdefs.h. */ -| #include <sys/types.h> -| #include <sys/socket.h> -| #include <netinet/in.h> -| #include <arpa/inet.h> -| int -| main () -| { -| struct sockaddr_in a; a.sin_len=0; -| ; -| return 0; -| } -aconfigure:9399: result: no -aconfigure:9404: checking if socklen_t is available -aconfigure:9422: gcc -c -O2 conftest.c >&5 -aconfigure:9428: $? = 0 -aconfigure:9432: test -z - || test ! -s conftest.err -aconfigure:9435: $? = 0 -aconfigure:9438: test -s conftest.o -aconfigure:9441: $? = 0 -aconfigure:9447: result: yes -aconfigure:9458: checking if SO_ERROR is available -aconfigure:9489: gcc -c -O2 conftest.c >&5 -aconfigure:9495: $? = 0 -aconfigure:9499: test -z - || test ! -s conftest.err -aconfigure:9502: $? = 0 -aconfigure:9505: test -s conftest.o -aconfigure:9508: $? = 0 -aconfigure:9514: result: yes -aconfigure:9528: checking if pthread_rwlock_t is available -aconfigure:9546: gcc -c -O2 conftest.c >&5 -aconfigure:9552: $? = 0 -aconfigure:9556: test -z - || test ! -s conftest.err -aconfigure:9559: $? = 0 -aconfigure:9562: test -s conftest.o -aconfigure:9565: $? = 0 -aconfigure:9572: result: yes -aconfigure:9650: checking if pthread_mutexattr_settype() is available -aconfigure:9668: gcc -c -O2 conftest.c >&5 -conftest.c: In function 'main': -conftest.c:77: error: 'PTHREAD_MUTEX_FAST_NP' undeclared (first use in this function) -conftest.c:77: error: (Each undeclared identifier is reported only once -conftest.c:77: error: for each function it appears in.) -aconfigure:9674: $? = 1 -aconfigure: failed program was: -| /* confdefs.h. */ -| -| #define PACKAGE_NAME "pjproject" -| #define PACKAGE_TARNAME "pjproject" -| #define PACKAGE_VERSION "1.0" -| #define PACKAGE_STRING "pjproject 1.0" -| #define PACKAGE_BUGREPORT "" -| #ifdef __cplusplus -| extern "C" void exit (int) throw (); -| #endif -| #define HAVE_LIBPTHREAD 1 -| #define HAVE_LIBRT 1 -| #define HAVE_LIBNSL 1 -| #define HAVE_LIBUUID 1 -| #define PJ_M_NAME "x86_64" -| #define PJ_POOL_ALIGNMENT 8 -| #define PJ_LINUX 1 -| #define PJ_HAS_FLOATING_POINT 1 -| #define HAVE_LIBM 1 -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define PJ_HAS_ARPA_INET_H 1 -| #define PJ_HAS_ASSERT_H 1 -| #define PJ_HAS_CTYPE_H 1 -| #define PJ_HAS_ERRNO_H 1 -| #define PJ_HAS_FCNTL_H 1 -| #define PJ_HAS_LINUX_SOCKET_H 1 -| #define PJ_HAS_MALLOC_H 1 -| #define PJ_HAS_NETDB_H 1 -| #define PJ_HAS_NETINET_IN_SYSTM_H 1 -| #define PJ_HAS_NETINET_IN_H 1 -| #define PJ_HAS_NETINET_IP_H 1 -| #define PJ_HAS_IFADDRS_H 1 -| #define PJ_HAS_SEMAPHORE_H 1 -| #define PJ_HAS_SETJMP_H 1 -| #define PJ_HAS_STDARG_H 1 -| #define PJ_HAS_STDDEF_H 1 -| #define PJ_HAS_STDIO_H 1 -| #define PJ_HAS_STDINT_H 1 -| #define PJ_HAS_STDLIB_H 1 -| #define PJ_HAS_STRING_H 1 -| #define PJ_HAS_SYS_IOCTL_H 1 -| #define PJ_HAS_SYS_SELECT_H 1 -| #define PJ_HAS_SYS_SOCKET_H 1 -| #define PJ_HAS_SYS_TIME_H 1 -| #define PJ_HAS_SYS_TIMEB_H 1 -| #define PJ_HAS_SYS_TYPES_H 1 -| #define PJ_HAS_TIME_H 1 -| #define PJ_HAS_UNISTD_H 1 -| #define PJ_HAS_NET_IF_H 1 -| #define PJ_OS_NAME "x86_64-unknown-linux-gnu" -| #define PJ_HAS_ERRNO_VAR 1 -| #define PJ_HAS_HIGH_RES_TIMER 1 -| #define PJ_HAS_MALLOC 1 -| #define PJ_NATIVE_STRING_IS_UNICODE 0 -| #define PJ_ATOMIC_VALUE_TYPE long -| #define PJ_SOCK_HAS_INET_ATON 1 -| #define PJ_SOCK_HAS_INET_PTON 1 -| #define PJ_SOCK_HAS_INET_NTOP 1 -| #define PJ_SOCK_HAS_GETADDRINFO 1 -| #define PJ_HAS_SOCKLEN_T 1 -| #define PJ_HAS_SO_ERROR 1 -| #define PJ_EMULATE_RWMUTEX 0 -| /* end confdefs.h. */ -| #include <pthread.h> -| int -| main () -| { -| pthread_mutexattr_settype(0,PTHREAD_MUTEX_FAST_NP); -| ; -| return 0; -| } -aconfigure:9699: result: no -aconfigure:9704: checking if pthread_mutexattr_t has recursive member -aconfigure:9723: gcc -c -O2 conftest.c >&5 -conftest.c: In function 'main': -conftest.c:78: error: 'pthread_mutexattr_t' has no member named 'recursive' -aconfigure:9729: $? = 1 -aconfigure: failed program was: -| /* confdefs.h. */ -| -| #define PACKAGE_NAME "pjproject" -| #define PACKAGE_TARNAME "pjproject" -| #define PACKAGE_VERSION "1.0" -| #define PACKAGE_STRING "pjproject 1.0" -| #define PACKAGE_BUGREPORT "" -| #ifdef __cplusplus -| extern "C" void exit (int) throw (); -| #endif -| #define HAVE_LIBPTHREAD 1 -| #define HAVE_LIBRT 1 -| #define HAVE_LIBNSL 1 -| #define HAVE_LIBUUID 1 -| #define PJ_M_NAME "x86_64" -| #define PJ_POOL_ALIGNMENT 8 -| #define PJ_LINUX 1 -| #define PJ_HAS_FLOATING_POINT 1 -| #define HAVE_LIBM 1 -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define PJ_HAS_ARPA_INET_H 1 -| #define PJ_HAS_ASSERT_H 1 -| #define PJ_HAS_CTYPE_H 1 -| #define PJ_HAS_ERRNO_H 1 -| #define PJ_HAS_FCNTL_H 1 -| #define PJ_HAS_LINUX_SOCKET_H 1 -| #define PJ_HAS_MALLOC_H 1 -| #define PJ_HAS_NETDB_H 1 -| #define PJ_HAS_NETINET_IN_SYSTM_H 1 -| #define PJ_HAS_NETINET_IN_H 1 -| #define PJ_HAS_NETINET_IP_H 1 -| #define PJ_HAS_IFADDRS_H 1 -| #define PJ_HAS_SEMAPHORE_H 1 -| #define PJ_HAS_SETJMP_H 1 -| #define PJ_HAS_STDARG_H 1 -| #define PJ_HAS_STDDEF_H 1 -| #define PJ_HAS_STDIO_H 1 -| #define PJ_HAS_STDINT_H 1 -| #define PJ_HAS_STDLIB_H 1 -| #define PJ_HAS_STRING_H 1 -| #define PJ_HAS_SYS_IOCTL_H 1 -| #define PJ_HAS_SYS_SELECT_H 1 -| #define PJ_HAS_SYS_SOCKET_H 1 -| #define PJ_HAS_SYS_TIME_H 1 -| #define PJ_HAS_SYS_TIMEB_H 1 -| #define PJ_HAS_SYS_TYPES_H 1 -| #define PJ_HAS_TIME_H 1 -| #define PJ_HAS_UNISTD_H 1 -| #define PJ_HAS_NET_IF_H 1 -| #define PJ_OS_NAME "x86_64-unknown-linux-gnu" -| #define PJ_HAS_ERRNO_VAR 1 -| #define PJ_HAS_HIGH_RES_TIMER 1 -| #define PJ_HAS_MALLOC 1 -| #define PJ_NATIVE_STRING_IS_UNICODE 0 -| #define PJ_ATOMIC_VALUE_TYPE long -| #define PJ_SOCK_HAS_INET_ATON 1 -| #define PJ_SOCK_HAS_INET_PTON 1 -| #define PJ_SOCK_HAS_INET_NTOP 1 -| #define PJ_SOCK_HAS_GETADDRINFO 1 -| #define PJ_HAS_SOCKLEN_T 1 -| #define PJ_HAS_SO_ERROR 1 -| #define PJ_EMULATE_RWMUTEX 0 -| /* end confdefs.h. */ -| #include <pthread.h> -| int -| main () -| { -| pthread_mutexattr_t attr; -| attr.recursive=1; -| ; -| return 0; -| } -aconfigure:9754: result: no -aconfigure:9760: checking ioqueue backend -aconfigure:9773: result: select() -aconfigure:9820: checking sys/soundcard.h usability -aconfigure:9832: gcc -c -O2 conftest.c >&5 -aconfigure:9838: $? = 0 -aconfigure:9842: test -z - || test ! -s conftest.err -aconfigure:9845: $? = 0 -aconfigure:9848: test -s conftest.o -aconfigure:9851: $? = 0 -aconfigure:9861: result: yes -aconfigure:9865: checking sys/soundcard.h presence -aconfigure:9875: gcc -E conftest.c -aconfigure:9881: $? = 0 -aconfigure:9901: result: yes -aconfigure:9936: checking for sys/soundcard.h -aconfigure:9943: result: yes -aconfigure:9962: checking linux/soundcard.h usability -aconfigure:9974: gcc -c -O2 conftest.c >&5 -aconfigure:9980: $? = 0 -aconfigure:9984: test -z - || test ! -s conftest.err -aconfigure:9987: $? = 0 -aconfigure:9990: test -s conftest.o -aconfigure:9993: $? = 0 -aconfigure:10003: result: yes -aconfigure:10007: checking linux/soundcard.h presence -aconfigure:10017: gcc -E conftest.c -aconfigure:10023: $? = 0 -aconfigure:10043: result: yes -aconfigure:10078: checking for linux/soundcard.h -aconfigure:10085: result: yes -aconfigure:10104: checking machine/soundcard.h usability -aconfigure:10116: gcc -c -O2 conftest.c >&5 -conftest.c:107:31: error: machine/soundcard.h: No such file or directory -aconfigure:10122: $? = 1 -aconfigure: failed program was: -| /* confdefs.h. */ -| -| #define PACKAGE_NAME "pjproject" -| #define PACKAGE_TARNAME "pjproject" -| #define PACKAGE_VERSION "1.0" -| #define PACKAGE_STRING "pjproject 1.0" -| #define PACKAGE_BUGREPORT "" -| #ifdef __cplusplus -| extern "C" void exit (int) throw (); -| #endif -| #define HAVE_LIBPTHREAD 1 -| #define HAVE_LIBRT 1 -| #define HAVE_LIBNSL 1 -| #define HAVE_LIBUUID 1 -| #define PJ_M_NAME "x86_64" -| #define PJ_POOL_ALIGNMENT 8 -| #define PJ_LINUX 1 -| #define PJ_HAS_FLOATING_POINT 1 -| #define HAVE_LIBM 1 -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define PJ_HAS_ARPA_INET_H 1 -| #define PJ_HAS_ASSERT_H 1 -| #define PJ_HAS_CTYPE_H 1 -| #define PJ_HAS_ERRNO_H 1 -| #define PJ_HAS_FCNTL_H 1 -| #define PJ_HAS_LINUX_SOCKET_H 1 -| #define PJ_HAS_MALLOC_H 1 -| #define PJ_HAS_NETDB_H 1 -| #define PJ_HAS_NETINET_IN_SYSTM_H 1 -| #define PJ_HAS_NETINET_IN_H 1 -| #define PJ_HAS_NETINET_IP_H 1 -| #define PJ_HAS_IFADDRS_H 1 -| #define PJ_HAS_SEMAPHORE_H 1 -| #define PJ_HAS_SETJMP_H 1 -| #define PJ_HAS_STDARG_H 1 -| #define PJ_HAS_STDDEF_H 1 -| #define PJ_HAS_STDIO_H 1 -| #define PJ_HAS_STDINT_H 1 -| #define PJ_HAS_STDLIB_H 1 -| #define PJ_HAS_STRING_H 1 -| #define PJ_HAS_SYS_IOCTL_H 1 -| #define PJ_HAS_SYS_SELECT_H 1 -| #define PJ_HAS_SYS_SOCKET_H 1 -| #define PJ_HAS_SYS_TIME_H 1 -| #define PJ_HAS_SYS_TIMEB_H 1 -| #define PJ_HAS_SYS_TYPES_H 1 -| #define PJ_HAS_TIME_H 1 -| #define PJ_HAS_UNISTD_H 1 -| #define PJ_HAS_NET_IF_H 1 -| #define PJ_OS_NAME "x86_64-unknown-linux-gnu" -| #define PJ_HAS_ERRNO_VAR 1 -| #define PJ_HAS_HIGH_RES_TIMER 1 -| #define PJ_HAS_MALLOC 1 -| #define PJ_NATIVE_STRING_IS_UNICODE 0 -| #define PJ_ATOMIC_VALUE_TYPE long -| #define PJ_SOCK_HAS_INET_ATON 1 -| #define PJ_SOCK_HAS_INET_PTON 1 -| #define PJ_SOCK_HAS_INET_NTOP 1 -| #define PJ_SOCK_HAS_GETADDRINFO 1 -| #define PJ_HAS_SOCKLEN_T 1 -| #define PJ_HAS_SO_ERROR 1 -| #define PJ_EMULATE_RWMUTEX 0 -| /* end confdefs.h. */ -| #include <stdio.h> -| #if HAVE_SYS_TYPES_H -| # include <sys/types.h> -| #endif -| #if HAVE_SYS_STAT_H -| # include <sys/stat.h> -| #endif -| #if STDC_HEADERS -| # include <stdlib.h> -| # include <stddef.h> -| #else -| # if HAVE_STDLIB_H -| # include <stdlib.h> -| # endif -| #endif -| #if HAVE_STRING_H -| # if !STDC_HEADERS && HAVE_MEMORY_H -| # include <memory.h> -| # endif -| # include <string.h> -| #endif -| #if HAVE_STRINGS_H -| # include <strings.h> -| #endif -| #if HAVE_INTTYPES_H -| # include <inttypes.h> -| #else -| # if HAVE_STDINT_H -| # include <stdint.h> -| # endif -| #endif -| #if HAVE_UNISTD_H -| # include <unistd.h> -| #endif -| #include <machine/soundcard.h> -aconfigure:10145: result: no -aconfigure:10149: checking machine/soundcard.h presence -aconfigure:10159: gcc -E conftest.c -conftest.c:73:31: error: machine/soundcard.h: No such file or directory -aconfigure:10165: $? = 1 -aconfigure: failed program was: -| /* confdefs.h. */ -| -| #define PACKAGE_NAME "pjproject" -| #define PACKAGE_TARNAME "pjproject" -| #define PACKAGE_VERSION "1.0" -| #define PACKAGE_STRING "pjproject 1.0" -| #define PACKAGE_BUGREPORT "" -| #ifdef __cplusplus -| extern "C" void exit (int) throw (); -| #endif -| #define HAVE_LIBPTHREAD 1 -| #define HAVE_LIBRT 1 -| #define HAVE_LIBNSL 1 -| #define HAVE_LIBUUID 1 -| #define PJ_M_NAME "x86_64" -| #define PJ_POOL_ALIGNMENT 8 -| #define PJ_LINUX 1 -| #define PJ_HAS_FLOATING_POINT 1 -| #define HAVE_LIBM 1 -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define PJ_HAS_ARPA_INET_H 1 -| #define PJ_HAS_ASSERT_H 1 -| #define PJ_HAS_CTYPE_H 1 -| #define PJ_HAS_ERRNO_H 1 -| #define PJ_HAS_FCNTL_H 1 -| #define PJ_HAS_LINUX_SOCKET_H 1 -| #define PJ_HAS_MALLOC_H 1 -| #define PJ_HAS_NETDB_H 1 -| #define PJ_HAS_NETINET_IN_SYSTM_H 1 -| #define PJ_HAS_NETINET_IN_H 1 -| #define PJ_HAS_NETINET_IP_H 1 -| #define PJ_HAS_IFADDRS_H 1 -| #define PJ_HAS_SEMAPHORE_H 1 -| #define PJ_HAS_SETJMP_H 1 -| #define PJ_HAS_STDARG_H 1 -| #define PJ_HAS_STDDEF_H 1 -| #define PJ_HAS_STDIO_H 1 -| #define PJ_HAS_STDINT_H 1 -| #define PJ_HAS_STDLIB_H 1 -| #define PJ_HAS_STRING_H 1 -| #define PJ_HAS_SYS_IOCTL_H 1 -| #define PJ_HAS_SYS_SELECT_H 1 -| #define PJ_HAS_SYS_SOCKET_H 1 -| #define PJ_HAS_SYS_TIME_H 1 -| #define PJ_HAS_SYS_TIMEB_H 1 -| #define PJ_HAS_SYS_TYPES_H 1 -| #define PJ_HAS_TIME_H 1 -| #define PJ_HAS_UNISTD_H 1 -| #define PJ_HAS_NET_IF_H 1 -| #define PJ_OS_NAME "x86_64-unknown-linux-gnu" -| #define PJ_HAS_ERRNO_VAR 1 -| #define PJ_HAS_HIGH_RES_TIMER 1 -| #define PJ_HAS_MALLOC 1 -| #define PJ_NATIVE_STRING_IS_UNICODE 0 -| #define PJ_ATOMIC_VALUE_TYPE long -| #define PJ_SOCK_HAS_INET_ATON 1 -| #define PJ_SOCK_HAS_INET_PTON 1 -| #define PJ_SOCK_HAS_INET_NTOP 1 -| #define PJ_SOCK_HAS_GETADDRINFO 1 -| #define PJ_HAS_SOCKLEN_T 1 -| #define PJ_HAS_SO_ERROR 1 -| #define PJ_EMULATE_RWMUTEX 0 -| /* end confdefs.h. */ -| #include <machine/soundcard.h> -aconfigure:10185: result: no -aconfigure:10220: checking for machine/soundcard.h -aconfigure:10227: result: no -aconfigure:10283: checking alsa/version.h usability -aconfigure:10295: gcc -c -O2 conftest.c >&5 -aconfigure:10301: $? = 0 -aconfigure:10305: test -z - || test ! -s conftest.err -aconfigure:10308: $? = 0 -aconfigure:10311: test -s conftest.o -aconfigure:10314: $? = 0 -aconfigure:10324: result: yes -aconfigure:10328: checking alsa/version.h presence -aconfigure:10338: gcc -E conftest.c -aconfigure:10344: $? = 0 -aconfigure:10364: result: yes -aconfigure:10399: checking for alsa/version.h -aconfigure:10406: result: yes -aconfigure:10421: result: Checking sound device backend... unix -aconfigure:10462: result: Checking if small filter is disabled... no -aconfigure:10476: result: Checking if large filter is disabled... no -aconfigure:10490: result: Checking if Speex AEC is disabled...no -aconfigure:10508: result: Checking if G.711 codec is disabled...no -aconfigure:10527: result: Checking if L16 codec is disabled...no -aconfigure:10546: result: Checking if GSM codec is disabled...no -aconfigure:10564: result: Checking if G.722 codec is disabled...no -aconfigure:10582: result: Checking if Speex codec is disabled...no -aconfigure:10600: result: Checking if iLBC codec is disabled...no -aconfigure:10682: result: Skipping libsamplerate detection -aconfigure:10959: result: Skipping Intel IPP settings (not wanted) -aconfigure:10978: result: checking for OpenSSL installations.. -aconfigure:10993: checking openssl/ssl.h usability -aconfigure:11005: gcc -c -O2 conftest.c >&5 -conftest.c:107:25: error: openssl/ssl.h: No such file or directory -aconfigure:11011: $? = 1 -aconfigure: failed program was: -| /* confdefs.h. */ -| -| #define PACKAGE_NAME "pjproject" -| #define PACKAGE_TARNAME "pjproject" -| #define PACKAGE_VERSION "1.0" -| #define PACKAGE_STRING "pjproject 1.0" -| #define PACKAGE_BUGREPORT "" -| #ifdef __cplusplus -| extern "C" void exit (int) throw (); -| #endif -| #define HAVE_LIBPTHREAD 1 -| #define HAVE_LIBRT 1 -| #define HAVE_LIBNSL 1 -| #define HAVE_LIBUUID 1 -| #define PJ_M_NAME "x86_64" -| #define PJ_POOL_ALIGNMENT 8 -| #define PJ_LINUX 1 -| #define PJ_HAS_FLOATING_POINT 1 -| #define HAVE_LIBM 1 -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define PJ_HAS_ARPA_INET_H 1 -| #define PJ_HAS_ASSERT_H 1 -| #define PJ_HAS_CTYPE_H 1 -| #define PJ_HAS_ERRNO_H 1 -| #define PJ_HAS_FCNTL_H 1 -| #define PJ_HAS_LINUX_SOCKET_H 1 -| #define PJ_HAS_MALLOC_H 1 -| #define PJ_HAS_NETDB_H 1 -| #define PJ_HAS_NETINET_IN_SYSTM_H 1 -| #define PJ_HAS_NETINET_IN_H 1 -| #define PJ_HAS_NETINET_IP_H 1 -| #define PJ_HAS_IFADDRS_H 1 -| #define PJ_HAS_SEMAPHORE_H 1 -| #define PJ_HAS_SETJMP_H 1 -| #define PJ_HAS_STDARG_H 1 -| #define PJ_HAS_STDDEF_H 1 -| #define PJ_HAS_STDIO_H 1 -| #define PJ_HAS_STDINT_H 1 -| #define PJ_HAS_STDLIB_H 1 -| #define PJ_HAS_STRING_H 1 -| #define PJ_HAS_SYS_IOCTL_H 1 -| #define PJ_HAS_SYS_SELECT_H 1 -| #define PJ_HAS_SYS_SOCKET_H 1 -| #define PJ_HAS_SYS_TIME_H 1 -| #define PJ_HAS_SYS_TIMEB_H 1 -| #define PJ_HAS_SYS_TYPES_H 1 -| #define PJ_HAS_TIME_H 1 -| #define PJ_HAS_UNISTD_H 1 -| #define PJ_HAS_NET_IF_H 1 -| #define PJ_OS_NAME "x86_64-unknown-linux-gnu" -| #define PJ_HAS_ERRNO_VAR 1 -| #define PJ_HAS_HIGH_RES_TIMER 1 -| #define PJ_HAS_MALLOC 1 -| #define PJ_NATIVE_STRING_IS_UNICODE 0 -| #define PJ_ATOMIC_VALUE_TYPE long -| #define PJ_SOCK_HAS_INET_ATON 1 -| #define PJ_SOCK_HAS_INET_PTON 1 -| #define PJ_SOCK_HAS_INET_NTOP 1 -| #define PJ_SOCK_HAS_GETADDRINFO 1 -| #define PJ_HAS_SOCKLEN_T 1 -| #define PJ_HAS_SO_ERROR 1 -| #define PJ_EMULATE_RWMUTEX 0 -| /* end confdefs.h. */ -| #include <stdio.h> -| #if HAVE_SYS_TYPES_H -| # include <sys/types.h> -| #endif -| #if HAVE_SYS_STAT_H -| # include <sys/stat.h> -| #endif -| #if STDC_HEADERS -| # include <stdlib.h> -| # include <stddef.h> -| #else -| # if HAVE_STDLIB_H -| # include <stdlib.h> -| # endif -| #endif -| #if HAVE_STRING_H -| # if !STDC_HEADERS && HAVE_MEMORY_H -| # include <memory.h> -| # endif -| # include <string.h> -| #endif -| #if HAVE_STRINGS_H -| # include <strings.h> -| #endif -| #if HAVE_INTTYPES_H -| # include <inttypes.h> -| #else -| # if HAVE_STDINT_H -| # include <stdint.h> -| # endif -| #endif -| #if HAVE_UNISTD_H -| # include <unistd.h> -| #endif -| #include <openssl/ssl.h> -aconfigure:11034: result: no -aconfigure:11038: checking openssl/ssl.h presence -aconfigure:11048: gcc -E conftest.c -conftest.c:73:25: error: openssl/ssl.h: No such file or directory -aconfigure:11054: $? = 1 -aconfigure: failed program was: -| /* confdefs.h. */ -| -| #define PACKAGE_NAME "pjproject" -| #define PACKAGE_TARNAME "pjproject" -| #define PACKAGE_VERSION "1.0" -| #define PACKAGE_STRING "pjproject 1.0" -| #define PACKAGE_BUGREPORT "" -| #ifdef __cplusplus -| extern "C" void exit (int) throw (); -| #endif -| #define HAVE_LIBPTHREAD 1 -| #define HAVE_LIBRT 1 -| #define HAVE_LIBNSL 1 -| #define HAVE_LIBUUID 1 -| #define PJ_M_NAME "x86_64" -| #define PJ_POOL_ALIGNMENT 8 -| #define PJ_LINUX 1 -| #define PJ_HAS_FLOATING_POINT 1 -| #define HAVE_LIBM 1 -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define PJ_HAS_ARPA_INET_H 1 -| #define PJ_HAS_ASSERT_H 1 -| #define PJ_HAS_CTYPE_H 1 -| #define PJ_HAS_ERRNO_H 1 -| #define PJ_HAS_FCNTL_H 1 -| #define PJ_HAS_LINUX_SOCKET_H 1 -| #define PJ_HAS_MALLOC_H 1 -| #define PJ_HAS_NETDB_H 1 -| #define PJ_HAS_NETINET_IN_SYSTM_H 1 -| #define PJ_HAS_NETINET_IN_H 1 -| #define PJ_HAS_NETINET_IP_H 1 -| #define PJ_HAS_IFADDRS_H 1 -| #define PJ_HAS_SEMAPHORE_H 1 -| #define PJ_HAS_SETJMP_H 1 -| #define PJ_HAS_STDARG_H 1 -| #define PJ_HAS_STDDEF_H 1 -| #define PJ_HAS_STDIO_H 1 -| #define PJ_HAS_STDINT_H 1 -| #define PJ_HAS_STDLIB_H 1 -| #define PJ_HAS_STRING_H 1 -| #define PJ_HAS_SYS_IOCTL_H 1 -| #define PJ_HAS_SYS_SELECT_H 1 -| #define PJ_HAS_SYS_SOCKET_H 1 -| #define PJ_HAS_SYS_TIME_H 1 -| #define PJ_HAS_SYS_TIMEB_H 1 -| #define PJ_HAS_SYS_TYPES_H 1 -| #define PJ_HAS_TIME_H 1 -| #define PJ_HAS_UNISTD_H 1 -| #define PJ_HAS_NET_IF_H 1 -| #define PJ_OS_NAME "x86_64-unknown-linux-gnu" -| #define PJ_HAS_ERRNO_VAR 1 -| #define PJ_HAS_HIGH_RES_TIMER 1 -| #define PJ_HAS_MALLOC 1 -| #define PJ_NATIVE_STRING_IS_UNICODE 0 -| #define PJ_ATOMIC_VALUE_TYPE long -| #define PJ_SOCK_HAS_INET_ATON 1 -| #define PJ_SOCK_HAS_INET_PTON 1 -| #define PJ_SOCK_HAS_INET_NTOP 1 -| #define PJ_SOCK_HAS_GETADDRINFO 1 -| #define PJ_HAS_SOCKLEN_T 1 -| #define PJ_HAS_SO_ERROR 1 -| #define PJ_EMULATE_RWMUTEX 0 -| /* end confdefs.h. */ -| #include <openssl/ssl.h> -aconfigure:11074: result: no -aconfigure:11109: checking for openssl/ssl.h -aconfigure:11116: result: no -aconfigure:11125: checking for SSL_library_init in -lssl -aconfigure:11155: gcc -o conftest -O2 conftest.c -lssl -lm -luuid -lnsl -lrt -lpthread -lasound >&5 -/usr/bin/ld: cannot find -lssl -collect2: ld returned 1 exit status -aconfigure:11161: $? = 1 -aconfigure: failed program was: -| /* confdefs.h. */ -| -| #define PACKAGE_NAME "pjproject" -| #define PACKAGE_TARNAME "pjproject" -| #define PACKAGE_VERSION "1.0" -| #define PACKAGE_STRING "pjproject 1.0" -| #define PACKAGE_BUGREPORT "" -| #ifdef __cplusplus -| extern "C" void exit (int) throw (); -| #endif -| #define HAVE_LIBPTHREAD 1 -| #define HAVE_LIBRT 1 -| #define HAVE_LIBNSL 1 -| #define HAVE_LIBUUID 1 -| #define PJ_M_NAME "x86_64" -| #define PJ_POOL_ALIGNMENT 8 -| #define PJ_LINUX 1 -| #define PJ_HAS_FLOATING_POINT 1 -| #define HAVE_LIBM 1 -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define PJ_HAS_ARPA_INET_H 1 -| #define PJ_HAS_ASSERT_H 1 -| #define PJ_HAS_CTYPE_H 1 -| #define PJ_HAS_ERRNO_H 1 -| #define PJ_HAS_FCNTL_H 1 -| #define PJ_HAS_LINUX_SOCKET_H 1 -| #define PJ_HAS_MALLOC_H 1 -| #define PJ_HAS_NETDB_H 1 -| #define PJ_HAS_NETINET_IN_SYSTM_H 1 -| #define PJ_HAS_NETINET_IN_H 1 -| #define PJ_HAS_NETINET_IP_H 1 -| #define PJ_HAS_IFADDRS_H 1 -| #define PJ_HAS_SEMAPHORE_H 1 -| #define PJ_HAS_SETJMP_H 1 -| #define PJ_HAS_STDARG_H 1 -| #define PJ_HAS_STDDEF_H 1 -| #define PJ_HAS_STDIO_H 1 -| #define PJ_HAS_STDINT_H 1 -| #define PJ_HAS_STDLIB_H 1 -| #define PJ_HAS_STRING_H 1 -| #define PJ_HAS_SYS_IOCTL_H 1 -| #define PJ_HAS_SYS_SELECT_H 1 -| #define PJ_HAS_SYS_SOCKET_H 1 -| #define PJ_HAS_SYS_TIME_H 1 -| #define PJ_HAS_SYS_TIMEB_H 1 -| #define PJ_HAS_SYS_TYPES_H 1 -| #define PJ_HAS_TIME_H 1 -| #define PJ_HAS_UNISTD_H 1 -| #define PJ_HAS_NET_IF_H 1 -| #define PJ_OS_NAME "x86_64-unknown-linux-gnu" -| #define PJ_HAS_ERRNO_VAR 1 -| #define PJ_HAS_HIGH_RES_TIMER 1 -| #define PJ_HAS_MALLOC 1 -| #define PJ_NATIVE_STRING_IS_UNICODE 0 -| #define PJ_ATOMIC_VALUE_TYPE long -| #define PJ_SOCK_HAS_INET_ATON 1 -| #define PJ_SOCK_HAS_INET_PTON 1 -| #define PJ_SOCK_HAS_INET_NTOP 1 -| #define PJ_SOCK_HAS_GETADDRINFO 1 -| #define PJ_HAS_SOCKLEN_T 1 -| #define PJ_HAS_SO_ERROR 1 -| #define PJ_EMULATE_RWMUTEX 0 -| /* end confdefs.h. */ -| -| /* Override any gcc2 internal prototype to avoid an error. */ -| #ifdef __cplusplus -| extern "C" -| #endif -| /* We use char because int might match the return type of a gcc2 -| builtin and then its argument prototype would still apply. */ -| char SSL_library_init (); -| int -| main () -| { -| SSL_library_init (); -| ; -| return 0; -| } -aconfigure:11187: result: no -aconfigure:11193: checking for ERR_load_BIO_strings in -lcrypto -aconfigure:11223: gcc -o conftest -O2 conftest.c -lcrypto -lm -luuid -lnsl -lrt -lpthread -lasound >&5 -/usr/bin/ld: cannot find -lcrypto -collect2: ld returned 1 exit status -aconfigure:11229: $? = 1 -aconfigure: failed program was: -| /* confdefs.h. */ -| -| #define PACKAGE_NAME "pjproject" -| #define PACKAGE_TARNAME "pjproject" -| #define PACKAGE_VERSION "1.0" -| #define PACKAGE_STRING "pjproject 1.0" -| #define PACKAGE_BUGREPORT "" -| #ifdef __cplusplus -| extern "C" void exit (int) throw (); -| #endif -| #define HAVE_LIBPTHREAD 1 -| #define HAVE_LIBRT 1 -| #define HAVE_LIBNSL 1 -| #define HAVE_LIBUUID 1 -| #define PJ_M_NAME "x86_64" -| #define PJ_POOL_ALIGNMENT 8 -| #define PJ_LINUX 1 -| #define PJ_HAS_FLOATING_POINT 1 -| #define HAVE_LIBM 1 -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define PJ_HAS_ARPA_INET_H 1 -| #define PJ_HAS_ASSERT_H 1 -| #define PJ_HAS_CTYPE_H 1 -| #define PJ_HAS_ERRNO_H 1 -| #define PJ_HAS_FCNTL_H 1 -| #define PJ_HAS_LINUX_SOCKET_H 1 -| #define PJ_HAS_MALLOC_H 1 -| #define PJ_HAS_NETDB_H 1 -| #define PJ_HAS_NETINET_IN_SYSTM_H 1 -| #define PJ_HAS_NETINET_IN_H 1 -| #define PJ_HAS_NETINET_IP_H 1 -| #define PJ_HAS_IFADDRS_H 1 -| #define PJ_HAS_SEMAPHORE_H 1 -| #define PJ_HAS_SETJMP_H 1 -| #define PJ_HAS_STDARG_H 1 -| #define PJ_HAS_STDDEF_H 1 -| #define PJ_HAS_STDIO_H 1 -| #define PJ_HAS_STDINT_H 1 -| #define PJ_HAS_STDLIB_H 1 -| #define PJ_HAS_STRING_H 1 -| #define PJ_HAS_SYS_IOCTL_H 1 -| #define PJ_HAS_SYS_SELECT_H 1 -| #define PJ_HAS_SYS_SOCKET_H 1 -| #define PJ_HAS_SYS_TIME_H 1 -| #define PJ_HAS_SYS_TIMEB_H 1 -| #define PJ_HAS_SYS_TYPES_H 1 -| #define PJ_HAS_TIME_H 1 -| #define PJ_HAS_UNISTD_H 1 -| #define PJ_HAS_NET_IF_H 1 -| #define PJ_OS_NAME "x86_64-unknown-linux-gnu" -| #define PJ_HAS_ERRNO_VAR 1 -| #define PJ_HAS_HIGH_RES_TIMER 1 -| #define PJ_HAS_MALLOC 1 -| #define PJ_NATIVE_STRING_IS_UNICODE 0 -| #define PJ_ATOMIC_VALUE_TYPE long -| #define PJ_SOCK_HAS_INET_ATON 1 -| #define PJ_SOCK_HAS_INET_PTON 1 -| #define PJ_SOCK_HAS_INET_NTOP 1 -| #define PJ_SOCK_HAS_GETADDRINFO 1 -| #define PJ_HAS_SOCKLEN_T 1 -| #define PJ_HAS_SO_ERROR 1 -| #define PJ_EMULATE_RWMUTEX 0 -| /* end confdefs.h. */ -| -| /* Override any gcc2 internal prototype to avoid an error. */ -| #ifdef __cplusplus -| extern "C" -| #endif -| /* We use char because int might match the return type of a gcc2 -| builtin and then its argument prototype would still apply. */ -| char ERR_load_BIO_strings (); -| int -| main () -| { -| ERR_load_BIO_strings (); -| ; -| return 0; -| } -aconfigure:11255: result: no -aconfigure:11269: result: ** OpenSSL libraries not found, disabling SSL support ** -aconfigure:11278: checking if select() needs correct nfds -aconfigure:11292: result: no (default) -aconfigure:11294: result: ** Decided that select() doesn't need correct nfds (please check) -aconfigure:11299: checking if pj_thread_create() should enforce stack size -aconfigure:11313: result: no (default) -aconfigure:11318: checking if pj_thread_create() should allocate stack -aconfigure:11332: result: no (default) -aconfigure:11348: result: ** Setting non-blocking recv() retval to EAGAIN (please check) -aconfigure:11364: result: ** Setting non-blocking connect() retval to EINPROGRESS (please check) -aconfigure:11488: creating ./config.status - -## ---------------------- ## -## Running config.status. ## -## ---------------------- ## - -This file was extended by pjproject config.status 1.0, which was -generated by GNU Autoconf 2.59. Invocation command line was - - CONFIG_FILES = - CONFIG_HEADERS = - CONFIG_LINKS = - CONFIG_COMMANDS = - $ ./config.status - -on emilou-desktop - -config.status:691: creating build.mak -config.status:691: creating build/os-auto.mak -config.status:691: creating pjlib/build/os-auto.mak -config.status:691: creating pjlib-util/build/os-auto.mak -config.status:691: creating pjmedia/build/os-auto.mak -config.status:691: creating pjsip/build/os-auto.mak -config.status:691: creating third_party/build/portaudio/os-auto.mak -config.status:691: creating third_party/build/os-auto.mak -config.status:794: creating pjlib/include/pj/compat/os_auto.h -config.status:794: creating pjlib/include/pj/compat/m_auto.h -config.status:794: creating pjmedia/include/pjmedia/config_auto.h -config.status:794: creating pjmedia/include/pjmedia-codec/config_auto.h -config.status:794: creating pjsip/include/pjsip/sip_autoconf.h -aconfigure:12561: result: - -Configurations for current target have been written to 'build.mak', and 'os-auto.mak' in various build directories, and pjlib/include/pj/compat/os_auto.h. - -Further customizations can be put in: - - 'user.mak' - - 'pjlib/include/pj/config_site.h' - -The next step now is to run 'make dep' and 'make'. - - -## ---------------- ## -## Cache variables. ## -## ---------------- ## - -ac_cv_build=x86_64-unknown-linux-gnu -ac_cv_build_alias=x86_64-unknown-linux-gnu -ac_cv_c_bigendian=no -ac_cv_c_compiler_gnu=yes -ac_cv_cxx_compiler_gnu=yes -ac_cv_env_CC_set= -ac_cv_env_CC_value= -ac_cv_env_CFLAGS_set= -ac_cv_env_CFLAGS_value= -ac_cv_env_CPPFLAGS_set= -ac_cv_env_CPPFLAGS_value= -ac_cv_env_CPP_set= -ac_cv_env_CPP_value= -ac_cv_env_CXXFLAGS_set= -ac_cv_env_CXXFLAGS_value= -ac_cv_env_CXX_set= -ac_cv_env_CXX_value= -ac_cv_env_LDFLAGS_set= -ac_cv_env_LDFLAGS_value= -ac_cv_env_build_alias_set= -ac_cv_env_build_alias_value= -ac_cv_env_host_alias_set= -ac_cv_env_host_alias_value= -ac_cv_env_target_alias_set= -ac_cv_env_target_alias_value= -ac_cv_exeext= -ac_cv_header_alsa_version_h=yes -ac_cv_header_arpa_inet_h=yes -ac_cv_header_assert_h=yes -ac_cv_header_ctype_h=yes -ac_cv_header_errno_h=yes -ac_cv_header_fcntl_h=yes -ac_cv_header_ifaddrs_h=yes -ac_cv_header_inttypes_h=yes -ac_cv_header_linux_socket_h=yes -ac_cv_header_linux_soundcard_h=yes -ac_cv_header_machine_soundcard_h=no -ac_cv_header_malloc_h=yes -ac_cv_header_memory_h=yes -ac_cv_header_mswsock_h=no -ac_cv_header_net_if_h=yes -ac_cv_header_netdb_h=yes -ac_cv_header_netinet_in_h=yes -ac_cv_header_netinet_in_systm_h=yes -ac_cv_header_netinet_ip_h=yes -ac_cv_header_openssl_ssl_h=no -ac_cv_header_semaphore_h=yes -ac_cv_header_setjmp_h=yes -ac_cv_header_stdarg_h=yes -ac_cv_header_stdc=yes -ac_cv_header_stddef_h=yes -ac_cv_header_stdint_h=yes -ac_cv_header_stdio_h=yes -ac_cv_header_stdlib_h=yes -ac_cv_header_string_h=yes -ac_cv_header_strings_h=yes -ac_cv_header_sys_ioctl_h=yes -ac_cv_header_sys_select_h=yes -ac_cv_header_sys_socket_h=yes -ac_cv_header_sys_soundcard_h=yes -ac_cv_header_sys_stat_h=yes -ac_cv_header_sys_time_h=yes -ac_cv_header_sys_timeb_h=yes -ac_cv_header_sys_types_h=yes -ac_cv_header_time_h=yes -ac_cv_header_unistd_h=yes -ac_cv_header_uuid_uuid_h=yes -ac_cv_header_winsock2_h=no -ac_cv_header_winsock_h=no -ac_cv_header_ws2tcpip_h=no -ac_cv_host=x86_64-unknown-linux-gnu -ac_cv_host_alias=x86_64-unknown-linux-gnu -ac_cv_lib_crypto_ERR_load_BIO_strings=no -ac_cv_lib_m_fmod=yes -ac_cv_lib_nsl_puts=yes -ac_cv_lib_ole32_puts=no -ac_cv_lib_pthread_pthread_create=yes -ac_cv_lib_rt_puts=yes -ac_cv_lib_socket_puts=no -ac_cv_lib_ssl_SSL_library_init=no -ac_cv_lib_uuid_uuid_generate=yes -ac_cv_lib_winmm_puts=no -ac_cv_lib_ws2_32_puts=no -ac_cv_lib_wsock32_puts=no -ac_cv_objext=o -ac_cv_prog_CPP='gcc -E' -ac_cv_prog_ac_ct_CC=gcc -ac_cv_prog_ac_ct_CXX=g++ -ac_cv_prog_cc_g=yes -ac_cv_prog_cc_stdc= -ac_cv_prog_cxx_g=yes -ac_cv_prog_egrep='grep -E' -ac_cv_target=x86_64-unknown-linux-gnu -ac_cv_target_alias=x86_64-unknown-linux-gnu - -## ----------------- ## -## Output variables. ## -## ----------------- ## - -CC='gcc' -CFLAGS='-O2' -CPP='gcc -E' -CPPFLAGS='' -CXX='g++' -CXXFLAGS='-O2 ' -DEFS='-DHAVE_CONFIG_H' -ECHO_C='' -ECHO_N='-n' -ECHO_T='' -EGREP='grep -E' -EXEEXT='' -LDFLAGS='' -LIBOBJS='' -LIBS='-lm -luuid -lnsl -lrt -lpthread -lasound' -LTLIBOBJS='' -OBJEXT='o' -PACKAGE_BUGREPORT='' -PACKAGE_NAME='pjproject' -PACKAGE_STRING='pjproject 1.0' -PACKAGE_TARNAME='pjproject' -PACKAGE_VERSION='1.0' -PATH_SEPARATOR=':' -SHELL='/bin/bash' -ac_build_mak_vars='' -ac_cross_compile='' -ac_ct_CC='gcc' -ac_ct_CXX='g++' -ac_host='unix' -ac_linux_poll='select' -ac_main_obj='main.o' -ac_no_g711_codec='' -ac_no_g722_codec='' -ac_no_gsm_codec='' -ac_no_ilbc_codec='' -ac_no_l16_codec='' -ac_no_large_filter='' -ac_no_small_filter='' -ac_no_speex_aec='' -ac_no_speex_codec='' -ac_no_ssl='' -ac_os_objs='ioqueue_select.o file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o guid_uuid.o' -ac_pa_cflags=' -DHAVE_SYS_SOUNDCARD_H -DHAVE_LINUX_SOUNDCARD_H -DPA_LITTLE_ENDIAN' -ac_pa_use_alsa='1' -ac_pa_use_oss='1' -ac_pjdir='/home/emilou/git-repos/sflphone/sflphone-common/libs/pjproject-1.0.2' -ac_pjmedia_snd='pa_unix' -bindir='${exec_prefix}/bin' -build='x86_64-unknown-linux-gnu' -build_alias='' -build_cpu='x86_64' -build_os='linux-gnu' -build_vendor='unknown' -datadir='${prefix}/share' -exec_prefix='${prefix}' -host='x86_64-unknown-linux-gnu' -host_alias='' -host_cpu='x86_64' -host_os='linux-gnu' -host_vendor='unknown' -includedir='${prefix}/include' -infodir='${prefix}/info' -libcrypto_present='' -libdir='${exec_prefix}/lib' -libexecdir='${exec_prefix}/libexec' -libssl_present='' -localstatedir='${prefix}/var' -mandir='${prefix}/man' -oldincludedir='/usr/include' -openssl_h_present='' -prefix='/usr/local' -program_transform_name='s,x,x,' -sbindir='${exec_prefix}/sbin' -sharedstatedir='${prefix}/com' -sysconfdir='${prefix}/etc' -target='x86_64-unknown-linux-gnu' -target_alias='' -target_cpu='x86_64' -target_os='linux-gnu' -target_vendor='unknown' - -## ----------- ## -## confdefs.h. ## -## ----------- ## - -#define HAVE_INTTYPES_H 1 -#define HAVE_LIBM 1 -#define HAVE_LIBNSL 1 -#define HAVE_LIBPTHREAD 1 -#define HAVE_LIBRT 1 -#define HAVE_LIBUUID 1 -#define HAVE_MEMORY_H 1 -#define HAVE_STDINT_H 1 -#define HAVE_STDLIB_H 1 -#define HAVE_STRINGS_H 1 -#define HAVE_STRING_H 1 -#define HAVE_SYS_STAT_H 1 -#define HAVE_SYS_TYPES_H 1 -#define HAVE_UNISTD_H 1 -#define PACKAGE_BUGREPORT "" -#define PACKAGE_NAME "pjproject" -#define PACKAGE_STRING "pjproject 1.0" -#define PACKAGE_TARNAME "pjproject" -#define PACKAGE_VERSION "1.0" -#define PJ_ATOMIC_VALUE_TYPE long -#define PJ_BLOCKING_CONNECT_ERROR_VAL EINPROGRESS -#define PJ_BLOCKING_ERROR_VAL EAGAIN -#define PJ_EMULATE_RWMUTEX 0 -#define PJ_HAS_ARPA_INET_H 1 -#define PJ_HAS_ASSERT_H 1 -#define PJ_HAS_CTYPE_H 1 -#define PJ_HAS_ERRNO_H 1 -#define PJ_HAS_ERRNO_VAR 1 -#define PJ_HAS_FCNTL_H 1 -#define PJ_HAS_FLOATING_POINT 1 -#define PJ_HAS_HIGH_RES_TIMER 1 -#define PJ_HAS_IFADDRS_H 1 -#define PJ_HAS_LINUX_SOCKET_H 1 -#define PJ_HAS_MALLOC 1 -#define PJ_HAS_MALLOC_H 1 -#define PJ_HAS_NETDB_H 1 -#define PJ_HAS_NETINET_IN_H 1 -#define PJ_HAS_NETINET_IN_SYSTM_H 1 -#define PJ_HAS_NETINET_IP_H 1 -#define PJ_HAS_NET_IF_H 1 -#define PJ_HAS_SEMAPHORE_H 1 -#define PJ_HAS_SETJMP_H 1 -#define PJ_HAS_SOCKLEN_T 1 -#define PJ_HAS_SO_ERROR 1 -#define PJ_HAS_STDARG_H 1 -#define PJ_HAS_STDDEF_H 1 -#define PJ_HAS_STDINT_H 1 -#define PJ_HAS_STDIO_H 1 -#define PJ_HAS_STDLIB_H 1 -#define PJ_HAS_STRING_H 1 -#define PJ_HAS_SYS_IOCTL_H 1 -#define PJ_HAS_SYS_SELECT_H 1 -#define PJ_HAS_SYS_SOCKET_H 1 -#define PJ_HAS_SYS_TIMEB_H 1 -#define PJ_HAS_SYS_TIME_H 1 -#define PJ_HAS_SYS_TYPES_H 1 -#define PJ_HAS_TIME_H 1 -#define PJ_HAS_UNISTD_H 1 -#define PJ_LINUX 1 -#define PJ_M_NAME "x86_64" -#define PJ_NATIVE_STRING_IS_UNICODE 0 -#define PJ_OS_NAME "x86_64-unknown-linux-gnu" -#define PJ_POOL_ALIGNMENT 8 -#define PJ_SELECT_NEEDS_NFDS 0 -#define PJ_SOCK_HAS_GETADDRINFO 1 -#define PJ_SOCK_HAS_INET_ATON 1 -#define PJ_SOCK_HAS_INET_NTOP 1 -#define PJ_SOCK_HAS_INET_PTON 1 -#define PJ_THREAD_ALLOCATE_STACK 0 -#define PJ_THREAD_SET_STACK_SIZE 0 -#define STDC_HEADERS 1 -#endif -#ifdef __cplusplus -extern "C" void exit (int) throw (); - -aconfigure: exit 0 diff --git a/sflphone-common/libs/pjproject-1.0.2/config.status b/sflphone-common/libs/pjproject-1.0.2/config.status deleted file mode 100755 index 2c61c60623246bb10326e73dc4512833636b35aa..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/pjproject-1.0.2/config.status +++ /dev/null @@ -1,1075 +0,0 @@ -#! /bin/bash -# Generated by aconfigure. -# Run this file to recreate the current configuration. -# Compiler output produced by configure, useful for debugging -# configure, is in config.log if it exists. - -debug=false -ac_cs_recheck=false -ac_cs_silent=false -SHELL=${CONFIG_SHELL-/bin/bash} -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi -DUALCASE=1; export DUALCASE # for MKS sh - -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - - -# Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - - -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done - - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 -echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | - sed ' - N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, - t loop - s,-$,, - s,^['$as_cr_digits']*\n,, - ' >$as_me.lineno && - chmod +x $as_me.lineno || - { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 -echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno - # Exit status is that of the last command. - exit -} - - -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac - -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.file - -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -as_executable_p="test -f" - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH - -exec 6>&1 - -# Open the log real soon, to keep \$[0] and so on meaningful, and to -# report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. Logging --version etc. is OK. -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX -} >&5 -cat >&5 <<_CSEOF - -This file was extended by pjproject $as_me 1.0, which was -generated by GNU Autoconf 2.59. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - -_CSEOF -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 -echo >&5 -config_files=" build.mak build/os-auto.mak pjlib/build/os-auto.mak pjlib-util/build/os-auto.mak pjmedia/build/os-auto.mak pjsip/build/os-auto.mak third_party/build/portaudio/os-auto.mak third_party/build/os-auto.mak" -config_headers=" pjlib/include/pj/compat/os_auto.h pjlib/include/pj/compat/m_auto.h pjmedia/include/pjmedia/config_auto.h pjmedia/include/pjmedia-codec/config_auto.h pjsip/include/pjsip/sip_autoconf.h" - -ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. - -Usage: $0 [OPTIONS] [FILE]... - - -h, --help print this help, then exit - -V, --version print version number, then exit - -q, --quiet do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - --header=FILE[:TEMPLATE] - instantiate the configuration header FILE - -Configuration files: -$config_files - -Configuration headers: -$config_headers - -Report bugs to <bug-autoconf@gnu.org>." -ac_cs_version="\ -pjproject config.status 1.0 -configured by ./aconfigure, generated by GNU Autoconf 2.59, - with options \"\" - -Copyright (C) 2003 Free Software Foundation, Inc. -This config.status script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it." -srcdir=. -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. -ac_need_defaults=: -while test $# != 0 -do - case $1 in - --*=*) - ac_option=`expr "x$1" : 'x\([^=]*\)='` - ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` - ac_shift=: - ;; - -*) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; - *) # This is not an option, so the user has probably given explicit - # arguments. - ac_option=$1 - ac_need_defaults=false;; - esac - - case $ac_option in - # Handling of the options. - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; - --he | --h) - # Conflict between --help and --header - { { echo "$as_me:$LINENO: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; };; - --help | --hel | -h ) - echo "$ac_cs_usage"; exit 0 ;; - --debug | --d* | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) - $ac_shift - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" - ac_need_defaults=false;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. - -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; } ;; - - *) ac_config_targets="$ac_config_targets $1" ;; - - esac - shift -done - -ac_configure_extra_args= - -if $ac_cs_silent; then - exec 6>/dev/null - ac_configure_extra_args="$ac_configure_extra_args --silent" -fi - -if $ac_cs_recheck; then - echo "running /bin/bash ./aconfigure " $ac_configure_extra_args " --no-create --no-recursion" >&6 - exec /bin/bash ./aconfigure $ac_configure_extra_args --no-create --no-recursion -fi - -for ac_config_target in $ac_config_targets -do - case "$ac_config_target" in - # Handling of arguments. - "build.mak" ) CONFIG_FILES="$CONFIG_FILES build.mak" ;; - "build/os-auto.mak" ) CONFIG_FILES="$CONFIG_FILES build/os-auto.mak" ;; - "pjlib/build/os-auto.mak" ) CONFIG_FILES="$CONFIG_FILES pjlib/build/os-auto.mak" ;; - "pjlib-util/build/os-auto.mak" ) CONFIG_FILES="$CONFIG_FILES pjlib-util/build/os-auto.mak" ;; - "pjmedia/build/os-auto.mak" ) CONFIG_FILES="$CONFIG_FILES pjmedia/build/os-auto.mak" ;; - "pjsip/build/os-auto.mak" ) CONFIG_FILES="$CONFIG_FILES pjsip/build/os-auto.mak" ;; - "third_party/build/portaudio/os-auto.mak" ) CONFIG_FILES="$CONFIG_FILES third_party/build/portaudio/os-auto.mak" ;; - "third_party/build/os-auto.mak" ) CONFIG_FILES="$CONFIG_FILES third_party/build/os-auto.mak" ;; - "pjlib/include/pj/compat/os_auto.h" ) CONFIG_HEADERS="$CONFIG_HEADERS pjlib/include/pj/compat/os_auto.h" ;; - "pjlib/include/pj/compat/m_auto.h" ) CONFIG_HEADERS="$CONFIG_HEADERS pjlib/include/pj/compat/m_auto.h" ;; - "pjmedia/include/pjmedia/config_auto.h" ) CONFIG_HEADERS="$CONFIG_HEADERS pjmedia/include/pjmedia/config_auto.h" ;; - "pjmedia/include/pjmedia-codec/config_auto.h" ) CONFIG_HEADERS="$CONFIG_HEADERS pjmedia/include/pjmedia-codec/config_auto.h" ;; - "pjsip/include/pjsip/sip_autoconf.h" ) CONFIG_HEADERS="$CONFIG_HEADERS pjsip/include/pjsip/sip_autoconf.h" ;; - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; - esac -done - -# If the user did not use the arguments to specify the items to instantiate, -# then the envvar interface is used. Set only those that are not. -# We use the long form for the default assignment because of an extremely -# bizarre bug on SunOS 4.1.3. -if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers -fi - -# Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason to put it here, and in addition, -# creating and moving files from /tmp can sometimes cause problems. -# Create a temporary directory, and hook for its removal unless debugging. -$debug || -{ - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 -} - -# Create a (secure) tmp directory for tmp files. - -{ - tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" -} || -{ - tmp=./confstat$$-$RANDOM - (umask 077 && mkdir $tmp) -} || -{ - echo "$me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} - - -# -# CONFIG_FILES section. -# - -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h -if test -n "$CONFIG_FILES"; then - # Protect against being on the right side of a sed subst in config.status. - sed 's/,@/@@/; s/@,/@@/; s/,;t t$/@;t t/; /@;t t$/s/[\\&,]/\\&/g; - s/@@/,@/; s/@@/@,/; s/@;t t$/,;t t/' >$tmp/subs.sed <<\CEOF -s,@SHELL@,/bin/bash,;t t -s,@PATH_SEPARATOR@,:,;t t -s,@PACKAGE_NAME@,pjproject,;t t -s,@PACKAGE_TARNAME@,pjproject,;t t -s,@PACKAGE_VERSION@,1.0,;t t -s,@PACKAGE_STRING@,pjproject 1.0,;t t -s,@PACKAGE_BUGREPORT@,,;t t -s,@exec_prefix@,${prefix},;t t -s,@prefix@,/usr/local,;t t -s,@program_transform_name@,s,x,x,,;t t -s,@bindir@,${exec_prefix}/bin,;t t -s,@sbindir@,${exec_prefix}/sbin,;t t -s,@libexecdir@,${exec_prefix}/libexec,;t t -s,@datadir@,${prefix}/share,;t t -s,@sysconfdir@,${prefix}/etc,;t t -s,@sharedstatedir@,${prefix}/com,;t t -s,@localstatedir@,${prefix}/var,;t t -s,@libdir@,${exec_prefix}/lib,;t t -s,@includedir@,${prefix}/include,;t t -s,@oldincludedir@,/usr/include,;t t -s,@infodir@,${prefix}/info,;t t -s,@mandir@,${prefix}/man,;t t -s,@build_alias@,,;t t -s,@host_alias@,,;t t -s,@target_alias@,,;t t -s,@DEFS@,-DHAVE_CONFIG_H,;t t -s,@ECHO_C@,,;t t -s,@ECHO_N@,-n,;t t -s,@ECHO_T@,,;t t -s,@LIBS@,-lm -luuid -lnsl -lrt -lpthread -lasound,;t t -s,@build@,x86_64-unknown-linux-gnu,;t t -s,@build_cpu@,x86_64,;t t -s,@build_vendor@,unknown,;t t -s,@build_os@,linux-gnu,;t t -s,@host@,x86_64-unknown-linux-gnu,;t t -s,@host_cpu@,x86_64,;t t -s,@host_vendor@,unknown,;t t -s,@host_os@,linux-gnu,;t t -s,@target@,x86_64-unknown-linux-gnu,;t t -s,@target_cpu@,x86_64,;t t -s,@target_vendor@,unknown,;t t -s,@target_os@,linux-gnu,;t t -s,@CC@,gcc,;t t -s,@CFLAGS@,-O2,;t t -s,@LDFLAGS@,,;t t -s,@CPPFLAGS@,,;t t -s,@ac_ct_CC@,gcc,;t t -s,@EXEEXT@,,;t t -s,@OBJEXT@,o,;t t -s,@CXX@,g++,;t t -s,@CXXFLAGS@,-O2 ,;t t -s,@ac_ct_CXX@,g++,;t t -s,@ac_pjdir@,/home/emilou/git-repos/sflphone/sflphone-common/libs/pjproject-1.0.2,;t t -s,@ac_build_mak_vars@,,;t t -s,@CPP@,gcc -E,;t t -s,@EGREP@,grep -E,;t t -s,@ac_os_objs@,ioqueue_select.o file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o guid_uuid.o,;t t -s,@ac_pjmedia_snd@,pa_unix,;t t -s,@ac_pa_cflags@, -DHAVE_SYS_SOUNDCARD_H -DHAVE_LINUX_SOUNDCARD_H -DPA_LITTLE_ENDIAN,;t t -s,@ac_pa_use_alsa@,1,;t t -s,@ac_pa_use_oss@,1,;t t -s,@ac_no_small_filter@,,;t t -s,@ac_no_large_filter@,,;t t -s,@ac_no_speex_aec@,,;t t -s,@ac_no_g711_codec@,,;t t -s,@ac_no_l16_codec@,,;t t -s,@ac_no_gsm_codec@,,;t t -s,@ac_no_g722_codec@,,;t t -s,@ac_no_speex_codec@,,;t t -s,@ac_no_ilbc_codec@,,;t t -s,@ac_no_ssl@,,;t t -s,@openssl_h_present@,,;t t -s,@libssl_present@,,;t t -s,@libcrypto_present@,,;t t -s,@ac_cross_compile@,,;t t -s,@ac_linux_poll@,select,;t t -s,@ac_host@,unix,;t t -s,@ac_main_obj@,main.o,;t t -s,@LIBOBJS@,,;t t -s,@LTLIBOBJS@,,;t t -CEOF - - # Split the substitutions into bite-sized pieces for seds with - # small command number limits, like on Digital OSF/1 and HP-UX. - ac_max_sed_lines=48 - ac_sed_frag=1 # Number of current file. - ac_beg=1 # First line for current file. - ac_end=$ac_max_sed_lines # Line after last line for current file. - ac_more_lines=: - ac_sed_cmds= - while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - else - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - fi - if test ! -s $tmp/subs.frag; then - ac_more_lines=false - else - # The purpose of the label and of the branching condition is to - # speed up the sed processing (if there are no `@' at all, there - # is no need to browse any of the substitutions). - # These are the two extra sed commands mentioned above. - (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" - else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" - fi - ac_sed_frag=`expr $ac_sed_frag + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_lines` - fi - done - if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat - fi -fi # test -n "$CONFIG_FILES" - -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; - esac - - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`(dirname "$ac_file") 2>/dev/null || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - - ac_builddir=. - -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi - -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac - - - - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - configure_input= - else - configure_input="$ac_file. " - fi - configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo "$f";; - *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } - sed "/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/; -s/:*\${srcdir}:*/:/; -s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; -s/:*$//; -s/^[^=]*=[ ]*$//; -} - -:t -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s,@configure_input@,$configure_input,;t t -s,@srcdir@,$ac_srcdir,;t t -s,@abs_srcdir@,$ac_abs_srcdir,;t t -s,@top_srcdir@,$ac_top_srcdir,;t t -s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t -s,@builddir@,$ac_builddir,;t t -s,@abs_builddir@,$ac_abs_builddir,;t t -s,@top_builddir@,$ac_top_builddir,;t t -s,@abs_top_builddir@,$ac_abs_top_builddir,;t t -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out - rm -f $tmp/stdin - if test x"$ac_file" != x-; then - mv $tmp/out $ac_file - else - cat $tmp/out - rm -f $tmp/out - fi - -done - -# -# CONFIG_HEADER section. -# - -# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where -# NAME is the cpp macro being defined and VALUE is the value it is being given. -# -# ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='[ ].*$,\1#\2' -ac_dC=' ' -ac_dD=',;t' -# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_uB='$,\1#\2define\3' -ac_uC=' ' -ac_uD=',;t' - -for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; - esac - - test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - # Do quote $f, to prevent DOS paths from being IFS'd. - echo "$f";; - *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } - # Remove the trailing spaces. - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in - - # Handle all the #define templates only if necessary. - if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then - # If there are no defines, we may have an empty if/fi - : - cat >$tmp/defines.sed <<CEOF -/^[ ]*#[ ]*define/!b -t clr -: clr -${ac_dA}PACKAGE_NAME${ac_dB}PACKAGE_NAME${ac_dC}"pjproject"${ac_dD} -${ac_dA}PACKAGE_TARNAME${ac_dB}PACKAGE_TARNAME${ac_dC}"pjproject"${ac_dD} -${ac_dA}PACKAGE_VERSION${ac_dB}PACKAGE_VERSION${ac_dC}"1.0"${ac_dD} -${ac_dA}PACKAGE_STRING${ac_dB}PACKAGE_STRING${ac_dC}"pjproject 1.0"${ac_dD} -${ac_dA}PACKAGE_BUGREPORT${ac_dB}PACKAGE_BUGREPORT${ac_dC}""${ac_dD} -${ac_dA}HAVE_LIBPTHREAD${ac_dB}HAVE_LIBPTHREAD${ac_dC}1${ac_dD} -${ac_dA}HAVE_LIBRT${ac_dB}HAVE_LIBRT${ac_dC}1${ac_dD} -${ac_dA}HAVE_LIBNSL${ac_dB}HAVE_LIBNSL${ac_dC}1${ac_dD} -${ac_dA}HAVE_LIBUUID${ac_dB}HAVE_LIBUUID${ac_dC}1${ac_dD} -${ac_dA}PJ_M_NAME${ac_dB}PJ_M_NAME${ac_dC}"x86_64"${ac_dD} -${ac_dA}PJ_POOL_ALIGNMENT${ac_dB}PJ_POOL_ALIGNMENT${ac_dC}8${ac_dD} -${ac_dA}PJ_LINUX${ac_dB}PJ_LINUX${ac_dC}1${ac_dD} -${ac_dA}PJ_HAS_FLOATING_POINT${ac_dB}PJ_HAS_FLOATING_POINT${ac_dC}1${ac_dD} -${ac_dA}HAVE_LIBM${ac_dB}HAVE_LIBM${ac_dC}1${ac_dD} -${ac_dA}STDC_HEADERS${ac_dB}STDC_HEADERS${ac_dC}1${ac_dD} -${ac_dA}HAVE_SYS_TYPES_H${ac_dB}HAVE_SYS_TYPES_H${ac_dC}1${ac_dD} -${ac_dA}HAVE_SYS_STAT_H${ac_dB}HAVE_SYS_STAT_H${ac_dC}1${ac_dD} -${ac_dA}HAVE_STDLIB_H${ac_dB}HAVE_STDLIB_H${ac_dC}1${ac_dD} -${ac_dA}HAVE_STRING_H${ac_dB}HAVE_STRING_H${ac_dC}1${ac_dD} -${ac_dA}HAVE_MEMORY_H${ac_dB}HAVE_MEMORY_H${ac_dC}1${ac_dD} -${ac_dA}HAVE_STRINGS_H${ac_dB}HAVE_STRINGS_H${ac_dC}1${ac_dD} -${ac_dA}HAVE_INTTYPES_H${ac_dB}HAVE_INTTYPES_H${ac_dC}1${ac_dD} -${ac_dA}HAVE_STDINT_H${ac_dB}HAVE_STDINT_H${ac_dC}1${ac_dD} -${ac_dA}HAVE_UNISTD_H${ac_dB}HAVE_UNISTD_H${ac_dC}1${ac_dD} -${ac_dA}PJ_HAS_ARPA_INET_H${ac_dB}PJ_HAS_ARPA_INET_H${ac_dC}1${ac_dD} -${ac_dA}PJ_HAS_ASSERT_H${ac_dB}PJ_HAS_ASSERT_H${ac_dC}1${ac_dD} -${ac_dA}PJ_HAS_CTYPE_H${ac_dB}PJ_HAS_CTYPE_H${ac_dC}1${ac_dD} -${ac_dA}PJ_HAS_ERRNO_H${ac_dB}PJ_HAS_ERRNO_H${ac_dC}1${ac_dD} -${ac_dA}PJ_HAS_FCNTL_H${ac_dB}PJ_HAS_FCNTL_H${ac_dC}1${ac_dD} -${ac_dA}PJ_HAS_LINUX_SOCKET_H${ac_dB}PJ_HAS_LINUX_SOCKET_H${ac_dC}1${ac_dD} -${ac_dA}PJ_HAS_MALLOC_H${ac_dB}PJ_HAS_MALLOC_H${ac_dC}1${ac_dD} -${ac_dA}PJ_HAS_NETDB_H${ac_dB}PJ_HAS_NETDB_H${ac_dC}1${ac_dD} -${ac_dA}PJ_HAS_NETINET_IN_SYSTM_H${ac_dB}PJ_HAS_NETINET_IN_SYSTM_H${ac_dC}1${ac_dD} -${ac_dA}PJ_HAS_NETINET_IN_H${ac_dB}PJ_HAS_NETINET_IN_H${ac_dC}1${ac_dD} -${ac_dA}PJ_HAS_NETINET_IP_H${ac_dB}PJ_HAS_NETINET_IP_H${ac_dC}1${ac_dD} -${ac_dA}PJ_HAS_IFADDRS_H${ac_dB}PJ_HAS_IFADDRS_H${ac_dC}1${ac_dD} -${ac_dA}PJ_HAS_SEMAPHORE_H${ac_dB}PJ_HAS_SEMAPHORE_H${ac_dC}1${ac_dD} -${ac_dA}PJ_HAS_SETJMP_H${ac_dB}PJ_HAS_SETJMP_H${ac_dC}1${ac_dD} -CEOF - sed -f $tmp/defines.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in - - cat >$tmp/defines.sed <<CEOF -/^[ ]*#[ ]*define/!b -t clr -: clr -${ac_dA}PJ_HAS_STDARG_H${ac_dB}PJ_HAS_STDARG_H${ac_dC}1${ac_dD} -${ac_dA}PJ_HAS_STDDEF_H${ac_dB}PJ_HAS_STDDEF_H${ac_dC}1${ac_dD} -${ac_dA}PJ_HAS_STDIO_H${ac_dB}PJ_HAS_STDIO_H${ac_dC}1${ac_dD} -${ac_dA}PJ_HAS_STDINT_H${ac_dB}PJ_HAS_STDINT_H${ac_dC}1${ac_dD} -${ac_dA}PJ_HAS_STDLIB_H${ac_dB}PJ_HAS_STDLIB_H${ac_dC}1${ac_dD} -${ac_dA}PJ_HAS_STRING_H${ac_dB}PJ_HAS_STRING_H${ac_dC}1${ac_dD} -${ac_dA}PJ_HAS_SYS_IOCTL_H${ac_dB}PJ_HAS_SYS_IOCTL_H${ac_dC}1${ac_dD} -${ac_dA}PJ_HAS_SYS_SELECT_H${ac_dB}PJ_HAS_SYS_SELECT_H${ac_dC}1${ac_dD} -${ac_dA}PJ_HAS_SYS_SOCKET_H${ac_dB}PJ_HAS_SYS_SOCKET_H${ac_dC}1${ac_dD} -${ac_dA}PJ_HAS_SYS_TIME_H${ac_dB}PJ_HAS_SYS_TIME_H${ac_dC}1${ac_dD} -${ac_dA}PJ_HAS_SYS_TIMEB_H${ac_dB}PJ_HAS_SYS_TIMEB_H${ac_dC}1${ac_dD} -${ac_dA}PJ_HAS_SYS_TYPES_H${ac_dB}PJ_HAS_SYS_TYPES_H${ac_dC}1${ac_dD} -${ac_dA}PJ_HAS_TIME_H${ac_dB}PJ_HAS_TIME_H${ac_dC}1${ac_dD} -${ac_dA}PJ_HAS_UNISTD_H${ac_dB}PJ_HAS_UNISTD_H${ac_dC}1${ac_dD} -${ac_dA}PJ_HAS_NET_IF_H${ac_dB}PJ_HAS_NET_IF_H${ac_dC}1${ac_dD} -${ac_dA}PJ_OS_NAME${ac_dB}PJ_OS_NAME${ac_dC}"x86_64-unknown-linux-gnu"${ac_dD} -${ac_dA}PJ_HAS_ERRNO_VAR${ac_dB}PJ_HAS_ERRNO_VAR${ac_dC}1${ac_dD} -${ac_dA}PJ_HAS_HIGH_RES_TIMER${ac_dB}PJ_HAS_HIGH_RES_TIMER${ac_dC}1${ac_dD} -${ac_dA}PJ_HAS_MALLOC${ac_dB}PJ_HAS_MALLOC${ac_dC}1${ac_dD} -${ac_dA}PJ_NATIVE_STRING_IS_UNICODE${ac_dB}PJ_NATIVE_STRING_IS_UNICODE${ac_dC}0${ac_dD} -${ac_dA}PJ_ATOMIC_VALUE_TYPE${ac_dB}PJ_ATOMIC_VALUE_TYPE${ac_dC}long${ac_dD} -${ac_dA}PJ_SOCK_HAS_INET_ATON${ac_dB}PJ_SOCK_HAS_INET_ATON${ac_dC}1${ac_dD} -${ac_dA}PJ_SOCK_HAS_INET_PTON${ac_dB}PJ_SOCK_HAS_INET_PTON${ac_dC}1${ac_dD} -${ac_dA}PJ_SOCK_HAS_INET_NTOP${ac_dB}PJ_SOCK_HAS_INET_NTOP${ac_dC}1${ac_dD} -${ac_dA}PJ_SOCK_HAS_GETADDRINFO${ac_dB}PJ_SOCK_HAS_GETADDRINFO${ac_dC}1${ac_dD} -${ac_dA}PJ_HAS_SOCKLEN_T${ac_dB}PJ_HAS_SOCKLEN_T${ac_dC}1${ac_dD} -${ac_dA}PJ_HAS_SO_ERROR${ac_dB}PJ_HAS_SO_ERROR${ac_dC}1${ac_dD} -${ac_dA}PJ_EMULATE_RWMUTEX${ac_dB}PJ_EMULATE_RWMUTEX${ac_dC}0${ac_dD} -${ac_dA}PJ_SELECT_NEEDS_NFDS${ac_dB}PJ_SELECT_NEEDS_NFDS${ac_dC}0${ac_dD} -${ac_dA}PJ_THREAD_SET_STACK_SIZE${ac_dB}PJ_THREAD_SET_STACK_SIZE${ac_dC}0${ac_dD} -${ac_dA}PJ_THREAD_ALLOCATE_STACK${ac_dB}PJ_THREAD_ALLOCATE_STACK${ac_dC}0${ac_dD} -${ac_dA}PJ_BLOCKING_ERROR_VAL${ac_dB}PJ_BLOCKING_ERROR_VAL${ac_dC}EAGAIN${ac_dD} -${ac_dA}PJ_BLOCKING_CONNECT_ERROR_VAL${ac_dB}PJ_BLOCKING_CONNECT_ERROR_VAL${ac_dC}EINPROGRESS${ac_dD} -CEOF - sed -f $tmp/defines.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in - - fi # grep - - # Handle all the #undef templates - cat >$tmp/undefs.sed <<CEOF -/^[ ]*#[ ]*undef/!b -t clr -: clr -${ac_uA}PACKAGE_NAME${ac_uB}PACKAGE_NAME${ac_uC}"pjproject"${ac_uD} -${ac_uA}PACKAGE_TARNAME${ac_uB}PACKAGE_TARNAME${ac_uC}"pjproject"${ac_uD} -${ac_uA}PACKAGE_VERSION${ac_uB}PACKAGE_VERSION${ac_uC}"1.0"${ac_uD} -${ac_uA}PACKAGE_STRING${ac_uB}PACKAGE_STRING${ac_uC}"pjproject 1.0"${ac_uD} -${ac_uA}PACKAGE_BUGREPORT${ac_uB}PACKAGE_BUGREPORT${ac_uC}""${ac_uD} -${ac_uA}HAVE_LIBPTHREAD${ac_uB}HAVE_LIBPTHREAD${ac_uC}1${ac_uD} -${ac_uA}HAVE_LIBRT${ac_uB}HAVE_LIBRT${ac_uC}1${ac_uD} -${ac_uA}HAVE_LIBNSL${ac_uB}HAVE_LIBNSL${ac_uC}1${ac_uD} -${ac_uA}HAVE_LIBUUID${ac_uB}HAVE_LIBUUID${ac_uC}1${ac_uD} -${ac_uA}PJ_M_NAME${ac_uB}PJ_M_NAME${ac_uC}"x86_64"${ac_uD} -${ac_uA}PJ_POOL_ALIGNMENT${ac_uB}PJ_POOL_ALIGNMENT${ac_uC}8${ac_uD} -${ac_uA}PJ_LINUX${ac_uB}PJ_LINUX${ac_uC}1${ac_uD} -${ac_uA}PJ_HAS_FLOATING_POINT${ac_uB}PJ_HAS_FLOATING_POINT${ac_uC}1${ac_uD} -${ac_uA}HAVE_LIBM${ac_uB}HAVE_LIBM${ac_uC}1${ac_uD} -${ac_uA}STDC_HEADERS${ac_uB}STDC_HEADERS${ac_uC}1${ac_uD} -${ac_uA}HAVE_SYS_TYPES_H${ac_uB}HAVE_SYS_TYPES_H${ac_uC}1${ac_uD} -${ac_uA}HAVE_SYS_STAT_H${ac_uB}HAVE_SYS_STAT_H${ac_uC}1${ac_uD} -${ac_uA}HAVE_STDLIB_H${ac_uB}HAVE_STDLIB_H${ac_uC}1${ac_uD} -${ac_uA}HAVE_STRING_H${ac_uB}HAVE_STRING_H${ac_uC}1${ac_uD} -${ac_uA}HAVE_MEMORY_H${ac_uB}HAVE_MEMORY_H${ac_uC}1${ac_uD} -${ac_uA}HAVE_STRINGS_H${ac_uB}HAVE_STRINGS_H${ac_uC}1${ac_uD} -${ac_uA}HAVE_INTTYPES_H${ac_uB}HAVE_INTTYPES_H${ac_uC}1${ac_uD} -${ac_uA}HAVE_STDINT_H${ac_uB}HAVE_STDINT_H${ac_uC}1${ac_uD} -${ac_uA}HAVE_UNISTD_H${ac_uB}HAVE_UNISTD_H${ac_uC}1${ac_uD} -${ac_uA}PJ_HAS_ARPA_INET_H${ac_uB}PJ_HAS_ARPA_INET_H${ac_uC}1${ac_uD} -${ac_uA}PJ_HAS_ASSERT_H${ac_uB}PJ_HAS_ASSERT_H${ac_uC}1${ac_uD} -${ac_uA}PJ_HAS_CTYPE_H${ac_uB}PJ_HAS_CTYPE_H${ac_uC}1${ac_uD} -${ac_uA}PJ_HAS_ERRNO_H${ac_uB}PJ_HAS_ERRNO_H${ac_uC}1${ac_uD} -${ac_uA}PJ_HAS_FCNTL_H${ac_uB}PJ_HAS_FCNTL_H${ac_uC}1${ac_uD} -${ac_uA}PJ_HAS_LINUX_SOCKET_H${ac_uB}PJ_HAS_LINUX_SOCKET_H${ac_uC}1${ac_uD} -${ac_uA}PJ_HAS_MALLOC_H${ac_uB}PJ_HAS_MALLOC_H${ac_uC}1${ac_uD} -${ac_uA}PJ_HAS_NETDB_H${ac_uB}PJ_HAS_NETDB_H${ac_uC}1${ac_uD} -${ac_uA}PJ_HAS_NETINET_IN_SYSTM_H${ac_uB}PJ_HAS_NETINET_IN_SYSTM_H${ac_uC}1${ac_uD} -${ac_uA}PJ_HAS_NETINET_IN_H${ac_uB}PJ_HAS_NETINET_IN_H${ac_uC}1${ac_uD} -${ac_uA}PJ_HAS_NETINET_IP_H${ac_uB}PJ_HAS_NETINET_IP_H${ac_uC}1${ac_uD} -${ac_uA}PJ_HAS_IFADDRS_H${ac_uB}PJ_HAS_IFADDRS_H${ac_uC}1${ac_uD} -${ac_uA}PJ_HAS_SEMAPHORE_H${ac_uB}PJ_HAS_SEMAPHORE_H${ac_uC}1${ac_uD} -${ac_uA}PJ_HAS_SETJMP_H${ac_uB}PJ_HAS_SETJMP_H${ac_uC}1${ac_uD} -CEOF - sed -f $tmp/undefs.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in - - cat >$tmp/undefs.sed <<CEOF -/^[ ]*#[ ]*undef/!b -t clr -: clr -${ac_uA}PJ_HAS_STDARG_H${ac_uB}PJ_HAS_STDARG_H${ac_uC}1${ac_uD} -${ac_uA}PJ_HAS_STDDEF_H${ac_uB}PJ_HAS_STDDEF_H${ac_uC}1${ac_uD} -${ac_uA}PJ_HAS_STDIO_H${ac_uB}PJ_HAS_STDIO_H${ac_uC}1${ac_uD} -${ac_uA}PJ_HAS_STDINT_H${ac_uB}PJ_HAS_STDINT_H${ac_uC}1${ac_uD} -${ac_uA}PJ_HAS_STDLIB_H${ac_uB}PJ_HAS_STDLIB_H${ac_uC}1${ac_uD} -${ac_uA}PJ_HAS_STRING_H${ac_uB}PJ_HAS_STRING_H${ac_uC}1${ac_uD} -${ac_uA}PJ_HAS_SYS_IOCTL_H${ac_uB}PJ_HAS_SYS_IOCTL_H${ac_uC}1${ac_uD} -${ac_uA}PJ_HAS_SYS_SELECT_H${ac_uB}PJ_HAS_SYS_SELECT_H${ac_uC}1${ac_uD} -${ac_uA}PJ_HAS_SYS_SOCKET_H${ac_uB}PJ_HAS_SYS_SOCKET_H${ac_uC}1${ac_uD} -${ac_uA}PJ_HAS_SYS_TIME_H${ac_uB}PJ_HAS_SYS_TIME_H${ac_uC}1${ac_uD} -${ac_uA}PJ_HAS_SYS_TIMEB_H${ac_uB}PJ_HAS_SYS_TIMEB_H${ac_uC}1${ac_uD} -${ac_uA}PJ_HAS_SYS_TYPES_H${ac_uB}PJ_HAS_SYS_TYPES_H${ac_uC}1${ac_uD} -${ac_uA}PJ_HAS_TIME_H${ac_uB}PJ_HAS_TIME_H${ac_uC}1${ac_uD} -${ac_uA}PJ_HAS_UNISTD_H${ac_uB}PJ_HAS_UNISTD_H${ac_uC}1${ac_uD} -${ac_uA}PJ_HAS_NET_IF_H${ac_uB}PJ_HAS_NET_IF_H${ac_uC}1${ac_uD} -${ac_uA}PJ_OS_NAME${ac_uB}PJ_OS_NAME${ac_uC}"x86_64-unknown-linux-gnu"${ac_uD} -${ac_uA}PJ_HAS_ERRNO_VAR${ac_uB}PJ_HAS_ERRNO_VAR${ac_uC}1${ac_uD} -${ac_uA}PJ_HAS_HIGH_RES_TIMER${ac_uB}PJ_HAS_HIGH_RES_TIMER${ac_uC}1${ac_uD} -${ac_uA}PJ_HAS_MALLOC${ac_uB}PJ_HAS_MALLOC${ac_uC}1${ac_uD} -${ac_uA}PJ_NATIVE_STRING_IS_UNICODE${ac_uB}PJ_NATIVE_STRING_IS_UNICODE${ac_uC}0${ac_uD} -${ac_uA}PJ_ATOMIC_VALUE_TYPE${ac_uB}PJ_ATOMIC_VALUE_TYPE${ac_uC}long${ac_uD} -${ac_uA}PJ_SOCK_HAS_INET_ATON${ac_uB}PJ_SOCK_HAS_INET_ATON${ac_uC}1${ac_uD} -${ac_uA}PJ_SOCK_HAS_INET_PTON${ac_uB}PJ_SOCK_HAS_INET_PTON${ac_uC}1${ac_uD} -${ac_uA}PJ_SOCK_HAS_INET_NTOP${ac_uB}PJ_SOCK_HAS_INET_NTOP${ac_uC}1${ac_uD} -${ac_uA}PJ_SOCK_HAS_GETADDRINFO${ac_uB}PJ_SOCK_HAS_GETADDRINFO${ac_uC}1${ac_uD} -${ac_uA}PJ_HAS_SOCKLEN_T${ac_uB}PJ_HAS_SOCKLEN_T${ac_uC}1${ac_uD} -${ac_uA}PJ_HAS_SO_ERROR${ac_uB}PJ_HAS_SO_ERROR${ac_uC}1${ac_uD} -${ac_uA}PJ_EMULATE_RWMUTEX${ac_uB}PJ_EMULATE_RWMUTEX${ac_uC}0${ac_uD} -${ac_uA}PJ_SELECT_NEEDS_NFDS${ac_uB}PJ_SELECT_NEEDS_NFDS${ac_uC}0${ac_uD} -${ac_uA}PJ_THREAD_SET_STACK_SIZE${ac_uB}PJ_THREAD_SET_STACK_SIZE${ac_uC}0${ac_uD} -${ac_uA}PJ_THREAD_ALLOCATE_STACK${ac_uB}PJ_THREAD_ALLOCATE_STACK${ac_uC}0${ac_uD} -${ac_uA}PJ_BLOCKING_ERROR_VAL${ac_uB}PJ_BLOCKING_ERROR_VAL${ac_uC}EAGAIN${ac_uD} -${ac_uA}PJ_BLOCKING_CONNECT_ERROR_VAL${ac_uB}PJ_BLOCKING_CONNECT_ERROR_VAL${ac_uC}EINPROGRESS${ac_uD} -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, -CEOF - sed -f $tmp/undefs.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in - - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - echo "/* Generated by configure. */" >$tmp/config.h - else - echo "/* $ac_file. Generated by configure. */" >$tmp/config.h - fi - cat $tmp/in >>$tmp/config.h - rm -f $tmp/in - if test x"$ac_file" != x-; then - if diff $ac_file $tmp/config.h >/dev/null 2>&1; then - { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 -echo "$as_me: $ac_file is unchanged" >&6;} - else - ac_dir=`(dirname "$ac_file") 2>/dev/null || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - - rm -f $ac_file - mv $tmp/config.h $ac_file - fi - else - cat $tmp/config.h - rm -f $tmp/config.h - fi -done - -{ (exit 0); exit 0; } diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/bin/pjlib-util-test-x86_64-unknown-linux-gnu b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/bin/pjlib-util-test-x86_64-unknown-linux-gnu deleted file mode 100755 index d29a2047c0c9e32e4549e062089937381641a02b..0000000000000000000000000000000000000000 Binary files a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/bin/pjlib-util-test-x86_64-unknown-linux-gnu and /dev/null differ diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/os-auto.mak b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/os-auto.mak deleted file mode 100644 index fe7975b64497ac781be78cb52d8fcbd9cb2a9842..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/os-auto.mak +++ /dev/null @@ -1,3 +0,0 @@ -# pjlib-util/build/os-auto.mak. Generated from os-auto.mak.in by configure. -export UTIL_TEST_OBJS = main.o - diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/bin/pjlib-test-x86_64-unknown-linux-gnu b/sflphone-common/libs/pjproject-1.0.2/pjlib/bin/pjlib-test-x86_64-unknown-linux-gnu deleted file mode 100755 index c6ed11cacf80b33d2f1413c74947812304dcb047..0000000000000000000000000000000000000000 Binary files a/sflphone-common/libs/pjproject-1.0.2/pjlib/bin/pjlib-test-x86_64-unknown-linux-gnu and /dev/null differ diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-auto.mak b/sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-auto.mak deleted file mode 100644 index 126fe0993bef586c6b993db41f27a391b0682806..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-auto.mak +++ /dev/null @@ -1,35 +0,0 @@ -# pjlib/build/os-auto.mak. Generated from os-auto.mak.in by configure. - -# Determine OS specific files -AC_OS_OBJS=ioqueue_select.o file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o guid_uuid.o - -# -# PJLIB_OBJS specified here are object files to be included in PJLIB -# (the library) for this specific operating system. Object files common -# to all operating systems should go in Makefile instead. -# -export PJLIB_OBJS += $(AC_OS_OBJS) \ - addr_resolv_sock.o \ - log_writer_stdout.o \ - os_timestamp_common.o \ - pool_policy_malloc.o sock_bsd.o sock_select.o - -# -# TEST_OBJS are operating system specific object files to be included in -# the test application. -# -export TEST_OBJS += main.o - -# -# Additional LDFLAGS for pjlib-test -# -export TEST_LDFLAGS += -lm -luuid -lnsl -lrt -lpthread -lasound - -# -# TARGETS are make targets in the Makefile, to be executed for this given -# operating system. -# -export TARGETS = pjlib pjlib-test - - - diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_auto.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_auto.h deleted file mode 100644 index bbdce3ca67bafb8bef5e8186d18d37259be66260..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_auto.h +++ /dev/null @@ -1,61 +0,0 @@ -/* pjlib/include/pj/compat/m_auto.h. Generated by configure. */ -/* $Id: m_auto.h.in 2528 2009-03-23 12:09:19Z bennylp $ */ -/* - * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) - * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -#ifndef __PJ_COMPAT_M_AUTO_H__ -#define __PJ_COMPAT_M_AUTO_H__ - -/** - * @file m_auto.h - * @brief Automatically generated process definition file. - */ - -/* Machine name, filled in by autoconf script */ -#define PJ_M_NAME "x86_64" - -/* Endianness. It's reported on pjsip list on 09/02/13 that autoconf - * endianness detection failed for universal build, so special case - * for it here. Thanks Ruud Klaver for the fix. - */ -#ifdef PJ_DARWINOS -# ifdef __BIG_ENDIAN__ -# define WORDS_BIGENDIAN 1 -# endif -#else - /* Endianness, as detected by autoconf */ -/* # undef WORDS_BIGENDIAN */ -#endif - -#ifdef WORDS_BIGENDIAN -# define PJ_IS_LITTLE_ENDIAN 0 -# define PJ_IS_BIG_ENDIAN 1 -#else -# define PJ_IS_LITTLE_ENDIAN 1 -# define PJ_IS_BIG_ENDIAN 0 -#endif - - -/* Specify if floating point is present/desired */ -#define PJ_HAS_FLOATING_POINT 1 - -/* Deprecated */ -#define PJ_HAS_PENTIUM 0 - -#endif /* __PJ_COMPAT_M_AUTO_H__ */ - diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_auto.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_auto.h deleted file mode 100644 index 1d69febf20ff5dcf5a84f30e1320d1141f721c0f..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_auto.h +++ /dev/null @@ -1,185 +0,0 @@ -/* pjlib/include/pj/compat/os_auto.h. Generated by configure. */ -/* $Id: os_auto.h.in 2394 2008-12-23 17:27:53Z bennylp $ */ -/* - * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) - * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -#ifndef __PJ_COMPAT_OS_AUTO_H__ -#define __PJ_COMPAT_OS_AUTO_H__ - -/** - * @file os_auto.h - * @brief Describes operating system specifics (automatically detected by - * autoconf) - */ - -/* Canonical OS name */ -#define PJ_OS_NAME "x86_64-unknown-linux-gnu" - -/* Legacy macros */ -/* #undef PJ_WIN32 */ -/* #undef PJ_WIN32_WINNT */ -/* #undef WIN32_LEAN_AND_MEAN */ -/* #undef PJ_DARWINOS */ -#define PJ_LINUX 1 -/* #undef PJ_RTEMS */ -/* #undef PJ_SUNOS */ - -#if defined(PJ_WIN32_WINNT) && !defined(_WIN32_WINNT) -# define _WIN32_WINNT PJ_WIN32_WINNT -#endif - -/* Headers availability */ -#define PJ_HAS_ARPA_INET_H 1 -#define PJ_HAS_ASSERT_H 1 -#define PJ_HAS_CTYPE_H 1 -#define PJ_HAS_ERRNO_H 1 -#define PJ_HAS_FCNTL_H 1 -#define PJ_HAS_LINUX_SOCKET_H 1 -#define PJ_HAS_MALLOC_H 1 -#define PJ_HAS_NETDB_H 1 -#define PJ_HAS_NETINET_IN_SYSTM_H 1 -#define PJ_HAS_NETINET_IN_H 1 -#define PJ_HAS_NETINET_IP_H 1 -#define PJ_HAS_NET_IF_H 1 -#define PJ_HAS_IFADDRS_H 1 -#define PJ_HAS_SEMAPHORE_H 1 -#define PJ_HAS_SETJMP_H 1 -#define PJ_HAS_STDARG_H 1 -#define PJ_HAS_STDDEF_H 1 -#define PJ_HAS_STDIO_H 1 -#define PJ_HAS_STDINT_H 1 -#define PJ_HAS_STDLIB_H 1 -#define PJ_HAS_STRING_H 1 -#define PJ_HAS_SYS_IOCTL_H 1 -#define PJ_HAS_SYS_SELECT_H 1 -#define PJ_HAS_SYS_SOCKET_H 1 -#define PJ_HAS_SYS_TIME_H 1 -#define PJ_HAS_SYS_TIMEB_H 1 -#define PJ_HAS_SYS_TYPES_H 1 -#define PJ_HAS_TIME_H 1 -#define PJ_HAS_UNISTD_H 1 - -/* #undef PJ_HAS_MSWSOCK_H */ -/* #undef PJ_HAS_WINSOCK_H */ -/* #undef PJ_HAS_WINSOCK2_H */ -/* #undef PJ_HAS_WS2TCPIP_H */ - -#define PJ_SOCK_HAS_INET_ATON 1 -#define PJ_SOCK_HAS_INET_PTON 1 -#define PJ_SOCK_HAS_INET_NTOP 1 -#define PJ_SOCK_HAS_GETADDRINFO 1 - -/* On these OSes, semaphore feature depends on semaphore.h */ -#if defined(PJ_HAS_SEMAPHORE_H) && PJ_HAS_SEMAPHORE_H!=0 -# define PJ_HAS_SEMAPHORE 1 -#elif defined(PJ_WIN32) && PJ_WIN32!=0 -# define PJ_HAS_SEMAPHORE 1 -#else -# define PJ_HAS_SEMAPHORE 0 -#endif - -/* Do we have pthread_mutexattr_settype()? */ -/* #undef PJ_HAS_PTHREAD_MUTEXATTR_SETTYPE */ - -/* Does pthread_mutexattr_t has "recursive" member? */ -/* #undef PJ_PTHREAD_MUTEXATTR_T_HAS_RECURSIVE */ - -/* Set 1 if native sockaddr_in has sin_len member. - * Default: 0 - */ -/* #undef PJ_SOCKADDR_HAS_LEN */ - -/* Does the OS have socklen_t? */ -#define PJ_HAS_SOCKLEN_T 1 - -#if !defined(socklen_t) && (!defined(PJ_HAS_SOCKLEN_T) || PJ_HAS_SOCKLEN_T==0) -# define PJ_HAS_SOCKLEN_T 1 - typedef int socklen_t; -#endif - -/** - * If this macro is set, it tells select I/O Queue that select() needs to - * be given correct value of nfds (i.e. largest fd + 1). This requires - * select ioqueue to re-scan the descriptors on each registration and - * unregistration. - * If this macro is not set, then ioqueue will always give FD_SETSIZE for - * nfds argument when calling select(). - * - * Default: 0 - */ -#define PJ_SELECT_NEEDS_NFDS 0 - -/* Is errno a good way to retrieve OS errors? - */ -#define PJ_HAS_ERRNO_VAR 1 - -/* When this macro is set, getsockopt(SOL_SOCKET, SO_ERROR) will return - * the status of non-blocking connect() operation. - */ -#define PJ_HAS_SO_ERROR 1 - -/* This value specifies the value set in errno by the OS when a non-blocking - * socket recv() can not return immediate daata. - */ -#define PJ_BLOCKING_ERROR_VAL EAGAIN - -/* This value specifies the value set in errno by the OS when a non-blocking - * socket connect() can not get connected immediately. - */ -#define PJ_BLOCKING_CONNECT_ERROR_VAL EINPROGRESS - -/* Default threading is enabled, unless it's overridden. */ -#ifndef PJ_HAS_THREADS -# define PJ_HAS_THREADS (1) -#endif - -/* Do we need high resolution timer? */ -#define PJ_HAS_HIGH_RES_TIMER 1 - -/* Is malloc() available? */ -#define PJ_HAS_MALLOC 1 - -#ifndef PJ_OS_HAS_CHECK_STACK -# define PJ_OS_HAS_CHECK_STACK 0 -#endif - -/* Unicode? */ -#define PJ_NATIVE_STRING_IS_UNICODE 0 - -/* Pool alignment in bytes */ -#define PJ_POOL_ALIGNMENT 8 - -/* The type of atomic variable value: */ -#define PJ_ATOMIC_VALUE_TYPE long - -/* If 1, use Read/Write mutex emulation for platforms that don't support it */ -#define PJ_EMULATE_RWMUTEX 0 - -/* If 1, pj_thread_create() should enforce the stack size when creating - * threads. - * Default: 0 (let OS decide the thread's stack size). - */ -#define PJ_THREAD_SET_STACK_SIZE 0 - -/* If 1, pj_thread_create() should allocate stack from the pool supplied. - * Default: 0 (let OS allocate memory for thread's stack). - */ -#define PJ_THREAD_ALLOCATE_STACK 0 - -#endif /* __PJ_COMPAT_OS_AUTO_H__ */ - diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/config_site.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/config_site.h deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_time_win32.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_time_win32.c deleted file mode 100644 index 5b9af57ebccad704e4c1bdcda9d973de4ef724b4..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_time_win32.c +++ /dev/null @@ -1,138 +0,0 @@ -/* $Id: os_time_win32.c 2394 2008-12-23 17:27:53Z bennylp $ */ -/* - * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) - * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -#include <pj/os.h> -#include <pj/string.h> -#include <windows.h> - -/////////////////////////////////////////////////////////////////////////////// - -#define SECS_TO_FT_MULT 10000000 - -static LARGE_INTEGER base_time; - -// Find 1st Jan 1970 as a FILETIME -static void get_base_time(void) -{ - SYSTEMTIME st; - FILETIME ft; - - memset(&st,0,sizeof(st)); - st.wYear=1970; - st.wMonth=1; - st.wDay=1; - SystemTimeToFileTime(&st, &ft); - - base_time.LowPart = ft.dwLowDateTime; - base_time.HighPart = ft.dwHighDateTime; - base_time.QuadPart /= SECS_TO_FT_MULT; -} - -PJ_DEF(pj_status_t) pj_gettimeofday(pj_time_val *tv) -{ - SYSTEMTIME st; - FILETIME ft; - LARGE_INTEGER li; - - if (base_time.QuadPart == 0) - get_base_time(); - - GetLocalTime(&st); - SystemTimeToFileTime(&st, &ft); - - li.LowPart = ft.dwLowDateTime; - li.HighPart = ft.dwHighDateTime; - li.QuadPart /= SECS_TO_FT_MULT; - li.QuadPart -= base_time.QuadPart; - - tv->sec = li.LowPart; - tv->msec = st.wMilliseconds; - - return PJ_SUCCESS; -} - -PJ_DEF(pj_status_t) pj_time_decode(const pj_time_val *tv, pj_parsed_time *pt) -{ - LARGE_INTEGER li; - FILETIME ft; - SYSTEMTIME st; - - li.QuadPart = tv->sec; - li.QuadPart += base_time.QuadPart; - li.QuadPart *= SECS_TO_FT_MULT; - - ft.dwLowDateTime = li.LowPart; - ft.dwHighDateTime = li.HighPart; - FileTimeToSystemTime(&ft, &st); - - pt->year = st.wYear; - pt->mon = st.wMonth-1; - pt->day = st.wDay; - pt->wday = st.wDayOfWeek; - - pt->hour = st.wHour; - pt->min = st.wMinute; - pt->sec = st.wSecond; - pt->msec = tv->msec; - - return PJ_SUCCESS; -} - -/** - * Encode parsed time to time value. - */ -PJ_DEF(pj_status_t) pj_time_encode(const pj_parsed_time *pt, pj_time_val *tv) -{ - SYSTEMTIME st; - FILETIME ft; - LARGE_INTEGER li; - - pj_bzero(&st, sizeof(st)); - st.wYear = (pj_uint16_t) pt->year; - st.wMonth = (pj_uint16_t) (pt->mon + 1); - st.wDay = (pj_uint16_t) pt->day; - st.wHour = (pj_uint16_t) pt->hour; - st.wMinute = (pj_uint16_t) pt->min; - st.wSecond = (pj_uint16_t) pt->sec; - st.wMilliseconds = (pj_uint16_t) pt->msec; - - SystemTimeToFileTime(&st, &ft); - - li.LowPart = ft.dwLowDateTime; - li.HighPart = ft.dwHighDateTime; - li.QuadPart /= SECS_TO_FT_MULT; - li.QuadPart -= base_time.QuadPart; - - tv->sec = li.LowPart; - tv->msec = st.wMilliseconds; - - return PJ_SUCCESS; -} - -/** - * Convert local time to GMT. - */ -PJ_DEF(pj_status_t) pj_time_local_to_gmt(pj_time_val *tv); - -/** - * Convert GMT to local time. - */ -PJ_DEF(pj_status_t) pj_time_gmt_to_local(pj_time_val *tv); - - diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/bin/pjmedia-test-x86_64-unknown-linux-gnu b/sflphone-common/libs/pjproject-1.0.2/pjmedia/bin/pjmedia-test-x86_64-unknown-linux-gnu deleted file mode 100755 index e79b87acc0657fe03f984fa890304b3d4ef82de7..0000000000000000000000000000000000000000 Binary files a/sflphone-common/libs/pjproject-1.0.2/pjmedia/bin/pjmedia-test-x86_64-unknown-linux-gnu and /dev/null differ diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/Jbtest.dat b/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/Jbtest.dat deleted file mode 100644 index 7646b6f597305c3e2e252b930c4ad3f458dc16b8..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/Jbtest.dat +++ /dev/null @@ -1,62 +0,0 @@ -# -############################################################################### -# This test demonstrates situation where there is no jitter. -# Jitter should go the minimum configured value. -############################################################################### -# -#PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG - -# -############################################################################### -# This test demonstrates situation where there is no jitter, but with -# addition of silence compression. The jitter value should also go -# to the minimum. -############################################################################### -# -#PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG /* Start silence */ GGGGGGGGGGGGGGGGGGGGG /* End silence */ PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG - -# -############################################################################### -# This test demonstrates situation where there's about one-three packets jitter -# in the network, without packet lost. -############################################################################### -# -#PGPGPPGGPPGGPPGGGGPG PGPGPPGGPPPGGPPGGGPG PGPGPPGGPPPGGPPGGGPG PGPGPPGGPPGGPPPGGGPG PGPGPPGGPPGGPPPGGGPG - -# -############################################################################### -# Two gets two puts, no jitter -############################################################################### -# -#PPGGPPGGPPGGPPGGPPGG PPGGPPGGPPGGPPGGPPGG PPGGPPGGPPGGPPGGPPGG PPGGPPGGPPGGPPGGPPGG PPGGPPGGPPGGPPGGPPGG - -# -############################################################################### -# Three gets three puts, no packet lost -############################################################################### -# -#PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG - - -# -############################################################################### -# Three gets three puts, with packet lost -############################################################################### -# -#PPPGGGPPPGGGPPPGGGPGPG /* Lost */ GGGGGGGGGG PPPGGGPPPGGGPPPGGGPGPG /* Lost */ GGGGGGGGGG PPPGGGPPPGGGPPPGGGPGPG /* Lost */ GGGGGGGGGG PPPGGGPPPGGGPPPGGGPGPG /* Lost */ GGGGGGGGGG PPPGGGPPPGGGPPPGGGPGPG /* Lost */ GGGGGGGGGG PPPGGGPPPGGGPPPGGGPGPG /* Lost */ GGGGGGGGGG PPPGGGPPPGGGPPPGGGPGPG /* Lost */ GGGGGGGGGG PPPGGGPPPGGGPPPGGGPGPG /* Lost */ GGGGGGGGGG PPPGGGPPPGGGPPPGGGPGPG /* Lost */ GGGGGGGGGG PPPGGGPPPGGGPPPGGGPGPG /* Lost */ GGGGGGGGGG PPPGGGPPPGGGPPPGGGPGPG - - -# -############################################################################### -# Three gets three puts, then stable -############################################################################### -# -PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG - -# -############################################################################### -# Some jitter -############################################################################### -# -#PGPGPGPGPG /*Some frames missing here*/ GG /*Some frames arrive*/ PPPG /*Normal*/ PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG - diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-auto.mak b/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-auto.mak deleted file mode 100644 index 88526c7557229514b8c39702af29d1293afeb01f..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-auto.mak +++ /dev/null @@ -1,109 +0,0 @@ -# pjmedia/build/os-auto.mak. Generated from os-auto.mak.in by configure. - -# PJMEDIA features exclusion -export CFLAGS += - -# Define the desired sound device backend -# Valid values are: -# - pa_unix: PortAudio on Unix (OSS or ALSA) -# - pa_darwinos: PortAudio on MacOSX (CoreAudio) -# - pa_old_darwinos: PortAudio on MacOSX (old CoreAudio, for OSX 10.2) -# - pa_win32: PortAudio on Win32 (WMME) -# - ds: Win32 DirectSound (dsound.c) -# - null: Null sound device (nullsound.c) -# - external: Link with no sounddev (app will provide) -AC_PJMEDIA_SND=pa_unix - -# For Unix, specify if ALSA should be supported -AC_PA_USE_ALSA=1 - -# Additional PortAudio CFLAGS are in -DHAVE_SYS_SOUNDCARD_H -DHAVE_LINUX_SOUNDCARD_H -DPA_LITTLE_ENDIAN - -# -# Codecs -# -AC_NO_G711_CODEC= -AC_NO_L16_CODEC= -AC_NO_GSM_CODEC= -AC_NO_SPEEX_CODEC= -AC_NO_ILBC_CODEC= -AC_NO_G722_CODEC= - -export CODEC_OBJS= - -ifeq ($(AC_NO_G711_CODEC),1) -export CFLAGS += -DPJMEDIA_HAS_G711_CODEC=0 -else -export CODEC_OBJS += -endif - -ifeq ($(AC_NO_L16_CODEC),1) -export CFLAGS += -DPJMEDIA_HAS_L16_CODEC=0 -else -export CODEC_OBJS += l16.o -endif - -ifeq ($(AC_NO_GSM_CODEC),1) -export CFLAGS += -DPJMEDIA_HAS_GSM_CODEC=0 -else -export CODEC_OBJS += gsm.o -endif - -ifeq ($(AC_NO_SPEEX_CODEC),1) -export CFLAGS += -DPJMEDIA_HAS_SPEEX_CODEC=0 -else -export CFLAGS += -I$(THIRD_PARTY)/build/speex -I$(THIRD_PARTY)/speex/include -export CODEC_OBJS += speex_codec.o - -ifneq (,1) -export PJMEDIA_OBJS += echo_speex.o -endif - -endif - -ifeq ($(AC_NO_ILBC_CODEC),1) -export CFLAGS += -DPJMEDIA_HAS_ILBC_CODEC=0 -else -export CODEC_OBJS += ilbc.o -endif - -ifeq ($(AC_NO_G722_CODEC),1) -export CFLAGS += -DPJMEDIA_HAS_G722_CODEC=0 -else -export CODEC_OBJS += g722.o g722/g722_enc.o g722/g722_dec.o -endif - - -# -# PortAudio -# -ifneq ($(findstring pa,$(AC_PJMEDIA_SND)),) -export CFLAGS += -I$(THIRD_PARTY)/build/portaudio -I$(THIRD_PARTY)/portaudio/include -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_PORTAUDIO_SOUND -export SOUND_OBJS = pasound.o -endif - -# -# Win32 DirectSound -# -ifeq ($(AC_PJMEDIA_SND),ds) -export SOUND_OBJS = dsound.o -export CFLAGS += -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_WIN32_DIRECT_SOUND -endif - -# -# Null sound device -# -ifeq ($(AC_PJMEDIA_SND),null) -export SOUND_OBJS = nullsound.o -export CFLAGS += -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_NULL_SOUND -endif - -# -# External sound device -# -ifeq ($(AC_PJMEDIA_SND),external) -export SOUND_OBJS = -export CFLAGS += -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_EXTERNAL -endif - - diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/config_auto.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/config_auto.h deleted file mode 100644 index dce3d656a99f8fd0a857e40f4781068de96d3338..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/config_auto.h +++ /dev/null @@ -1,67 +0,0 @@ -/* pjmedia/include/pjmedia-codec/config_auto.h. Generated by configure. */ -/* $Id: config_auto.h.in 2394 2008-12-23 17:27:53Z bennylp $ */ -/* - * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) - * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -#ifndef __PJMEDIA_CODEC_CONFIG_AUTO_H_ -#define __PJMEDIA_CODEC_CONFIG_AUTO_H_ - -/** - * @file config_auto.h - * @brief PJMEDIA-CODEC configuration as set by autoconf script - */ - -/* - * Note: - * The configuration in config_site.h overrides any other settings, - * including the setting as detected by autoconf. - */ - -/* L16 codec */ -#ifndef PJMEDIA_HAS_L16_CODEC -/* #undef PJMEDIA_HAS_L16_CODEC */ -#endif - - -/* GSM codec */ -#ifndef PJMEDIA_HAS_GSM_CODEC -/* #undef PJMEDIA_HAS_GSM_CODEC */ -#endif - - -/* Speex codec */ -#ifndef PJMEDIA_HAS_SPEEX_CODEC -/* #undef PJMEDIA_HAS_SPEEX_CODEC */ -#endif - - -/* iLBC codec */ -#ifndef PJMEDIA_HAS_ILBC_CODEC -/* #undef PJMEDIA_HAS_ILBC_CODEC */ -#endif - - -/* G722 codec */ -#ifndef PJMEDIA_HAS_G722_CODEC -/* #undef PJMEDIA_HAS_G722_CODEC */ -#endif - - -#endif /* __PJMEDIA_CODEC_CONFIG_AUTO_H_ */ - - diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/config_auto.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/config_auto.h deleted file mode 100644 index e88f6b957d5632144858e0b6f1f5b2bda0f09cf3..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/config_auto.h +++ /dev/null @@ -1,44 +0,0 @@ -/* pjmedia/include/pjmedia/config_auto.h. Generated by configure. */ -/* $Id: config_auto.h.in 2394 2008-12-23 17:27:53Z bennylp $ */ -/* - * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) - * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -#ifndef __PJMEDIA_CONFIG_AUTO_H_ -#define __PJMEDIA_CONFIG_AUTO_H_ - -/** - * @file config_auto.h - * @brief PJMEDIA configuration as set by autoconf script - */ - -/* - * Note: - * The configuration in config_site.h overrides any other settings, - * including the setting as detected by autoconf. - */ - -/* G711 codec */ -#ifndef PJMEDIA_HAS_G711_CODEC -/* #undef PJMEDIA_HAS_G711_CODEC */ -#endif - - -#endif /* __PJMEDIA_CONFIG_AUTO_H_ */ - - - diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/jbuf.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/jbuf.c deleted file mode 100644 index 75c3e11e7dbc5fbed8168be1bb25488dea727ffd..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/jbuf.c +++ /dev/null @@ -1,673 +0,0 @@ -/* $Id: jbuf.c 2549 2009-03-23 13:30:26Z nanang $ */ -/* - * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) - * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -/* - * Based on implementation kindly contributed by Switchlab, Ltd. - */ -#include <pjmedia/jbuf.h> -#include <pjmedia/errno.h> -#include <pj/pool.h> -#include <pj/assert.h> -#include <pj/log.h> -#include <pj/math.h> -#include <pj/string.h> - - -#define THIS_FILE "jbuf.c" - -#define SAFE_SHRINKING_DIFF 1 -#define MIN_SHRINK_GAP_MSEC 200 - -typedef struct jb_framelist_t -{ - char *flist_buffer; - int *flist_frame_type; - pj_size_t *flist_content_len; - pj_uint32_t *flist_bit_info; - unsigned flist_frame_size; - unsigned flist_max_count; - unsigned flist_empty; - unsigned flist_head; - unsigned flist_tail; - unsigned flist_origin; -} jb_framelist_t; - - -struct pjmedia_jbuf -{ - pj_str_t name; // jitter buffer name - jb_framelist_t jb_framelist; - pj_size_t jb_frame_size; // frame size - unsigned jb_frame_ptime; // frame duration. - pj_size_t jb_max_count; // max frames in the jitter framelist->flist_buffer - - int jb_level; // delay between source & destination - // (calculated according of the number of get/put operations) - int jb_max_hist_level; // max level during the last level calculations - int jb_stable_hist; // num of times the delay has been lower then the prefetch num - int jb_last_op; // last operation executed on the framelist->flist_buffer (put/get) - int jb_last_seq_no; // seq no. of the last frame inserted to the framelist->flist_buffer - int jb_prefetch; // no. of frame to insert before removing some - // (at the beginning of the framelist->flist_buffer operation) - int jb_prefetch_cnt; // prefetch counter - int jb_def_prefetch; // Default prefetch - int jb_min_prefetch; // Minimum allowable prefetch - int jb_max_prefetch; // Maximum allowable prefetch - int jb_status; // status is 'init' until the first 'put' operation - pj_math_stat jb_delay; // Delay statistics of jitter buffer (in frame unit) - - unsigned jb_last_del_seq; // Seq # of last frame deleted - unsigned jb_min_shrink_gap; // How often can we shrink -}; - - -#define JB_STATUS_INITIALIZING 0 -#define JB_STATUS_PROCESSING 1 -#define JB_STATUS_PREFETCHING 2 - -/* Enabling this would log the jitter buffer state about once per - * second. - */ -#if 1 -# define TRACE__(args) PJ_LOG(5,args) -#else -# define TRACE__(args) -#endif - - -static pj_status_t jb_framelist_init( pj_pool_t *pool, - jb_framelist_t *framelist, - unsigned frame_size, - unsigned max_count) -{ - PJ_ASSERT_RETURN(pool && framelist, PJ_EINVAL); - - pj_bzero(framelist, sizeof(jb_framelist_t)); - - framelist->flist_frame_size = frame_size; - framelist->flist_max_count = max_count; - framelist->flist_buffer = (char*) - pj_pool_zalloc(pool, - framelist->flist_frame_size * - framelist->flist_max_count); - - framelist->flist_frame_type = (int*) - pj_pool_zalloc(pool, sizeof(framelist->flist_frame_type[0]) * - framelist->flist_max_count); - - framelist->flist_content_len = (pj_size_t*) - pj_pool_zalloc(pool, sizeof(framelist->flist_content_len[0]) * - framelist->flist_max_count); - - framelist->flist_bit_info = (pj_uint32_t*) - pj_pool_zalloc(pool, sizeof(framelist->flist_bit_info[0]) * - framelist->flist_max_count); - - framelist->flist_empty = 1; - - return PJ_SUCCESS; - -} - -static pj_status_t jb_framelist_destroy(jb_framelist_t *framelist) -{ - PJ_UNUSED_ARG(framelist); - return PJ_SUCCESS; -} - - -static unsigned jb_framelist_size(jb_framelist_t *framelist) -{ - if (framelist->flist_tail == framelist->flist_head) { - return framelist->flist_empty ? 0 : framelist->flist_max_count; - } else { - return (framelist->flist_tail - framelist->flist_head + - framelist->flist_max_count) % framelist->flist_max_count; - } -} - - -static pj_bool_t jb_framelist_get(jb_framelist_t *framelist, - void *frame, pj_size_t *size, - pjmedia_jb_frame_type *p_type, - pj_uint32_t *bit_info) -{ - if (!framelist->flist_empty) { - pj_memcpy(frame, - framelist->flist_buffer + - framelist->flist_head * framelist->flist_frame_size, - framelist->flist_frame_size); - *p_type = (pjmedia_jb_frame_type) - framelist->flist_frame_type[framelist->flist_head]; - if (size) - *size = framelist->flist_content_len[framelist->flist_head]; - if (bit_info) - *bit_info = framelist->flist_bit_info[framelist->flist_head]; - - pj_bzero(framelist->flist_buffer + - framelist->flist_head * framelist->flist_frame_size, - framelist->flist_frame_size); - framelist->flist_frame_type[framelist->flist_head] = - PJMEDIA_JB_MISSING_FRAME; - framelist->flist_content_len[framelist->flist_head] = 0; - - framelist->flist_origin++; - framelist->flist_head = (framelist->flist_head + 1 ) % - framelist->flist_max_count; - if (framelist->flist_head == framelist->flist_tail) - framelist->flist_empty = PJ_TRUE; - - return PJ_TRUE; - - } else { - pj_bzero(frame, framelist->flist_frame_size); - return PJ_FALSE; - } -} - - -static void jb_framelist_remove_head( jb_framelist_t *framelist, - unsigned count) -{ - unsigned cur_size; - - cur_size = jb_framelist_size(framelist); - if (count > cur_size) - count = cur_size; - - if (count) { - // may be done in two steps if overlapping - unsigned step1,step2; - unsigned tmp = framelist->flist_head+count; - - if (tmp > framelist->flist_max_count) { - step1 = framelist->flist_max_count - framelist->flist_head; - step2 = count-step1; - } else { - step1 = count; - step2 = 0; - } - - pj_bzero(framelist->flist_buffer + - framelist->flist_head * framelist->flist_frame_size, - step1*framelist->flist_frame_size); - pj_memset(framelist->flist_frame_type+framelist->flist_head, - PJMEDIA_JB_MISSING_FRAME, - step1*sizeof(framelist->flist_frame_type[0])); - pj_bzero(framelist->flist_content_len+framelist->flist_head, - step1*sizeof(framelist->flist_content_len[0])); - - if (step2) { - pj_bzero( framelist->flist_buffer, - step2*framelist->flist_frame_size); - pj_memset(framelist->flist_frame_type, - PJMEDIA_JB_MISSING_FRAME, - step2*sizeof(framelist->flist_frame_type[0])); - pj_bzero (framelist->flist_content_len, - step2*sizeof(framelist->flist_content_len[0])); - } - - // update pointers - framelist->flist_origin += count; - framelist->flist_head = (framelist->flist_head + count) % - framelist->flist_max_count; - if (framelist->flist_head == framelist->flist_tail) - framelist->flist_empty = PJ_TRUE; - } -} - - -static pj_bool_t jb_framelist_put_at(jb_framelist_t *framelist, - unsigned index, - const void *frame, - unsigned frame_size, - pj_uint32_t bit_info) -{ - unsigned where; - - assert(frame_size <= framelist->flist_frame_size); - - if (!framelist->flist_empty) { - unsigned max_index; - unsigned cur_size; - - // too late - if (index < framelist->flist_origin) - return PJ_FALSE; - - // too soon - max_index = framelist->flist_origin + framelist->flist_max_count - 1; - if (index > max_index) - return PJ_FALSE; - - where = (index - framelist->flist_origin + framelist->flist_head) % - framelist->flist_max_count; - - // update framelist->flist_tail pointer - cur_size = jb_framelist_size(framelist); - if (index >= framelist->flist_origin + cur_size) { - unsigned diff = (index - (framelist->flist_origin + cur_size)); - framelist->flist_tail = (framelist->flist_tail + diff + 1) % - framelist->flist_max_count; - } - } else { - // check if frame is not too late, but watch out for sequence restart. - if (index < framelist->flist_origin && - framelist->flist_origin - index < 0x7FFF) - { - return PJ_FALSE; - } - - where = framelist->flist_tail; - framelist->flist_origin = index; - framelist->flist_tail = (framelist->flist_tail + 1) % - framelist->flist_max_count; - framelist->flist_empty = PJ_FALSE; - } - - pj_memcpy(framelist->flist_buffer + where * framelist->flist_frame_size, - frame, frame_size); - - framelist->flist_frame_type[where] = PJMEDIA_JB_NORMAL_FRAME; - framelist->flist_content_len[where] = frame_size; - framelist->flist_bit_info[where] = bit_info; - - return PJ_TRUE; -} - - - -enum pjmedia_jb_op -{ - JB_OP_INIT = -1, - JB_OP_PUT = 1, - JB_OP_GET = 2 -}; - - -PJ_DEF(pj_status_t) pjmedia_jbuf_create(pj_pool_t *pool, - const pj_str_t *name, - unsigned frame_size, - unsigned ptime, - unsigned max_count, - pjmedia_jbuf **p_jb) -{ - pjmedia_jbuf *jb; - pj_status_t status; - - jb = PJ_POOL_ZALLOC_T(pool, pjmedia_jbuf); - - status = jb_framelist_init(pool, &jb->jb_framelist, frame_size, max_count); - if (status != PJ_SUCCESS) - return status; - - pj_strdup_with_null(pool, &jb->name, name); - jb->jb_frame_size = frame_size; - jb->jb_frame_ptime = ptime; - jb->jb_last_seq_no = -1; - jb->jb_level = 0; - jb->jb_last_op = JB_OP_INIT; - jb->jb_prefetch = PJ_MIN(PJMEDIA_JB_DEFAULT_INIT_DELAY,max_count*4/5); - jb->jb_prefetch_cnt = 0; - jb->jb_min_prefetch = 0; - jb->jb_max_prefetch = max_count*4/5; - jb->jb_stable_hist = 0; - jb->jb_status = JB_STATUS_INITIALIZING; - jb->jb_max_hist_level = 0; - jb->jb_max_count = max_count; - jb->jb_min_shrink_gap= MIN_SHRINK_GAP_MSEC / ptime; - - pj_math_stat_init(&jb->jb_delay); - - *p_jb = jb; - return PJ_SUCCESS; -} - - -/* - * Set the jitter buffer to fixed delay mode. The default behavior - * is to adapt the delay with actual packet delay. - * - */ -PJ_DEF(pj_status_t) pjmedia_jbuf_set_fixed( pjmedia_jbuf *jb, - unsigned prefetch) -{ - PJ_ASSERT_RETURN(jb, PJ_EINVAL); - PJ_ASSERT_RETURN(prefetch <= jb->jb_max_count, PJ_EINVAL); - - jb->jb_min_prefetch = jb->jb_max_prefetch = - jb->jb_prefetch = jb->jb_def_prefetch = prefetch; - - return PJ_SUCCESS; -} - - -/* - * Set the jitter buffer to adaptive mode. - */ -PJ_DEF(pj_status_t) pjmedia_jbuf_set_adaptive( pjmedia_jbuf *jb, - unsigned prefetch, - unsigned min_prefetch, - unsigned max_prefetch) -{ - PJ_ASSERT_RETURN(jb, PJ_EINVAL); - PJ_ASSERT_RETURN(min_prefetch < max_prefetch && - prefetch <= max_prefetch && - max_prefetch <= jb->jb_max_count, - PJ_EINVAL); - - jb->jb_prefetch = jb->jb_def_prefetch = prefetch; - jb->jb_min_prefetch = min_prefetch; - jb->jb_max_prefetch = max_prefetch; - - return PJ_SUCCESS; -} - - -PJ_DEF(pj_status_t) pjmedia_jbuf_reset(pjmedia_jbuf *jb) -{ - jb->jb_last_seq_no = -1; - jb->jb_level = 0; - jb->jb_last_op = JB_OP_INIT; - jb->jb_prefetch_cnt = 0; - jb->jb_stable_hist = 0; - jb->jb_status = JB_STATUS_INITIALIZING; - jb->jb_max_hist_level = 0; - - jb_framelist_remove_head(&jb->jb_framelist, - jb_framelist_size(&jb->jb_framelist)); - - pj_math_stat_init(&jb->jb_delay); - - return PJ_SUCCESS; -} - - -PJ_DEF(pj_status_t) pjmedia_jbuf_destroy(pjmedia_jbuf *jb) -{ - return jb_framelist_destroy(&jb->jb_framelist); -} - - -static void jbuf_calculate_jitter(pjmedia_jbuf *jb) -{ - int diff, cur_size; - - cur_size = jb_framelist_size(&jb->jb_framelist); - - /* Only apply burst-level calculation on PUT operation since if VAD is - * active the burst-level may not be accurate. - */ - if (jb->jb_last_op == JB_OP_PUT) { - - jb->jb_max_hist_level = PJ_MAX(jb->jb_max_hist_level,jb->jb_level); - - /* Level is decreasing */ - if (jb->jb_level < jb->jb_prefetch) { - - enum { STABLE_HISTORY_LIMIT = 100 }; - - jb->jb_stable_hist++; - - /* Only update the prefetch if 'stable' condition is reached - * (not just short time impulse) - */ - if (jb->jb_stable_hist > STABLE_HISTORY_LIMIT) { - - diff = (jb->jb_prefetch - jb->jb_max_hist_level) / 3; - - if (diff < 1) - diff = 1; - - /* Update max_hist_level. */ - jb->jb_max_hist_level = jb->jb_prefetch; - - jb->jb_prefetch -= diff; - if (jb->jb_prefetch < jb->jb_min_prefetch) - jb->jb_prefetch = jb->jb_min_prefetch; - - jb->jb_stable_hist = 0; - - TRACE__((jb->name.ptr,"jb updated(1), prefetch=%d, size=%d", - jb->jb_prefetch, cur_size)); - } - } - - /* Level is increasing */ - else if (jb->jb_level > jb->jb_prefetch) { - - /* Instaneous set prefetch */ - jb->jb_prefetch = PJ_MIN(jb->jb_max_hist_level, - (int)(jb->jb_max_count*4/5)); - if (jb->jb_prefetch > jb->jb_max_prefetch) - jb->jb_prefetch = jb->jb_max_prefetch; - - jb->jb_stable_hist = 0; - // Keep max_hist_level. - //jb->jb_max_hist_level = 0; - - TRACE__((jb->name.ptr,"jb updated(2), prefetch=%d, size=%d", - jb->jb_prefetch, cur_size)); - } - - /* Level is unchanged */ - else { - jb->jb_stable_hist = 0; - } - } - - /* These code is used for shortening the delay in the jitter buffer. */ - // Shrinking based on max_hist_level (recent max level). - //diff = cur_size - jb->jb_prefetch; - diff = cur_size - jb->jb_max_hist_level; - if (diff > SAFE_SHRINKING_DIFF && - jb->jb_framelist.flist_origin-jb->jb_last_del_seq > jb->jb_min_shrink_gap) - { - /* Shrink slowly */ - diff = 1; - - /* Drop frame(s)! */ - jb_framelist_remove_head(&jb->jb_framelist, diff); - jb->jb_last_del_seq = jb->jb_framelist.flist_origin; - - pj_math_stat_update(&jb->jb_delay, cur_size - diff); - - TRACE__((jb->name.ptr, - "JB shrinking %d frame(s), size=%d", diff, - jb_framelist_size(&jb->jb_framelist))); - } else { - pj_math_stat_update(&jb->jb_delay, cur_size); - } - - jb->jb_level = 0; -} - -PJ_INLINE(void) jbuf_update(pjmedia_jbuf *jb, int oper) -{ - if(jb->jb_last_op != oper) { - jbuf_calculate_jitter(jb); - jb->jb_last_op = oper; - } -} - -PJ_DEF(void) pjmedia_jbuf_put_frame( pjmedia_jbuf *jb, - const void *frame, - pj_size_t frame_size, - int frame_seq) -{ - pjmedia_jbuf_put_frame2(jb, frame, frame_size, 0, frame_seq, NULL); -} - -PJ_DEF(void) pjmedia_jbuf_put_frame2(pjmedia_jbuf *jb, - const void *frame, - pj_size_t frame_size, - pj_uint32_t bit_info, - int frame_seq, - pj_bool_t *discarded) -{ - pj_size_t min_frame_size; - int seq_diff; - - if (jb->jb_last_seq_no == -1) { - jb->jb_last_seq_no = frame_seq - 1; - } - - seq_diff = frame_seq - jb->jb_last_seq_no; - jb->jb_last_seq_no = PJ_MAX(jb->jb_last_seq_no, frame_seq); - if (seq_diff > 0) jb->jb_level += seq_diff; - - if(jb->jb_status == JB_STATUS_INITIALIZING) { - jb->jb_status = JB_STATUS_PROCESSING; - jb->jb_level = 0; - } else { - jbuf_update(jb, JB_OP_PUT); - } - - min_frame_size = PJ_MIN(frame_size, jb->jb_frame_size); - if (seq_diff > 0) { - - while (jb_framelist_put_at(&jb->jb_framelist, frame_seq, frame, - min_frame_size, bit_info) == PJ_FALSE) - { - jb_framelist_remove_head(&jb->jb_framelist, - PJ_MAX(jb->jb_max_count/4,1) ); - } - - if (jb->jb_prefetch_cnt < jb->jb_prefetch) { - jb->jb_prefetch_cnt += seq_diff; - - TRACE__((jb->name.ptr, "PUT prefetch_cnt=%d/%d", - jb->jb_prefetch_cnt, jb->jb_prefetch)); - - if (jb->jb_status == JB_STATUS_PREFETCHING && - jb->jb_prefetch_cnt >= jb->jb_prefetch) - { - jb->jb_status = JB_STATUS_PROCESSING; - } - } - - - - if (discarded) - *discarded = PJ_FALSE; - } - else - { - pj_bool_t res; - res = jb_framelist_put_at(&jb->jb_framelist,frame_seq,frame, - min_frame_size, bit_info); - if (discarded) - *discarded = !res; - } -} - -/* - * Get frame from jitter buffer. - */ -PJ_DEF(void) pjmedia_jbuf_get_frame( pjmedia_jbuf *jb, - void *frame, - char *p_frame_type) -{ - pjmedia_jbuf_get_frame2(jb, frame, NULL, p_frame_type, NULL); -} - -/* - * Get frame from jitter buffer. - */ -PJ_DEF(void) pjmedia_jbuf_get_frame2(pjmedia_jbuf *jb, - void *frame, - pj_size_t *size, - char *p_frame_type, - pj_uint32_t *bit_info) -{ - pjmedia_jb_frame_type ftype; - - jb->jb_level++; - - jbuf_update(jb, JB_OP_GET); - - if (jb_framelist_size(&jb->jb_framelist) == 0) { - jb->jb_prefetch_cnt = 0; - if (jb->jb_def_prefetch) - jb->jb_status = JB_STATUS_PREFETCHING; - } - - if (jb->jb_status == JB_STATUS_PREFETCHING && - jb->jb_prefetch_cnt < jb->jb_prefetch) - { - /* Can't return frame because jitter buffer is filling up - * minimum prefetch. - */ - pj_bzero(frame, jb->jb_frame_size); - if (jb_framelist_size(&jb->jb_framelist) == 0) - *p_frame_type = PJMEDIA_JB_ZERO_EMPTY_FRAME; - else - *p_frame_type = PJMEDIA_JB_ZERO_PREFETCH_FRAME; - - if (size) - *size = 0; - - TRACE__((jb->name.ptr, "GET prefetch_cnt=%d/%d", - jb->jb_prefetch_cnt, jb->jb_prefetch)); - return; - } - - /* Retrieve a frame from frame list */ - if (jb_framelist_get(&jb->jb_framelist,frame,size,&ftype,bit_info) == - PJ_FALSE) - { - /* Can't return frame because jitter buffer is empty! */ - pj_bzero(frame, jb->jb_frame_size); - *p_frame_type = PJMEDIA_JB_ZERO_EMPTY_FRAME; - if (size) - *size = 0; - - return; - } - - /* We've successfully retrieved a frame from the frame list, but - * the frame could be a blank frame! - */ - if (ftype == PJMEDIA_JB_NORMAL_FRAME) - *p_frame_type = PJMEDIA_JB_NORMAL_FRAME; - else - *p_frame_type = PJMEDIA_JB_MISSING_FRAME; -} - -/* - * Get jitter buffer state. - */ -PJ_DEF(pj_status_t) pjmedia_jbuf_get_state( pjmedia_jbuf *jb, - pjmedia_jb_state *state ) -{ - PJ_ASSERT_RETURN(jb && state, PJ_EINVAL); - - state->frame_size = jb->jb_frame_size; - state->prefetch = jb->jb_prefetch; - state->min_prefetch = jb->jb_min_prefetch; - state->max_prefetch = jb->jb_max_prefetch; - state->size = jb_framelist_size(&jb->jb_framelist); - state->avg_delay = jb->jb_delay.mean * jb->jb_frame_ptime; - state->min_delay = jb->jb_delay.min * jb->jb_frame_ptime; - state->max_delay = jb->jb_delay.max * jb->jb_frame_ptime; - state->dev_delay = pj_math_stat_get_stddev(&jb->jb_delay) * - jb->jb_frame_ptime; - - return PJ_SUCCESS; -} diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/jbuf_test.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/jbuf_test.c deleted file mode 100644 index c8a5681fdc4ecab99518f8b3e7c8554aea30830f..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/jbuf_test.c +++ /dev/null @@ -1,132 +0,0 @@ -/* $Id$ */ -/* - * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) - * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -#include <stdio.h> -#include <ctype.h> -#include <pj/pool.h> -#include "test.h" - -#define JB_INIT_PREFETCH 0 -#define JB_MIN_PREFETCH 0 -#define JB_MAX_PREFETCH 10 -#define JB_PTIME 20 -#define JB_BUF_SIZE 20 - -#define REPORT -//#define PRINT_COMMENT - -int jbuf_main(void) -{ - pjmedia_jbuf *jb; - FILE *input = fopen("JBTEST.DAT", "rt"); - unsigned seq; - char line[1024 * 10], *p; - pj_pool_t *pool; - pjmedia_jb_state state; - pj_str_t jb_name = {"JBTEST", 6}; - - pj_init(); - pool = pj_pool_create(mem, "JBPOOL", 256*16, 256*16, NULL); - - pjmedia_jbuf_create(pool, &jb_name, 1, JB_PTIME, JB_BUF_SIZE, &jb); - pjmedia_jbuf_set_adaptive(jb, JB_INIT_PREFETCH, JB_MIN_PREFETCH, - JB_MAX_PREFETCH); - - while ((p=fgets(line, sizeof(line), input)) != NULL) { - - while (*p && isspace(*p)) - ++p; - - if (!*p) - continue; - - if (*p == '#') { -#ifdef PRINT_COMMENT - printf("%s", p); -#endif - continue; - } - - pjmedia_jbuf_reset(jb); - seq = 1; - -#ifdef REPORT - pjmedia_jbuf_get_state(jb, &state); - printf("Initial\tsize=%d\tprefetch=%d\tmin.pftch=%d\tmax.pftch=%d\n", - state.size, state.prefetch, state.min_prefetch, state.max_prefetch); -#endif - - while (*p) { - int c; - char frame[1]; - char f_type; - - c = *p++; - if (isspace(c)) - continue; - - if (c == '/') { - putchar('\n'); - - while (*++p && *p != '/') - putchar(*p); - - putchar('\n'); - - if (*++p == 0) - break; - - continue; - } - - switch (toupper(c)) { - case 'G': - pjmedia_jbuf_get_frame(jb, frame, &f_type); - break; - case 'P': - pjmedia_jbuf_put_frame(jb, (void*)frame, 1, seq); - seq++; - break; - case 'L': - seq++; - printf("Lost\n"); - break; - default: - printf("Unknown character '%c'\n", c); - break; - } - -#ifdef REPORT - if (toupper(c) != 'L') { - pjmedia_jbuf_get_state(jb, &state); - printf("seq=%d\t%c\tsize=%d\tprefetch=%d\n", - seq, toupper(c), state.size, state.prefetch); - } -#endif - } - } - - pjmedia_jbuf_destroy(jb); - - if (input != stdin) - fclose(input); - - pj_pool_release(pool); - return 0; -} diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/bin/pjnath-test-x86_64-unknown-linux-gnu b/sflphone-common/libs/pjproject-1.0.2/pjnath/bin/pjnath-test-x86_64-unknown-linux-gnu deleted file mode 100755 index 04211592492fdd6811a6d506b60633266625aabb..0000000000000000000000000000000000000000 Binary files a/sflphone-common/libs/pjproject-1.0.2/pjnath/bin/pjnath-test-x86_64-unknown-linux-gnu and /dev/null differ diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/bin/pjturn-client-x86_64-unknown-linux-gnu b/sflphone-common/libs/pjproject-1.0.2/pjnath/bin/pjturn-client-x86_64-unknown-linux-gnu deleted file mode 100755 index 1069246a783679a577d95a9863aabcb7ccf686af..0000000000000000000000000000000000000000 Binary files a/sflphone-common/libs/pjproject-1.0.2/pjnath/bin/pjturn-client-x86_64-unknown-linux-gnu and /dev/null differ diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/bin/pjturn-srv-x86_64-unknown-linux-gnu b/sflphone-common/libs/pjproject-1.0.2/pjnath/bin/pjturn-srv-x86_64-unknown-linux-gnu deleted file mode 100755 index 0d2af4648b03b5043df35934f540320bff1bd532..0000000000000000000000000000000000000000 Binary files a/sflphone-common/libs/pjproject-1.0.2/pjnath/bin/pjturn-srv-x86_64-unknown-linux-gnu and /dev/null differ diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/bin/pjsua-x86_64-unknown-linux-gnu b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/bin/pjsua-x86_64-unknown-linux-gnu deleted file mode 100755 index 3f1ed10dc8e3c7e2a38ef4bbd8cab83a25d611aa..0000000000000000000000000000000000000000 Binary files a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/bin/pjsua-x86_64-unknown-linux-gnu and /dev/null differ diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/bin/pjsip-test-x86_64-unknown-linux-gnu b/sflphone-common/libs/pjproject-1.0.2/pjsip/bin/pjsip-test-x86_64-unknown-linux-gnu deleted file mode 100755 index 45542bd1c516ee8b685b2f16469808270c040be0..0000000000000000000000000000000000000000 Binary files a/sflphone-common/libs/pjproject-1.0.2/pjsip/bin/pjsip-test-x86_64-unknown-linux-gnu and /dev/null differ diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/os-auto.mak b/sflphone-common/libs/pjproject-1.0.2/pjsip/build/os-auto.mak deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_autoconf.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_autoconf.h deleted file mode 100644 index ff184d20d616b16ad37f2b09f6d43c1ac2b9f35b..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_autoconf.h +++ /dev/null @@ -1,40 +0,0 @@ -/* pjsip/include/pjsip/sip_autoconf.h. Generated by configure. */ -/* $Id: sip_autoconf.h.in 2394 2008-12-23 17:27:53Z bennylp $ */ -/* - * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) - * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -#ifndef __PJSIP_SIP_AUTOCONF_H__ -#define __PJSIP_SIP_AUTOCONF_H__ - -/** - * @file sip_autoconf.h - * @brief Describes operating system specifics (automatically detected by - * autoconf) - */ - -/** - * Enable/disable TLS transport, as configured by autoconf. - * But only do this if user doesn't explicitly configure in pj/config_site.h. - */ -#ifndef PJSIP_HAS_TLS_TRANSPORT -/* #undef PJSIP_HAS_TLS_TRANSPORT */ -#endif - - -#endif /* __PJSIP_SIP_AUTOCONF_H__ */ - diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/os-auto.mak b/sflphone-common/libs/pjproject-1.0.2/third_party/build/os-auto.mak deleted file mode 100644 index 16e37e22b0f30fdb29d2b9a6f62255d41e3bc2d0..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/pjproject-1.0.2/third_party/build/os-auto.mak +++ /dev/null @@ -1,16 +0,0 @@ - -ifneq (,1) -DIRS += gsm -endif - -ifneq (,1) -DIRS += ilbc -endif - -ifneq (,1) -DIRS += speex -endif - -ifneq ($(findstring pa,pa_unix),) -DIRS += portaudio -endif diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/os-auto.mak b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/os-auto.mak deleted file mode 100644 index 79022f6df192d1ccb21fc34000725dd8e694aa22..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/os-auto.mak +++ /dev/null @@ -1,79 +0,0 @@ -# third_party/build/portaudio/os-auto.mak. Generated from os-auto.mak.in by configure. - -# Define the desired sound device backend -# Valid values are: -# - pa_unix: PortAudio on Unix (OSS or ALSA) -# - pa_darwinos: PortAudio on MacOSX (CoreAudio) -# - pa_old_darwinos: PortAudio on MacOSX (old CoreAudio, for OSX 10.2) -# - pa_win32: PortAudio on Win32 (WMME) -# -# There are other values below, but these are handled by PJMEDIA's Makefile -# - ds: Win32 DirectSound (dsound.c) -# - null: Null sound device (nullsound.c) -AC_PJMEDIA_SND=pa_unix - -# For Unix, specify if ALSA should be supported -AC_PA_USE_ALSA=1 - -# For Unix, specify if OSS should be supported -AC_PA_USE_OSS=1 - -# Additional PortAudio CFLAGS are in -DHAVE_SYS_SOUNDCARD_H -DHAVE_LINUX_SOUNDCARD_H -DPA_LITTLE_ENDIAN - - -# -# PortAudio on Unix -# -ifeq ($(AC_PJMEDIA_SND),pa_unix) -# Host APIs and utils -export PORTAUDIO_OBJS += pa_unix_hostapis.o pa_unix_util.o - -# Include ALSA? -ifeq ($(AC_PA_USE_ALSA),1) -export CFLAGS += -DPA_USE_ALSA=1 -export PORTAUDIO_OBJS += pa_linux_alsa.o -endif - -export CFLAGS += -DHAVE_SYS_SOUNDCARD_H -DHAVE_LINUX_SOUNDCARD_H -DPA_LITTLE_ENDIAN -endif - -# Include OSS? -ifeq ($(AC_PA_USE_OSS),1) -export CFLAGS += -DPA_USE_OSS=1 -export PORTAUDIO_OBJS += pa_unix_oss.o -endif - -# -# PortAudio on MacOS X (using current PortAudio) -# -ifeq ($(AC_PJMEDIA_SND),pa_darwinos) -export PORTAUDIO_OBJS +=pa_mac_hostapis.o \ - pa_unix_util.o \ - pa_mac_core.o \ - pa_mac_core_blocking.o \ - pa_mac_core_utilities.o \ - pa_ringbuffer.o -export CFLAGS += -DPA_USE_COREAUDIO=1 -export CFLAGS += -DHAVE_SYS_SOUNDCARD_H -DHAVE_LINUX_SOUNDCARD_H -DPA_LITTLE_ENDIAN -endif - -# -# PortAudio on MacOS X (using old PortAudio, for MacOS X 10.2.x) -# -ifeq ($(AC_PJMEDIA_SND),pa_old_darwinos) -export PORTAUDIO_OBJS +=pa_mac_hostapis.o \ - pa_unix_util.o \ - pa_mac_core_old.o -export CFLAGS += -DPA_USE_COREAUDIO=1 -export CFLAGS += -DHAVE_SYS_SOUNDCARD_H -DHAVE_LINUX_SOUNDCARD_H -DPA_LITTLE_ENDIAN -endif - -# -# -# PortAudio on Win32 (WMME) -# -ifeq ($(AC_PJMEDIA_SND),pa_win32) -export PORTAUDIO_OBJS += pa_win_hostapis.o pa_win_util.o \ - pa_win_wmme.o pa_win_waveformat.o -export CFLAGS += -DPA_NO_ASIO -DPA_NO_DS -endif diff --git a/sflphone-common/libs/pjproject-1.0.2/COPYING b/sflphone-common/libs/pjproject-1.0.3/COPYING similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/COPYING rename to sflphone-common/libs/pjproject-1.0.3/COPYING diff --git a/sflphone-common/libs/pjproject-1.0.2/INSTALL.txt b/sflphone-common/libs/pjproject-1.0.3/INSTALL.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/INSTALL.txt rename to sflphone-common/libs/pjproject-1.0.3/INSTALL.txt diff --git a/sflphone-common/libs/pjproject-1.0.2/Makefile b/sflphone-common/libs/pjproject-1.0.3/Makefile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/Makefile rename to sflphone-common/libs/pjproject-1.0.3/Makefile diff --git a/sflphone-common/libs/pjproject-1.0.2/README-RTEMS b/sflphone-common/libs/pjproject-1.0.3/README-RTEMS similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/README-RTEMS rename to sflphone-common/libs/pjproject-1.0.3/README-RTEMS diff --git a/sflphone-common/libs/pjproject-1.0.2/README.txt b/sflphone-common/libs/pjproject-1.0.3/README.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/README.txt rename to sflphone-common/libs/pjproject-1.0.3/README.txt diff --git a/sflphone-common/libs/pjproject-1.0.2/aconfigure b/sflphone-common/libs/pjproject-1.0.3/aconfigure similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/aconfigure rename to sflphone-common/libs/pjproject-1.0.3/aconfigure diff --git a/sflphone-common/libs/pjproject-1.0.2/aconfigure.ac b/sflphone-common/libs/pjproject-1.0.3/aconfigure.ac similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/aconfigure.ac rename to sflphone-common/libs/pjproject-1.0.3/aconfigure.ac diff --git a/sflphone-common/libs/pjproject-1.0.2/autogen.sh b/sflphone-common/libs/pjproject-1.0.3/autogen.sh similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/autogen.sh rename to sflphone-common/libs/pjproject-1.0.3/autogen.sh diff --git a/sflphone-common/libs/pjproject-1.0.2/build.mak.in b/sflphone-common/libs/pjproject-1.0.3/build.mak.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.mak.in rename to sflphone-common/libs/pjproject-1.0.3/build.mak.in diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/00.bat b/sflphone-common/libs/pjproject-1.0.3/build.symbian/00.bat similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/00.bat rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/00.bat diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/01.bat b/sflphone-common/libs/pjproject-1.0.3/build.symbian/01.bat similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/01.bat rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/01.bat diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/bld.inf b/sflphone-common/libs/pjproject-1.0.3/build.symbian/bld.inf similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/bld.inf rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/bld.inf diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/libgsmcodec.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/libgsmcodec.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/libgsmcodec.mmp rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/libgsmcodec.mmp diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/libspeexcodec.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/libspeexcodec.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/libspeexcodec.mmp rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/libspeexcodec.mmp diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/libsrtp.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/libsrtp.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/libsrtp.mmp rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/libsrtp.mmp diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/makedef.sh b/sflphone-common/libs/pjproject-1.0.3/build.symbian/makedef.sh similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/makedef.sh rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/makedef.sh diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/null_audio.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/null_audio.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/null_audio.mmp rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/null_audio.mmp diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/null_audioU.def b/sflphone-common/libs/pjproject-1.0.3/build.symbian/null_audioU.def similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/null_audioU.def rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/null_audioU.def diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjlib.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjlib.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjlib.mmp rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjlib.mmp diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjlibU.def b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjlibU.def similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjlibU.def rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjlibU.def diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjlib_test.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjlib_test.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjlib_test.mmp rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjlib_test.mmp diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjlib_util.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjlib_util.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjlib_util.mmp rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjlib_util.mmp diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjlib_utilU.def b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjlib_utilU.def similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjlib_utilU.def rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjlib_utilU.def diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjmedia.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjmedia.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjmedia.mmp rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjmedia.mmp diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjmediaU.def b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjmediaU.def similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjmediaU.def rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjmediaU.def diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjnath.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjnath.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjnath.mmp rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjnath.mmp diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjnathU.def b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjnathU.def similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjnathU.def rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjnathU.def diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjproject.cww b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjproject.cww similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjproject.cww rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjproject.cww diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsdp.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsdp.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsdp.mmp rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsdp.mmp diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsdpU.def b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsdpU.def similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsdpU.def rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsdpU.def diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsip.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsip.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsip.mmp rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsip.mmp diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsipU.def b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsipU.def similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsipU.def rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsipU.def diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsip_simple.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsip_simple.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsip_simple.mmp rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsip_simple.mmp diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsip_simpleU.def b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsip_simpleU.def similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsip_simpleU.def rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsip_simpleU.def diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsip_ua.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsip_ua.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsip_ua.mmp rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsip_ua.mmp diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsip_uaU.def b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsip_uaU.def similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsip_uaU.def rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsip_uaU.def diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjstun_client.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjstun_client.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjstun_client.mmp rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjstun_client.mmp diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsua_lib.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsua_lib.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsua_lib.mmp rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsua_lib.mmp diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsua_libU.def b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsua_libU.def similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsua_libU.def rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsua_libU.def diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_audio.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/symbian_audio.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_audio.mmp rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/symbian_audio.mmp diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_audioU.def b/sflphone-common/libs/pjproject-1.0.3/build.symbian/symbian_audioU.def similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_audioU.def rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/symbian_audioU.def diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_audio_aps.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/symbian_audio_aps.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_audio_aps.mmp rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/symbian_audio_aps.mmp diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_ua.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/symbian_ua.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_ua.mmp rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/symbian_ua.mmp diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_ua_udeb.pkg b/sflphone-common/libs/pjproject-1.0.3/build.symbian/symbian_ua_udeb.pkg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_ua_udeb.pkg rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/symbian_ua_udeb.pkg diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_ua_urel.pkg b/sflphone-common/libs/pjproject-1.0.3/build.symbian/symbian_ua_urel.pkg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_ua_urel.pkg rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/symbian_ua_urel.pkg diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/symsndtest.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/symsndtest.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/symsndtest.mmp rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/symsndtest.mmp diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/symsndtest.pkg b/sflphone-common/libs/pjproject-1.0.3/build.symbian/symsndtest.pkg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/symsndtest.pkg rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/symsndtest.pkg diff --git a/sflphone-common/libs/pjproject-1.0.2/build/cc-gcc.mak b/sflphone-common/libs/pjproject-1.0.3/build/cc-gcc.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build/cc-gcc.mak rename to sflphone-common/libs/pjproject-1.0.3/build/cc-gcc.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/build/cc-vc.mak b/sflphone-common/libs/pjproject-1.0.3/build/cc-vc.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build/cc-vc.mak rename to sflphone-common/libs/pjproject-1.0.3/build/cc-vc.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/build/common.mak b/sflphone-common/libs/pjproject-1.0.3/build/common.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build/common.mak rename to sflphone-common/libs/pjproject-1.0.3/build/common.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/build/host-mingw.mak b/sflphone-common/libs/pjproject-1.0.3/build/host-mingw.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build/host-mingw.mak rename to sflphone-common/libs/pjproject-1.0.3/build/host-mingw.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/build/host-unix.mak b/sflphone-common/libs/pjproject-1.0.3/build/host-unix.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build/host-unix.mak rename to sflphone-common/libs/pjproject-1.0.3/build/host-unix.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/build/host-win32.mak b/sflphone-common/libs/pjproject-1.0.3/build/host-win32.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build/host-win32.mak rename to sflphone-common/libs/pjproject-1.0.3/build/host-win32.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/build/m-alpha.mak b/sflphone-common/libs/pjproject-1.0.3/build/m-alpha.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build/m-alpha.mak rename to sflphone-common/libs/pjproject-1.0.3/build/m-alpha.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/build/m-arm.mak b/sflphone-common/libs/pjproject-1.0.3/build/m-arm.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build/m-arm.mak rename to sflphone-common/libs/pjproject-1.0.3/build/m-arm.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/build/m-auto.mak b/sflphone-common/libs/pjproject-1.0.3/build/m-auto.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build/m-auto.mak rename to sflphone-common/libs/pjproject-1.0.3/build/m-auto.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/build/m-i386.mak b/sflphone-common/libs/pjproject-1.0.3/build/m-i386.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build/m-i386.mak rename to sflphone-common/libs/pjproject-1.0.3/build/m-i386.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/build/m-m68k.mak b/sflphone-common/libs/pjproject-1.0.3/build/m-m68k.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build/m-m68k.mak rename to sflphone-common/libs/pjproject-1.0.3/build/m-m68k.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/build/m-mpc860.mak b/sflphone-common/libs/pjproject-1.0.3/build/m-mpc860.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build/m-mpc860.mak rename to sflphone-common/libs/pjproject-1.0.3/build/m-mpc860.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/build/m-powerpc.mak b/sflphone-common/libs/pjproject-1.0.3/build/m-powerpc.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build/m-powerpc.mak rename to sflphone-common/libs/pjproject-1.0.3/build/m-powerpc.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/build/m-sparc.mak b/sflphone-common/libs/pjproject-1.0.3/build/m-sparc.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build/m-sparc.mak rename to sflphone-common/libs/pjproject-1.0.3/build/m-sparc.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/build/m-x86_64.mak b/sflphone-common/libs/pjproject-1.0.3/build/m-x86_64.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build/m-x86_64.mak rename to sflphone-common/libs/pjproject-1.0.3/build/m-x86_64.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/build/os-auto.mak.in b/sflphone-common/libs/pjproject-1.0.3/build/os-auto.mak.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build/os-auto.mak.in rename to sflphone-common/libs/pjproject-1.0.3/build/os-auto.mak.in diff --git a/sflphone-common/libs/pjproject-1.0.2/build/os-darwinos.mak b/sflphone-common/libs/pjproject-1.0.3/build/os-darwinos.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build/os-darwinos.mak rename to sflphone-common/libs/pjproject-1.0.3/build/os-darwinos.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/build/os-linux-kernel.mak b/sflphone-common/libs/pjproject-1.0.3/build/os-linux-kernel.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build/os-linux-kernel.mak rename to sflphone-common/libs/pjproject-1.0.3/build/os-linux-kernel.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/build/os-linux.mak b/sflphone-common/libs/pjproject-1.0.3/build/os-linux.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build/os-linux.mak rename to sflphone-common/libs/pjproject-1.0.3/build/os-linux.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/build/os-palmos.mak b/sflphone-common/libs/pjproject-1.0.3/build/os-palmos.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build/os-palmos.mak rename to sflphone-common/libs/pjproject-1.0.3/build/os-palmos.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/build/os-rtems.mak b/sflphone-common/libs/pjproject-1.0.3/build/os-rtems.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build/os-rtems.mak rename to sflphone-common/libs/pjproject-1.0.3/build/os-rtems.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/build/os-sunos.mak b/sflphone-common/libs/pjproject-1.0.3/build/os-sunos.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build/os-sunos.mak rename to sflphone-common/libs/pjproject-1.0.3/build/os-sunos.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/build/os-win32.mak b/sflphone-common/libs/pjproject-1.0.3/build/os-win32.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build/os-win32.mak rename to sflphone-common/libs/pjproject-1.0.3/build/os-win32.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/build/rules.mak b/sflphone-common/libs/pjproject-1.0.3/build/rules.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/build/rules.mak rename to sflphone-common/libs/pjproject-1.0.3/build/rules.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/c++-build.mak b/sflphone-common/libs/pjproject-1.0.3/c++-build.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/c++-build.mak rename to sflphone-common/libs/pjproject-1.0.3/c++-build.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/configure b/sflphone-common/libs/pjproject-1.0.3/configure similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/configure rename to sflphone-common/libs/pjproject-1.0.3/configure diff --git a/sflphone-common/libs/pjproject-1.0.2/configure-legacy b/sflphone-common/libs/pjproject-1.0.3/configure-legacy similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/configure-legacy rename to sflphone-common/libs/pjproject-1.0.3/configure-legacy diff --git a/sflphone-common/libs/pjproject-1.0.2/configure.ac b/sflphone-common/libs/pjproject-1.0.3/configure.ac similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/configure.ac rename to sflphone-common/libs/pjproject-1.0.3/configure.ac diff --git a/sflphone-common/libs/pjproject-1.0.2/install-sh b/sflphone-common/libs/pjproject-1.0.3/install-sh similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/install-sh rename to sflphone-common/libs/pjproject-1.0.3/install-sh diff --git a/sflphone-common/libs/pjproject-1.0.2/libpj-sfl.pc.in b/sflphone-common/libs/pjproject-1.0.3/libpj-sfl.pc.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/libpj-sfl.pc.in rename to sflphone-common/libs/pjproject-1.0.3/libpj-sfl.pc.in diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/Makefile b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/Makefile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/Makefile rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/Makefile diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/os-auto.mak.in b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/os-auto.mak.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/os-auto.mak.in rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/os-auto.mak.in diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/os-rtems.mak b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/os-rtems.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/os-rtems.mak rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/os-rtems.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/pjlib_util.dsp b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/pjlib_util.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/pjlib_util.dsp rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/pjlib_util.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/pjlib_util.dsw b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/pjlib_util.dsw similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/pjlib_util.dsw rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/pjlib_util.dsw diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/pjlib_util.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/pjlib_util.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/pjlib_util.vcproj rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/pjlib_util.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/pjlib_util_test.dsp b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/pjlib_util_test.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/pjlib_util_test.dsp rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/pjlib_util_test.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/pjlib_util_test.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/pjlib_util_test.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/pjlib_util_test.vcproj rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/pjlib_util_test.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/wince-evc4/pjlib_util_test_wince.vcp b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/wince-evc4/pjlib_util_test_wince.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/wince-evc4/pjlib_util_test_wince.vcp rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/wince-evc4/pjlib_util_test_wince.vcp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/wince-evc4/pjlib_util_wince.vcp b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/wince-evc4/pjlib_util_wince.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/wince-evc4/pjlib_util_wince.vcp rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/wince-evc4/pjlib_util_wince.vcp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/wince-evc4/pjlib_util_wince.vcw b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/wince-evc4/pjlib_util_wince.vcw similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/wince-evc4/pjlib_util_wince.vcw rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/wince-evc4/pjlib_util_wince.vcw diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/docs/doxygen.cfg b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/docs/doxygen.cfg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/docs/doxygen.cfg rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/docs/doxygen.cfg diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/docs/doxygen.css b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/docs/doxygen.css similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/docs/doxygen.css rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/docs/doxygen.css diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/docs/footer.html b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/docs/footer.html similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/docs/footer.html rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/docs/footer.html diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/docs/header.html b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/docs/header.html similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/docs/header.html rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/docs/header.html diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/base64.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/base64.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/base64.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/base64.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/config.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/config.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/config.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/config.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/crc32.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/crc32.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/crc32.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/crc32.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/dns.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/dns.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/dns.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/dns.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/dns_server.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/dns_server.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/dns_server.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/dns_server.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/errno.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/errno.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/errno.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/errno.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/getopt.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/getopt.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/getopt.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/getopt.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/hmac_md5.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/hmac_md5.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/hmac_md5.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/hmac_md5.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/hmac_sha1.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/hmac_sha1.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/hmac_sha1.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/hmac_sha1.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/md5.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/md5.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/md5.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/md5.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/pcap.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/pcap.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/pcap.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/pcap.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/resolver.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/resolver.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/resolver.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/resolver.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/scanner.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/scanner.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/scanner.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/scanner.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/scanner_cis_bitwise.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/scanner_cis_bitwise.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/scanner_cis_bitwise.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/scanner_cis_bitwise.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/scanner_cis_uint.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/scanner_cis_uint.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/scanner_cis_uint.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/scanner_cis_uint.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/sha1.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/sha1.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/sha1.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/sha1.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/srv_resolver.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/srv_resolver.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/srv_resolver.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/srv_resolver.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/string.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/string.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/string.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/string.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/stun_simple.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/stun_simple.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/stun_simple.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/stun_simple.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/types.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/types.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/types.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/types.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/xml.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/xml.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/xml.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/xml.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/encryption.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/encryption.c similarity index 94% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/encryption.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/encryption.c index 50fd1dd296027c71c206a3b5bebde5e2796e5555..9553892f894b5530cf768c8422b5d019f898e367 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/encryption.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/encryption.c @@ -1,4 +1,4 @@ -/* $Id: encryption.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: encryption.c 2809 2009-06-25 12:46:00Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -64,10 +64,13 @@ static void digest_to_hex(const pj_uint8_t digest[PJ_SHA1_DIGEST_SIZE], static int sha1_test1(void) { + enum { MILLION = 1000000 }; int k; pj_sha1_context context; pj_uint8_t digest[20]; char output[80]; + pj_pool_t *pool; + pj_uint8_t *block; PJ_LOG(3, (THIS_FILE, " SHA1 test vector 1 from sha1.c..")); @@ -86,7 +89,7 @@ static int sha1_test1(void) /* million 'a' vector we feed separately */ pj_sha1_init(&context); - for (k = 0; k < 1000000; k++) + for (k = 0; k < MILLION; k++) pj_sha1_update(&context, (pj_uint8_t*)"a", 1); pj_sha1_final(&context, digest); digest_to_hex(digest, output); @@ -95,6 +98,32 @@ static int sha1_test1(void) return -20; } + /* million 'a' test, using block */ + pool = pj_pool_create(mem, "sha1test", 256, 512, NULL); + block = (pj_uint8_t*)pj_pool_alloc(pool, MILLION); + pj_memset(block, 'a', MILLION); + + pj_sha1_init(&context); + pj_sha1_update(&context, block, MILLION); + pj_sha1_final(&context, digest); + digest_to_hex(digest, output); + if (strcmp(output, sha1_test_results[2])) { + pj_pool_release(pool); + PJ_LOG(3, (THIS_FILE, " incorrect hash result for block update!")); + return -21; + } + + /* verify that original buffer was not modified */ + for (k=0; k<MILLION; ++k) { + if (block[k] != 'a') { + pj_pool_release(pool); + PJ_LOG(3, (THIS_FILE, " block was modified!")); + return -22; + } + } + + pj_pool_release(pool); + /* success */ return(0); } diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/main.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/main.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/main.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/main.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/main_rtems.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/main_rtems.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/main_rtems.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/main_rtems.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/main_win32.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/main_win32.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/main_win32.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/main_win32.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/resolver_test.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/resolver_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/resolver_test.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/resolver_test.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/stun.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/stun.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/stun.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/stun.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/test.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/test.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/test.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/test.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/test.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/test.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/test.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/xml.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/xml.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/xml.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/xml.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/base64.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/base64.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/base64.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/base64.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/crc32.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/crc32.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/crc32.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/crc32.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/dns.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/dns.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/dns.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/dns.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/dns_dump.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/dns_dump.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/dns_dump.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/dns_dump.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/dns_server.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/dns_server.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/dns_server.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/dns_server.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/errno.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/errno.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/errno.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/errno.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/getopt.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/getopt.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/getopt.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/getopt.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/hmac_md5.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/hmac_md5.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/hmac_md5.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/hmac_md5.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/hmac_sha1.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/hmac_sha1.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/hmac_sha1.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/hmac_sha1.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/md5.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/md5.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/md5.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/md5.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/pcap.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/pcap.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/pcap.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/pcap.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/resolver.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/resolver.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/resolver.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/resolver.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/scanner.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/scanner.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/scanner.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/scanner.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/scanner_cis_bitwise.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/scanner_cis_bitwise.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/scanner_cis_bitwise.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/scanner_cis_bitwise.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/scanner_cis_uint.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/scanner_cis_uint.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/scanner_cis_uint.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/scanner_cis_uint.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/sha1.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/sha1.c similarity index 96% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/sha1.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/sha1.c index 3cb20f6463f7319fa3ba57ad48abb219e668e6da..a591449b0bc450d11b27a1cbb46224068e96f677 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/sha1.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/sha1.c @@ -1,4 +1,4 @@ -/* $Id: sha1.c 1001 2007-02-25 15:38:32Z bennylp $ */ +/* $Id: sha1.c 2809 2009-06-25 12:46:00Z bennylp $ */ /* * Modified 2/07 * By Benny Prijono <benny@prijono.org> @@ -105,7 +105,7 @@ A million repetitions of "a" #undef SHA1HANDSOFF -static void SHA1_Transform(pj_uint32_t state[5], const pj_uint8_t buffer[64]); +static void SHA1_Transform(pj_uint32_t state[5], pj_uint8_t buffer[64]); #define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits)))) @@ -131,7 +131,7 @@ static void SHA1_Transform(pj_uint32_t state[5], const pj_uint8_t buffer[64]); /* Hash a single 512-bit block. This is the core of the algorithm. */ -static void SHA1_Transform(pj_uint32_t state[5], const pj_uint8_t buffer[64]) +static void SHA1_Transform(pj_uint32_t state[5], pj_uint8_t buffer[64]) { pj_uint32_t a, b, c, d, e; typedef union { @@ -214,8 +214,10 @@ PJ_DEF(void) pj_sha1_update(pj_sha1_context* context, if ((j + len) > 63) { pj_memcpy(&context->buffer[j], data, (i = 64-j)); SHA1_Transform(context->state, context->buffer); - for ( ; i + 63 < len; i += 64) { - SHA1_Transform(context->state, data + i); + for ( ; i + 63 < len; i += 64) { + pj_uint8_t tmp[64]; + pj_memcpy(tmp, data + i, 64); + SHA1_Transform(context->state, tmp); } j = 0; } diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/srv_resolver.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/srv_resolver.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/srv_resolver.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/srv_resolver.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/string.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/string.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/string.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/string.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/stun_simple.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/stun_simple.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/stun_simple.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/stun_simple.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/stun_simple_client.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/stun_simple_client.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/stun_simple_client.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/stun_simple_client.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/symbols.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/symbols.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/symbols.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/symbols.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/xml.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/xml.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/xml.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/xml.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/Makefile b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/Makefile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/Makefile rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/Makefile diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-auto.mak.in b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/os-auto.mak.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-auto.mak.in rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/os-auto.mak.in diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-darwinos.mak b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/os-darwinos.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-darwinos.mak rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/os-darwinos.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-linux-kernel.mak b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/os-linux-kernel.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-linux-kernel.mak rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/os-linux-kernel.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-linux.mak b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/os-linux.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-linux.mak rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/os-linux.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-rtems.mak b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/os-rtems.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-rtems.mak rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/os-rtems.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-sunos.mak b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/os-sunos.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-sunos.mak rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/os-sunos.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-win32.mak b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/os-win32.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-win32.mak rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/os-win32.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib++-test.dsp b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib++-test.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib++-test.dsp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib++-test.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib++.dsp b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib++.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib++.dsp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib++.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib.dsp b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib.dsp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib.dsw b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib.dsw similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib.dsw rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib.dsw diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib.vcproj rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib_samples.dsp b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib_samples.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib_samples.dsp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib_samples.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib_samples.mak b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib_samples.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib_samples.mak rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib_samples.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib_test.dsp b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib_test.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib_test.dsp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib_test.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib_test.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib_test.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib_test.vcproj rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib_test.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/wince-evc4/pjlib_test_wince.vcp b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/wince-evc4/pjlib_test_wince.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/wince-evc4/pjlib_test_wince.vcp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/wince-evc4/pjlib_test_wince.vcp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/wince-evc4/pjlib_wince.vcp b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/wince-evc4/pjlib_wince.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/wince-evc4/pjlib_wince.vcp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/wince-evc4/pjlib_wince.vcp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/wince-evc4/pjlib_wince.vcw b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/wince-evc4/pjlib_wince.vcw similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/wince-evc4/pjlib_wince.vcw rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/wince-evc4/pjlib_wince.vcw diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/docs/doxygen.cfg b/sflphone-common/libs/pjproject-1.0.3/pjlib/docs/doxygen.cfg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/docs/doxygen.cfg rename to sflphone-common/libs/pjproject-1.0.3/pjlib/docs/doxygen.cfg diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/docs/doxygen.css b/sflphone-common/libs/pjproject-1.0.3/pjlib/docs/doxygen.css similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/docs/doxygen.css rename to sflphone-common/libs/pjproject-1.0.3/pjlib/docs/doxygen.css diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/docs/footer.html b/sflphone-common/libs/pjproject-1.0.3/pjlib/docs/footer.html similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/docs/footer.html rename to sflphone-common/libs/pjproject-1.0.3/pjlib/docs/footer.html diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/docs/header.html b/sflphone-common/libs/pjproject-1.0.3/pjlib/docs/header.html similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/docs/header.html rename to sflphone-common/libs/pjproject-1.0.3/pjlib/docs/header.html diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/file.hpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/file.hpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/file.hpp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/file.hpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/hash.hpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/hash.hpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/hash.hpp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/hash.hpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/list.hpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/list.hpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/list.hpp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/list.hpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/lock.hpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/lock.hpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/lock.hpp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/lock.hpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/os.hpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/os.hpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/os.hpp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/os.hpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/pool.hpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/pool.hpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/pool.hpp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/pool.hpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/proactor.hpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/proactor.hpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/proactor.hpp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/proactor.hpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/scanner.hpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/scanner.hpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/scanner.hpp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/scanner.hpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/sock.hpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/sock.hpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/sock.hpp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/sock.hpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/string.hpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/string.hpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/string.hpp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/string.hpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/timer.hpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/timer.hpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/timer.hpp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/timer.hpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/tree.hpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/tree.hpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/tree.hpp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/tree.hpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/types.hpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/types.hpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/types.hpp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/types.hpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/activesock.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/activesock.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/activesock.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/activesock.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/addr_resolv.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/addr_resolv.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/addr_resolv.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/addr_resolv.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/array.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/array.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/array.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/array.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/assert.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/assert.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/assert.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/assert.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/assert.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/assert.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/assert.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/assert.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_armcc.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/cc_armcc.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_armcc.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/cc_armcc.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_codew.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/cc_codew.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_codew.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/cc_codew.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_gcc.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/cc_gcc.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_gcc.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/cc_gcc.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_gcce.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/cc_gcce.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_gcce.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/cc_gcce.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_msvc.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/cc_msvc.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_msvc.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/cc_msvc.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_mwcc.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/cc_mwcc.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_mwcc.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/cc_mwcc.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/ctype.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/ctype.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/ctype.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/ctype.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/errno.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/errno.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/errno.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/errno.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/high_precision.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/high_precision.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/high_precision.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/high_precision.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_alpha.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_alpha.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_alpha.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_alpha.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_armv4.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_armv4.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_armv4.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_armv4.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_auto.h.in b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_auto.h.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_auto.h.in rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_auto.h.in diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_i386.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_i386.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_i386.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_i386.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_m68k.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_m68k.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_m68k.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_m68k.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_powerpc.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_powerpc.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_powerpc.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_powerpc.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_sparc.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_sparc.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_sparc.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_sparc.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_x86_64.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_x86_64.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_x86_64.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_x86_64.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/malloc.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/malloc.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/malloc.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/malloc.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_auto.h.in b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_auto.h.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_auto.h.in rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_auto.h.in diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_darwinos.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_darwinos.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_darwinos.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_darwinos.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_linux.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_linux.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_linux.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_linux.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_linux_kernel.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_linux_kernel.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_linux_kernel.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_linux_kernel.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_palmos.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_palmos.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_palmos.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_palmos.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_rtems.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_rtems.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_rtems.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_rtems.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_sunos.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_sunos.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_sunos.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_sunos.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_symbian.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_symbian.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_symbian.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_symbian.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_win32.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_win32.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_win32.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_win32.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_win32_wince.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_win32_wince.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_win32_wince.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_win32_wince.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/rand.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/rand.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/rand.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/rand.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/setjmp.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/setjmp.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/setjmp.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/setjmp.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/size_t.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/size_t.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/size_t.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/size_t.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/socket.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/socket.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/socket.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/socket.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/stdarg.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/stdarg.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/stdarg.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/stdarg.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/stdfileio.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/stdfileio.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/stdfileio.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/stdfileio.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/string.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/string.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/string.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/string.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/time.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/time.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/time.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/time.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/config.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/config.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/config.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/config.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/config_site_sample.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/config_site_sample.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/config_site_sample.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/config_site_sample.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/ctype.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/ctype.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/ctype.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/ctype.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/doxygen.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/doxygen.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/doxygen.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/doxygen.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/errno.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/errno.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/errno.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/errno.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/except.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/except.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/except.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/except.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/fifobuf.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/fifobuf.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/fifobuf.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/fifobuf.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/file_access.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/file_access.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/file_access.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/file_access.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/file_io.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/file_io.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/file_io.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/file_io.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/guid.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/guid.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/guid.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/guid.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/hash.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/hash.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/hash.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/hash.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/ioqueue.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/ioqueue.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/ioqueue.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/ioqueue.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/ip_helper.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/ip_helper.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/ip_helper.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/ip_helper.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/list.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/list.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/list.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/list.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/list_i.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/list_i.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/list_i.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/list_i.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/lock.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/lock.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/lock.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/lock.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/log.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/log.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/log.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/log.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/math.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/math.h similarity index 96% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/math.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/math.h index 93ba2d997782f5785db0684c12f5d54f054e96f2..9d0209589a19acf025b5f1c7aa2d167703c84f9c 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/math.h +++ b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/math.h @@ -1,4 +1,4 @@ -/* $Id: math.h 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: math.h 2818 2009-06-25 13:27:02Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -140,7 +140,9 @@ PJ_INLINE(void) pj_math_stat_update(pj_math_stat *stat, int val) #if PJ_HAS_FLOATING_POINT delta = val - stat->fmean_; stat->fmean_ += delta/stat->n; - stat->mean = (int) stat->fmean_; + + /* Return mean value with 'rounding' */ + stat->mean = (int) (stat->fmean_ + 0.5); stat->m2_ += (int)(delta * (val-stat->fmean_)); #else diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/os.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/os.h similarity index 99% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/os.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/os.h index 9e221e8ee0959a1aa16b93a7f14431e706167505..b85af2a22e78827098804baf16b9025f8a0ef351 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/os.h +++ b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/os.h @@ -1,4 +1,4 @@ -/* $Id: os.h 2482 2009-03-02 15:50:12Z nanang $ */ +/* $Id: os.h 2805 2009-06-25 12:29:04Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -1267,6 +1267,12 @@ PJ_DECL(pj_time_val) pj_elapsed_time( const pj_timestamp *start, PJ_DECL(pj_uint32_t) pj_elapsed_msec( const pj_timestamp *start, const pj_timestamp *stop ); +/** + * Variant of #pj_elapsed_msec() which returns 64bit value. + */ +PJ_DECL(pj_uint64_t) pj_elapsed_msec64(const pj_timestamp *start, + const pj_timestamp *stop ); + /** * Calculate the elapsed time in 32-bit microseconds. * This function calculates the elapsed time using highest precision diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/pool.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/pool.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/pool.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/pool.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/pool_alt.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/pool_alt.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/pool_alt.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/pool_alt.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/pool_buf.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/pool_buf.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/pool_buf.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/pool_buf.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/pool_i.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/pool_i.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/pool_i.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/pool_i.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/rand.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/rand.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/rand.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/rand.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/rbtree.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/rbtree.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/rbtree.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/rbtree.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/sock.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/sock.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/sock.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/sock.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/sock_select.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/sock_select.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/sock_select.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/sock_select.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/string.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/string.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/string.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/string.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/string_i.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/string_i.h similarity index 98% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/string_i.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/string_i.h index 495a7995735f4a1f3fa69a6d1a52ee1e5bdede71..d99c13bd8b912fce84a0ea78571cd7d71da91c42 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/string_i.h +++ b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/string_i.h @@ -1,4 +1,4 @@ -/* $Id: string_i.h 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: string_i.h 2819 2009-06-25 13:29:52Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -32,6 +32,10 @@ PJ_IDEF(pj_str_t*) pj_strdup(pj_pool_t *pool, pj_str_t *dst, const pj_str_t *src) { + /* Without this, destination will be corrupted */ + if (dst == src) + return dst; + if (src->slen) { dst->ptr = (char*)pj_pool_alloc(pool, src->slen); pj_memcpy(dst->ptr, src->ptr, src->slen); diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/timer.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/timer.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/timer.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/timer.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/types.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/types.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/types.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/types.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/unicode.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/unicode.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/unicode.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/unicode.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pjlib++.hpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pjlib++.hpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pjlib++.hpp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pjlib++.hpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pjlib.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pjlib.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pjlib.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pjlib.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/activesock.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/activesock.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/activesock.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/activesock.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/addr_resolv_linux_kernel.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/addr_resolv_linux_kernel.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/addr_resolv_linux_kernel.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/addr_resolv_linux_kernel.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/addr_resolv_sock.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/addr_resolv_sock.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/addr_resolv_sock.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/addr_resolv_sock.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/addr_resolv_symbian.cpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/addr_resolv_symbian.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/addr_resolv_symbian.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/addr_resolv_symbian.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/array.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/array.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/array.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/array.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/compat/longjmp_i386.S b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/compat/longjmp_i386.S similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/compat/longjmp_i386.S rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/compat/longjmp_i386.S diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/compat/setjmp_i386.S b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/compat/setjmp_i386.S similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/compat/setjmp_i386.S rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/compat/setjmp_i386.S diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/compat/sigjmp.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/compat/sigjmp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/compat/sigjmp.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/compat/sigjmp.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/compat/string.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/compat/string.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/compat/string.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/compat/string.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/compat/string_compat.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/compat/string_compat.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/compat/string_compat.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/compat/string_compat.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/config.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/config.c similarity index 97% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/config.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/config.c index f2beb56635399cfc789ea6a03ca35137c457c5b7..6c8d6df3c56493d874f974829db4c9cc87312408 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/config.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/config.c @@ -1,4 +1,4 @@ -/* $Id: config.c 2551 2009-03-25 12:13:09Z bennylp $ */ +/* $Id: config.c 2828 2009-07-02 14:50:38Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -22,7 +22,7 @@ #include <pj/ioqueue.h> static const char *id = "config.c"; -PJ_DEF_DATA(const char*) PJ_VERSION = "1.0.2"; +PJ_DEF_DATA(const char*) PJ_VERSION = "1.0.3"; /* * Get PJLIB version string. diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ctype.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ctype.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ctype.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ctype.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/errno.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/errno.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/errno.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/errno.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/except.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/except.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/except.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/except.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/exception_symbian.cpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/exception_symbian.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/exception_symbian.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/exception_symbian.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/extra-exports.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/extra-exports.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/extra-exports.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/extra-exports.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/fifobuf.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/fifobuf.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/fifobuf.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/fifobuf.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/file_access_unistd.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/file_access_unistd.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/file_access_unistd.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/file_access_unistd.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/file_access_win32.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/file_access_win32.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/file_access_win32.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/file_access_win32.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/file_io_ansi.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/file_io_ansi.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/file_io_ansi.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/file_io_ansi.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/file_io_win32.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/file_io_win32.c similarity index 93% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/file_io_win32.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/file_io_win32.c index 82269bc3ed6a6e3784256b4de3ca490dfec1f9d8..e5d6d857336d49aaba98d47d77f40d7618bd63af 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/file_io_win32.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/file_io_win32.c @@ -1,4 +1,4 @@ -/* $Id: file_io_win32.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: file_io_win32.c 2807 2009-06-25 12:33:59Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -59,7 +59,15 @@ PJ_DEF(pj_status_t) pj_file_open( pj_pool_t *pool, if ((flags & PJ_O_WRONLY) == PJ_O_WRONLY) { dwDesiredAccess |= GENERIC_WRITE; if ((flags & PJ_O_APPEND) == PJ_O_APPEND) { +#if !defined(PJ_WIN32_WINCE) || !PJ_WIN32_WINCE + /* FILE_APPEND_DATA is invalid on WM2003 and WM5, but it seems + * to be working on WM6. All are tested on emulator though. + * Removing this also seem to work (i.e. data is appended), so + * I guess this flag is "optional". + * See http://trac.pjsip.org/repos/ticket/825 + */ dwDesiredAccess |= FILE_APPEND_DATA; +#endif dwCreationDisposition |= OPEN_ALWAYS; } else { dwDesiredAccess &= ~(FILE_APPEND_DATA); diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/guid.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/guid.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/guid.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/guid.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/guid_simple.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/guid_simple.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/guid_simple.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/guid_simple.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/guid_uuid.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/guid_uuid.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/guid_uuid.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/guid_uuid.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/guid_win32.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/guid_win32.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/guid_win32.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/guid_win32.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/hash.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/hash.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/hash.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/hash.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_common_abs.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_common_abs.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_common_abs.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_common_abs.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_common_abs.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_common_abs.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_common_abs.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_common_abs.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_dummy.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_dummy.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_dummy.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_dummy.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_epoll.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_epoll.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_epoll.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_epoll.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_linux_kernel.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_linux_kernel.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_linux_kernel.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_linux_kernel.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_select.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_select.c similarity index 99% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_select.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_select.c index e6ed8c1de0f5e45bab5e7cbfc5fa7db32e31fc2a..e64037ceac2f9b130771f67f6631c3b1d7de0f7f 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_select.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_select.c @@ -1,4 +1,4 @@ -/* $Id: ioqueue_select.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: ioqueue_select.c 2806 2009-06-25 12:31:52Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -727,7 +727,8 @@ PJ_DEF(int) pj_ioqueue_poll( pj_ioqueue_t *ioqueue, const pj_time_val *timeout) /* Scan for readable socket. */ if ((key_has_pending_read(h) || key_has_pending_accept(h)) - && PJ_FD_ISSET(h->fd, &rfdset) && !IS_CLOSING(h)) + && PJ_FD_ISSET(h->fd, &rfdset) && !IS_CLOSING(h) && + counter<count) { #if PJ_IOQUEUE_HAS_SAFE_UNREG increment_counter(h); @@ -739,7 +740,7 @@ PJ_DEF(int) pj_ioqueue_poll( pj_ioqueue_t *ioqueue, const pj_time_val *timeout) #if PJ_HAS_TCP if (key_has_pending_connect(h) && PJ_FD_ISSET(h->fd, &xfdset) && - !IS_CLOSING(h)) + !IS_CLOSING(h) && counter<count) { #if PJ_IOQUEUE_HAS_SAFE_UNREG increment_counter(h); diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_symbian.cpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_symbian.cpp similarity index 97% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_symbian.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_symbian.cpp index ceb23e258d9f2dd286ea5fcc918fddedd838c06c..0c2836a664f0057392c452d25c3f93889c8894a1 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_symbian.cpp +++ b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_symbian.cpp @@ -1,4 +1,4 @@ -/* $Id: ioqueue_symbian.cpp 2482 2009-03-02 15:50:12Z nanang $ */ +/* $Id: ioqueue_symbian.cpp 2804 2009-06-25 12:26:15Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -210,7 +210,16 @@ pj_status_t CIoqueueCallback::StartRead (pj_ioqueue_op_key_t *op_key, } else { aAddress_.SetAddress (0); aAddress_.SetPort (0); - sock_->Socket().Recv (aBufferPtr_, flags, iStatus); + + if (sock_->IsDatagram()) { + sock_->Socket().Recv (aBufferPtr_, flags, iStatus); + } else { + // Using static like this is not pretty, but we don't need to use + // the value anyway, hence doing it like this is probably most + // optimal. + static TSockXfrLength len; + sock_->Socket().RecvOneOrMore (aBufferPtr_, flags, iStatus, len); + } } SetActive(); @@ -275,6 +284,7 @@ void CIoqueueCallback::HandleReadCompletion() CPjSocket *CIoqueueCallback::HandleAcceptCompletion() { CPjSocket *pjNewSock = new CPjSocket (get_pj_socket()->GetAf(), + get_pj_socket()->GetSockType(), blank_sock_); int addrlen = 0; diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_winnt.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_winnt.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_winnt.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_winnt.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ip_helper_generic.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ip_helper_generic.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ip_helper_generic.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ip_helper_generic.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ip_helper_symbian.cpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ip_helper_symbian.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ip_helper_symbian.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ip_helper_symbian.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ip_helper_win32.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ip_helper_win32.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ip_helper_win32.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ip_helper_win32.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/list.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/list.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/list.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/list.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/lock.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/lock.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/lock.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/lock.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/log.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/log.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/log.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/log.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/log_writer_printk.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/log_writer_printk.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/log_writer_printk.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/log_writer_printk.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/log_writer_stdout.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/log_writer_stdout.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/log_writer_stdout.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/log_writer_stdout.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/log_writer_symbian_console.cpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/log_writer_symbian_console.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/log_writer_symbian_console.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/log_writer_symbian_console.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_core_linux_kernel.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_core_linux_kernel.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_core_linux_kernel.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_core_linux_kernel.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_core_symbian.cpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_core_symbian.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_core_symbian.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_core_symbian.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_core_unix.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_core_unix.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_core_unix.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_core_unix.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_core_win32.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_core_win32.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_core_win32.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_core_win32.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_error_linux_kernel.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_error_linux_kernel.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_error_linux_kernel.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_error_linux_kernel.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_error_symbian.cpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_error_symbian.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_error_symbian.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_error_symbian.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_error_unix.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_error_unix.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_error_unix.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_error_unix.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_error_win32.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_error_win32.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_error_win32.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_error_win32.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_rwmutex.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_rwmutex.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_rwmutex.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_rwmutex.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_symbian.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_symbian.h similarity index 95% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_symbian.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_symbian.h index 9c01516fa7cf9ef09b80e34513e7ab6df90841d3..54d8a8011309e04b3bb741efc6ad5ef9eea80743 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_symbian.h +++ b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_symbian.h @@ -1,4 +1,4 @@ -/* $Id: os_symbian.h 2482 2009-03-02 15:50:12Z nanang $ */ +/* $Id: os_symbian.h 2804 2009-06-25 12:26:15Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -54,8 +54,9 @@ public: }; // Construct CPjSocket - CPjSocket(int af, RSocket &sock) - : af_(af), sock_(sock), connected_(false), sockReader_(NULL) + CPjSocket(int af, int sock_type, RSocket &sock) + : af_(af), sock_(sock), sock_type_(sock_type), connected_(false), + sockReader_(NULL) { } @@ -86,6 +87,18 @@ public: connected_ = connected; } + // Get socket type + int GetSockType() const + { + return sock_type_; + } + + // Returns true if socket is a datagram + bool IsDatagram() const + { + return sock_type_ == KSockDatagram; + } + // Get socket reader, if any. // May return NULL. CPjSocketReader *Reader() @@ -103,6 +116,8 @@ private: int af_; RSocket sock_; // Must not be reference, or otherwise // it may point to local variable! + unsigned sock_type_; + bool connected_; CPjSocketReader *sockReader_; }; diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_time_bsd.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_time_bsd.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_time_bsd.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_time_bsd.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_time_common.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_time_common.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_time_common.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_time_common.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_time_linux_kernel.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_time_linux_kernel.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_time_linux_kernel.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_time_linux_kernel.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_time_unix.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_time_unix.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_time_unix.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_time_unix.c diff --git a/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_time_win32.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_time_win32.c new file mode 100644 index 0000000000000000000000000000000000000000..2fe985c56981fca47fe0eac74638bcff0595980d --- /dev/null +++ b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_time_win32.c @@ -0,0 +1,303 @@ +/* $Id: os_time_win32.c 2805 2009-06-25 12:29:04Z bennylp $ */ +/* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#include <pj/os.h> +#include <pj/string.h> +#include <pj/log.h> +#include <windows.h> + +/////////////////////////////////////////////////////////////////////////////// + +#define SECS_TO_FT_MULT 10000000 + +static LARGE_INTEGER base_time; + +#if defined(PJ_WIN32_WINCE) && PJ_WIN32_WINCE +# define WINCE_TIME +#endif + +#ifdef WINCE_TIME +/* Note: + * In Windows CE/Windows Mobile platforms, the availability of milliseconds + * time resolution in SYSTEMTIME.wMilliseconds depends on the OEM, and most + * likely it won't be available. When it's not available, the + * SYSTEMTIME.wMilliseconds will contain a constant arbitrary value. + * + * Because of that, we need to emulate the milliseconds time resolution + * using QueryPerformanceCounter() (via pj_get_timestamp() API). However + * there is limitation on using this, i.e. the time returned by + * pj_gettimeofday() may be off by up to plus/minus 999 msec (the second + * part will be correct, however the msec part may be off), because we're + * not synchronizing the msec field with the change of value of the "second" + * field of the system time. + * + * Also there is other caveat which need to be handled (and they are + * handled by this implementation): + * - user may change system time, so pj_gettimeofday() needs to periodically + * checks if system time has changed. The period on which system time is + * checked is controlled by PJ_WINCE_TIME_CHECK_INTERVAL macro. + */ +static LARGE_INTEGER g_start_time; /* Time gettimeofday() is first called */ +static pj_timestamp g_start_tick; /* TS gettimeofday() is first called */ +static pj_timestamp g_last_update; /* Last time check_system_time() is + called, to periodically synchronize + with up-to-date system time (in case + user changes system time). */ +static pj_uint64_t g_update_period; /* Period (in TS) check_system_time() + should be called. */ + +/* Period on which check_system_time() is called, in seconds */ +#ifndef PJ_WINCE_TIME_CHECK_INTERVAL +# define PJ_WINCE_TIME_CHECK_INTERVAL (10) +#endif + +#endif + +#ifdef WINCE_TIME +static pj_status_t init_start_time(void) +{ + SYSTEMTIME st; + FILETIME ft; + pj_timestamp freq; + pj_status_t status; + + GetLocalTime(&st); + SystemTimeToFileTime(&st, &ft); + + g_start_time.LowPart = ft.dwLowDateTime; + g_start_time.HighPart = ft.dwHighDateTime; + g_start_time.QuadPart /= SECS_TO_FT_MULT; + g_start_time.QuadPart -= base_time.QuadPart; + + status = pj_get_timestamp(&g_start_tick); + if (status != PJ_SUCCESS) + return status; + + g_last_update.u64 = g_start_tick.u64; + + status = pj_get_timestamp_freq(&freq); + if (status != PJ_SUCCESS) + return status; + + g_update_period = PJ_WINCE_TIME_CHECK_INTERVAL * freq.u64; + + PJ_LOG(4,("os_time_win32.c", "WinCE time (re)started")); + + return PJ_SUCCESS; +} + +static pj_status_t check_system_time(pj_uint64_t ts_elapsed) +{ + enum { MIS = 5 }; + SYSTEMTIME st; + FILETIME ft; + LARGE_INTEGER cur, calc; + DWORD diff; + pj_timestamp freq; + pj_status_t status; + + /* Get system's current time */ + GetLocalTime(&st); + SystemTimeToFileTime(&st, &ft); + + cur.LowPart = ft.dwLowDateTime; + cur.HighPart = ft.dwHighDateTime; + cur.QuadPart /= SECS_TO_FT_MULT; + cur.QuadPart -= base_time.QuadPart; + + /* Get our calculated system time */ + status = pj_get_timestamp_freq(&freq); + if (status != PJ_SUCCESS) + return status; + + calc.QuadPart = g_start_time.QuadPart + ts_elapsed / freq.u64; + + /* See the difference between calculated and actual system time */ + if (calc.QuadPart >= cur.QuadPart) { + diff = (DWORD)(calc.QuadPart - cur.QuadPart); + } else { + diff = (DWORD)(cur.QuadPart - calc.QuadPart); + } + + if (diff > MIS) { + /* System time has changed */ + PJ_LOG(3,("os_time_win32.c", "WinCE system time changed detected " + "(diff=%u)", diff)); + status = init_start_time(); + } else { + status = PJ_SUCCESS; + } + + return status; +} + +#endif + +// Find 1st Jan 1970 as a FILETIME +static pj_status_t get_base_time(void) +{ + SYSTEMTIME st; + FILETIME ft; + pj_status_t status = PJ_SUCCESS; + + memset(&st,0,sizeof(st)); + st.wYear=1970; + st.wMonth=1; + st.wDay=1; + SystemTimeToFileTime(&st, &ft); + + base_time.LowPart = ft.dwLowDateTime; + base_time.HighPart = ft.dwHighDateTime; + base_time.QuadPart /= SECS_TO_FT_MULT; + +#ifdef WINCE_TIME + pj_enter_critical_section(); + status = init_start_time(); + pj_leave_critical_section(); +#endif + + return status; +} + +PJ_DEF(pj_status_t) pj_gettimeofday(pj_time_val *tv) +{ +#ifdef WINCE_TIME + pj_timestamp tick; + pj_uint64_t msec_elapsed; +#else + SYSTEMTIME st; + FILETIME ft; + LARGE_INTEGER li; +#endif + pj_status_t status; + + if (base_time.QuadPart == 0) { + status = get_base_time(); + if (status != PJ_SUCCESS) + return status; + } + +#ifdef WINCE_TIME + do { + status = pj_get_timestamp(&tick); + if (status != PJ_SUCCESS) + return status; + + if (tick.u64 - g_last_update.u64 >= g_update_period) { + pj_enter_critical_section(); + if (tick.u64 - g_last_update.u64 >= g_update_period) { + g_last_update.u64 = tick.u64; + check_system_time(tick.u64 - g_start_tick.u64); + } + pj_leave_critical_section(); + } else { + break; + } + } while (1); + + msec_elapsed = pj_elapsed_msec64(&g_start_tick, &tick); + + tv->sec = (long)(g_start_time.QuadPart + msec_elapsed/1000); + tv->msec = (long)(msec_elapsed % 1000); +#else + /* Standard Win32 GetLocalTime */ + GetLocalTime(&st); + SystemTimeToFileTime(&st, &ft); + + li.LowPart = ft.dwLowDateTime; + li.HighPart = ft.dwHighDateTime; + li.QuadPart /= SECS_TO_FT_MULT; + li.QuadPart -= base_time.QuadPart; + + tv->sec = li.LowPart; + tv->msec = st.wMilliseconds; +#endif /* WINCE_TIME */ + + return PJ_SUCCESS; +} + +PJ_DEF(pj_status_t) pj_time_decode(const pj_time_val *tv, pj_parsed_time *pt) +{ + LARGE_INTEGER li; + FILETIME ft; + SYSTEMTIME st; + + li.QuadPart = tv->sec; + li.QuadPart += base_time.QuadPart; + li.QuadPart *= SECS_TO_FT_MULT; + + ft.dwLowDateTime = li.LowPart; + ft.dwHighDateTime = li.HighPart; + FileTimeToSystemTime(&ft, &st); + + pt->year = st.wYear; + pt->mon = st.wMonth-1; + pt->day = st.wDay; + pt->wday = st.wDayOfWeek; + + pt->hour = st.wHour; + pt->min = st.wMinute; + pt->sec = st.wSecond; + pt->msec = tv->msec; + + return PJ_SUCCESS; +} + +/** + * Encode parsed time to time value. + */ +PJ_DEF(pj_status_t) pj_time_encode(const pj_parsed_time *pt, pj_time_val *tv) +{ + SYSTEMTIME st; + FILETIME ft; + LARGE_INTEGER li; + + pj_bzero(&st, sizeof(st)); + st.wYear = (pj_uint16_t) pt->year; + st.wMonth = (pj_uint16_t) (pt->mon + 1); + st.wDay = (pj_uint16_t) pt->day; + st.wHour = (pj_uint16_t) pt->hour; + st.wMinute = (pj_uint16_t) pt->min; + st.wSecond = (pj_uint16_t) pt->sec; + st.wMilliseconds = (pj_uint16_t) pt->msec; + + SystemTimeToFileTime(&st, &ft); + + li.LowPart = ft.dwLowDateTime; + li.HighPart = ft.dwHighDateTime; + li.QuadPart /= SECS_TO_FT_MULT; + li.QuadPart -= base_time.QuadPart; + + tv->sec = li.LowPart; + tv->msec = st.wMilliseconds; + + return PJ_SUCCESS; +} + +/** + * Convert local time to GMT. + */ +PJ_DEF(pj_status_t) pj_time_local_to_gmt(pj_time_val *tv); + +/** + * Convert GMT to local time. + */ +PJ_DEF(pj_status_t) pj_time_gmt_to_local(pj_time_val *tv); + + diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_timestamp_common.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_timestamp_common.c similarity index 95% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_timestamp_common.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_timestamp_common.c index 6262a1993fa4d57caacde071209c1dc55b428035..10941d211d6b36cca6ccb9309eb41e386b44cb43 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_timestamp_common.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_timestamp_common.c @@ -1,4 +1,4 @@ -/* $Id: os_timestamp_common.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: os_timestamp_common.c 2805 2009-06-25 12:29:04Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -152,6 +152,12 @@ PJ_DEF(pj_uint32_t) pj_elapsed_msec( const pj_timestamp *start, return (pj_uint32_t)elapsed_msec(start, stop); } +PJ_DEF(pj_uint64_t) pj_elapsed_msec64(const pj_timestamp *start, + const pj_timestamp *stop ) +{ + return (pj_uint64_t)elapsed_msec(start, stop); +} + PJ_DEF(pj_time_val) pj_elapsed_time( const pj_timestamp *start, const pj_timestamp *stop ) { diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_timestamp_linux_kernel.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_timestamp_linux_kernel.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_timestamp_linux_kernel.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_timestamp_linux_kernel.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_timestamp_posix.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_timestamp_posix.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_timestamp_posix.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_timestamp_posix.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_timestamp_win32.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_timestamp_win32.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_timestamp_win32.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_timestamp_win32.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/pool.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/pool.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_buf.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/pool_buf.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_buf.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/pool_buf.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_caching.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/pool_caching.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_caching.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/pool_caching.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_dbg.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/pool_dbg.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_dbg.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/pool_dbg.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_policy_kmalloc.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/pool_policy_kmalloc.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_policy_kmalloc.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/pool_policy_kmalloc.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_policy_malloc.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/pool_policy_malloc.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_policy_malloc.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/pool_policy_malloc.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_policy_new.cpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/pool_policy_new.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_policy_new.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/pool_policy_new.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_signature.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/pool_signature.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_signature.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/pool_signature.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/rand.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/rand.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/rand.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/rand.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/rbtree.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/rbtree.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/rbtree.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/rbtree.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_bsd.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/sock_bsd.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_bsd.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/sock_bsd.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_common.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/sock_common.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_common.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/sock_common.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_linux_kernel.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/sock_linux_kernel.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_linux_kernel.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/sock_linux_kernel.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_select.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/sock_select.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_select.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/sock_select.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_select_symbian.cpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/sock_select_symbian.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_select_symbian.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/sock_select_symbian.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_symbian.cpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/sock_symbian.cpp similarity index 97% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_symbian.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/sock_symbian.cpp index 29858afab1d4485e6f476eb7c5d506f7ca57bfe1..f3124a1490a91a2d61e897913f9b925f57d5cc13 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_symbian.cpp +++ b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/sock_symbian.cpp @@ -1,4 +1,4 @@ -/* $Id: sock_symbian.cpp 2482 2009-03-02 15:50:12Z nanang $ */ +/* $Id: sock_symbian.cpp 2804 2009-06-25 12:26:15Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -125,13 +125,7 @@ CPjSocketReader::CPjSocketReader (CPjSocket &sock) void CPjSocketReader::ConstructL (unsigned max_len) { - TProtocolDesc aProtocol; - TInt err; - - err = sock_.Socket().Info (aProtocol); - User::LeaveIfError (err); - - isDatagram_ = (aProtocol.iSockType == KSockDatagram); + isDatagram_ = sock_.IsDatagram(); TUint8 *ptr = new TUint8[max_len]; buffer_.Set (ptr, 0, (TInt) max_len); @@ -535,7 +529,7 @@ PJ_DEF (pj_status_t) pj_sock_socket (int af, /* Wrap Symbian RSocket into PJLIB's CPjSocket, and return to caller */ - CPjSocket *pjSock = new CPjSocket (af, rSock); + CPjSocket *pjSock = new CPjSocket (af, type, rSock); *p_sock = (pj_sock_t) pjSock; @@ -757,7 +751,6 @@ PJ_DEF (pj_status_t) pj_sock_recv (pj_sock_t sock, PJ_SYMBIAN_CHECK_CONNECTION(); CPjSocket *pjSock = (CPjSocket*) sock; - RSocket &rSock = pjSock->Socket(); if (pjSock->Reader()) { CPjSocketReader *reader = pjSock->Reader(); @@ -782,7 +775,16 @@ PJ_DEF (pj_status_t) pj_sock_recv (pj_sock_t sock, TSockXfrLength recvLen; TPtr8 data ( (TUint8*) buf, (TInt) *len, (TInt) *len); - rSock.Recv (data, flags, reqStatus, recvLen); + if (pjSock->IsDatagram()) { + pjSock->Socket().Recv (data, flags, reqStatus); + } else { + // Using static like this is not pretty, but we don't need to use + // the value anyway, hence doing it like this is probably most + // optimal. + static TSockXfrLength len; + pjSock->Socket().RecvOneOrMore (data, flags, reqStatus, len); + } + User::WaitForRequest (reqStatus); if (reqStatus == KErrNone) { @@ -1027,7 +1029,8 @@ PJ_DEF (pj_status_t) pj_sock_accept (pj_sock_t serverfd, } // Create PJ socket - CPjSocket *newPjSock = new CPjSocket (pjSock->GetAf(), newSock); + CPjSocket *newPjSock = new CPjSocket (pjSock->GetAf(), pjSock->GetSockType(), + newSock); newPjSock->SetConnected (true); diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/string.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/string.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/string.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/string.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/symbols.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/symbols.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/symbols.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/symbols.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/timer.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/timer.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/timer.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/timer.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/timer_symbian.cpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/timer_symbian.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/timer_symbian.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/timer_symbian.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/types.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/types.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/types.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/types.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/unicode_symbian.cpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/unicode_symbian.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/unicode_symbian.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/unicode_symbian.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/unicode_win32.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/unicode_win32.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/unicode_win32.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/unicode_win32.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib++-test/main.cpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib++-test/main.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib++-test/main.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib++-test/main.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-samples/except.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-samples/except.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-samples/except.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-samples/except.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-samples/list.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-samples/list.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-samples/list.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-samples/list.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-samples/log.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-samples/log.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-samples/log.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-samples/log.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/activesock.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/activesock.c similarity index 92% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/activesock.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/activesock.c index 770493b1531efd9e2dfe1c5094876658d19b1231..ed6da1359514b70b20a90edc1980de1147e69063 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/activesock.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/activesock.c @@ -1,4 +1,4 @@ -/* $Id: activesock.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: activesock.c 2804 2009-06-25 12:26:15Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -212,7 +212,11 @@ static int udp_ping_pong_test(void) for (i=0; i<10 && last_rx1 == srv1->rx_cnt && last_rx2 == srv2->rx_cnt; ++i) { pj_time_val delay = {0, 10}; +#ifdef PJ_SYMBIAN + pj_symbianos_poll(-1, 100); +#else pj_ioqueue_poll(ioqueue, &delay); +#endif } if (srv1->rx_err_cnt+srv1->tx_err_cnt != 0 || @@ -403,26 +407,47 @@ static int tcp_perf_test(void) status = pj_activesock_send(asock2, &op_key->op_key, pkt, &len, 0); if (status == PJ_EPENDING) { do { +#if PJ_SYMBIAN + pj_symbianos_poll(-1, -1); +#else pj_ioqueue_poll(ioqueue, NULL); +#endif } while (!state2->sent); - } else if (status != PJ_SUCCESS) { - PJ_LOG(1,("", " err: send status=%d", status)); - status = -180; - break; - } else if (status == PJ_SUCCESS) { - if (len != sizeof(*pkt)) { - PJ_LOG(1,("", " err: shouldn't report partial sent")); - status = -190; - break; - } + } else { +#if PJ_SYMBIAN + /* The Symbian socket always returns PJ_SUCCESS for TCP send, + * eventhough the remote end hasn't received the data yet. + * If we continue sending, eventually send() will block, + * possibly because the send buffer is full. So we need to + * poll the ioqueue periodically, to let receiver gets the + * data. + */ + pj_symbianos_poll(-1, 0); +#endif + if (status != PJ_SUCCESS) { + PJ_LOG(1,("", " err: send status=%d", status)); + status = -180; + break; + } else if (status == PJ_SUCCESS) { + if (len != sizeof(*pkt)) { + PJ_LOG(1,("", " err: shouldn't report partial sent")); + status = -190; + break; + } + } } } /* Wait until everything has been sent/received */ if (state1->next_recv_seq < COUNT) { +#ifdef PJ_SYMBIAN + while (pj_symbianos_poll(-1, 1000) == PJ_TRUE) + ; +#else pj_time_val delay = {0, 100}; while (pj_ioqueue_poll(ioqueue, &delay) > 0) ; +#endif } if (status == PJ_EPENDING) diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/atomic.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/atomic.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/atomic.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/atomic.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/echo_clt.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/echo_clt.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/echo_clt.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/echo_clt.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/errno.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/errno.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/errno.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/errno.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/exception.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/exception.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/exception.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/exception.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/fifobuf.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/fifobuf.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/fifobuf.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/fifobuf.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/file.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/file.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/file.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/file.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/hash_test.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/hash_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/hash_test.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/hash_test.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/ioq_perf.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/ioq_perf.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/ioq_perf.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/ioq_perf.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/ioq_tcp.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/ioq_tcp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/ioq_tcp.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/ioq_tcp.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/ioq_udp.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/ioq_udp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/ioq_udp.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/ioq_udp.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/ioq_unreg.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/ioq_unreg.c similarity index 98% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/ioq_unreg.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/ioq_unreg.c index 95cfce7f66101c1910e1dbbb8cafc01e80ee6acf..bbd96dc0f94f67fbacba2bf28fbe94d492cdd598 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/ioq_unreg.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/ioq_unreg.c @@ -1,4 +1,4 @@ -/* $Id: ioq_unreg.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: ioq_unreg.c 2816 2009-06-25 13:14:54Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -250,11 +250,12 @@ static int perform_unreg_test(pj_ioqueue_t *ioqueue, PJ_TIME_VAL_GTE(now, time_to_unregister) && sock_data.pool) { - pj_mutex_lock(sock_data.mutex); + //Can't do this otherwise it'll deadlock + //pj_mutex_lock(sock_data.mutex); sock_data.unregistered = 1; pj_ioqueue_unregister(sock_data.key); - pj_mutex_unlock(sock_data.mutex); + //pj_mutex_unlock(sock_data.mutex); pj_mutex_destroy(sock_data.mutex); pj_pool_release(sock_data.pool); sock_data.pool = NULL; diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/list.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/list.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/list.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/list.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/main.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/main.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/main.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/main.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/main_mod.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/main_mod.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/main_mod.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/main_mod.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/main_rtems.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/main_rtems.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/main_rtems.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/main_rtems.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/main_symbian.cpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/main_symbian.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/main_symbian.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/main_symbian.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/main_win32.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/main_win32.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/main_win32.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/main_win32.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/mutex.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/mutex.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/mutex.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/mutex.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/os.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/os.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/os.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/os.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/pool.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/pool.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/pool.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/pool.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/pool_perf.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/pool_perf.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/pool_perf.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/pool_perf.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/rand.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/rand.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/rand.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/rand.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/rbtree.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/rbtree.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/rbtree.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/rbtree.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/rtems_network_config.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/rtems_network_config.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/rtems_network_config.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/rtems_network_config.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/select.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/select.c similarity index 97% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/select.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/select.c index f9f37b96a083abb5415ff4785c3142a8eba8af2f..935168ec936a1436e4359264b8bd980e3b8687fc 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/select.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/select.c @@ -1,4 +1,4 @@ -/* $Id: select.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: select.c 2820 2009-06-29 11:35:40Z nanang $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -142,6 +142,9 @@ int select_test() status=-40; goto on_return; } + // Sleep a bit. See http://trac.pjsip.org/repos/ticket/908 + pj_thread_sleep(10); + // Check that socket is marked as reable. // Note that select() may also report that sockets are writable. status = do_select(udp1, udp2, setcount); diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/sleep.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/sleep.c similarity index 83% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/sleep.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/sleep.c index 46a1e06780abd99980c28560985958aa90a626ee..11c3db98afcf907acea001fa199cbcb82216869c 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/sleep.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/sleep.c @@ -1,4 +1,4 @@ -/* $Id: sleep.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: sleep.c 2805 2009-06-25 12:29:04Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -55,19 +55,35 @@ static int simple_sleep_test(void) { - enum { COUNT = 5 }; + enum { COUNT = 10 }; int i; pj_status_t rc; PJ_LOG(3,(THIS_FILE, "..will write messages every 1 second:")); for (i=0; i<COUNT; ++i) { + pj_time_val tv; + pj_parsed_time pt; + rc = pj_thread_sleep(1000); if (rc != PJ_SUCCESS) { app_perror("...error: pj_thread_sleep()", rc); return -10; } - PJ_LOG(3,(THIS_FILE, "...wake up..")); + + rc = pj_gettimeofday(&tv); + if (rc != PJ_SUCCESS) { + app_perror("...error: pj_gettimeofday()", rc); + return -11; + } + + pj_time_decode(&tv, &pt); + + PJ_LOG(3,(THIS_FILE, + "...%04d-%02d-%02d %02d:%02d:%02d.%03d", + pt.year, pt.mon, pt.day, + pt.hour, pt.min, pt.sec, pt.msec)); + } return 0; @@ -75,13 +91,15 @@ static int simple_sleep_test(void) static int sleep_duration_test(void) { - enum { MIS = 20, DURATION = 1000, DURATION2 = 500 }; + enum { MIS = 20}; + unsigned duration[] = { 2000, 1000, 500, 200, 100 }; + unsigned i; pj_status_t rc; PJ_LOG(3,(THIS_FILE, "..running sleep duration test")); /* Test pj_thread_sleep() and pj_gettimeofday() */ - { + for (i=0; i<PJ_ARRAY_SIZE(duration); ++i) { pj_time_val start, stop; pj_uint32_t msec; @@ -93,7 +111,7 @@ static int sleep_duration_test(void) } /* Sleep */ - rc = pj_thread_sleep(DURATION); + rc = pj_thread_sleep(duration[i]); if (rc != PJ_SUCCESS) { app_perror("...error: pj_thread_sleep()", rc); return -20; @@ -109,20 +127,20 @@ static int sleep_duration_test(void) msec = PJ_TIME_VAL_MSEC(stop); /* Check if it's within range. */ - if (msec < DURATION * (100-MIS)/100 || - msec > DURATION * (100+MIS)/100) + if (msec < duration[i] * (100-MIS)/100 || + msec > duration[i] * (100+MIS)/100) { PJ_LOG(3,(THIS_FILE, "...error: slept for %d ms instead of %d ms " "(outside %d%% err window)", - msec, DURATION, MIS)); + msec, duration[i], MIS)); return -30; } } /* Test pj_thread_sleep() and pj_get_timestamp() and friends */ - { + for (i=0; i<PJ_ARRAY_SIZE(duration); ++i) { pj_time_val t1, t2; pj_timestamp start, stop; pj_uint32_t msec; @@ -140,7 +158,7 @@ static int sleep_duration_test(void) pj_gettimeofday(&t1); /* Sleep */ - rc = pj_thread_sleep(DURATION2); + rc = pj_thread_sleep(duration[i]); if (rc != PJ_SUCCESS) { app_perror("...error: pj_thread_sleep()", rc); return -70; @@ -162,13 +180,13 @@ static int sleep_duration_test(void) msec = pj_elapsed_msec(&start, &stop); /* Check if it's within range. */ - if (msec < DURATION2 * (100-MIS)/100 || - msec > DURATION2 * (100+MIS)/100) + if (msec < duration[i] * (100-MIS)/100 || + msec > duration[i] * (100+MIS)/100) { PJ_LOG(3,(THIS_FILE, "...error: slept for %d ms instead of %d ms " "(outside %d%% err window)", - msec, DURATION2, MIS)); + msec, duration[i], MIS)); PJ_TIME_VAL_SUB(t2, t1); PJ_LOG(3,(THIS_FILE, "...info: gettimeofday() reported duration is " diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/sock.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/sock.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/sock.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/sock.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/sock_perf.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/sock_perf.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/sock_perf.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/sock_perf.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/string.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/string.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/string.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/string.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/test.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/test.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/test.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/test.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/test.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/test.h rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/test.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/thread.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/thread.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/thread.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/thread.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/timer.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/timer.c similarity index 93% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/timer.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/timer.c index f378091b746343aa0edb891dd22caed6571bcc80..5409172abe3864fc8fda3cd39198aeb93640c91f 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/timer.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/timer.c @@ -1,4 +1,4 @@ -/* $Id: timer.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: timer.c 2817 2009-06-25 13:18:36Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -139,7 +139,16 @@ static int test_timer_heap(void) pj_gettimeofday(&now); pj_get_timestamp(&t1); +#if defined(PJ_SYMBIAN) && PJ_SYMBIAN!=0 + /* On Symbian, we must use OS poll (Active Scheduler poll) since + * timer is implemented using Active Object. + */ + rc = 0; + while (pj_symbianos_poll(-1, 0)) + ++rc; +#else rc = pj_timer_heap_poll(timer, NULL); +#endif pj_get_timestamp(&t2); if (rc > 0) { done += rc; diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/timestamp.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/timestamp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/timestamp.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/timestamp.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/udp_echo_srv_sync.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/udp_echo_srv_sync.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/udp_echo_srv_sync.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/udp_echo_srv_sync.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/util.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/util.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/util.c rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/util.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/README.txt b/sflphone-common/libs/pjproject-1.0.3/pjmedia/README.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/README.txt rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/README.txt diff --git a/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/Jbtest.dat b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/Jbtest.dat new file mode 100644 index 0000000000000000000000000000000000000000..3e2169c433078b38ced52575f88d92a21976c79c --- /dev/null +++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/Jbtest.dat @@ -0,0 +1,324 @@ += Ideal condition +%adaptive 0 0 10 +!burst 1 +!discard 0 +!lost 0 +!empty 0 +!delay 1 +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG +. + += DTX +%adaptive 0 0 10 +!burst 1 +!discard 0 +!lost 0 +!empty 20 +!delay 1 +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG +# Start silence +GGGGGGGGGGGGGGGGGGGG +# End silence +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG +. + += Regular burst (three gets three puts) +%adaptive 0 0 10 +!burst 3 +!discard 0 +!lost 0 +!empty 0 +!delay 3 +PPPGGGPPPGGGPPPGGG PPPGGGPPPGGGPPPGGG PPPGGGPPPGGGPPPGGG PPPGGGPPPGGGPPPGGG +PPPGGGPPPGGGPPPGGG PPPGGGPPPGGGPPPGGG PPPGGGPPPGGGPPPGGG PPPGGGPPPGGGPPPGGG +. + += Random burst (no drift) +%adaptive 0 0 10 +!burst 4 +!discard 1 <- there may be delay adaptation caused by multiple empty GETs followed by multiple PUTs, later when burst level reaches 'stable' condition, JB may shrink some excess frames +!lost 0 +!empty 4 +!delay 4 +PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG +PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG +PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG +PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG +PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG +PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG +PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG +PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG +PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG +PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG +PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG +PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG +PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG +PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG +PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG +PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG +PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG +PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG +PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG +PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG +PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG +PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG +PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG +PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG +PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG +PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG +PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG +PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG +PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG +PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG +PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG +PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG +PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG +PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG +PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG +PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG +PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG +PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG +PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG +PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG +PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG +PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG +PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG +PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG +PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG +PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG +PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG +PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG +PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG +PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG +PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG +PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG +. + += Random burst (with drift, PUT > GET) +%adaptive 0 0 10 +!burst 4 +!discard 68 <- number of PUT - GET, JB does shrinking by discarding frames +!lost 0 +!empty 4 +!delay 8 <- should be less than or equal to twice of burst +P PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG P PGPGPPGGPPPPGGPGGGPG +P PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG P PGGGGPPPGPPGPPPGGPGG +P PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG P PGPGPPGGPPPPGGPGGGPG +P PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG P PGGGGPPPGPPGPPPGGPGG +P PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG P PGPGPPGGPPPPGGPGGGPG +P PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG P PGGGGPPPGPPGPPPGGPGG +P PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG P PGPGPPGGPPPPGGPGGGPG +P PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG P PGGGGPPPGPPGPPPGGPGG +P PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG P PGPGPPGGPPPPGGPGGGPG +P PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG P PGGGGPPPGPPGPPPGGPGG +P PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG P PGPGPPGGPPPPGGPGGGPG +P PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG P PGGGGPPPGPPGPPPGGPGG +P PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG P PGPGPPGGPPPPGGPGGGPG +P PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG P PGGGGPPPGPPGPPPGGPGG +P PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG P PGPGPPGGPPPPGGPGGGPG +P PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG P PGGGGPPPGPPGPPPGGPGG +P PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG P PGPGPPGGPPPPGGPGGGPG +P PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG P PGGGGPPPGPPGPPPGGPGG +P PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG P PGPGPPGGPPPPGGPGGGPG +P PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG P PGGGGPPPGPPGPPPGGPGG +P PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG P PGPGPPGGPPPPGGPGGGPG +P PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG P PGGGGPPPGPPGPPPGGPGG +P PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG P PGPGPPGGPPPPGGPGGGPG +P PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG P PGGGGPPPGPPGPPPGGPGG +P PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG P PGPGPPGGPPPPGGPGGGPG +P PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG P PGGGGPPPGPPGPPPGGPGG +P PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG P PGPGPPGGPPPPGGPGGGPG +P PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG P PGGGGPPPGPPGPPPGGPGG +P PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG P PGPGPPGGPPPPGGPGGGPG +P PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG P PGGGGPPPGPPGPPPGGPGG +P PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG P PGPGPPGGPPPPGGPGGGPG +P PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG P PGGGGPPPGPPGPPPGGPGG +P PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG P PGPGPPGGPPPPGGPGGGPG +P PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG P PGGGGPPPGPPGPPPGGPGG +. + += Random burst (with drift, PUT < GET) +%adaptive 0 0 10 +!burst 4 +!discard 0 +!lost 0 +!empty 70 <- GET - PUT = 66, added 4 for tolerating empty caused by burst +!delay 4 <- should be less than or equal to burst +G PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG G PGPGPPGGPPPPGGPGGGPG +G PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG G PGGGGPPPGPPGPPPGGPGG +G PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG G PGPGPPGGPPPPGGPGGGPG +G PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG G PGGGGPPPGPPGPPPGGPGG +G PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG G PGPGPPGGPPPPGGPGGGPG +G PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG G PGGGGPPPGPPGPPPGGPGG +G PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG G PGPGPPGGPPPPGGPGGGPG +G PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG G PGGGGPPPGPPGPPPGGPGG +G PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG G PGPGPPGGPPPPGGPGGGPG +G PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG G PGGGGPPPGPPGPPPGGPGG +G PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG G PGPGPPGGPPPPGGPGGGPG +G PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG G PGGGGPPPGPPGPPPGGPGG +G PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG G PGPGPPGGPPPPGGPGGGPG +G PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG G PGGGGPPPGPPGPPPGGPGG +G PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG G PGPGPPGGPPPPGGPGGGPG +G PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG G PGGGGPPPGPPGPPPGGPGG +G PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG G PGPGPPGGPPPPGGPGGGPG +G PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG G PGGGGPPPGPPGPPPGGPGG +G PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG G PGPGPPGGPPPPGGPGGGPG +G PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG G PGGGGPPPGPPGPPPGGPGG +G PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG G PGPGPPGGPPPPGGPGGGPG +G PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG G PGGGGPPPGPPGPPPGGPGG +G PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG G PGPGPPGGPPPPGGPGGGPG +G PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG G PGGGGPPPGPPGPPPGGPGG +G PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG G PGPGPPGGPPPPGGPGGGPG +G PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG G PGGGGPPPGPPGPPPGGPGG +G PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG G PGPGPPGGPPPPGGPGGGPG +G PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG G PGGGGPPPGPPGPPPGGPGG +G PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG G PGPGPPGGPPPPGGPGGGPG +G PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG G PGGGGPPPGPPGPPPGGPGG +G PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG G PGPGPPGGPPPPGGPGGGPG +G PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG G PGGGGPPPGPPGPPPGGPGG +G PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG G PGPGPPGGPPPPGGPGGGPG +. + += Packet lost +%adaptive 0 0 10 +!burst 1 +!discard 0 +!lost 7 +!empty 3 +!delay 3 +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG +# Some losts +LGPGPGLGPGPGPGLGPGPG +# Normal +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG +# More losts +PLPGGGPPPGGGPLPGGGPG PLPGGGPPPGGGPLPGGGPG +# Normal +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG +. + += Sequence restart +%adaptive 0 0 10 +!burst 1 +!discard 0 +!lost 0 +!empty 0 +!delay 1 +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG +# seq restarted after 120 PUTs (default MAX_MISORDER == 100) +R +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG +. + += Duplicated frames += e.g.: some Forward Error Correction (FEC) methods. +%adaptive 0 0 10 +!burst 1 +!discard 40 +!lost 0 +!empty 0 +!delay 1 +PDGPDGPDGPDGPDG PDGPDGPDGPDGPDG PDGPDGPDGPDGPDG PDGPDGPDGPDGPDG +PDGPDGPDGPDGPDG PDGPDGPDGPDGPDG PDGPDGPDGPDGPDG PDGPDGPDGPDGPDG +. + += Late frames +%adaptive 0 0 10 +!burst 1 +!discard 8 <- late frames are discarded + delay adaptation +!lost 4 +!empty 4 +!delay 4 +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG +# Suddenly there are some lost frames +LGLGPGLGLGPG +# Those lost frames are actually late (+misordered), here they come +OOOO +# Then back to normal +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG +. + += PUT burst at the beginning +%adaptive 0 0 10 +!burst 1 +!discard 50 <- frames discarded for delay adaptation +!lost 0 +!empty 0 +!delay 25 <- average delay, JB is able to adapt the delay +PPPPPPPPPPPPPPPPPPPP PPPPPPPPPPPPPPPPPPPP PPPPPPPPPP +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG +. + += Fixed mode prefetch 5, with two empty events +%fixed 5 +!burst 1 +!discard 0 +!lost 0 +!empty 10 +!delay 5 +G +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG +GGGGG +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG +. + += Fixed mode prefetch 5, with random burst +%fixed 5 +!burst 3 +!discard 0 +!lost 0 +!empty 5 +!delay 5 +PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG +PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG +PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG +PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG +PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG +PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG +PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG +PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG +. + += Fixed mode prefetch 10, PUT burst at the beginning +%fixed 10 +!burst 1 +!discard 35 <- frames discarded for delay adaptation +!lost 0 +!empty 0 +!delay 30 <- average delay +PPPPPPPPPPPPPPPPPPPP PPPPPPPPPPPPPPPPPPPP PPPPPPPPPP +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG +PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG +. diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/Makefile b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/Makefile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/Makefile rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/Makefile diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/m-i386.mak b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/m-i386.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/m-i386.mak rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/m-i386.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/m-x86_64.mak b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/m-x86_64.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/m-x86_64.mak rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/m-x86_64.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-auto.mak.in b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/os-auto.mak.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-auto.mak.in rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/os-auto.mak.in diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-darwinos.mak b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/os-darwinos.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-darwinos.mak rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/os-darwinos.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-linux.mak b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/os-linux.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-linux.mak rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/os-linux.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-rtems.mak b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/os-rtems.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-rtems.mak rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/os-rtems.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-win32.mak b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/os-win32.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-win32.mak rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/os-win32.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjaut.dsp b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/pjaut.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjaut.dsp rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/pjaut.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia.dsp b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/pjmedia.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia.dsp rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/pjmedia.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia.dsw b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/pjmedia.dsw similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia.dsw rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/pjmedia.dsw diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/pjmedia.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia.vcproj rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/pjmedia.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia_codec.dsp b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/pjmedia_codec.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia_codec.dsp rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/pjmedia_codec.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia_codec.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/pjmedia_codec.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia_codec.vcproj rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/pjmedia_codec.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia_test.dsp b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/pjmedia_test.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia_test.dsp rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/pjmedia_test.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia_test.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/pjmedia_test.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia_test.vcproj rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/pjmedia_test.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/wince-evc4/pjmedia_codec_wince.vcp b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/wince-evc4/pjmedia_codec_wince.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/wince-evc4/pjmedia_codec_wince.vcp rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/wince-evc4/pjmedia_codec_wince.vcp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/wince-evc4/pjmedia_test.vcp b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/wince-evc4/pjmedia_test.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/wince-evc4/pjmedia_test.vcp rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/wince-evc4/pjmedia_test.vcp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/wince-evc4/pjmedia_wince.vcp b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/wince-evc4/pjmedia_wince.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/wince-evc4/pjmedia_wince.vcp rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/wince-evc4/pjmedia_wince.vcp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/wince-evc4/pjmedia_wince.vcw b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/wince-evc4/pjmedia_wince.vcw similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/wince-evc4/pjmedia_wince.vcw rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/wince-evc4/pjmedia_wince.vcw diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/doxygen.cfg b/sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/doxygen.cfg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/doxygen.cfg rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/doxygen.cfg diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/footer.html b/sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/footer.html similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/footer.html rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/footer.html diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/header.html b/sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/header.html similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/header.html rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/header.html diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/master-port.jpg b/sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/master-port.jpg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/master-port.jpg rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/master-port.jpg diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/media-flow.jpg b/sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/media-flow.jpg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/media-flow.jpg rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/media-flow.jpg diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/media-flow.vsd b/sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/media-flow.vsd similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/media-flow.vsd rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/media-flow.vsd diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/media-srtp-transport.PNG b/sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/media-srtp-transport.PNG similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/media-srtp-transport.PNG rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/media-srtp-transport.PNG diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/media-transport.PNG b/sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/media-transport.PNG similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/media-transport.PNG rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/media-transport.PNG diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/sample-manual-resampling.jpg b/sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/sample-manual-resampling.jpg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/sample-manual-resampling.jpg rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/sample-manual-resampling.jpg diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/siprtp.jpg b/sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/siprtp.jpg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/siprtp.jpg rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/siprtp.jpg diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/sndtest.jpg b/sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/sndtest.jpg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/sndtest.jpg rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/sndtest.jpg diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/amr_helper.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/amr_helper.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/amr_helper.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/amr_helper.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/config.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/config.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/config.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/config.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/config_auto.h.in b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/config_auto.h.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/config_auto.h.in rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/config_auto.h.in diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/g722.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/g722.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/g722.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/g722.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/gsm.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/gsm.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/gsm.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/gsm.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/ilbc.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/ilbc.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/ilbc.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/ilbc.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/ipp_codecs.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/ipp_codecs.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/ipp_codecs.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/ipp_codecs.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/l16.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/l16.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/l16.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/l16.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/speex.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/speex.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/speex.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/speex.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/types.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/types.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/types.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/types.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/alaw_ulaw.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/alaw_ulaw.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/alaw_ulaw.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/alaw_ulaw.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/bidirectional.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/bidirectional.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/bidirectional.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/bidirectional.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/circbuf.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/circbuf.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/circbuf.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/circbuf.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/clock.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/clock.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/clock.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/clock.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/codec.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/codec.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/codec.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/codec.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/conference.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/conference.h similarity index 98% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/conference.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/conference.h index 3206ce614b886520d6e0fc95635f3971c1b4f7b6..7c296adc98b9762caf5c026ff3c65b4cb2ea5eba 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/conference.h +++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/conference.h @@ -1,4 +1,4 @@ -/* $Id: conference.h 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: conference.h 2790 2009-06-24 15:26:59Z nanang $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -224,6 +224,9 @@ PJ_DECL(pj_status_t) pjmedia_conf_add_port( pjmedia_conf *conf, /** + * <i><b>Warning:</b> This API has been deprecated since 1.3 and will be + * removed in the future release, use #PJMEDIA_SPLITCOMB instead.</i> + * * Create and add a passive media port to the conference bridge. Unlike * "normal" media port that is added with #pjmedia_conf_add_port(), media * port created with this function will not have its get_frame() and diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/config.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/config.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/config.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/config.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/config_auto.h.in b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/config_auto.h.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/config_auto.h.in rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/config_auto.h.in diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/delaybuf.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/delaybuf.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/delaybuf.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/delaybuf.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/doxygen.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/doxygen.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/doxygen.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/doxygen.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/echo.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/echo.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/echo.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/echo.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/echo_port.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/echo_port.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/echo_port.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/echo_port.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/endpoint.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/endpoint.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/endpoint.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/endpoint.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/errno.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/errno.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/errno.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/errno.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/g711.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/g711.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/g711.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/g711.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/jbuf.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/jbuf.h similarity index 95% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/jbuf.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/jbuf.h index a941ae0d8112addf80a7bba602d2ef155fd561d6..99e4728e752b4567bfba49d333f5502f724ac7a5 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/jbuf.h +++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/jbuf.h @@ -1,4 +1,4 @@ -/* $Id: jbuf.h 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: jbuf.h 2788 2009-06-24 14:46:36Z nanang $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -66,19 +66,28 @@ typedef enum pjmedia_jb_frame_type pjmedia_jb_frame_type; /** - * This structure describes jitter buffer current status. + * This structure describes jitter buffer state. */ struct pjmedia_jb_state { + /* Setting */ unsigned frame_size; /**< Individual frame size, in bytes. */ - unsigned prefetch; /**< Current prefetch value, in frames */ unsigned min_prefetch; /**< Minimum allowed prefetch, in frms. */ unsigned max_prefetch; /**< Maximum allowed prefetch, in frms. */ + + /* Status */ + unsigned prefetch; /**< Current prefetch value, in frames */ unsigned size; /**< Current buffer size, in frames. */ + + /* Statistic */ unsigned avg_delay; /**< Average delay, in ms. */ unsigned min_delay; /**< Minimum delay, in ms. */ unsigned max_delay; /**< Maximum delay, in ms. */ - unsigned dev_delay; /**< Standard deviation of delay, in ms. */ + unsigned dev_delay; /**< Standard deviation of delay, in ms.*/ + unsigned avg_burst; /**< Average burst, in frames. */ + unsigned lost; /**< Number of lost frames. */ + unsigned discard; /**< Number of discarded frames. */ + unsigned empty; /**< Number of empty on GET events. */ }; diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/master_port.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/master_port.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/master_port.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/master_port.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/mem_port.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/mem_port.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/mem_port.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/mem_port.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/null_port.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/null_port.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/null_port.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/null_port.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/plc.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/plc.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/plc.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/plc.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/port.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/port.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/port.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/port.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/resample.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/resample.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/resample.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/resample.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/rtcp.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/rtcp.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/rtcp.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/rtcp.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/rtcp_xr.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/rtcp_xr.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/rtcp_xr.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/rtcp_xr.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/rtp.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/rtp.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/rtp.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/rtp.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/sdp.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/sdp.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/sdp.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/sdp.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/sdp_neg.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/sdp_neg.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/sdp_neg.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/sdp_neg.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/session.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/session.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/session.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/session.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/silencedet.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/silencedet.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/silencedet.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/silencedet.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/sound.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/sound.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/sound.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/sound.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/sound_port.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/sound_port.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/sound_port.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/sound_port.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/splitcomb.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/splitcomb.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/splitcomb.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/splitcomb.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/stereo.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/stereo.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/stereo.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/stereo.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/stream.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/stream.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/stream.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/stream.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/symbian_sound_aps.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/symbian_sound_aps.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/symbian_sound_aps.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/symbian_sound_aps.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/tonegen.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/tonegen.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/tonegen.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/tonegen.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/transport.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/transport.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport_adapter_sample.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/transport_adapter_sample.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport_adapter_sample.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/transport_adapter_sample.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport_ice.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/transport_ice.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport_ice.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/transport_ice.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport_loop.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/transport_loop.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport_loop.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/transport_loop.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport_srtp.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/transport_srtp.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport_srtp.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/transport_srtp.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport_udp.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/transport_udp.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport_udp.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/transport_udp.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/types.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/types.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/types.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/types.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/wav_playlist.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/wav_playlist.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/wav_playlist.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/wav_playlist.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/wav_port.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/wav_port.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/wav_port.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/wav_port.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/wave.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/wave.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/wave.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/wave.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/wsola.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/wsola.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/wsola.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/wsola.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/g722.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/g722.c similarity index 98% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/g722.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/g722.c index 033317d608e1a6e3eb1be4e1b9ae9112e237ab6f..ff8483bf092b3f62ef4e6e407cce72c591ee2c01 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/g722.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/g722.c @@ -1,4 +1,4 @@ -/* $Id: g722.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: g722.c 2792 2009-06-24 15:46:49Z nanang $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -552,8 +552,8 @@ static pj_status_t g722_codec_encode(pjmedia_codec *codec, (input->size >> 1), NULL); if (is_silence && - PJMEDIA_CODEC_MAX_SILENCE_PERIOD != -1 && - silence_duration < PJMEDIA_CODEC_MAX_SILENCE_PERIOD*16000/1000) + (PJMEDIA_CODEC_MAX_SILENCE_PERIOD == -1 || + silence_duration < PJMEDIA_CODEC_MAX_SILENCE_PERIOD*16000/1000)) { output->type = PJMEDIA_FRAME_TYPE_NONE; output->buf = NULL; @@ -578,6 +578,7 @@ static pj_status_t g722_codec_encode(pjmedia_codec *codec, } output->type = PJMEDIA_FRAME_TYPE_AUDIO; + output->timestamp = input->timestamp; TRACE_((THIS_FILE, "G722 encode(): size=%d", output->size)); return PJ_SUCCESS; @@ -624,6 +625,7 @@ static pj_status_t g722_codec_decode(pjmedia_codec *codec, pj_assert(output->size == SAMPLES_PER_FRAME); output->size = SAMPLES_PER_FRAME * 2; output->type = PJMEDIA_FRAME_TYPE_AUDIO; + output->timestamp = input->timestamp; #if !PLC_DISABLED if (g722_data->plc_enabled) diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/g722/g722_dec.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/g722/g722_dec.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/g722/g722_dec.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/g722/g722_dec.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/g722/g722_dec.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/g722/g722_dec.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/g722/g722_dec.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/g722/g722_dec.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/g722/g722_enc.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/g722/g722_enc.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/g722/g722_enc.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/g722/g722_enc.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/g722/g722_enc.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/g722/g722_enc.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/g722/g722_enc.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/g722/g722_enc.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/gsm.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/gsm.c similarity index 98% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/gsm.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/gsm.c index 19e6b0394c950cc7bb7b7d50e27cd2d45690b89b..f56b1e949b53813476fb92c37f7b5034b88b10ad 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/gsm.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/gsm.c @@ -1,4 +1,4 @@ -/* $Id: gsm.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: gsm.c 2792 2009-06-24 15:46:49Z nanang $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -542,8 +542,8 @@ static pj_status_t gsm_codec_encode( pjmedia_codec *codec, (input->size >> 1), NULL); if (is_silence && - PJMEDIA_CODEC_MAX_SILENCE_PERIOD != -1 && - silence_duration < PJMEDIA_CODEC_MAX_SILENCE_PERIOD*8000/1000) + (PJMEDIA_CODEC_MAX_SILENCE_PERIOD == -1 || + silence_duration < PJMEDIA_CODEC_MAX_SILENCE_PERIOD*8000/1000)) { output->type = PJMEDIA_FRAME_TYPE_NONE; output->buf = NULL; @@ -566,6 +566,7 @@ static pj_status_t gsm_codec_encode( pjmedia_codec *codec, } output->type = PJMEDIA_FRAME_TYPE_AUDIO; + output->timestamp = input->timestamp; return PJ_SUCCESS; } @@ -595,6 +596,7 @@ static pj_status_t gsm_codec_decode( pjmedia_codec *codec, output->size = 320; output->type = PJMEDIA_FRAME_TYPE_AUDIO; + output->timestamp = input->timestamp; #if !PLC_DISABLED if (gsm_data->plc_enabled) diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/ilbc.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/ilbc.c similarity index 99% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/ilbc.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/ilbc.c index ff004aa734d99f973bb6a86538d85caf912b14c3..7feb1370c850d8679aac47abe514e8b5b5e8a9af 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/ilbc.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/ilbc.c @@ -1,4 +1,4 @@ -/* $Id: ilbc.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: ilbc.c 2792 2009-06-24 15:46:49Z nanang $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -563,8 +563,8 @@ static pj_status_t ilbc_codec_encode(pjmedia_codec *codec, (input->size >> 1), NULL); if (is_silence && - PJMEDIA_CODEC_MAX_SILENCE_PERIOD != -1 && - silence_period < PJMEDIA_CODEC_MAX_SILENCE_PERIOD*8000/1000) + (PJMEDIA_CODEC_MAX_SILENCE_PERIOD == -1 || + silence_period < PJMEDIA_CODEC_MAX_SILENCE_PERIOD*8000/1000)) { output->type = PJMEDIA_FRAME_TYPE_NONE; output->buf = NULL; diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/ipp_codecs.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/ipp_codecs.c similarity index 99% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/ipp_codecs.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/ipp_codecs.c index 2ae0654012e2ddde699b89fd0ff1553055fd062b..34948362ae20395c0cc84afeb25e9c4393829b45 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/ipp_codecs.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/ipp_codecs.c @@ -1,4 +1,4 @@ -/* $Id: ipp_codecs.c 2543 2009-03-23 13:22:45Z nanang $ */ +/* $Id: ipp_codecs.c 2792 2009-06-24 15:46:49Z nanang $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -1172,9 +1172,9 @@ static pj_status_t ipp_codec_encode( pjmedia_codec *codec, (input->size >> 1), NULL); if (is_silence && - PJMEDIA_CODEC_MAX_SILENCE_PERIOD != -1 && - silence_duration < (PJMEDIA_CODEC_MAX_SILENCE_PERIOD * - (int)ippc->clock_rate / 1000)) + (PJMEDIA_CODEC_MAX_SILENCE_PERIOD == -1 || + silence_duration < (PJMEDIA_CODEC_MAX_SILENCE_PERIOD * + (int)ippc->clock_rate / 1000))) { output->type = PJMEDIA_FRAME_TYPE_NONE; output->buf = NULL; diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/l16.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/l16.c similarity index 98% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/l16.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/l16.c index c4aee2ab9d436298f05751156da0579ab1199a6d..4e8d187d7d145bd7490099d9c9708368ff5d49c9 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/l16.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/l16.c @@ -1,4 +1,4 @@ -/* $Id: l16.c 2547 2009-03-23 13:27:54Z nanang $ */ +/* $Id: l16.c 2792 2009-06-24 15:46:49Z nanang $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -624,9 +624,9 @@ static pj_status_t l16_encode(pjmedia_codec *codec, (input->size >> 1), NULL); if (is_silence && - PJMEDIA_CODEC_MAX_SILENCE_PERIOD != -1 && - silence_duration < PJMEDIA_CODEC_MAX_SILENCE_PERIOD* - (int)data->clock_rate/1000) + (PJMEDIA_CODEC_MAX_SILENCE_PERIOD == -1 || + silence_duration < PJMEDIA_CODEC_MAX_SILENCE_PERIOD* + (int)data->clock_rate/1000)) { output->type = PJMEDIA_FRAME_TYPE_NONE; output->buf = NULL; @@ -650,6 +650,7 @@ static pj_status_t l16_encode(pjmedia_codec *codec, /* Done */ output->type = PJMEDIA_FRAME_TYPE_AUDIO; output->size = input->size; + output->timestamp = input->timestamp; return PJ_SUCCESS; } @@ -684,6 +685,7 @@ static pj_status_t l16_decode(pjmedia_codec *codec, output->type = PJMEDIA_FRAME_TYPE_AUDIO; output->size = input->size; + output->timestamp = input->timestamp; #if !PLC_DISABLED if (l16_data->plc_enabled) diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/speex_codec.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/speex_codec.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/speex_codec.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/speex_codec.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/alaw_ulaw.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/alaw_ulaw.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/alaw_ulaw.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/alaw_ulaw.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/alaw_ulaw_table.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/alaw_ulaw_table.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/alaw_ulaw_table.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/alaw_ulaw_table.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/bidirectional.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/bidirectional.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/bidirectional.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/bidirectional.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/clock_thread.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/clock_thread.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/clock_thread.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/clock_thread.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/codec.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/codec.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/codec.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/codec.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/conference.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/conference.c similarity index 95% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/conference.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/conference.c index c46444f8badaf28a0b294ef0b1cfdda78e460b68..41ccea787a48ffe50aecc8fccc53694c2dfb0fb7 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/conference.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/conference.c @@ -1,4 +1,4 @@ -/* $Id: conference.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: conference.c 2790 2009-06-24 15:26:59Z nanang $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -570,13 +570,17 @@ PJ_DEF(pj_status_t) pjmedia_conf_create( pj_pool_t *pool, /* Create port zero for sound device. */ status = create_sound_port(pool, conf); - if (status != PJ_SUCCESS) + if (status != PJ_SUCCESS) { + pjmedia_conf_destroy(conf); return status; + } /* Create mutex. */ status = pj_mutex_create_recursive(pool, "conf", &conf->mutex); - if (status != PJ_SUCCESS) + if (status != PJ_SUCCESS) { + pjmedia_conf_destroy(conf); return status; + } /* If sound device was created, connect sound device to the * master port. @@ -625,6 +629,8 @@ static pj_status_t resume_sound( pjmedia_conf *conf ) */ PJ_DEF(pj_status_t) pjmedia_conf_destroy( pjmedia_conf *conf ) { + unsigned i, ci; + PJ_ASSERT_RETURN(conf != NULL, PJ_EINVAL); /* Destroy sound device port. */ @@ -633,8 +639,24 @@ PJ_DEF(pj_status_t) pjmedia_conf_destroy( pjmedia_conf *conf ) conf->snd_dev_port = NULL; } + /* Destroy delay buf of all (passive) ports. */ + for (i=0, ci=0; i<conf->max_ports && ci<conf->port_cnt; ++i) { + struct conf_port *cport; + + cport = conf->ports[i]; + if (!cport) + continue; + + ++ci; + if (cport->delay_buf) { + pjmedia_delay_buf_destroy(cport->delay_buf); + cport->delay_buf = NULL; + } + } + /* Destroy mutex */ - pj_mutex_destroy(conf->mutex); + if (conf->mutex) + pj_mutex_destroy(conf->mutex); return PJ_SUCCESS; } @@ -792,6 +814,9 @@ PJ_DEF(pj_status_t) pjmedia_conf_add_passive_port( pjmedia_conf *conf, pj_str_t tmp; pj_status_t status; + PJ_LOG(1, (THIS_FILE, "This API has been deprecated since 1.3 and will " + "be removed in the future release!")); + PJ_ASSERT_RETURN(conf && pool, PJ_EINVAL); /* For this version of PJMEDIA, channel(s) number MUST be: @@ -886,8 +911,14 @@ PJ_DEF(pj_status_t) pjmedia_conf_configure_port( pjmedia_conf *conf, /* Check arguments */ PJ_ASSERT_RETURN(conf && slot<conf->max_ports, PJ_EINVAL); + pj_mutex_lock(conf->mutex); + /* Port must be valid. */ - PJ_ASSERT_RETURN(conf->ports[slot] != NULL, PJ_EINVAL); + conf_port = conf->ports[slot]; + if (conf_port == NULL) { + pj_mutex_unlock(conf->mutex); + return PJ_EINVAL; + } conf_port = conf->ports[slot]; @@ -897,6 +928,8 @@ PJ_DEF(pj_status_t) pjmedia_conf_configure_port( pjmedia_conf *conf, if (rx != PJMEDIA_PORT_NO_CHANGE) conf_port->rx_setting = rx; + pj_mutex_unlock(conf->mutex); + return PJ_SUCCESS; } @@ -917,17 +950,18 @@ PJ_DEF(pj_status_t) pjmedia_conf_connect_port( pjmedia_conf *conf, PJ_ASSERT_RETURN(conf && src_slot<conf->max_ports && sink_slot<conf->max_ports, PJ_EINVAL); - /* Ports must be valid. */ - PJ_ASSERT_RETURN(conf->ports[src_slot] != NULL, PJ_EINVAL); - PJ_ASSERT_RETURN(conf->ports[sink_slot] != NULL, PJ_EINVAL); - /* For now, level MUST be zero. */ PJ_ASSERT_RETURN(level == 0, PJ_EINVAL); pj_mutex_lock(conf->mutex); + /* Ports must be valid. */ src_port = conf->ports[src_slot]; dst_port = conf->ports[sink_slot]; + if (!src_port || !dst_port) { + pj_mutex_unlock(conf->mutex); + return PJ_EINVAL; + } /* Check if connection has been made */ for (i=0; i<src_port->listener_cnt; ++i) { @@ -979,14 +1013,15 @@ PJ_DEF(pj_status_t) pjmedia_conf_disconnect_port( pjmedia_conf *conf, PJ_ASSERT_RETURN(conf && src_slot<conf->max_ports && sink_slot<conf->max_ports, PJ_EINVAL); - /* Ports must be valid. */ - PJ_ASSERT_RETURN(conf->ports[src_slot] != NULL, PJ_EINVAL); - PJ_ASSERT_RETURN(conf->ports[sink_slot] != NULL, PJ_EINVAL); - pj_mutex_lock(conf->mutex); + /* Ports must be valid. */ src_port = conf->ports[src_slot]; dst_port = conf->ports[sink_slot]; + if (!src_port || !dst_port) { + pj_mutex_unlock(conf->mutex); + return PJ_EINVAL; + } /* Check if connection has been made */ for (i=0; i<src_port->listener_cnt; ++i) { @@ -1057,9 +1092,6 @@ PJ_DEF(pj_status_t) pjmedia_conf_remove_port( pjmedia_conf *conf, /* Check arguments */ PJ_ASSERT_RETURN(conf && port < conf->max_ports, PJ_EINVAL); - /* Port must be valid. */ - PJ_ASSERT_RETURN(conf->ports[port] != NULL, PJ_EINVAL); - /* Suspend the sound devices. * Don't want to remove port while port is being accessed by sound * device's threads! @@ -1067,7 +1099,13 @@ PJ_DEF(pj_status_t) pjmedia_conf_remove_port( pjmedia_conf *conf, pj_mutex_lock(conf->mutex); + /* Port must be valid. */ conf_port = conf->ports[port]; + if (conf_port == NULL) { + pj_mutex_unlock(conf->mutex); + return PJ_EINVAL; + } + conf_port->tx_setting = PJMEDIA_PORT_DISABLE; conf_port->rx_setting = PJMEDIA_PORT_DISABLE; @@ -1109,6 +1147,14 @@ PJ_DEF(pj_status_t) pjmedia_conf_remove_port( pjmedia_conf *conf, --conf->connect_cnt; } + /* Destroy pjmedia port if this conf port is passive port, + * i.e: has delay buf. + */ + if (conf_port->delay_buf) { + pjmedia_port_destroy(conf_port->port); + conf_port->port = NULL; + } + /* Remove the port. */ conf->ports[port] = NULL; --conf->port_cnt; @@ -1136,6 +1182,9 @@ PJ_DEF(pj_status_t) pjmedia_conf_enum_ports( pjmedia_conf *conf, PJ_ASSERT_RETURN(conf && p_count && ports, PJ_EINVAL); + /* Lock mutex */ + pj_mutex_lock(conf->mutex); + for (i=0; i<conf->max_ports && count<*p_count; ++i) { if (!conf->ports[i]) continue; @@ -1143,6 +1192,9 @@ PJ_DEF(pj_status_t) pjmedia_conf_enum_ports( pjmedia_conf *conf, ports[count++] = i; } + /* Unlock mutex */ + pj_mutex_unlock(conf->mutex); + *p_count = count; return PJ_SUCCESS; } @@ -1159,10 +1211,15 @@ PJ_DEF(pj_status_t) pjmedia_conf_get_port_info( pjmedia_conf *conf, /* Check arguments */ PJ_ASSERT_RETURN(conf && slot<conf->max_ports, PJ_EINVAL); - /* Port must be valid. */ - PJ_ASSERT_RETURN(conf->ports[slot] != NULL, PJ_EINVAL); + /* Lock mutex */ + pj_mutex_lock(conf->mutex); + /* Port must be valid. */ conf_port = conf->ports[slot]; + if (conf_port == NULL) { + pj_mutex_unlock(conf->mutex); + return PJ_EINVAL; + } info->slot = slot; info->name = conf_port->name; @@ -1177,6 +1234,9 @@ PJ_DEF(pj_status_t) pjmedia_conf_get_port_info( pjmedia_conf *conf, info->tx_adj_level = conf_port->tx_adj_level - NORMAL_LEVEL; info->rx_adj_level = conf_port->rx_adj_level - NORMAL_LEVEL; + /* Unlock mutex */ + pj_mutex_unlock(conf->mutex); + return PJ_SUCCESS; } @@ -1189,6 +1249,9 @@ PJ_DEF(pj_status_t) pjmedia_conf_get_ports_info(pjmedia_conf *conf, PJ_ASSERT_RETURN(conf && size && info, PJ_EINVAL); + /* Lock mutex */ + pj_mutex_lock(conf->mutex); + for (i=0; i<conf->max_ports && count<*size; ++i) { if (!conf->ports[i]) continue; @@ -1197,6 +1260,9 @@ PJ_DEF(pj_status_t) pjmedia_conf_get_ports_info(pjmedia_conf *conf, ++count; } + /* Unlock mutex */ + pj_mutex_unlock(conf->mutex); + *size = count; return PJ_SUCCESS; } @@ -1215,10 +1281,15 @@ PJ_DEF(pj_status_t) pjmedia_conf_get_signal_level( pjmedia_conf *conf, /* Check arguments */ PJ_ASSERT_RETURN(conf && slot<conf->max_ports, PJ_EINVAL); - /* Port must be valid. */ - PJ_ASSERT_RETURN(conf->ports[slot] != NULL, PJ_EINVAL); + /* Lock mutex */ + pj_mutex_lock(conf->mutex); + /* Port must be valid. */ conf_port = conf->ports[slot]; + if (conf_port == NULL) { + pj_mutex_unlock(conf->mutex); + return PJ_EINVAL; + } if (tx_level != NULL) { *tx_level = conf_port->tx_level; @@ -1227,6 +1298,9 @@ PJ_DEF(pj_status_t) pjmedia_conf_get_signal_level( pjmedia_conf *conf, if (rx_level != NULL) *rx_level = conf_port->rx_level; + /* Unlock mutex */ + pj_mutex_unlock(conf->mutex); + return PJ_SUCCESS; } @@ -1243,20 +1317,28 @@ PJ_DEF(pj_status_t) pjmedia_conf_adjust_rx_level( pjmedia_conf *conf, /* Check arguments */ PJ_ASSERT_RETURN(conf && slot<conf->max_ports, PJ_EINVAL); - /* Port must be valid. */ - PJ_ASSERT_RETURN(conf->ports[slot] != NULL, PJ_EINVAL); - /* Value must be from -128 to +127 */ /* Disabled, you can put more than +127, at your own risk: PJ_ASSERT_RETURN(adj_level >= -128 && adj_level <= 127, PJ_EINVAL); */ PJ_ASSERT_RETURN(adj_level >= -128, PJ_EINVAL); + /* Lock mutex */ + pj_mutex_lock(conf->mutex); + + /* Port must be valid. */ conf_port = conf->ports[slot]; + if (conf_port == NULL) { + pj_mutex_unlock(conf->mutex); + return PJ_EINVAL; + } /* Set normalized adjustment level. */ conf_port->rx_adj_level = adj_level + NORMAL_LEVEL; + /* Unlock mutex */ + pj_mutex_unlock(conf->mutex); + return PJ_SUCCESS; } @@ -1273,20 +1355,28 @@ PJ_DEF(pj_status_t) pjmedia_conf_adjust_tx_level( pjmedia_conf *conf, /* Check arguments */ PJ_ASSERT_RETURN(conf && slot<conf->max_ports, PJ_EINVAL); - /* Port must be valid. */ - PJ_ASSERT_RETURN(conf->ports[slot] != NULL, PJ_EINVAL); - /* Value must be from -128 to +127 */ /* Disabled, you can put more than +127,, at your own risk: PJ_ASSERT_RETURN(adj_level >= -128 && adj_level <= 127, PJ_EINVAL); */ PJ_ASSERT_RETURN(adj_level >= -128, PJ_EINVAL); + /* Lock mutex */ + pj_mutex_lock(conf->mutex); + + /* Port must be valid. */ conf_port = conf->ports[slot]; + if (conf_port == NULL) { + pj_mutex_unlock(conf->mutex); + return PJ_EINVAL; + } /* Set normalized adjustment level. */ conf_port->tx_adj_level = adj_level + NORMAL_LEVEL; + /* Unlock mutex */ + pj_mutex_unlock(conf->mutex); + return PJ_SUCCESS; } diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/delaybuf.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/delaybuf.c similarity index 98% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/delaybuf.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/delaybuf.c index 9fd748bc4193635e24f8c4a4c42d4d8c682de5b9..908fe5c5396339425e76810c2107b3a05c931451 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/delaybuf.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/delaybuf.c @@ -1,4 +1,4 @@ -/* $Id: delaybuf.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: delaybuf.c 2790 2009-06-24 15:26:59Z nanang $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -121,20 +121,23 @@ PJ_DEF(pj_status_t) pjmedia_delay_buf_create( pj_pool_t *pool, b->eff_cnt = b->max_cnt >> 1; b->recalc_timer = RECALC_TIME; - status = pj_lock_create_recursive_mutex(pool, b->obj_name, - &b->lock); - if (status != PJ_SUCCESS) - return status; - + /* Create circular buffer */ status = pjmedia_circ_buf_create(pool, b->max_cnt, &b->circ_buf); if (status != PJ_SUCCESS) return status; + /* Create WSOLA */ status = pjmedia_wsola_create(pool, clock_rate, samples_per_frame, 1, 0, &b->wsola); if (status != PJ_SUCCESS) return status; + /* Finally, create mutex */ + status = pj_lock_create_recursive_mutex(pool, b->obj_name, + &b->lock); + if (status != PJ_SUCCESS) + return status; + *p_b = b; TRACE__((b->obj_name,"Delay buffer created")); diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/dsound.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/dsound.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/dsound.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/dsound.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/echo_common.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/echo_common.c similarity index 98% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/echo_common.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/echo_common.c index fb13055976677bc939388c47fce006fc5159f354..7275e7a4d049dad54eca57fa59f978283093b65b 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/echo_common.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/echo_common.c @@ -1,4 +1,4 @@ -/* $Id: echo_common.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: echo_common.c 2790 2009-06-24 15:26:59Z nanang $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -239,6 +239,12 @@ PJ_DEF(pj_status_t) pjmedia_echo_create2(pj_pool_t *pool, PJ_DEF(pj_status_t) pjmedia_echo_destroy(pjmedia_echo_state *echo ) { (*echo->op->ec_destroy)(echo->state); + + if (echo->delay_buf) { + pjmedia_delay_buf_destroy(echo->delay_buf); + echo->delay_buf = NULL; + } + pj_pool_release(echo->pool); return PJ_SUCCESS; } diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/echo_internal.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/echo_internal.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/echo_internal.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/echo_internal.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/echo_port.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/echo_port.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/echo_port.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/echo_port.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/echo_speex.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/echo_speex.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/echo_speex.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/echo_speex.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/echo_suppress.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/echo_suppress.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/echo_suppress.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/echo_suppress.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/endpoint.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/endpoint.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/endpoint.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/endpoint.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/errno.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/errno.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/errno.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/errno.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/g711.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/g711.c similarity index 98% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/g711.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/g711.c index f595fb9877d71c8b9b6f4772447a9218dde830c7..33b9b1524e2250b0d41ab9dc2aea6592762babd8 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/g711.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/g711.c @@ -1,4 +1,4 @@ -/* $Id: g711.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: g711.c 2792 2009-06-24 15:46:49Z nanang $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -502,8 +502,8 @@ static pj_status_t g711_encode(pjmedia_codec *codec, (const pj_int16_t*) input->buf, (input->size >> 1), NULL); if (is_silence && - PJMEDIA_CODEC_MAX_SILENCE_PERIOD != -1 && - silence_period < PJMEDIA_CODEC_MAX_SILENCE_PERIOD*8000/1000) + (PJMEDIA_CODEC_MAX_SILENCE_PERIOD == -1 || + silence_period < PJMEDIA_CODEC_MAX_SILENCE_PERIOD*8000/1000)) { output->type = PJMEDIA_FRAME_TYPE_NONE; output->buf = NULL; @@ -539,6 +539,7 @@ static pj_status_t g711_encode(pjmedia_codec *codec, output->type = PJMEDIA_FRAME_TYPE_AUDIO; output->size = (input->size >> 1); + output->timestamp = input->timestamp; return PJ_SUCCESS; } @@ -582,6 +583,7 @@ static pj_status_t g711_decode(pjmedia_codec *codec, output->type = PJMEDIA_FRAME_TYPE_AUDIO; output->size = (input->size << 1); + output->timestamp = input->timestamp; #if !PLC_DISABLED if (priv->plc_enabled) diff --git a/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/jbuf.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/jbuf.c new file mode 100644 index 0000000000000000000000000000000000000000..6e1e8b3fdd5b756a90403f790f16bce8dc637ef2 --- /dev/null +++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/jbuf.c @@ -0,0 +1,791 @@ +/* $Id: jbuf.c 2788 2009-06-24 14:46:36Z nanang $ */ +/* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +/* + * Based on implementation kindly contributed by Switchlab, Ltd. + */ +#include <pjmedia/jbuf.h> +#include <pjmedia/errno.h> +#include <pj/pool.h> +#include <pj/assert.h> +#include <pj/log.h> +#include <pj/math.h> +#include <pj/string.h> + + +#define THIS_FILE "jbuf.c" + + +/* Minimal difference between JB size and 2*burst-level to perform + * JB shrinking. + */ +#define SAFE_SHRINKING_DIFF 1 + +/* Minimal gap (in ms) between JB shrinking */ +#define MIN_SHRINK_GAP_MSEC 200 + +/* Invalid sequence number, used as the initial value. */ +#define INVALID_OFFSET -9999 + +/* Maximum burst length, whenever an operation is bursting longer than + * this value, JB will assume that the opposite operation was idle. + */ +#define MAX_BURST_MSEC 1000 + +/* Number of OP switches to be performed in JB_STATUS_INITIALIZING, before + * JB can switch its states to JB_STATUS_PROCESSING. + */ +#define INIT_CYCLE 10 + + +/* Struct of JB internal buffer, represented in a circular buffer containing + * frame content, frame type, frame length, and frame bit info. + */ +typedef struct jb_framelist_t +{ + /* Settings */ + unsigned frame_size; /**< maximum size of frame */ + unsigned max_count; /**< maximum number of frames */ + + /* Buffers */ + char *content; /**< frame content array */ + int *frame_type; /**< frame type array */ + pj_size_t *content_len; /**< frame length array */ + pj_uint32_t *bit_info; /**< frame bit info array */ + + /* States */ + unsigned head; /**< index of head, pointed frame + will be returned by next GET */ + unsigned size; /**< current size of framelist. */ + int origin; /**< original index of flist_head */ +} jb_framelist_t; + + +struct pjmedia_jbuf +{ + /* Settings (consts) */ + pj_str_t jb_name; /**< jitter buffer name */ + pj_size_t jb_frame_size; /**< frame size */ + unsigned jb_frame_ptime; /**< frame duration. */ + pj_size_t jb_max_count; /**< capacity of jitter buffer, + in frames */ + int jb_def_prefetch; /**< Default prefetch */ + int jb_min_prefetch; /**< Minimum allowable prefetch */ + int jb_max_prefetch; /**< Maximum allowable prefetch */ + int jb_max_burst; /**< maximum possible burst, whenever + burst exceeds this value, it + won't be included in level + calculation */ + int jb_min_shrink_gap; /**< How often can we shrink */ + + /* Buffer */ + jb_framelist_t jb_framelist; /**< the buffer */ + + /* States */ + int jb_level; /**< delay between source & + destination (calculated according + of the number of burst get/put + operations) */ + int jb_max_hist_level; /**< max level during the last level + calculations */ + int jb_stable_hist; /**< num of times the delay has been + lower then the prefetch num */ + int jb_last_op; /**< last operation executed + (put/get) */ + int jb_prefetch; /**< no. of frame to insert before + removing some (at the beginning + of the framelist->content + operation), the value may be + continuously updated based on + current frame burst level. */ + int jb_status; /**< status is 'init' until the first + 'put' operation */ + int jb_init_cycle_cnt; /**< status is 'init' until the first + 'put' operation */ + int jb_last_del_seq; /**< Seq # of last frame deleted */ + + /* Statistics */ + pj_math_stat jb_delay; /**< Delay statistics of jitter buffer + (in ms) */ + pj_math_stat jb_burst; /**< Burst statistics (in frames) */ + unsigned jb_lost; /**< Number of lost frames. */ + unsigned jb_discard; /**< Number of discarded frames. */ + unsigned jb_empty; /**< Number of empty/prefetching frame + returned by GET. */ +}; + + +#define JB_STATUS_INITIALIZING 0 +#define JB_STATUS_PROCESSING 1 +#define JB_STATUS_PREFETCHING 2 + +/* Enabling this would log the jitter buffer state about once per + * second. + */ +#if 1 +# define TRACE__(args) PJ_LOG(5,args) +#else +# define TRACE__(args) +#endif + +static pj_status_t jb_framelist_reset(jb_framelist_t *framelist); + +static pj_status_t jb_framelist_init( pj_pool_t *pool, + jb_framelist_t *framelist, + unsigned frame_size, + unsigned max_count) +{ + PJ_ASSERT_RETURN(pool && framelist, PJ_EINVAL); + + pj_bzero(framelist, sizeof(jb_framelist_t)); + + framelist->frame_size = frame_size; + framelist->max_count = max_count; + framelist->content = (char*) + pj_pool_alloc(pool, + framelist->frame_size* + framelist->max_count); + framelist->frame_type = (int*) + pj_pool_alloc(pool, + sizeof(framelist->frame_type[0])* + framelist->max_count); + framelist->content_len = (pj_size_t*) + pj_pool_alloc(pool, + sizeof(framelist->content_len[0])* + framelist->max_count); + framelist->bit_info = (pj_uint32_t*) + pj_pool_alloc(pool, + sizeof(framelist->bit_info[0])* + framelist->max_count); + + return jb_framelist_reset(framelist); + +} + +static pj_status_t jb_framelist_destroy(jb_framelist_t *framelist) +{ + PJ_UNUSED_ARG(framelist); + return PJ_SUCCESS; +} + +static pj_status_t jb_framelist_reset(jb_framelist_t *framelist) +{ + framelist->head = 0; + framelist->origin = INVALID_OFFSET; + framelist->size = 0; + + //pj_bzero(framelist->content, + // framelist->frame_size * + // framelist->max_count); + + pj_memset(framelist->frame_type, + PJMEDIA_JB_MISSING_FRAME, + sizeof(framelist->frame_type[0]) * + framelist->max_count); + + pj_bzero(framelist->content_len, + sizeof(framelist->content_len[0]) * + framelist->max_count); + + //pj_bzero(framelist->bit_info, + // sizeof(framelist->bit_info[0]) * + // framelist->max_count); + + return PJ_SUCCESS; +} + + +static unsigned jb_framelist_size(jb_framelist_t *framelist) +{ + return framelist->size; +} + + +static pj_bool_t jb_framelist_get(jb_framelist_t *framelist, + void *frame, pj_size_t *size, + pjmedia_jb_frame_type *p_type, + pj_uint32_t *bit_info) +{ + if (framelist->size) { + pj_memcpy(frame, + framelist->content + + framelist->head * framelist->frame_size, + framelist->frame_size); + *p_type = (pjmedia_jb_frame_type) + framelist->frame_type[framelist->head]; + if (size) + *size = framelist->content_len[framelist->head]; + if (bit_info) + *bit_info = framelist->bit_info[framelist->head]; + + //pj_bzero(framelist->content + + // framelist->head * framelist->frame_size, + // framelist->frame_size); + framelist->frame_type[framelist->head] = PJMEDIA_JB_MISSING_FRAME; + framelist->content_len[framelist->head] = 0; + framelist->bit_info[framelist->head] = 0; + + framelist->origin++; + framelist->head = (framelist->head + 1) % framelist->max_count; + framelist->size--; + + return PJ_TRUE; + } else { + pj_bzero(frame, framelist->frame_size); + + return PJ_FALSE; + } +} + + +static unsigned jb_framelist_remove_head(jb_framelist_t *framelist, + unsigned count) +{ + if (count > framelist->size) + count = framelist->size; + + if (count) { + /* may be done in two steps if overlapping */ + unsigned step1,step2; + unsigned tmp = framelist->head+count; + + if (tmp > framelist->max_count) { + step1 = framelist->max_count - framelist->head; + step2 = count-step1; + } else { + step1 = count; + step2 = 0; + } + + //pj_bzero(framelist->content + + // framelist->head * framelist->frame_size, + // step1*framelist->frame_size); + pj_memset(framelist->frame_type+framelist->head, + PJMEDIA_JB_MISSING_FRAME, + step1*sizeof(framelist->frame_type[0])); + pj_bzero(framelist->content_len+framelist->head, + step1*sizeof(framelist->content_len[0])); + + if (step2) { + //pj_bzero( framelist->content, + // step2*framelist->frame_size); + pj_memset(framelist->frame_type, + PJMEDIA_JB_MISSING_FRAME, + step2*sizeof(framelist->frame_type[0])); + pj_bzero (framelist->content_len, + step2*sizeof(framelist->content_len[0])); + } + + /* update states */ + framelist->origin += count; + framelist->head = (framelist->head + count) % framelist->max_count; + framelist->size -= count; + } + + return count; +} + + +static pj_status_t jb_framelist_put_at(jb_framelist_t *framelist, + int index, + const void *frame, + unsigned frame_size, + pj_uint32_t bit_info) +{ + int distance; + unsigned where; + enum { MAX_MISORDER = 100 }; + enum { MAX_DROPOUT = 3000 }; + + assert(frame_size <= framelist->frame_size); + + /* too late or duplicated or sequence restart */ + if (index < framelist->origin) { + if (framelist->origin - index < MAX_MISORDER) { + /* too late or duplicated */ + return PJ_ETOOSMALL; + } else { + /* sequence restart */ + framelist->origin = index - framelist->size; + } + } + + /* if jbuf is empty, just reset the origin */ + if (framelist->size == 0) { + framelist->origin = index; + } + + /* get distance of this frame to the first frame in the buffer */ + distance = index - framelist->origin; + + /* far jump, the distance is greater than buffer capacity */ + if (distance >= (int)framelist->max_count) { + if (distance > MAX_DROPOUT) { + /* jump too far, reset the buffer */ + jb_framelist_reset(framelist); + framelist->origin = index; + distance = 0; + } else { + /* otherwise, reject the frame */ + return PJ_ETOOMANY; + } + } + + /* get the slot position */ + where = (framelist->head + distance) % framelist->max_count; + + /* if the slot is occupied, it must be duplicated frame, ignore it. */ + if (framelist->frame_type[where] != PJMEDIA_JB_MISSING_FRAME) + return PJ_EEXISTS; + + /* put the frame into the slot */ + pj_memcpy(framelist->content + where * framelist->frame_size, + frame, frame_size); + framelist->frame_type[where] = PJMEDIA_JB_NORMAL_FRAME; + framelist->content_len[where] = frame_size; + framelist->bit_info[where] = bit_info; + if (framelist->origin + (int)framelist->size <= index) + framelist->size = distance + 1; + + return PJ_SUCCESS; +} + + + +enum pjmedia_jb_op +{ + JB_OP_INIT = -1, + JB_OP_PUT = 1, + JB_OP_GET = 2 +}; + + +PJ_DEF(pj_status_t) pjmedia_jbuf_create(pj_pool_t *pool, + const pj_str_t *name, + unsigned frame_size, + unsigned ptime, + unsigned max_count, + pjmedia_jbuf **p_jb) +{ + pjmedia_jbuf *jb; + pj_status_t status; + + jb = PJ_POOL_ZALLOC_T(pool, pjmedia_jbuf); + + status = jb_framelist_init(pool, &jb->jb_framelist, frame_size, max_count); + if (status != PJ_SUCCESS) + return status; + + pj_strdup_with_null(pool, &jb->jb_name, name); + jb->jb_frame_size = frame_size; + jb->jb_frame_ptime = ptime; + jb->jb_prefetch = PJ_MIN(PJMEDIA_JB_DEFAULT_INIT_DELAY,max_count*4/5); + jb->jb_min_prefetch = 0; + jb->jb_max_prefetch = max_count*4/5; + jb->jb_max_count = max_count; + jb->jb_min_shrink_gap= MIN_SHRINK_GAP_MSEC / ptime; + jb->jb_max_burst = MAX_BURST_MSEC / ptime; + pj_math_stat_init(&jb->jb_delay); + pj_math_stat_init(&jb->jb_burst); + + pjmedia_jbuf_reset(jb); + + *p_jb = jb; + return PJ_SUCCESS; +} + + +/* + * Set the jitter buffer to fixed delay mode. The default behavior + * is to adapt the delay with actual packet delay. + * + */ +PJ_DEF(pj_status_t) pjmedia_jbuf_set_fixed( pjmedia_jbuf *jb, + unsigned prefetch) +{ + PJ_ASSERT_RETURN(jb, PJ_EINVAL); + PJ_ASSERT_RETURN(prefetch <= jb->jb_max_count, PJ_EINVAL); + + jb->jb_min_prefetch = jb->jb_max_prefetch = + jb->jb_prefetch = jb->jb_def_prefetch = prefetch; + + return PJ_SUCCESS; +} + + +/* + * Set the jitter buffer to adaptive mode. + */ +PJ_DEF(pj_status_t) pjmedia_jbuf_set_adaptive( pjmedia_jbuf *jb, + unsigned prefetch, + unsigned min_prefetch, + unsigned max_prefetch) +{ + PJ_ASSERT_RETURN(jb, PJ_EINVAL); + PJ_ASSERT_RETURN(min_prefetch < max_prefetch && + prefetch <= max_prefetch && + max_prefetch <= jb->jb_max_count, + PJ_EINVAL); + + jb->jb_prefetch = jb->jb_def_prefetch = prefetch; + jb->jb_min_prefetch = min_prefetch; + jb->jb_max_prefetch = max_prefetch; + + return PJ_SUCCESS; +} + + +PJ_DEF(pj_status_t) pjmedia_jbuf_reset(pjmedia_jbuf *jb) +{ + jb->jb_level = 0; + jb->jb_last_op = JB_OP_INIT; + jb->jb_stable_hist = 0; + jb->jb_status = JB_STATUS_INITIALIZING; + jb->jb_init_cycle_cnt= 0; + jb->jb_max_hist_level= 0; + + jb_framelist_reset(&jb->jb_framelist); + + return PJ_SUCCESS; +} + + +PJ_DEF(pj_status_t) pjmedia_jbuf_destroy(pjmedia_jbuf *jb) +{ + TRACE__((jb->jb_name.ptr, "\n" + " JB summary:\n" + " size=%d prefetch=%d\n" + " delay (min/max/avg/dev)=%d/%d/%d/%d ms\n" + " burst (min/max/avg/dev)=%d/%d/%d/%d frames\n" + " lost=%d discard=%d empty=%d\n", + jb->jb_framelist.size, jb->jb_prefetch, + jb->jb_delay.min, jb->jb_delay.max, jb->jb_delay.mean, + pj_math_stat_get_stddev(&jb->jb_delay), + jb->jb_burst.min, jb->jb_burst.max, jb->jb_burst.mean, + pj_math_stat_get_stddev(&jb->jb_burst), + jb->jb_lost, jb->jb_discard, jb->jb_empty)); + + return jb_framelist_destroy(&jb->jb_framelist); +} + + +static void jbuf_calculate_jitter(pjmedia_jbuf *jb) +{ + int diff, cur_size; + + cur_size = jb_framelist_size(&jb->jb_framelist); + pj_math_stat_update(&jb->jb_burst, jb->jb_level); + jb->jb_max_hist_level = PJ_MAX(jb->jb_max_hist_level, jb->jb_level); + + /* Burst level is decreasing */ + if (jb->jb_level < jb->jb_prefetch) { + + enum { STABLE_HISTORY_LIMIT = 100 }; + + jb->jb_stable_hist++; + + /* Only update the prefetch if 'stable' condition is reached + * (not just short time impulse) + */ + if (jb->jb_stable_hist > STABLE_HISTORY_LIMIT) { + + diff = (jb->jb_prefetch - jb->jb_max_hist_level) / 3; + + if (diff < 1) + diff = 1; + + jb->jb_prefetch -= diff; + if (jb->jb_prefetch < jb->jb_min_prefetch) + jb->jb_prefetch = jb->jb_min_prefetch; + + /* Reset history */ + jb->jb_max_hist_level = 0; + jb->jb_stable_hist = 0; + + TRACE__((jb->jb_name.ptr,"jb updated(1), prefetch=%d, size=%d", + jb->jb_prefetch, cur_size)); + } + } + + /* Burst level is increasing */ + else if (jb->jb_level > jb->jb_prefetch) { + + /* Instaneous set prefetch to recent maximum level (max_hist_level) */ + jb->jb_prefetch = PJ_MIN(jb->jb_max_hist_level, + (int)(jb->jb_max_count*4/5)); + if (jb->jb_prefetch > jb->jb_max_prefetch) + jb->jb_prefetch = jb->jb_max_prefetch; + + jb->jb_stable_hist = 0; + /* Do not reset max_hist_level. */ + //jb->jb_max_hist_level = 0; + + TRACE__((jb->jb_name.ptr,"jb updated(2), prefetch=%d, size=%d", + jb->jb_prefetch, cur_size)); + } + + /* Level is unchanged */ + else { + jb->jb_stable_hist = 0; + } +} + +PJ_INLINE(void) jbuf_update(pjmedia_jbuf *jb, int oper) +{ + int diff, burst_level; + + if(jb->jb_last_op != oper) { + jb->jb_last_op = oper; + + if (jb->jb_status == JB_STATUS_INITIALIZING) { + /* Switch status 'initializing' -> 'processing' after some OP + * switch cycles and current OP is GET (burst level is calculated + * based on PUT burst), so burst calculation is guaranted to be + * performed right after the status switching. + */ + if (++jb->jb_init_cycle_cnt >= INIT_CYCLE && oper == JB_OP_GET) { + jb->jb_status = JB_STATUS_PROCESSING; + } else { + jb->jb_level = 0; + return; + } + } + + /* Perform jitter calculation based on PUT burst-level only, since + * GET burst-level may not be accurate, e.g: when VAD is active. + * Note that when burst-level is too big, i.e: exceeds jb_max_burst, + * the GET op may be idle, in this case, we better skip the jitter + * calculation. + */ + if (oper == JB_OP_GET && jb->jb_level < jb->jb_max_burst) + jbuf_calculate_jitter(jb); + + jb->jb_level = 0; + } + + /* These code is used for shortening the delay in the jitter buffer. + * It needs shrink only when there is possibility of drift. Drift + * detection is performed by inspecting the jitter buffer size, if + * its size is twice of current burst level, there can be drift. + * + * Moreover, normally drift level is quite low, so JB shouldn't need + * to shrink aggresively, it will shrink maximum one frame per + * MIN_SHRINK_GAP_MSEC ms. Theoritically, JB may handle drift level + * as much as = FRAME_PTIME/MIN_SHRINK_GAP_MSEC * 100% + * + * Whenever there is drift, where PUT > GET, this method will keep + * the latency (JB size) as much as twice of burst level. + */ + + if (jb->jb_status != JB_STATUS_PROCESSING) + return; + + burst_level = PJ_MAX(jb->jb_prefetch, jb->jb_level); + diff = jb_framelist_size(&jb->jb_framelist) - burst_level*2; + + if (diff >= SAFE_SHRINKING_DIFF) { + /* Check and adjust jb_last_del_seq, in case there was seq restart */ + if (jb->jb_framelist.origin < jb->jb_last_del_seq) + jb->jb_last_del_seq = jb->jb_framelist.origin; + + if (jb->jb_framelist.origin - jb->jb_last_del_seq >= + jb->jb_min_shrink_gap) + { + /* Shrink slowly, one frame per cycle */ + diff = 1; + + /* Drop frame(s)! */ + diff = jb_framelist_remove_head(&jb->jb_framelist, diff); + jb->jb_last_del_seq = jb->jb_framelist.origin; + jb->jb_discard += diff; + + TRACE__((jb->jb_name.ptr, + "JB shrinking %d frame(s), cur size=%d", diff, + jb_framelist_size(&jb->jb_framelist))); + } + } +} + +PJ_DEF(void) pjmedia_jbuf_put_frame( pjmedia_jbuf *jb, + const void *frame, + pj_size_t frame_size, + int frame_seq) +{ + pjmedia_jbuf_put_frame2(jb, frame, frame_size, 0, frame_seq, NULL); +} + +PJ_DEF(void) pjmedia_jbuf_put_frame2(pjmedia_jbuf *jb, + const void *frame, + pj_size_t frame_size, + pj_uint32_t bit_info, + int frame_seq, + pj_bool_t *discarded) +{ + pj_size_t min_frame_size; + int prev_size, cur_size; + pj_status_t status; + + /* Get JB size before PUT */ + prev_size = jb_framelist_size(&jb->jb_framelist); + + /* Attempt to store the frame */ + min_frame_size = PJ_MIN(frame_size, jb->jb_frame_size); + status = jb_framelist_put_at(&jb->jb_framelist, frame_seq, frame, + min_frame_size, bit_info); + + /* Jitter buffer is full, cannot store the frame */ + while (status == PJ_ETOOMANY) { + unsigned removed; + + removed = jb_framelist_remove_head(&jb->jb_framelist, + PJ_MAX(jb->jb_max_count/4, 1)); + status = jb_framelist_put_at(&jb->jb_framelist, frame_seq, frame, + min_frame_size, bit_info); + + jb->jb_discard += removed; + } + + /* Get JB size after PUT */ + cur_size = jb_framelist_size(&jb->jb_framelist); + + /* Return the flag if this frame is discarded */ + if (discarded) + *discarded = (status != PJ_SUCCESS); + + if (status == PJ_SUCCESS) { + if (jb->jb_status == JB_STATUS_PREFETCHING) { + TRACE__((jb->jb_name.ptr, "PUT prefetch_cnt=%d/%d", + cur_size, jb->jb_prefetch)); + if (cur_size >= jb->jb_prefetch) + jb->jb_status = JB_STATUS_PROCESSING; + } + jb->jb_level += (cur_size > prev_size ? cur_size-prev_size : 1); + jbuf_update(jb, JB_OP_PUT); + } else + jb->jb_discard++; +} + +/* + * Get frame from jitter buffer. + */ +PJ_DEF(void) pjmedia_jbuf_get_frame( pjmedia_jbuf *jb, + void *frame, + char *p_frame_type) +{ + pjmedia_jbuf_get_frame2(jb, frame, NULL, p_frame_type, NULL); +} + +/* + * Get frame from jitter buffer. + */ +PJ_DEF(void) pjmedia_jbuf_get_frame2(pjmedia_jbuf *jb, + void *frame, + pj_size_t *size, + char *p_frame_type, + pj_uint32_t *bit_info) +{ + int cur_size; + + cur_size = jb_framelist_size(&jb->jb_framelist); + + if (cur_size == 0) { + /* jitter buffer empty */ + + if (jb->jb_def_prefetch) + jb->jb_status = JB_STATUS_PREFETCHING; + + //pj_bzero(frame, jb->jb_frame_size); + *p_frame_type = PJMEDIA_JB_ZERO_EMPTY_FRAME; + if (size) + *size = 0; + + jb->jb_empty++; + + } else if (jb->jb_status == JB_STATUS_PREFETCHING) { + + /* Can't return frame because jitter buffer is filling up + * minimum prefetch. + */ + + //pj_bzero(frame, jb->jb_frame_size); + *p_frame_type = PJMEDIA_JB_ZERO_PREFETCH_FRAME; + if (size) + *size = 0; + + TRACE__((jb->jb_name.ptr, "GET prefetch_cnt=%d/%d", + cur_size, jb->jb_prefetch)); + + jb->jb_empty++; + + } else { + + pjmedia_jb_frame_type ftype; + pj_bool_t res; + + /* Retrieve a frame from frame list */ + res = jb_framelist_get(&jb->jb_framelist, frame, size, &ftype, + bit_info); + pj_assert(res); + + /* We've successfully retrieved a frame from the frame list, but + * the frame could be a blank frame! + */ + if (ftype == PJMEDIA_JB_NORMAL_FRAME) { + *p_frame_type = PJMEDIA_JB_NORMAL_FRAME; + } else { + *p_frame_type = PJMEDIA_JB_MISSING_FRAME; + jb->jb_lost++; + } + + /* Calculate delay on the first GET */ + if (jb->jb_last_op == JB_OP_PUT) + pj_math_stat_update(&jb->jb_delay, cur_size * jb->jb_frame_ptime); + } + + jb->jb_level++; + jbuf_update(jb, JB_OP_GET); +} + +/* + * Get jitter buffer state. + */ +PJ_DEF(pj_status_t) pjmedia_jbuf_get_state( pjmedia_jbuf *jb, + pjmedia_jb_state *state ) +{ + PJ_ASSERT_RETURN(jb && state, PJ_EINVAL); + + state->frame_size = jb->jb_frame_size; + state->min_prefetch = jb->jb_min_prefetch; + state->max_prefetch = jb->jb_max_prefetch; + + state->prefetch = jb->jb_prefetch; + state->size = jb_framelist_size(&jb->jb_framelist); + + state->avg_delay = jb->jb_delay.mean; + state->min_delay = jb->jb_delay.min; + state->max_delay = jb->jb_delay.max; + state->dev_delay = pj_math_stat_get_stddev(&jb->jb_delay); + + state->avg_burst = jb->jb_burst.mean; + state->empty = jb->jb_empty; + state->discard = jb->jb_discard; + state->lost = jb->jb_lost; + + return PJ_SUCCESS; +} diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/master_port.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/master_port.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/master_port.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/master_port.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/mem_capture.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/mem_capture.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/mem_capture.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/mem_capture.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/mem_player.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/mem_player.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/mem_player.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/mem_player.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/null_port.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/null_port.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/null_port.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/null_port.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/nullsound.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/nullsound.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/nullsound.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/nullsound.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/pasound.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/pasound.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/pasound.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/pasound.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/plc_common.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/plc_common.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/plc_common.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/plc_common.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/port.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/port.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/port.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/port.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/resample_libsamplerate.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/resample_libsamplerate.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/resample_libsamplerate.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/resample_libsamplerate.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/resample_port.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/resample_port.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/resample_port.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/resample_port.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/resample_resample.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/resample_resample.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/resample_resample.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/resample_resample.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/resample_speex.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/resample_speex.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/resample_speex.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/resample_speex.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/rtcp.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/rtcp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/rtcp.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/rtcp.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/rtcp_xr.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/rtcp_xr.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/rtcp_xr.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/rtcp_xr.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/rtp.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/rtp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/rtp.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/rtp.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/sdp.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/sdp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/sdp.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/sdp.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/sdp_cmp.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/sdp_cmp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/sdp_cmp.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/sdp_cmp.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/sdp_neg.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/sdp_neg.c similarity index 98% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/sdp_neg.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/sdp_neg.c index 7d14c9e265c93a19cbf2f5276f4f9cae9f17ee44..c128118a157d3bbb25f0c0565770e63bb6c5b071 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/sdp_neg.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/sdp_neg.c @@ -1,4 +1,4 @@ -/* $Id: sdp_neg.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: sdp_neg.c 2795 2009-06-24 18:52:57Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -422,10 +422,18 @@ PJ_DEF(pj_status_t) pjmedia_sdp_neg_set_local_answer( pj_pool_t *pool, /* State now is STATE_WAIT_NEGO. */ neg->state = PJMEDIA_SDP_NEG_STATE_WAIT_NEGO; if (local) { - if (!neg->initial_sdp) { + neg->neg_local_sdp = pjmedia_sdp_session_clone(pool, local); + if (neg->initial_sdp) { + /* I don't think there is anything in RFC 3264 that mandates + * answerer to place the same origin (and increment version) + * in the answer, but probably it won't hurt either. + * Note that the version will be incremented in + * pjmedia_sdp_neg_negotiate() + */ + neg->neg_local_sdp->origin.id = neg->initial_sdp->origin.id; + } else { neg->initial_sdp = pjmedia_sdp_session_clone(pool, local); } - neg->neg_local_sdp = pjmedia_sdp_session_clone(pool, local); } else { PJ_ASSERT_RETURN(neg->initial_sdp, PJMEDIA_SDPNEG_ENOINITIAL); neg->neg_local_sdp = pjmedia_sdp_session_clone(pool, neg->initial_sdp); diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/session.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/session.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/session.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/session.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/silencedet.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/silencedet.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/silencedet.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/silencedet.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/sound_port.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/sound_port.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/sound_port.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/sound_port.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/splitcomb.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/splitcomb.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/splitcomb.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/splitcomb.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/stereo_port.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/stereo_port.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/stereo_port.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/stereo_port.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/stream.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/stream.c similarity index 99% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/stream.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/stream.c index ca518d73ccbdc48ffa679ec9038005e0227ffa10..479a8a1ff109bd1e16f9c219cebba7c535f784c8 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/stream.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/stream.c @@ -1,4 +1,4 @@ -/* $Id: stream.c 2543 2009-03-23 13:22:45Z nanang $ */ +/* $Id: stream.c 2818 2009-06-25 13:27:02Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -1884,6 +1884,10 @@ PJ_DEF(pj_status_t) pjmedia_stream_destroy( pjmedia_stream *stream ) stream->jb_mutex = NULL; } + /* Destroy jitter buffer */ + if (stream->jb) + pjmedia_jbuf_destroy(stream->jb); + return PJ_SUCCESS; } diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/symbian_sound.cpp b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/symbian_sound.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/symbian_sound.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/symbian_sound.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/symbian_sound_aps.cpp b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/symbian_sound_aps.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/symbian_sound_aps.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/symbian_sound_aps.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/tonegen.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/tonegen.c similarity index 99% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/tonegen.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/tonegen.c index 9338fe8b0a54ba7875f5f74089cb31a1b7c7789d..4065cf0bcc1485fca85daf9b422942c230a68131 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/tonegen.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/tonegen.c @@ -1,4 +1,4 @@ -/* $Id: tonegen.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: tonegen.c 2793 2009-06-24 15:52:17Z nanang $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -384,13 +384,13 @@ static pjmedia_tone_digit_map digit_map = { '0', 941, 1336 }, { '1', 697, 1209 }, { '2', 697, 1336 }, - { '3', 697, 1447 }, + { '3', 697, 1477 }, { '4', 770, 1209 }, { '5', 770, 1336 }, - { '6', 770, 1447 }, + { '6', 770, 1477 }, { '7', 852, 1209 }, { '8', 852, 1336 }, - { '9', 852, 1447 }, + { '9', 852, 1477 }, { 'a', 697, 1633 }, { 'b', 770, 1633 }, { 'c', 852, 1633 }, diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/transport_adapter_sample.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/transport_adapter_sample.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/transport_adapter_sample.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/transport_adapter_sample.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/transport_ice.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/transport_ice.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/transport_ice.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/transport_ice.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/transport_loop.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/transport_loop.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/transport_loop.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/transport_loop.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/transport_srtp.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/transport_srtp.c similarity index 99% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/transport_srtp.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/transport_srtp.c index b9650d1b02c14c04a10993bf905dc6a748377aff..92f22fd8bebcb235b855424c00c815f8e7ea1c7e 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/transport_srtp.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/transport_srtp.c @@ -1,4 +1,4 @@ -/* $Id: transport_srtp.c 2533 2009-03-23 13:07:05Z nanang $ */ +/* $Id: transport_srtp.c 2794 2009-06-24 16:00:36Z nanang $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -22,6 +22,7 @@ #include <pjmedia/endpoint.h> #include <pjlib-util/base64.h> #include <pj/assert.h> +#include <pj/ctype.h> #include <pj/lock.h> #include <pj/log.h> #include <pj/os.h> @@ -979,6 +980,7 @@ static pj_status_t parse_attr_crypto(pj_pool_t *pool, { pj_str_t input; char *token; + int token_len; pj_str_t tmp; pj_status_t status; int itmp; @@ -992,10 +994,20 @@ static pj_status_t parse_attr_crypto(pj_pool_t *pool, PJ_LOG(4,(THIS_FILE, "Attribute crypto expecting tag")); return PJMEDIA_SDP_EINATTR; } - *tag = atoi(token); - if (*tag == 0) + token_len = pj_ansi_strlen(token); + + /* Tag must not use leading zeroes. */ + if (token_len > 1 && *token == '0') return PJMEDIA_SDP_EINATTR; + /* Tag must be decimal, i.e: contains only digit '0'-'9'. */ + for (itmp = 0; itmp < token_len; ++itmp) + if (!pj_isdigit(token[itmp])) + return PJMEDIA_SDP_EINATTR; + + /* Get tag value. */ + *tag = atoi(token); + /* Crypto-suite */ token = strtok(NULL, " "); if (!token) { diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/transport_udp.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/transport_udp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/transport_udp.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/transport_udp.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wav_player.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/wav_player.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wav_player.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/wav_player.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wav_playlist.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/wav_playlist.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wav_playlist.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/wav_playlist.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wav_writer.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/wav_writer.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wav_writer.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/wav_writer.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wave.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/wave.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wave.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/wave.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wmme_sound.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/wmme_sound.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wmme_sound.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/wmme_sound.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wsola.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/wsola.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wsola.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/wsola.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/audio_tool.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/audio_tool.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/audio_tool.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/audio_tool.c diff --git a/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/jbuf_test.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/jbuf_test.c new file mode 100644 index 0000000000000000000000000000000000000000..3e8964832e9bdde62fd3dc62f063f5543e7f1c8b --- /dev/null +++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/jbuf_test.c @@ -0,0 +1,308 @@ +/* $Id$ */ +/* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#include <stdio.h> +#include <ctype.h> +#include <pj/pool.h> +#include "test.h" + +#define JB_INIT_PREFETCH 0 +#define JB_MIN_PREFETCH 0 +#define JB_MAX_PREFETCH 10 +#define JB_PTIME 20 +#define JB_BUF_SIZE 50 + +#define REPORT +//#define PRINT_COMMENT + +typedef struct test_param_t { + pj_bool_t adaptive; + unsigned init_prefetch; + unsigned min_prefetch; + unsigned max_prefetch; +} test_param_t; + +typedef struct test_cond_t { + int burst; + int discard; + int lost; + int empty; + int delay; /**< Maximum delay, in frames. */ +} test_cond_t; + +static pj_bool_t parse_test_headers(char *line, test_param_t *param, + test_cond_t *cond) +{ + char *p = line; + + if (*p == '%') { + /* Test params. */ + char mode_st[16]; + + sscanf(p+1, "%s %u %u %u", mode_st, ¶m->init_prefetch, + ¶m->min_prefetch, ¶m->max_prefetch); + param->adaptive = (pj_ansi_stricmp(mode_st, "adaptive") == 0); + + } else if (*p == '!') { + /* Success condition. */ + char cond_st[16]; + unsigned cond_val; + + sscanf(p+1, "%s %u", cond_st, &cond_val); + if (pj_ansi_stricmp(cond_st, "burst") == 0) + cond->burst = cond_val; + else if (pj_ansi_stricmp(cond_st, "delay") == 0) + cond->delay = cond_val; + else if (pj_ansi_stricmp(cond_st, "discard") == 0) + cond->discard = cond_val; + else if (pj_ansi_stricmp(cond_st, "empty") == 0) + cond->empty = cond_val; + else if (pj_ansi_stricmp(cond_st, "lost") == 0) + cond->lost = cond_val; + + } else if (*p == '=') { + /* Test title. */ + ++p; + while (*p && isspace(*p)) ++p; + printf("%s", p); + } else { + /* Unknown header, perhaps this is the test data */ + + /* Skip spaces */ + while (*p && isspace(*p)) ++p; + + /* Test data started.*/ + if (*p != 0) + return PJ_FALSE; + } + + return PJ_TRUE; +} + +static pj_bool_t process_test_data(char data, pjmedia_jbuf *jb, + pj_uint16_t *seq, pj_uint16_t *last_seq) +{ + char frame[1]; + char f_type; + pj_bool_t print_state = PJ_TRUE; + pj_bool_t data_eos = PJ_FALSE; + + switch (toupper(data)) { + case 'G': /* Get */ + pjmedia_jbuf_get_frame(jb, frame, &f_type); + break; + case 'P': /* Put */ + pjmedia_jbuf_put_frame(jb, (void*)frame, 1, *seq); + *last_seq = *seq; + ++*seq; + break; + case 'L': /* Lost */ + *last_seq = *seq; + ++*seq; + printf("Lost\n"); + break; + case 'R': /* Sequence restarts */ + *seq = 1; + printf("Sequence restarting, from %u to %u\n", *last_seq, *seq); + break; + case 'J': /* Sequence jumps */ + (*seq) += 5000; + printf("Sequence jumping, from %u to %u\n", *last_seq, *seq); + break; + case 'D': /* Frame duplicated */ + pjmedia_jbuf_put_frame(jb, (void*)frame, 1, *seq - 1); + break; + case 'O': /* Old/late frame */ + pjmedia_jbuf_put_frame(jb, (void*)frame, 1, *seq - 10 - pj_rand()%40); + break; + case '.': /* End of test session. */ + data_eos = PJ_TRUE; + break; + default: + print_state = PJ_FALSE; + printf("Unknown test data '%c'\n", data); + break; + } + + if (data_eos) + return PJ_FALSE; + +#ifdef REPORT + if (print_state) { + pjmedia_jb_state state; + + pjmedia_jbuf_get_state(jb, &state); + printf("seq=%d\t%c\tsize=%d\tprefetch=%d\n", + *last_seq, toupper(data), state.size, state.prefetch); + } +#endif + + return PJ_TRUE; +} + +int jbuf_main(void) +{ + FILE *input = fopen("JBTEST.DAT", "rt"); + pj_bool_t data_eof = PJ_FALSE; + int old_log_level; + int rc = 0; + + old_log_level = pj_log_get_level(); + pj_log_set_level(5); + + while (rc == 0 && !data_eof) { + pj_str_t jb_name = {"JBTEST", 6}; + pjmedia_jbuf *jb; + pj_pool_t *pool; + pjmedia_jb_state state; + pj_uint16_t last_seq = 0; + pj_uint16_t seq = 1; + char line[1024], *p = NULL; + + test_param_t param; + test_cond_t cond; + + param.adaptive = PJ_TRUE; + param.init_prefetch = JB_INIT_PREFETCH; + param.min_prefetch = JB_MIN_PREFETCH; + param.max_prefetch = JB_MAX_PREFETCH; + + cond.burst = -1; + cond.delay = -1; + cond.discard = -1; + cond.empty = -1; + cond.lost = -1; + + printf("\n\n"); + + /* Parse test session title, param, and conditions */ + do { + p = fgets(line, sizeof(line), input); + } while (p && parse_test_headers(line, ¶m, &cond)); + + /* EOF test data */ + if (p == NULL) + break; + + //printf("======================================================\n"); + + /* Initialize test session */ + pool = pj_pool_create(mem, "JBPOOL", 256*16, 256*16, NULL); + pjmedia_jbuf_create(pool, &jb_name, 1, JB_PTIME, JB_BUF_SIZE, &jb); + pjmedia_jbuf_reset(jb); + + if (param.adaptive) { + pjmedia_jbuf_set_adaptive(jb, + param.init_prefetch, + param.min_prefetch, + param.max_prefetch); + } else { + pjmedia_jbuf_set_fixed(jb, param.init_prefetch); + } + +#ifdef REPORT + pjmedia_jbuf_get_state(jb, &state); + printf("Initial\tsize=%d\tprefetch=%d\tmin.pftch=%d\tmax.pftch=%d\n", + state.size, state.prefetch, state.min_prefetch, + state.max_prefetch); +#endif + + + /* Test session start */ + while (1) { + int c; + + /* Get next line of test data */ + if (!p || *p == 0) { + p = fgets(line, sizeof(line), input); + if (p == NULL) { + data_eof = PJ_TRUE; + break; + } + } + + /* Get next char of test data */ + c = *p++; + + /* Skip spaces */ + if (isspace(c)) + continue; + + /* Print comment line */ + if (c == '#') { +#ifdef PRINT_COMMENT + while (*p && isspace(*p)) ++p; + if (*p) printf("..%s", p); +#endif + *p = 0; + continue; + } + + /* Process test data */ + if (!process_test_data(c, jb, &seq, &last_seq)) + break; + } + + /* Print JB states */ + pjmedia_jbuf_get_state(jb, &state); + printf("------------------------------------------------------\n"); + printf("Summary:\n"); + printf(" size=%d prefetch=%d\n", state.size, state.prefetch); + printf(" delay (min/max/avg/dev)=%d/%d/%d/%d ms\n", + state.min_delay, state.max_delay, state.avg_delay, + state.dev_delay); + printf(" lost=%d discard=%d empty=%d burst(avg)=%d\n", + state.lost, state.discard, state.empty, state.avg_burst); + + /* Evaluate test session */ + if (cond.burst >= 0 && (int)state.avg_burst > cond.burst) { + printf("! 'Burst' should be %d, it is %d\n", + cond.burst, state.avg_burst); + rc |= 1; + } + if (cond.delay >= 0 && (int)state.avg_delay/JB_PTIME > cond.delay) { + printf("! 'Delay' should be %d, it is %d\n", + cond.delay, state.avg_delay/JB_PTIME); + rc |= 2; + } + if (cond.discard >= 0 && (int)state.discard > cond.discard) { + printf("! 'Discard' should be %d, it is %d\n", + cond.discard, state.discard); + rc |= 4; + } + if (cond.empty >= 0 && (int)state.empty > cond.empty) { + printf("! 'Empty' should be %d, it is %d\n", + cond.empty, state.empty); + rc |= 8; + } + if (cond.lost >= 0 && (int)state.lost > cond.lost) { + printf("! 'Lost' should be %d, it is %d\n", + cond.lost, state.lost); + rc |= 16; + } + + pjmedia_jbuf_destroy(jb); + pj_pool_release(pool); + } + + fclose(input); + pj_log_set_level(old_log_level); + + return rc; +} diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/main.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/main.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/main.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/main.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/mips_test.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/mips_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/mips_test.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/mips_test.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/rtp_test.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/rtp_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/rtp_test.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/rtp_test.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/sdp_neg_test.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/sdp_neg_test.c similarity index 99% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/sdp_neg_test.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/sdp_neg_test.c index 35c414cea67f364614b7ecb8163452b11c7c78bd..c0be9d34d14bab1f569b46b06c6ae311dcf2af3d 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/sdp_neg_test.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/sdp_neg_test.c @@ -1,4 +1,4 @@ -/* $Id: sdp_neg_test.c 2548 2009-03-23 13:28:30Z bennylp $ */ +/* $Id: sdp_neg_test.c 2818 2009-06-25 13:27:02Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -39,7 +39,7 @@ struct offer_answer char *sdp3; /* local active media local answer */ }; -struct test +static struct test { const char *title; unsigned offer_answer_count; diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/sdptest.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/sdptest.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/sdptest.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/sdptest.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/session_test.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/session_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/session_test.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/session_test.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/test.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/test.c similarity index 96% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/test.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/test.c index 2bae030b1a4352c84bba6bfcf3e61847e904a7e9..0c39963eb91d14b68fdc1f132b8caa887bfe8350 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/test.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/test.c @@ -60,11 +60,12 @@ int test_main(void) //sdp_test (&caching_pool.factory); //rtp_test(&caching_pool.factory); //session_test (&caching_pool.factory); - //jbuf_main(); - mips_test(); + DO_TEST(jbuf_main()); + //DO_TEST(mips_test()); PJ_LOG(3,(THIS_FILE," ")); +on_return: if (rc != 0) { PJ_LOG(3,(THIS_FILE,"Test completed with error(s)!")); } else { @@ -72,5 +73,6 @@ int test_main(void) } pj_caching_pool_destroy(&caching_pool); + return rc; } diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/test.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/test.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/test.h rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/test.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/wince_main.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/wince_main.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/wince_main.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/wince_main.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/wsola_test.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/wsola_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/wsola_test.c rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/wsola_test.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/build/Makefile b/sflphone-common/libs/pjproject-1.0.3/pjnath/build/Makefile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/build/Makefile rename to sflphone-common/libs/pjproject-1.0.3/pjnath/build/Makefile diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjnath.dsp b/sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjnath.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjnath.dsp rename to sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjnath.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjnath.dsw b/sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjnath.dsw similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjnath.dsw rename to sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjnath.dsw diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjnath.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjnath.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjnath.vcproj rename to sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjnath.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjnath_test.dsp b/sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjnath_test.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjnath_test.dsp rename to sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjnath_test.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjnath_test.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjnath_test.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjnath_test.vcproj rename to sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjnath_test.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjstun_srv_test.dsp b/sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjstun_srv_test.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjstun_srv_test.dsp rename to sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjstun_srv_test.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjstun_srv_test.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjstun_srv_test.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjstun_srv_test.vcproj rename to sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjstun_srv_test.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjturn_client.dsp b/sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjturn_client.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjturn_client.dsp rename to sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjturn_client.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjturn_client.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjturn_client.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjturn_client.vcproj rename to sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjturn_client.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjturn_srv.dsp b/sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjturn_srv.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjturn_srv.dsp rename to sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjturn_srv.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/build/wince-evc4/pjnath_test_wince.vcp b/sflphone-common/libs/pjproject-1.0.3/pjnath/build/wince-evc4/pjnath_test_wince.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/build/wince-evc4/pjnath_test_wince.vcp rename to sflphone-common/libs/pjproject-1.0.3/pjnath/build/wince-evc4/pjnath_test_wince.vcp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/build/wince-evc4/pjnath_wince.vcp b/sflphone-common/libs/pjproject-1.0.3/pjnath/build/wince-evc4/pjnath_wince.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/build/wince-evc4/pjnath_wince.vcp rename to sflphone-common/libs/pjproject-1.0.3/pjnath/build/wince-evc4/pjnath_wince.vcp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/build/wince-evc4/pjnath_wince.vcw b/sflphone-common/libs/pjproject-1.0.3/pjnath/build/wince-evc4/pjnath_wince.vcw similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/build/wince-evc4/pjnath_wince.vcw rename to sflphone-common/libs/pjproject-1.0.3/pjnath/build/wince-evc4/pjnath_wince.vcw diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/docs/UML-class-diagram.dia b/sflphone-common/libs/pjproject-1.0.3/pjnath/docs/UML-class-diagram.dia similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/docs/UML-class-diagram.dia rename to sflphone-common/libs/pjproject-1.0.3/pjnath/docs/UML-class-diagram.dia diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/docs/UML-class-diagram.png b/sflphone-common/libs/pjproject-1.0.3/pjnath/docs/UML-class-diagram.png similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/docs/UML-class-diagram.png rename to sflphone-common/libs/pjproject-1.0.3/pjnath/docs/UML-class-diagram.png diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/docs/doxygen.cfg b/sflphone-common/libs/pjproject-1.0.3/pjnath/docs/doxygen.cfg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/docs/doxygen.cfg rename to sflphone-common/libs/pjproject-1.0.3/pjnath/docs/doxygen.cfg diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/docs/doxygen.css b/sflphone-common/libs/pjproject-1.0.3/pjnath/docs/doxygen.css similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/docs/doxygen.css rename to sflphone-common/libs/pjproject-1.0.3/pjnath/docs/doxygen.css diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/docs/footer.html b/sflphone-common/libs/pjproject-1.0.3/pjnath/docs/footer.html similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/docs/footer.html rename to sflphone-common/libs/pjproject-1.0.3/pjnath/docs/footer.html diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/docs/header.html b/sflphone-common/libs/pjproject-1.0.3/pjnath/docs/header.html similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/docs/header.html rename to sflphone-common/libs/pjproject-1.0.3/pjnath/docs/header.html diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/docs/ice-arch.jpg b/sflphone-common/libs/pjproject-1.0.3/pjnath/docs/ice-arch.jpg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/docs/ice-arch.jpg rename to sflphone-common/libs/pjproject-1.0.3/pjnath/docs/ice-arch.jpg diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/docs/stun-arch.jpg b/sflphone-common/libs/pjproject-1.0.3/pjnath/docs/stun-arch.jpg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/docs/stun-arch.jpg rename to sflphone-common/libs/pjproject-1.0.3/pjnath/docs/stun-arch.jpg diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath.h rename to sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/config.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/config.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/config.h rename to sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/config.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/errno.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/errno.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/errno.h rename to sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/errno.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/ice_session.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/ice_session.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/ice_session.h rename to sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/ice_session.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/ice_strans.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/ice_strans.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/ice_strans.h rename to sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/ice_strans.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/nat_detect.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/nat_detect.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/nat_detect.h rename to sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/nat_detect.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_auth.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/stun_auth.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_auth.h rename to sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/stun_auth.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_config.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/stun_config.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_config.h rename to sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/stun_config.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_msg.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/stun_msg.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_msg.h rename to sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/stun_msg.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_session.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/stun_session.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_session.h rename to sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/stun_session.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_sock.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/stun_sock.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_sock.h rename to sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/stun_sock.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_transaction.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/stun_transaction.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_transaction.h rename to sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/stun_transaction.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/turn_session.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/turn_session.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/turn_session.h rename to sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/turn_session.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/turn_sock.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/turn_sock.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/turn_sock.h rename to sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/turn_sock.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/types.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/types.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/types.h rename to sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/types.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/ice_test.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/ice_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/ice_test.c rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/ice_test.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/main.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/main.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/main.c rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/main.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/main_win32.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/main_win32.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/main_win32.c rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/main_win32.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/server.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/server.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/server.c rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/server.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/server.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/server.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/server.h rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/server.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/sess_auth.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/sess_auth.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/sess_auth.c rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/sess_auth.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/stun.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/stun.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/stun.c rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/stun.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/stun_sock_test.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/stun_sock_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/stun_sock_test.c rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/stun_sock_test.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/test.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/test.c rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/test.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/test.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/test.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/test.h rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/test.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/turn_sock_test.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/turn_sock_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/turn_sock_test.c rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/turn_sock_test.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/errno.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/errno.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/errno.c rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/errno.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/ice_session.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/ice_session.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/ice_session.c rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/ice_session.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/ice_strans.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/ice_strans.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/ice_strans.c rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/ice_strans.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/nat_detect.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/nat_detect.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/nat_detect.c rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/nat_detect.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_auth.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/stun_auth.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_auth.c rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/stun_auth.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_msg.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/stun_msg.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_msg.c rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/stun_msg.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_msg_dump.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/stun_msg_dump.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_msg_dump.c rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/stun_msg_dump.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_session.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/stun_session.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_session.c rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/stun_session.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_sock.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/stun_sock.c similarity index 97% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_sock.c rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/stun_sock.c index 40ab8ad5891db05fb1f8a91045fb6558b84ee279..90b32e50c126debb55c85571044e786df21cefff 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_sock.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/stun_sock.c @@ -1,4 +1,4 @@ -/* $Id: stun_sock.c 2531 2009-03-23 13:02:53Z bennylp $ */ +/* $Id: stun_sock.c 2808 2009-06-25 12:42:03Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -534,8 +534,17 @@ PJ_DEF(pj_status_t) pj_stun_sock_get_info( pj_stun_sock *stun_sock, info->alias_cnt = 1; pj_sockaddr_cp(&info->aliases[0], &info->bound_addr); } else { + pj_sockaddr def_addr; + pj_uint16_t port = pj_sockaddr_get_port(&info->bound_addr); unsigned i; + /* Get the default address */ + status = pj_gethostip(stun_sock->af, &def_addr); + if (status != PJ_SUCCESS) + return status; + + pj_sockaddr_set_port(&def_addr, port); + /* Enum all IP interfaces in the host */ info->alias_cnt = PJ_ARRAY_SIZE(info->aliases); status = pj_enum_ip_interface(stun_sock->af, &info->alias_cnt, @@ -545,10 +554,18 @@ PJ_DEF(pj_status_t) pj_stun_sock_get_info( pj_stun_sock *stun_sock, /* Set the port number for each address. */ - if (stun_sock->af == pj_AF_INET()) { - for (i=0; i<info->alias_cnt; ++i) { - pj_sockaddr_set_port(&info->aliases[i], - pj_sockaddr_get_port(&info->bound_addr)); + for (i=0; i<info->alias_cnt; ++i) { + pj_sockaddr_set_port(&info->aliases[i], port); + } + + /* Put the default IP in the first slot */ + for (i=0; i<info->alias_cnt; ++i) { + if (pj_sockaddr_cmp(&info->aliases[i], &def_addr)==0) { + if (i!=0) { + pj_sockaddr_cp(&info->aliases[i], &info->aliases[0]); + pj_sockaddr_cp(&info->aliases[0], &def_addr); + } + break; } } } diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_transaction.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/stun_transaction.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_transaction.c rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/stun_transaction.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/turn_session.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/turn_session.c similarity index 99% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/turn_session.c rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/turn_session.c index 1edb2f944e7c911123a99b499754fffd77cf2bfd..43801fe7f48fc3c38ba1271b3a4fbc0dd0162fdb 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/turn_session.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/turn_session.c @@ -1,4 +1,4 @@ -/* $Id: turn_session.c 2407 2009-01-01 20:56:36Z bennylp $ */ +/* $Id: turn_session.c 2810 2009-06-25 12:53:14Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -638,9 +638,10 @@ PJ_DEF(pj_status_t) pj_turn_session_alloc(pj_turn_session *sess, pj_lock_acquire(sess->lock); + if (param && param != &sess->alloc_param) + pj_turn_alloc_param_copy(sess->pool, &sess->alloc_param, param); + if (sess->state < PJ_TURN_STATE_RESOLVED) { - if (param && param != &sess->alloc_param) - pj_turn_alloc_param_copy(sess->pool, &sess->alloc_param, param); sess->pending_alloc = PJ_TRUE; PJ_LOG(4,(sess->obj_name, "Pending ALLOCATE in state %s", diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/turn_sock.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/turn_sock.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/turn_sock.c rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/turn_sock.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-client/client_main.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-client/client_main.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-client/client_main.c rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-client/client_main.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/allocation.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-srv/allocation.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/allocation.c rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-srv/allocation.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/auth.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-srv/auth.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/auth.c rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-srv/auth.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/auth.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-srv/auth.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/auth.h rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-srv/auth.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/listener_tcp.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-srv/listener_tcp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/listener_tcp.c rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-srv/listener_tcp.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/listener_udp.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-srv/listener_udp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/listener_udp.c rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-srv/listener_udp.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/main.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-srv/main.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/main.c rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-srv/main.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/server.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-srv/server.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/server.c rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-srv/server.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/turn.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-srv/turn.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/turn.h rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-srv/turn.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjproject-vs8.sln b/sflphone-common/libs/pjproject-1.0.3/pjproject-vs8.sln similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjproject-vs8.sln rename to sflphone-common/libs/pjproject-1.0.3/pjproject-vs8.sln diff --git a/sflphone-common/libs/pjproject-1.0.2/pjproject.dsw b/sflphone-common/libs/pjproject-1.0.3/pjproject.dsw similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjproject.dsw rename to sflphone-common/libs/pjproject-1.0.3/pjproject.dsw diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/bin/samples/hack b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/bin/samples/hack similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/bin/samples/hack rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/bin/samples/hack diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/Footprint.mak b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/Footprint.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/Footprint.mak rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/Footprint.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/Makefile b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/Makefile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/Makefile rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/Makefile diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/Samples-vc.mak b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/Samples-vc.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/Samples-vc.mak rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/Samples-vc.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/Samples.mak b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/Samples.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/Samples.mak rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/Samples.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/get-footprint.py b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/get-footprint.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/get-footprint.py rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/get-footprint.py diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/os-win32.mak b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/os-win32.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/os-win32.mak rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/os-win32.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/pjsip_apps.dsw b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/pjsip_apps.dsw similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/pjsip_apps.dsw rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/pjsip_apps.dsw diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/pjsua.dsp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/pjsua.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/pjsua.dsp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/pjsua.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/pjsua.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/pjsua.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/pjsua.vcproj rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/pjsua.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/py_pjsua.dsp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/py_pjsua.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/py_pjsua.dsp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/py_pjsua.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/py_pjsua.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/py_pjsua.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/py_pjsua.vcproj rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/py_pjsua.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/python_pjsua.dsp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/python_pjsua.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/python_pjsua.dsp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/python_pjsua.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/sample_debug.dsp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/sample_debug.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/sample_debug.dsp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/sample_debug.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/sample_debug.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/sample_debug.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/sample_debug.vcproj rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/sample_debug.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/samples.dsp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/samples.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/samples.dsp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/samples.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/samples.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/samples.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/samples.vcproj rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/samples.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/wince-evc4/wince_demos.vcw b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/wince-evc4/wince_demos.vcw similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/wince-evc4/wince_demos.vcw rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/wince-evc4/wince_demos.vcw diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua/main.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua/main.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua/main.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua/main.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua/main_rtems.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua/main_rtems.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua/main_rtems.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua/main_rtems.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua/pjsua_app.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua/pjsua_app.c similarity index 99% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua/pjsua_app.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua/pjsua_app.c index ad3df904b6be652071afa52bbee19643f0af50b0..654d06100a36e95456096f52eb688a13fef3c20a 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua/pjsua_app.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua/pjsua_app.c @@ -1,4 +1,4 @@ -/* $Id: pjsua_app.c 2544 2009-03-23 13:23:20Z bennylp $ */ +/* $Id: pjsua_app.c 2818 2009-06-25 13:27:02Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -3131,14 +3131,16 @@ void console_app_main(const pj_str_t *uri_to_call) } else { pjsua_buddy_info binfo; pjsua_buddy_get_info(result.nb_result-1, &binfo); - uri = binfo.uri.ptr; + tmp.ptr = buf; + pj_strncpy(&tmp, &binfo.uri, sizeof(buf)); } } else if (result.uri_result) { - uri = result.uri_result; + tmp = pj_str(result.uri_result); + } else { + tmp.slen = 0; } - tmp = pj_str(uri); pjsua_call_make_call( current_acc, &tmp, 0, NULL, NULL, NULL); break; @@ -3162,15 +3164,15 @@ void console_app_main(const pj_str_t *uri_to_call) continue; } pjsua_buddy_get_info(result.nb_result-1, &binfo); - uri = binfo.uri.ptr; + tmp.ptr = buf; + pj_strncpy(&tmp, &binfo.uri, sizeof(buf)); } else { - uri = result.uri_result; + tmp = pj_str(result.uri_result); } for (i=0; i<my_atoi(menuin); ++i) { pj_status_t status; - tmp = pj_str(uri); status = pjsua_call_make_call(current_acc, &tmp, 0, NULL, NULL, NULL); if (status != PJ_SUCCESS) @@ -3208,7 +3210,9 @@ void console_app_main(const pj_str_t *uri_to_call) } else { pjsua_buddy_info binfo; pjsua_buddy_get_info(result.nb_result-1, &binfo); - uri = binfo.uri.ptr; + tmp.ptr = buf; + pj_strncpy_with_null(&tmp, &binfo.uri, sizeof(buf)); + uri = buf; } } else if (result.uri_result) { @@ -3759,22 +3763,39 @@ void console_app_main(const pj_str_t *uri_to_call) ui_input_url("Destination URI", buf, sizeof(buf), &result); if (result.nb_result != NO_NB) { - if (result.nb_result == -1 || result.nb_result == 0) { + if (result.nb_result == -1) { puts("Sorry you can't do that!"); continue; + } else if (result.nb_result == 0) { + uri = NULL; + if (current_call == PJSUA_INVALID_ID) { + puts("No current call"); + continue; + } } else { pjsua_buddy_info binfo; pjsua_buddy_get_info(result.nb_result-1, &binfo); - uri = binfo.uri.ptr; + tmp.ptr = buf; + pj_strncpy_with_null(&tmp, &binfo.uri, sizeof(buf)); + uri = buf; } } else if (result.uri_result) { uri = result.uri_result; } - tmp = pj_str(uri); - - send_request(text, &tmp); + if (uri) { + tmp = pj_str(uri); + send_request(text, &tmp); + } else { + /* If you send call control request using this method + * (such requests includes BYE, CANCEL, etc.), it will + * not go well with the call state, so don't do it + * unless it's for testing. + */ + pj_str_t method = pj_str(text); + pjsua_call_send_request(current_call, &method, NULL); + } break; case 'e': diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/README.TXT b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/README.TXT similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/README.TXT rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/README.TXT diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/StdAfx.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/StdAfx.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/StdAfx.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/StdAfx.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/StdAfx.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/StdAfx.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/StdAfx.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/StdAfx.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/newres.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/newres.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/newres.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/newres.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/pjsua_wince.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/pjsua_wince.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/pjsua_wince.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/pjsua_wince.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/pjsua_wince.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/pjsua_wince.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/pjsua_wince.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/pjsua_wince.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/pjsua_wince.ico b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/pjsua_wince.ico similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/pjsua_wince.ico rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/pjsua_wince.ico diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/pjsua_wince.rc b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/pjsua_wince.rc similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/pjsua_wince.rc rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/pjsua_wince.rc diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/pjsua_wince.vcp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/pjsua_wince.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/pjsua_wince.vcp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/pjsua_wince.vcp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/resource.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/resource.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/resource.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/resource.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PocketPJ.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PocketPJ.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PocketPJ.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PocketPJ.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.rc b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PocketPJ.rc similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.rc rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PocketPJ.rc diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.vcc b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PocketPJ.vcc similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.vcc rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PocketPJ.vcc diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.vcp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PocketPJ.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.vcp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PocketPJ.vcp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.vcw b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PocketPJ.vcw similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.vcw rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PocketPJ.vcw diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJDlg.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PocketPJDlg.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJDlg.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PocketPJDlg.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJDlg.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PocketPJDlg.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJDlg.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PocketPJDlg.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PopUpWnd.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PopUpWnd.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PopUpWnd.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PopUpWnd.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PopUpWnd.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PopUpWnd.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PopUpWnd.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PopUpWnd.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/ReadMe.txt b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/ReadMe.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/ReadMe.txt rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/ReadMe.txt diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/SettingsDlg.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/SettingsDlg.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/SettingsDlg.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/SettingsDlg.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/SettingsDlg.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/SettingsDlg.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/SettingsDlg.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/SettingsDlg.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/StdAfx.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/StdAfx.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/StdAfx.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/StdAfx.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/StdAfx.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/StdAfx.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/StdAfx.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/StdAfx.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/newres.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/newres.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/newres.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/newres.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/PocketPJ.ico b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/PocketPJ.ico similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/PocketPJ.ico rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/PocketPJ.ico diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/PocketPJ.rc2 b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/PocketPJ.rc2 similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/PocketPJ.rc2 rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/PocketPJ.rc2 diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/action.bmp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/action.bmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/action.bmp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/action.bmp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/blank.bmp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/blank.bmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/blank.bmp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/blank.bmp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/invisibl.bmp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/invisibl.bmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/invisibl.bmp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/invisibl.bmp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/invisibl.ico b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/invisibl.ico similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/invisibl.ico rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/invisibl.ico diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/offline.bmp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/offline.bmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/offline.bmp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/offline.bmp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/offline.ico b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/offline.ico similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/offline.ico rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/offline.ico diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/online.bmp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/online.bmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/online.bmp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/online.bmp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/online.ico b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/online.ico similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/online.ico rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/online.ico diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/resource.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/resource.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/resource.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/resource.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/DEPRECATED.txt b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/DEPRECATED.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/DEPRECATED.txt rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/DEPRECATED.txt diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/Makefile b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/Makefile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/Makefile rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/Makefile diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/helper.mak b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/helper.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/helper.mak rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/helper.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/pjsua.py b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/pjsua.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/pjsua.py rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/pjsua.py diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/pjsua_app.py b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/pjsua_app.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/pjsua_app.py rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/pjsua_app.py diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/py_pjsua.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/py_pjsua.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/py_pjsua.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/py_pjsua.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/py_pjsua.def b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/py_pjsua.def similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/py_pjsua.def rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/py_pjsua.def diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/py_pjsua.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/py_pjsua.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/py_pjsua.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/py_pjsua.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/setup.py b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/setup.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/setup.py rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/setup.py diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/Makefile b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/Makefile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/Makefile rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/Makefile diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/_pjsua.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/_pjsua.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/_pjsua.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/_pjsua.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/_pjsua.def b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/_pjsua.def similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/_pjsua.def rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/_pjsua.def diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/_pjsua.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/_pjsua.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/_pjsua.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/_pjsua.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/helper.mak b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/helper.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/helper.mak rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/helper.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/pjsua.py b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/pjsua.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/pjsua.py rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/pjsua.py diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/samples/call.py b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/samples/call.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/samples/call.py rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/samples/call.py diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/samples/presence.py b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/samples/presence.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/samples/presence.py rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/samples/presence.py diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/samples/registration.py b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/samples/registration.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/samples/registration.py rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/samples/registration.py diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/samples/simplecall.py b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/samples/simplecall.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/samples/simplecall.py rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/samples/simplecall.py diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/setup-vc.py b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/setup-vc.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/setup-vc.py rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/setup-vc.py diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/setup.py b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/setup.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/setup.py rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/setup.py diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/aectest.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/aectest.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/aectest.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/aectest.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/confbench.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/confbench.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/confbench.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/confbench.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/confsample.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/confsample.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/confsample.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/confsample.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/debug.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/debug.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/debug.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/debug.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/encdec.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/encdec.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/encdec.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/encdec.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/footprint.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/footprint.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/footprint.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/footprint.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/invtester.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/invtester.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/invtester.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/invtester.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/latency.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/latency.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/latency.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/latency.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/level.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/level.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/level.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/level.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/main_rtems.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/main_rtems.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/main_rtems.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/main_rtems.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/mix.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/mix.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/mix.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/mix.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/pcaputil.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/pcaputil.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/pcaputil.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/pcaputil.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/pjsip-perf.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/pjsip-perf.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/pjsip-perf.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/pjsip-perf.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/playfile.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/playfile.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/playfile.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/playfile.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/playsine.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/playsine.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/playsine.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/playsine.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/proxy.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/proxy.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/proxy.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/proxy.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/recfile.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/recfile.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/recfile.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/recfile.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/resampleplay.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/resampleplay.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/resampleplay.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/resampleplay.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/simple_pjsua.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/simple_pjsua.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/simple_pjsua.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/simple_pjsua.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/simpleua.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/simpleua.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/simpleua.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/simpleua.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/siprtp.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/siprtp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/siprtp.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/siprtp.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/siprtp_report.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/siprtp_report.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/siprtp_report.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/siprtp_report.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/sipstateless.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/sipstateless.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/sipstateless.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/sipstateless.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/sndinfo.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/sndinfo.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/sndinfo.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/sndinfo.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/sndtest.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/sndtest.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/sndtest.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/sndtest.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/stateful_proxy.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/stateful_proxy.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/stateful_proxy.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/stateful_proxy.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/stateless_proxy.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/stateless_proxy.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/stateless_proxy.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/stateless_proxy.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/stereotest.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/stereotest.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/stereotest.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/stereotest.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/streamutil.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/streamutil.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/streamutil.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/streamutil.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/strerror.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/strerror.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/strerror.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/strerror.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/tonegen.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/tonegen.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/tonegen.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/tonegen.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/util.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/util.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/util.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/util.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua/main_symbian.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua/main_symbian.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua/main_symbian.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua/main_symbian.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua/symbian_ua_reg.rss b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua/symbian_ua_reg.rss similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua/symbian_ua_reg.rss rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua/symbian_ua_reg.rss diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua/ua.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua/ua.cpp similarity index 97% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua/ua.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua/ua.cpp index 6e790f246d61316afcd7f7edcd995f0af709dbc4..4ca32b66f5f3587cf43997d3abbf530b8856e7df 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua/ua.cpp +++ b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua/ua.cpp @@ -1,4 +1,4 @@ -/* $Id: ua.cpp 2482 2009-03-02 15:50:12Z nanang $ */ +/* $Id: ua.cpp 2804 2009-06-25 12:26:15Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -49,6 +49,10 @@ #define SIP_PROXY NULL //#define SIP_PROXY "<sip:192.168.0.8;lr>" +// +// Set to 1 if TCP is desired (experimental) +// +#define ENABLE_SIP_TCP 0 // // Configure nameserver if DNS SRV is to be used with both SIP @@ -401,11 +405,27 @@ static pj_status_t app_startup() status = pjsua_transport_create (PJSIP_TRANSPORT_UDP, &tcfg, &tid); if (status != PJ_SUCCESS) { - pjsua_perror (THIS_FILE, "Error creating transport", status); + pjsua_perror (THIS_FILE, "Error creating UDP transport", status); + pjsua_destroy(); + return status; + } + + /* Add TCP transport */ +#if ENABLE_SIP_TCP + pjsua_transport_config_default (&tcfg); + + tcfg.port = SIP_PORT; + + status = pjsua_transport_create (PJSIP_TRANSPORT_TCP, &tcfg, &tid); + + if (status != PJ_SUCCESS) { + pjsua_perror (THIS_FILE, "Error creating TCP transport", status); pjsua_destroy(); return status; } +#endif + /* Add account for the transport */ pjsua_acc_add_local (tid, PJ_TRUE, &g_acc_id); diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua/ua.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua/ua.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua/ua.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua/ua.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/application.uidesign b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/application.uidesign similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/application.uidesign rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/application.uidesign diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.l01 b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.l01 similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.l01 rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.l01 diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.loc b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.loc similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.loc rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.loc diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.rss b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.rss similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.rss rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.rss diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.l01 b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.l01 similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.l01 rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.l01 diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.loc b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.loc similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.loc rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.loc diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.rssi b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.rssi similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.rssi rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.rssi diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.l01 b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.l01 similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.l01 rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.l01 diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.loc b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.loc similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.loc rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.loc diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.rssi b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.rssi similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.rssi rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.rssi diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.loc b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.loc similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.loc rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.loc diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.rss b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.rss similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.rss rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.rss diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/gfx/list_icon.bmp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/gfx/list_icon.bmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/gfx/list_icon.bmp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/gfx/list_icon.bmp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/gfx/list_icon_mask.bmp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/gfx/list_icon_mask.bmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/gfx/list_icon_mask.bmp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/gfx/list_icon_mask.bmp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon.bmp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon.bmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon.bmp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon.bmp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon_mask.bmp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon_mask.bmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon_mask.bmp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon_mask.bmp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/gfx/qgn_menu_symbian_ua_gui.svg b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/gfx/qgn_menu_symbian_ua_gui.svg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/gfx/qgn_menu_symbian_ua_gui.svg rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/gfx/qgn_menu_symbian_ua_gui.svg diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/group/ABLD.BAT b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/group/ABLD.BAT similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/group/ABLD.BAT rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/group/ABLD.BAT diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/group/Icons_aif_scalable_dc.mk b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/group/Icons_aif_scalable_dc.mk similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/group/Icons_aif_scalable_dc.mk rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/group/Icons_aif_scalable_dc.mk diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/group/bld.inf b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/group/bld.inf similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/group/bld.inf rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/group/bld.inf diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/Symbian_ua_guiSettingItemListSettings.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/Symbian_ua_guiSettingItemListSettings.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/Symbian_ua_guiSettingItemListSettings.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/Symbian_ua_guiSettingItemListSettings.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.hrh b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.hrh similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.hrh rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.hrh diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.pan b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.pan similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.pan rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.pan diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiAppUi.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiAppUi.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiAppUi.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiAppUi.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiApplication.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiApplication.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiApplication.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiApplication.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.hrh b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.hrh similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.hrh rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.hrh diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainerView.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainerView.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainerView.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainerView.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiDocument.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiDocument.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiDocument.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiDocument.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.hrh b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.hrh similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.hrh rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.hrh diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemListView.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemListView.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemListView.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemListView.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.pkg b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.pkg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.pkg rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.pkg diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.txt b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.txt rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.txt diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/Symbian_ua_guiSettingItemListSets.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/Symbian_ua_guiSettingItemListSets.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/Symbian_ua_guiSettingItemListSets.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/Symbian_ua_guiSettingItemListSets.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiAppUi.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiAppUi.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiAppUi.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiAppUi.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiApplication.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiApplication.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiApplication.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiApplication.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainer.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainer.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainer.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainer.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainerView.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainerView.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainerView.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainerView.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiDocument.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiDocument.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiDocument.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiDocument.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemList.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemList.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemList.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemList.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemListView.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemListView.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemListView.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemListView.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiContainer.uidesign b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiContainer.uidesign similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiContainer.uidesign rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiContainer.uidesign diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiSettingItemList.uidesign b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiSettingItemList.uidesign similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiSettingItemList.uidesign rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiSettingItemList.uidesign diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symsndtest/app_main.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symsndtest/app_main.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symsndtest/app_main.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symsndtest/app_main.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symsndtest/main_symbian.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symsndtest/main_symbian.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symsndtest/main_symbian.cpp rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symsndtest/main_symbian.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symsndtest/symsndtest_reg.rss b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symsndtest/symsndtest_reg.rss similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symsndtest/symsndtest_reg.rss rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symsndtest/symsndtest_reg.rss diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/Makefile b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/Makefile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/Makefile rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/Makefile diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/os-auto.mak.in b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/os-auto.mak.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/os-auto.mak.in rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/os-auto.mak.in diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/os-rtems.mak b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/os-rtems.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/os-rtems.mak rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/os-rtems.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip.dsw b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsip.dsw similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip.dsw rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsip.dsw diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_core.dsp b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsip_core.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_core.dsp rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsip_core.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_core.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsip_core.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_core.vcproj rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsip_core.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_simple.dsp b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsip_simple.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_simple.dsp rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsip_simple.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_simple.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsip_simple.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_simple.vcproj rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsip_simple.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_ua.dsp b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsip_ua.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_ua.dsp rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsip_ua.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_ua.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsip_ua.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_ua.vcproj rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsip_ua.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsua_lib.dsp b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsua_lib.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsua_lib.dsp rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsua_lib.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsua_lib.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsua_lib.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsua_lib.vcproj rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsua_lib.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/test_pjsip.dsp b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/test_pjsip.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/test_pjsip.dsp rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/test_pjsip.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/test_pjsip.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/test_pjsip.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/test_pjsip.vcproj rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/test_pjsip.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/pjsip_core_wince.vcp b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/wince-evc4/pjsip_core_wince.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/pjsip_core_wince.vcp rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/wince-evc4/pjsip_core_wince.vcp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/pjsip_simple_wince.vcp b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/wince-evc4/pjsip_simple_wince.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/pjsip_simple_wince.vcp rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/wince-evc4/pjsip_simple_wince.vcp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/pjsip_ua_wince.vcp b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/wince-evc4/pjsip_ua_wince.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/pjsip_ua_wince.vcp rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/wince-evc4/pjsip_ua_wince.vcp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/pjsip_wince.vcw b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/wince-evc4/pjsip_wince.vcw similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/pjsip_wince.vcw rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/wince-evc4/pjsip_wince.vcw diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/pjsua_lib_wince.vcp b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/wince-evc4/pjsua_lib_wince.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/pjsua_lib_wince.vcp rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/wince-evc4/pjsua_lib_wince.vcp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/test_pjsip_wince.vcp b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/wince-evc4/test_pjsip_wince.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/test_pjsip_wince.vcp rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/wince-evc4/test_pjsip_wince.vcp diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/docs/PJSUA-TESTING.txt b/sflphone-common/libs/pjproject-1.0.3/pjsip/docs/PJSUA-TESTING.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/docs/PJSUA-TESTING.txt rename to sflphone-common/libs/pjproject-1.0.3/pjsip/docs/PJSUA-TESTING.txt diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/docs/TRANSPORT-PROBLEMS.TXT b/sflphone-common/libs/pjproject-1.0.3/pjsip/docs/TRANSPORT-PROBLEMS.TXT similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/docs/TRANSPORT-PROBLEMS.TXT rename to sflphone-common/libs/pjproject-1.0.3/pjsip/docs/TRANSPORT-PROBLEMS.TXT diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/docs/doxygen.cfg b/sflphone-common/libs/pjproject-1.0.3/pjsip/docs/doxygen.cfg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/docs/doxygen.cfg rename to sflphone-common/libs/pjproject-1.0.3/pjsip/docs/doxygen.cfg diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/docs/doxygen.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/docs/doxygen.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/docs/doxygen.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/docs/doxygen.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/docs/footer.html b/sflphone-common/libs/pjproject-1.0.3/pjsip/docs/footer.html similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/docs/footer.html rename to sflphone-common/libs/pjproject-1.0.3/pjsip/docs/footer.html diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/docs/header.html b/sflphone-common/libs/pjproject-1.0.3/pjsip/docs/header.html similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/docs/header.html rename to sflphone-common/libs/pjproject-1.0.3/pjsip/docs/header.html diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/docs/pjsip-arch.jpg b/sflphone-common/libs/pjproject-1.0.3/pjsip/docs/pjsip-arch.jpg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/docs/pjsip-arch.jpg rename to sflphone-common/libs/pjproject-1.0.3/pjsip/docs/pjsip-arch.jpg diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/docs/pjsip-perf.jpg b/sflphone-common/libs/pjproject-1.0.3/pjsip/docs/pjsip-perf.jpg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/docs/pjsip-perf.jpg rename to sflphone-common/libs/pjproject-1.0.3/pjsip/docs/pjsip-perf.jpg diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/docs/pjsua.jpg b/sflphone-common/libs/pjproject-1.0.3/pjsip/docs/pjsua.jpg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/docs/pjsua.jpg rename to sflphone-common/libs/pjproject-1.0.3/pjsip/docs/pjsua.jpg diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/docs/siprtp.jpg b/sflphone-common/libs/pjproject-1.0.3/pjsip/docs/siprtp.jpg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/docs/siprtp.jpg rename to sflphone-common/libs/pjproject-1.0.3/pjsip/docs/siprtp.jpg diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/errno.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/errno.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/errno.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/errno.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/evsub.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/evsub.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/evsub.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/evsub.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/evsub_msg.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/evsub_msg.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/evsub_msg.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/evsub_msg.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/iscomposing.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/iscomposing.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/iscomposing.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/iscomposing.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/pidf.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/pidf.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/pidf.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/pidf.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/presence.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/presence.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/presence.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/presence.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/publish.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/publish.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/publish.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/publish.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/rpid.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/rpid.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/rpid.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/rpid.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/types.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/types.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/types.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/types.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/xpidf.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/xpidf.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/xpidf.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/xpidf.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-ua/sip_100rel.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-ua/sip_100rel.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-ua/sip_100rel.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-ua/sip_100rel.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-ua/sip_inv.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-ua/sip_inv.h similarity index 95% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-ua/sip_inv.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-ua/sip_inv.h index f4066b4fa7a96cf5f598e127c97b27aa8afb1832..532eeb57d24218034c34e5f05d66a2ceb6ec1532 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-ua/sip_inv.h +++ b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-ua/sip_inv.h @@ -1,4 +1,4 @@ -/* $Id: sip_inv.h 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: sip_inv.h 2799 2009-06-25 10:58:13Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -653,16 +653,32 @@ PJ_DECL(pj_status_t) pjsip_inv_set_sdp_answer(pjsip_inv_session *inv, /** * Create a SIP message to initiate invite session termination. Depending on * the state of the session, this function may return CANCEL request, - * a non-2xx final response, or a BYE request. If the session has not answered - * the incoming INVITE, this function creates the non-2xx final response with - * the specified status code in st_code and optional status text in st_text. + * a non-2xx final response, a BYE request, or even no request. + * + * For UAS, if the session has not answered the incoming INVITE, this function + * creates the non-2xx final response with the specified status code in + * \a st_code and optional status text in \a st_text. + * + * For UAC, if the original INVITE has not been answered with a final + * response, the behavior depends on whether provisional response has been + * received. If provisional response has been received, this function will + * create CANCEL request. If no provisional response has been received, the + * function will not create CANCEL request (the function will return + * PJ_SUCCESS but the \a p_tdata will contain NULL) because we cannot send + * CANCEL before receiving provisional response. If then a provisional + * response is received, the invite session will send CANCEL automatically. + * + * For both UAC and UAS, if the INVITE session has been answered with final + * response, a BYE request will be created. * * @param inv The invite session. * @param st_code Status code to be used for terminating the session. * @param st_text Optional status text. - * @param p_tdata Pointer to receive the message to be created. + * @param p_tdata Pointer to receive the message to be created. Note + * that it's possible to receive NULL here while the + * function returns PJ_SUCCESS, see the description. * - * @return PJ_SUCCESS if termination message can be created. + * @return PJ_SUCCESS if termination is initiated. */ PJ_DECL(pj_status_t) pjsip_inv_end_session( pjsip_inv_session *inv, int st_code, diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-ua/sip_regc.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-ua/sip_regc.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-ua/sip_regc.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-ua/sip_regc.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-ua/sip_replaces.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-ua/sip_replaces.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-ua/sip_replaces.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-ua/sip_replaces.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-ua/sip_xfer.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-ua/sip_xfer.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-ua/sip_xfer.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-ua/sip_xfer.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/print_util.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/print_util.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/print_util.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/print_util.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_auth.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_auth.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_auth.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_auth.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_auth_aka.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_auth_aka.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_auth_aka.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_auth_aka.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_auth_msg.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_auth_msg.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_auth_msg.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_auth_msg.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_auth_parser.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_auth_parser.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_auth_parser.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_auth_parser.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_autoconf.h.in b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_autoconf.h.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_autoconf.h.in rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_autoconf.h.in diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_config.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_config.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_config.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_config.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_dialog.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_dialog.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_dialog.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_dialog.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_endpoint.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_endpoint.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_endpoint.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_endpoint.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_errno.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_errno.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_errno.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_errno.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_event.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_event.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_event.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_event.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_module.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_module.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_module.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_module.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_msg.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_msg.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_msg.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_msg.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_parser.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_parser.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_parser.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_parser.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_private.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_private.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_private.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_private.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_resolve.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_resolve.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_resolve.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_resolve.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_tel_uri.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_tel_uri.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_tel_uri.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_tel_uri.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transaction.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_transaction.h similarity index 92% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transaction.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_transaction.h index 98d40f49fa6f63f46bb09fbef7c69b860b9e6591..3c7f1bca4ec5db27d0676b1a8f5a49f21d50a360 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transaction.h +++ b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_transaction.h @@ -1,4 +1,4 @@ -/* $Id: sip_transaction.h 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: sip_transaction.h 2798 2009-06-25 10:48:08Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -311,7 +311,6 @@ PJ_DECL(pj_status_t) pjsip_tsx_create_key( pj_pool_t *pool, const pjsip_method *method, const pjsip_rx_data *rdata ); - /** * Force terminate transaction. * @@ -330,10 +329,38 @@ PJ_DECL(pj_status_t) pjsip_tsx_terminate( pjsip_transaction *tsx, * This operation normally is used for INVITE transaction only, when * the transaction is cancelled before any provisional response has been * received. + * + * @param tsx The transaction. + * + * @return PJ_SUCCESS or the appropriate error code. */ PJ_DECL(pj_status_t) pjsip_tsx_stop_retransmit(pjsip_transaction *tsx); +/** + * Start a timer to terminate transaction after the specified time + * has elapsed. This function is only valid for INVITE transaction, + * and only before final response is received for the INVITE transaction. + * It is normally called after the UAC has sent CANCEL for this + * INVITE transaction. + * + * The purpose of this function is to terminate the transaction if UAS + * does not send final response to this INVITE transaction even after + * it sends 200/OK to CANCEL (for example when the UAS complies to RFC + * 2543). + * + * Once this timer is set, the transaction will be terminated either when + * a final response is received or the timer expires. + * + * @param tsx The transaction. + * @param millisec Timeout value in milliseconds. + * + * @return PJ_SUCCESS or the appropriate error code. + */ +PJ_DECL(pj_status_t) pjsip_tsx_set_timeout(pjsip_transaction *tsx, + unsigned millisec); + + /** * Get the transaction instance in the incoming message. If the message * has a corresponding transaction, this function will return non NULL diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transport.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_transport.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transport.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_transport.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transport_loop.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_transport_loop.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transport_loop.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_transport_loop.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transport_tcp.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_transport_tcp.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transport_tcp.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_transport_tcp.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transport_tls.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_transport_tls.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transport_tls.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_transport_tls.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transport_udp.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_transport_udp.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transport_udp.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_transport_udp.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_types.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_types.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_types.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_types.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_ua_layer.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_ua_layer.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_ua_layer.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_ua_layer.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_uri.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_uri.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_uri.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_uri.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_util.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_util.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_util.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_util.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip_auth.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip_auth.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip_auth.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip_auth.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip_simple.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip_simple.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip_simple.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip_simple.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip_ua.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip_ua.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip_ua.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip_ua.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsua-lib/pjsua.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsua-lib/pjsua.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsua-lib/pjsua.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsua-lib/pjsua.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsua-lib/pjsua_internal.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsua-lib/pjsua_internal.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsua-lib/pjsua_internal.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsua-lib/pjsua_internal.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/errno.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/errno.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/errno.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/errno.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/evsub.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/evsub.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/evsub.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/evsub.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/evsub_msg.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/evsub_msg.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/evsub_msg.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/evsub_msg.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/iscomposing.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/iscomposing.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/iscomposing.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/iscomposing.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/pidf.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/pidf.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/pidf.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/pidf.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/presence.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/presence.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/presence.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/presence.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/presence_body.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/presence_body.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/presence_body.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/presence_body.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/publishc.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/publishc.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/publishc.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/publishc.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/rpid.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/rpid.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/rpid.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/rpid.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/xpidf.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/xpidf.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/xpidf.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/xpidf.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-ua/sip_100rel.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-ua/sip_100rel.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-ua/sip_100rel.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-ua/sip_100rel.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-ua/sip_inv.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-ua/sip_inv.c similarity index 98% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-ua/sip_inv.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-ua/sip_inv.c index a676e5addaf67ef52d5a2a8dddb2b547a932fb9d..e7391da47bf3931b198b1f8b6353aab6c818136d 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-ua/sip_inv.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-ua/sip_inv.c @@ -1,4 +1,4 @@ -/* $Id: sip_inv.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: sip_inv.c 2811 2009-06-25 13:01:06Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -1367,8 +1367,10 @@ PJ_DEF(pj_status_t) pjsip_inv_invite( pjsip_inv_session *inv, const pjmedia_sdp_session *offer; status = pjmedia_sdp_neg_get_neg_local(inv->neg, &offer); - if (status != PJ_SUCCESS) + if (status != PJ_SUCCESS) { + pjsip_tx_data_dec_ref(tdata); goto on_return; + } tdata->msg->body = create_sdp_body(tdata->pool, offer); } @@ -1867,12 +1869,13 @@ PJ_DEF(pj_status_t) pjsip_inv_end_session( pjsip_inv_session *inv, */ if (inv->invite_tsx->status_code < 100) { - pjsip_tsx_stop_retransmit(inv->invite_tsx); + /* Do not stop INVITE retransmission, see ticket #506 */ + //pjsip_tsx_stop_retransmit(inv->invite_tsx); inv->cancelling = PJ_TRUE; inv->pending_cancel = PJ_TRUE; *p_tdata = NULL; - PJ_LOG(4, (inv->obj_name, "Stopping retransmission, " - "delaying CANCEL")); + PJ_LOG(4, (inv->obj_name, "Delaying CANCEL since no " + "provisional response is received yet")); return PJ_SUCCESS; } @@ -1884,6 +1887,14 @@ PJ_DEF(pj_status_t) pjsip_inv_end_session( pjsip_inv_session *inv, status = pjsip_endpt_create_cancel(inv->dlg->endpt, inv->invite_tsx->last_tx, &tdata); + if (status != PJ_SUCCESS) + return status; + + /* Set timeout for the INVITE transaction, in case UAS is not + * able to respond the INVITE with 487 final response. The + * timeout value is 64*T1. + */ + pjsip_tsx_set_timeout(inv->invite_tsx, 64 * pjsip_cfg()->tsx.t1); } else { @@ -2246,11 +2257,16 @@ PJ_DEF(pj_status_t) pjsip_inv_update ( pjsip_inv_session *inv, goto on_error; } + /* Notify negotiator about the new offer. This will fix the offer + * with correct SDP origin. + */ status = pjmedia_sdp_neg_modify_local_offer(inv->pool,inv->neg, offer); if (status != PJ_SUCCESS) goto on_error; + /* Retrieve the "fixed" offer from negotiator */ + pjmedia_sdp_neg_get_neg_local(inv->neg, &offer); /* Update Contact if required */ if (new_contact) { @@ -2464,7 +2480,12 @@ static void inv_respond_incoming_cancel(pjsip_inv_session *inv, if (status == PJ_SUCCESS) { /* Remove the message body */ tdata->msg->body = NULL; - pjsip_dlg_send_response(inv->dlg, invite_tsx, tdata); + if (inv->options & PJSIP_INV_REQUIRE_100REL) { + status = pjsip_100rel_tx_response(inv, tdata); + } else { + status = pjsip_dlg_send_response(inv->dlg, invite_tsx, + tdata); + } } } @@ -3345,6 +3366,22 @@ static void inv_on_state_early( pjsip_inv_session *inv, pjsip_event *e) /* Generic handling for UAC tsx completion */ handle_uac_tsx_response(inv, e); + + } else if (tsx->role == PJSIP_ROLE_UAS && + tsx->method.id == PJSIP_BYE_METHOD && + tsx->status_code < 200 && + e->body.tsx_state.type == PJSIP_EVENT_RX_MSG) + { + /* Received BYE before the 2xx/OK response to INVITE. + * Assume that the 2xx/OK response is lost and the BYE + * arrives earlier. + */ + inv_respond_incoming_bye(inv, tsx, e->body.tsx_state.src.rdata, e); + + /* Set timer just in case we will never get the final response + * for INVITE. + */ + pjsip_tsx_set_timeout(inv->invite_tsx, 64*pjsip_cfg()->tsx.t1); } } @@ -3617,9 +3654,19 @@ static void inv_on_state_confirmed( pjsip_inv_session *inv, pjsip_event *e) if (mod_inv.cb.on_create_offer) { (*mod_inv.cb.on_create_offer)(inv, &sdp); if (sdp) { + /* Notify negotiator about the new offer. This will + * fix the offer with correct SDP origin. + */ status = pjmedia_sdp_neg_modify_local_offer(dlg->pool, inv->neg, sdp); + + /* Retrieve the "fixed" offer from negotiator */ + if (status==PJ_SUCCESS) { + const pjmedia_sdp_session *lsdp = NULL; + pjmedia_sdp_neg_get_neg_local(inv->neg, &lsdp); + sdp = (pjmedia_sdp_session*)lsdp; + } } } @@ -3726,6 +3773,9 @@ static void inv_on_state_confirmed( pjsip_inv_session *inv, pjsip_event *e) if (neg_state == PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER) { pjmedia_sdp_neg_cancel_offer(inv->neg); } + + if (tsx == inv->invite_tsx) + inv->invite_tsx = NULL; } } else if (tsx->role == PJSIP_ROLE_UAS && diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-ua/sip_reg.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-ua/sip_reg.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-ua/sip_reg.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-ua/sip_reg.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-ua/sip_replaces.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-ua/sip_replaces.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-ua/sip_replaces.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-ua/sip_replaces.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-ua/sip_xfer.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-ua/sip_xfer.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-ua/sip_xfer.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-ua/sip_xfer.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_auth_aka.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_auth_aka.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_auth_aka.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_auth_aka.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_auth_client.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_auth_client.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_auth_client.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_auth_client.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_auth_msg.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_auth_msg.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_auth_msg.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_auth_msg.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_auth_parser.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_auth_parser.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_auth_parser.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_auth_parser.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_auth_server.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_auth_server.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_auth_server.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_auth_server.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_config.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_config.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_config.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_config.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_dialog.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_dialog.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_dialog.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_dialog.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_endpoint.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_endpoint.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_endpoint.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_endpoint.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_errno.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_errno.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_errno.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_errno.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_msg.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_msg.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_msg.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_msg.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_parser.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_parser.c similarity index 99% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_parser.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_parser.c index 91f54687874c23ffc62c4a0f3fccc6b34d5d12d1..5c17443208fae224f1bdedf8e1e6e6774df49ab4 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_parser.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_parser.c @@ -1,4 +1,4 @@ -/* $Id: sip_parser.c 2538 2009-03-23 13:14:26Z bennylp $ */ +/* $Id: sip_parser.c 2802 2009-06-25 11:29:49Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -1588,7 +1588,8 @@ PJ_DEF(pj_status_t) pjsip_parse_status_line( char *buf, pj_size_t size, PJ_USE_EXCEPTION; pj_bzero(status_line, sizeof(*status_line)); - pj_scan_init(&scanner, buf, size, 0, &on_syntax_error); + pj_scan_init(&scanner, buf, size, PJ_SCAN_AUTOSKIP_WS_HEADER, + &on_syntax_error); PJ_TRY { int_parse_status_line(&scanner, status_line); diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_resolve.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_resolve.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_resolve.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_resolve.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_tel_uri.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_tel_uri.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_tel_uri.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_tel_uri.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transaction.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_transaction.c similarity index 98% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transaction.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_transaction.c index 50b7cdb70fd960a286afaf233c45d2508b59dc8e..864cd7c67f036e1e15274a61b1e84cd32be7c9c9 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transaction.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_transaction.c @@ -1,4 +1,4 @@ -/* $Id: sip_transaction.c 2534 2009-03-23 13:09:09Z bennylp $ */ +/* $Id: sip_transaction.c 2798 2009-06-25 10:48:08Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -1502,6 +1502,47 @@ PJ_DEF(pj_status_t) pjsip_tsx_stop_retransmit(pjsip_transaction *tsx) } +/* + * Start a timer to terminate transaction after the specified time + * has elapsed. + */ +PJ_DEF(pj_status_t) pjsip_tsx_set_timeout( pjsip_transaction *tsx, + unsigned millisec) +{ + struct tsx_lock_data lck; + pj_time_val timeout; + + PJ_ASSERT_RETURN(tsx != NULL, PJ_EINVAL); + PJ_ASSERT_RETURN(tsx->role == PJSIP_ROLE_UAC && + tsx->method.id == PJSIP_INVITE_METHOD, + PJ_EINVALIDOP); + + lock_tsx(tsx, &lck); + + /* Transaction must not have got final response */ + PJ_ASSERT_ON_FAIL(tsx->status_code < 200, + { unlock_tsx(tsx, &lck); return PJ_EINVALIDOP; }); + + if (tsx->timeout_timer.id != 0) { + pjsip_endpt_cancel_timer(tsx->endpt, &tsx->timeout_timer); + tsx->timeout_timer.id = 0; + } + + timeout.sec = 0; + timeout.msec = millisec; + pj_time_val_normalize(&timeout); + + tsx->timeout_timer.id = TIMER_ACTIVE; + pjsip_endpt_schedule_timer(tsx->endpt, &tsx->timeout_timer, + &timeout); + + + unlock_tsx(tsx, &lck); + + return PJ_SUCCESS; +} + + /* * This function is called by TU to send a message. */ diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transport.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_transport.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transport.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_transport.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transport_loop.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_transport_loop.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transport_loop.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_transport_loop.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transport_tcp.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_transport_tcp.c similarity index 97% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transport_tcp.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_transport_tcp.c index 042f192528cf30f934b634531459801ed42ddb88..c0829cc5d46f1c855ec3dfb4d31e5e8e96801cd7 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transport_tcp.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_transport_tcp.c @@ -1,4 +1,4 @@ -/* $Id: sip_transport_tcp.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: sip_transport_tcp.c 2804 2009-06-25 12:26:15Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -805,33 +805,33 @@ static pj_status_t lis_create_transport(pjsip_tpfactory *factory, status = pj_activesock_start_connect(tcp->asock, tcp->base.pool, rem_addr, sizeof(pj_sockaddr_in)); if (status == PJ_SUCCESS) { - tcp->has_pending_connect = PJ_FALSE; + on_connect_complete(tcp->asock, PJ_SUCCESS); } else if (status != PJ_EPENDING) { tcp_destroy(&tcp->base, status); return status; } - /* Update (again) local address, just in case local address currently - * set is different now that asynchronous connect() is started. - */ - addr_len = sizeof(pj_sockaddr_in); - if (pj_sock_getsockname(sock, &local_addr, &addr_len)==PJ_SUCCESS) { - pj_sockaddr_in *tp_addr = (pj_sockaddr_in*)&tcp->base.local_addr; - - /* Some systems (like old Win32 perhaps) may not set local address - * properly before socket is fully connected. + if (tcp->has_pending_connect) { + /* Update (again) local address, just in case local address currently + * set is different now that asynchronous connect() is started. */ - if (tp_addr->sin_addr.s_addr != local_addr.sin_addr.s_addr && - local_addr.sin_addr.s_addr != 0) - { - tp_addr->sin_addr.s_addr = local_addr.sin_addr.s_addr; - tp_addr->sin_port = local_addr.sin_port; - sockaddr_to_host_port(tcp->base.pool, &tcp->base.local_name, - &local_addr); - } - } + addr_len = sizeof(pj_sockaddr_in); + if (pj_sock_getsockname(sock, &local_addr, &addr_len)==PJ_SUCCESS) { + pj_sockaddr_in *tp_addr = (pj_sockaddr_in*)&tcp->base.local_addr; - if (tcp->has_pending_connect) { + /* Some systems (like old Win32 perhaps) may not set local address + * properly before socket is fully connected. + */ + if (tp_addr->sin_addr.s_addr != local_addr.sin_addr.s_addr && + local_addr.sin_addr.s_addr != 0) + { + tp_addr->sin_addr.s_addr = local_addr.sin_addr.s_addr; + tp_addr->sin_port = local_addr.sin_port; + sockaddr_to_host_port(tcp->base.pool, &tcp->base.local_name, + &local_addr); + } + } + PJ_LOG(4,(tcp->base.obj_name, "TCP transport %.*s:%d is connecting to %.*s:%d...", (int)tcp->base.local_name.host.slen, diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transport_tls_ossl.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_transport_tls_ossl.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transport_tls_ossl.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_transport_tls_ossl.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transport_udp.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_transport_udp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transport_udp.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_transport_udp.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_ua_layer.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_ua_layer.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_ua_layer.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_ua_layer.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_uri.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_uri.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_uri.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_uri.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_util.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_util.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_util.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_util.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_util_proxy.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_util_proxy.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_util_proxy.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_util_proxy.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_util_statefull.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_util_statefull.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_util_statefull.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_util_statefull.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_acc.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsua-lib/pjsua_acc.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_acc.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsua-lib/pjsua_acc.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_call.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsua-lib/pjsua_call.c similarity index 99% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_call.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsua-lib/pjsua_call.c index 55f5d95d7faf853068d88e5d569e89121ad218da..555a6ddd45d0355e19c7fb474dd2251f37418dc2 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_call.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsua-lib/pjsua_call.c @@ -1,4 +1,4 @@ -/* $Id: pjsua_call.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: pjsua_call.c 2815 2009-06-25 13:13:26Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -78,21 +78,6 @@ static pjsip_redirect_op pjsua_call_on_redirected(pjsip_inv_session *inv, static pj_status_t create_sdp_of_call_hold(pjsua_call *call, pjmedia_sdp_session **p_answer); -/* Update SDP version in the offer */ -static void update_sdp_version(pjsua_call *call, - pjmedia_sdp_session *sdp) -{ - const pjmedia_sdp_session *old_sdp = NULL; - pj_status_t status; - - status = pjmedia_sdp_neg_get_active_local(call->inv->neg, &old_sdp); - if (status != PJ_SUCCESS || old_sdp == NULL) - return; - - sdp->origin.version = old_sdp->origin.version + 1; -} - - /* * Callback called by event framework when the xfer subscription state * has changed. @@ -463,6 +448,11 @@ PJ_DEF(pj_status_t) pjsua_call_make_call( pjsua_acc_id acc_id, return status; } + /* Increment the dialog's lock otherwise when invite session creation + * fails the dialog will be destroyed prematurely. + */ + pjsip_dlg_inc_lock(dlg); + /* Calculate call's secure level */ call->secure_level = get_secure_level(acc_id, dest_uri); @@ -553,11 +543,10 @@ PJ_DEF(pj_status_t) pjsua_call_make_call( pjsua_acc_id acc_id, pjsua_perror(THIS_FILE, "Unable to send initial INVITE request", status); - /* Upon failure to send first request, both dialog and invite + /* Upon failure to send first request, the invite * session would have been cleared. */ inv = NULL; - dlg = NULL; goto on_error; } @@ -566,6 +555,7 @@ PJ_DEF(pj_status_t) pjsua_call_make_call( pjsua_acc_id acc_id, if (p_call_id) *p_call_id = call_id; + pjsip_dlg_dec_lock(dlg); pj_pool_release(tmp_pool); PJSUA_UNLOCK(); @@ -573,10 +563,13 @@ PJ_DEF(pj_status_t) pjsua_call_make_call( pjsua_acc_id acc_id, on_error: + if (dlg) { + /* This may destroy the dialog */ + pjsip_dlg_dec_lock(dlg); + } + if (inv != NULL) { pjsip_inv_terminate(inv, PJSIP_SC_OK, PJ_FALSE); - } else if (dlg) { - pjsip_dlg_terminate(dlg); } if (call_id != -1) { @@ -1507,8 +1500,6 @@ PJ_DEF(pj_status_t) pjsua_call_set_hold(pjsua_call_id call_id, return status; } - update_sdp_version(call, sdp); - /* Create re-INVITE with new offer */ status = pjsip_inv_reinvite( call->inv, NULL, sdp, &tdata); if (status != PJ_SUCCESS) { @@ -1579,8 +1570,6 @@ PJ_DEF(pj_status_t) pjsua_call_reinvite( pjsua_call_id call_id, return status; } - update_sdp_version(call, sdp); - /* Create re-INVITE with new offer */ status = pjsip_inv_reinvite( call->inv, NULL, sdp, &tdata); if (status != PJ_SUCCESS) { @@ -1638,8 +1627,6 @@ PJ_DEF(pj_status_t) pjsua_call_update( pjsua_call_id call_id, return status; } - update_sdp_version(call, sdp); - /* Create UPDATE with new offer */ status = pjsip_inv_update(call->inv, NULL, sdp, &tdata); if (status != PJ_SUCCESS) { @@ -3184,7 +3171,10 @@ static pj_status_t create_sdp_of_call_hold(pjsua_call *call, * 'inactive' (PJMEDIA_DIR_NONE). * (See RFC 3264 Section 8.4 and RFC 4317 Section 3.1) */ - if (call->media_dir != PJMEDIA_DIR_ENCODING) { + /* http://trac.pjsip.org/repos/ticket/880 + if (call->media_dir != PJMEDIA_DIR_ENCODING) { + */ + if (1) { pjmedia_sdp_attr *attr; /* Remove existing directions attributes */ @@ -3193,7 +3183,7 @@ static pj_status_t create_sdp_of_call_hold(pjsua_call *call, pjmedia_sdp_media_remove_all_attr(sdp->media[0], "recvonly"); pjmedia_sdp_media_remove_all_attr(sdp->media[0], "inactive"); - if (call->media_dir == PJMEDIA_DIR_ENCODING_DECODING) { + if (call->media_dir & PJMEDIA_DIR_ENCODING) { /* Add sendonly attribute */ attr = pjmedia_sdp_attr_create(pool, "sendonly", NULL); pjmedia_sdp_media_add_attr(sdp->media[0], attr); @@ -3309,8 +3299,6 @@ static void pjsua_call_on_create_offer(pjsip_inv_session *inv, return; } - update_sdp_version(call, *offer); - PJSUA_UNLOCK(); } @@ -3426,7 +3414,7 @@ static void xfer_client_on_evsub_state( pjsip_evsub *sub, pjsip_event *event) msg = rdata->msg_info.msg; body = msg->body; if (!body) { - PJ_LOG(4,(THIS_FILE, + PJ_LOG(2,(THIS_FILE, "Warning: received NOTIFY without message body")); return; } @@ -3435,7 +3423,7 @@ static void xfer_client_on_evsub_state( pjsip_evsub *sub, pjsip_event *event) if (pj_stricmp2(&body->content_type.type, "message") != 0 || pj_stricmp2(&body->content_type.subtype, "sipfrag") != 0) { - PJ_LOG(4,(THIS_FILE, + PJ_LOG(2,(THIS_FILE, "Warning: received NOTIFY with non message/sipfrag " "content")); return; @@ -3445,7 +3433,7 @@ static void xfer_client_on_evsub_state( pjsip_evsub *sub, pjsip_event *event) status = pjsip_parse_status_line((char*)body->data, body->len, &status_line); if (status != PJ_SUCCESS) { - PJ_LOG(4,(THIS_FILE, + PJ_LOG(2,(THIS_FILE, "Warning: received NOTIFY with invalid " "message/sipfrag content")); return; diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_core.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsua-lib/pjsua_core.c similarity index 99% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_core.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsua-lib/pjsua_core.c index b5dc17d787fb8b1f02bda76632b5ad0a73860487..2609c9343c712b7ad4f877478eebf8c96feaae4c 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_core.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsua-lib/pjsua_core.c @@ -1,4 +1,4 @@ -/* $Id: pjsua_core.c 2542 2009-03-23 13:21:01Z bennylp $ */ +/* $Id: pjsua_core.c 2814 2009-06-25 13:11:53Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -643,7 +643,8 @@ PJ_DEF(pj_status_t) pjsua_init( const pjsua_config *ua_cfg, /* Initialize logging first so that info/errors can be captured */ if (log_cfg) { status = pjsua_reconfigure_logging(log_cfg); - PJ_ASSERT_RETURN(status == PJ_SUCCESS, status); + if (status != PJ_SUCCESS) + return status; } /* If nameserver is configured, create DNS resolver instance and diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_im.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsua-lib/pjsua_im.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_im.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsua-lib/pjsua_im.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_media.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsua-lib/pjsua_media.c similarity index 99% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_media.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsua-lib/pjsua_media.c index 538f73e5701943695b969009d60f91f8a6fe4964..f312e404bd5a0eea1ca1cb56560ec20c1cba4c40 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_media.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsua-lib/pjsua_media.c @@ -1,4 +1,4 @@ -/* $Id: pjsua_media.c 2541 2009-03-23 13:19:31Z bennylp $ */ +/* $Id: pjsua_media.c 2813 2009-06-25 13:09:24Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -468,12 +468,16 @@ static void close_snd_timer_cb( pj_timer_heap_t *th, { PJ_UNUSED_ARG(th); - PJ_LOG(4,(THIS_FILE,"Closing sound device after idle for %d seconds", - pjsua_var.media_cfg.snd_auto_close_time)); + PJSUA_LOCK(); + if (entry->id) { + PJ_LOG(4,(THIS_FILE,"Closing sound device after idle for %d seconds", + pjsua_var.media_cfg.snd_auto_close_time)); - entry->id = PJ_FALSE; + entry->id = PJ_FALSE; - close_snd_dev(); + close_snd_dev(); + } + PJSUA_UNLOCK(); } @@ -1605,10 +1609,12 @@ PJ_DEF(pj_status_t) pjsua_conf_connect( pjsua_conf_port_id source, pjsua_conf_port_id sink) { /* If sound device idle timer is active, cancel it first. */ + PJSUA_LOCK(); if (pjsua_var.snd_idle_timer.id) { pjsip_endpt_cancel_timer(pjsua_var.endpt, &pjsua_var.snd_idle_timer); pjsua_var.snd_idle_timer.id = PJ_FALSE; } + PJSUA_UNLOCK(); /* Create sound port if none is instantiated */ if (pjsua_var.snd_port==NULL && pjsua_var.null_snd==NULL && diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_pres.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsua-lib/pjsua_pres.c similarity index 98% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_pres.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsua-lib/pjsua_pres.c index 616f2e62793923b598bd85f60d16e34640b48613..8ce1d4d3afe60ef56c358388c8713ff82c5c4487 100644 --- a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_pres.c +++ b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsua-lib/pjsua_pres.c @@ -1,4 +1,4 @@ -/* $Id: pjsua_pres.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: pjsua_pres.c 2812 2009-06-25 13:05:59Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -389,6 +389,12 @@ PJ_DEF(pj_status_t) pjsua_buddy_del(pjsua_buddy_id buddy_id) PJSUA_LOCK(); + /* Not interested with further events for this buddy */ + if (pjsua_var.buddy[buddy_id].sub) { + pjsip_evsub_set_mod_data(pjsua_var.buddy[buddy_id].sub, + pjsua_var.mod.id, NULL); + } + /* Remove buddy */ pjsua_var.buddy[buddy_id].uri.slen = 0; pjsua_var.buddy_cnt--; @@ -1442,13 +1448,21 @@ static void subscribe_buddy_presence(unsigned index) return; } + /* Increment the dialog's lock otherwise when presence session creation + * fails the dialog will be destroyed prematurely. + */ + pjsip_dlg_inc_lock(buddy->dlg); + status = pjsip_pres_create_uac( buddy->dlg, &pres_callback, PJSIP_EVSUB_NO_EVENT_ID, &buddy->sub); if (status != PJ_SUCCESS) { pjsua_var.buddy[index].sub = NULL; pjsua_perror(THIS_FILE, "Unable to create presence client", status); - pjsip_dlg_terminate(buddy->dlg); + /* This should destroy the dialog since there's no session + * referencing it + */ + pjsip_dlg_dec_lock(buddy->dlg); if (tmp_pool) pj_pool_release(tmp_pool); return; } @@ -1481,6 +1495,7 @@ static void subscribe_buddy_presence(unsigned index) status = pjsip_pres_initiate(buddy->sub, -1, &tdata); if (status != PJ_SUCCESS) { + pjsip_dlg_dec_lock(buddy->dlg); if (buddy->sub) { pjsip_pres_terminate(buddy->sub, PJ_FALSE); } @@ -1495,6 +1510,7 @@ static void subscribe_buddy_presence(unsigned index) status = pjsip_pres_send_request(buddy->sub, tdata); if (status != PJ_SUCCESS) { + pjsip_dlg_dec_lock(buddy->dlg); if (buddy->sub) { pjsip_pres_terminate(buddy->sub, PJ_FALSE); } @@ -1505,6 +1521,7 @@ static void subscribe_buddy_presence(unsigned index) return; } + pjsip_dlg_dec_lock(buddy->dlg); if (tmp_pool) pj_pool_release(tmp_pool); } diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/dlg_core_test.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/dlg_core_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/dlg_core_test.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/dlg_core_test.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/dns_test.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/dns_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/dns_test.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/dns_test.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/inv_offer_answer_test.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/inv_offer_answer_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/inv_offer_answer_test.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/inv_offer_answer_test.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/main.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/main.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/main.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/main.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/main_rtems.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/main_rtems.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/main_rtems.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/main_rtems.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/main_win32.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/main_win32.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/main_win32.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/main_win32.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/msg_err_test.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/msg_err_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/msg_err_test.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/msg_err_test.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/msg_logger.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/msg_logger.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/msg_logger.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/msg_logger.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/msg_test.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/msg_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/msg_test.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/msg_test.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/regc_test.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/regc_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/regc_test.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/regc_test.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/test.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/test.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/test.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/test.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/test.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/test.h rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/test.h diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/transport_loop_test.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/transport_loop_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/transport_loop_test.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/transport_loop_test.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/transport_tcp_test.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/transport_tcp_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/transport_tcp_test.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/transport_tcp_test.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/transport_test.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/transport_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/transport_test.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/transport_test.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/transport_udp_test.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/transport_udp_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/transport_udp_test.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/transport_udp_test.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/tsx_basic_test.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/tsx_basic_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/tsx_basic_test.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/tsx_basic_test.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/tsx_bench.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/tsx_bench.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/tsx_bench.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/tsx_bench.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/tsx_uac_test.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/tsx_uac_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/tsx_uac_test.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/tsx_uac_test.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/tsx_uas_test.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/tsx_uas_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/tsx_uas_test.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/tsx_uas_test.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/txdata_test.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/txdata_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/txdata_test.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/txdata_test.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/uri_test.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/uri_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/uri_test.c rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/uri_test.c diff --git a/sflphone-common/libs/pjproject-1.0.2/self-test.mak b/sflphone-common/libs/pjproject-1.0.3/self-test.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/self-test.mak rename to sflphone-common/libs/pjproject-1.0.3/self-test.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/svn_add b/sflphone-common/libs/pjproject-1.0.3/svn_add similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/svn_add rename to sflphone-common/libs/pjproject-1.0.3/svn_add diff --git a/sflphone-common/libs/pjproject-1.0.2/svn_pset b/sflphone-common/libs/pjproject-1.0.3/svn_pset similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/svn_pset rename to sflphone-common/libs/pjproject-1.0.3/svn_pset diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/cdash/README.TXT b/sflphone-common/libs/pjproject-1.0.3/tests/cdash/README.TXT similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/cdash/README.TXT rename to sflphone-common/libs/pjproject-1.0.3/tests/cdash/README.TXT diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/cdash/builder.py b/sflphone-common/libs/pjproject-1.0.3/tests/cdash/builder.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/cdash/builder.py rename to sflphone-common/libs/pjproject-1.0.3/tests/cdash/builder.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/cdash/cfg_gnu.py b/sflphone-common/libs/pjproject-1.0.3/tests/cdash/cfg_gnu.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/cdash/cfg_gnu.py rename to sflphone-common/libs/pjproject-1.0.3/tests/cdash/cfg_gnu.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/cdash/cfg_msvc.py b/sflphone-common/libs/pjproject-1.0.3/tests/cdash/cfg_msvc.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/cdash/cfg_msvc.py rename to sflphone-common/libs/pjproject-1.0.3/tests/cdash/cfg_msvc.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/cdash/cfg_site_sample.py b/sflphone-common/libs/pjproject-1.0.3/tests/cdash/cfg_site_sample.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/cdash/cfg_site_sample.py rename to sflphone-common/libs/pjproject-1.0.3/tests/cdash/cfg_site_sample.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/cdash/cfg_symbian.py b/sflphone-common/libs/pjproject-1.0.3/tests/cdash/cfg_symbian.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/cdash/cfg_symbian.py rename to sflphone-common/libs/pjproject-1.0.3/tests/cdash/cfg_symbian.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/cdash/inc_test.py b/sflphone-common/libs/pjproject-1.0.3/tests/cdash/inc_test.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/cdash/inc_test.py rename to sflphone-common/libs/pjproject-1.0.3/tests/cdash/inc_test.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/cdash/main.py b/sflphone-common/libs/pjproject-1.0.3/tests/cdash/main.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/cdash/main.py rename to sflphone-common/libs/pjproject-1.0.3/tests/cdash/main.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/cdash/starttest_sample.bat b/sflphone-common/libs/pjproject-1.0.3/tests/cdash/starttest_sample.bat similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/cdash/starttest_sample.bat rename to sflphone-common/libs/pjproject-1.0.3/tests/cdash/starttest_sample.bat diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/README.TXT b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/README.TXT similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/README.TXT rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/README.TXT diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/config_site.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/config_site.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/config_site.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/config_site.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/inc_cfg.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/inc_cfg.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/inc_cfg.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/inc_cfg.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/inc_const.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/inc_const.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/inc_const.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/inc_const.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/inc_sdp.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/inc_sdp.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/inc_sdp.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/inc_sdp.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/inc_sip.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/inc_sip.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/inc_sip.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/inc_sip.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_call.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/mod_call.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_call.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/mod_call.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_media_playrec.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/mod_media_playrec.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_media_playrec.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/mod_media_playrec.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_pesq.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/mod_pesq.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_pesq.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/mod_pesq.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_pres.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/mod_pres.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_pres.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/mod_pres.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_recvfrom.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/mod_recvfrom.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_recvfrom.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/mod_recvfrom.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_run.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/mod_run.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_run.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/mod_run.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_sendto.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/mod_sendto.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_sendto.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/mod_sendto.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/run.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/run.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/run.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/run.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/runall.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/runall.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/runall.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/runall.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/100_simplecall.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/100_simplecall.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/100_simplecall.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/100_simplecall.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_0_1.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/150_srtp_0_1.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_0_1.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/150_srtp_0_1.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_1_0.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/150_srtp_1_0.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_1_0.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/150_srtp_1_0.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_1_1.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/150_srtp_1_1.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_1_1.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/150_srtp_1_1.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_1_2.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/150_srtp_1_2.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_1_2.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/150_srtp_1_2.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_2_1.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/150_srtp_2_1.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_2_1.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/150_srtp_2_1.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_2_2.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/150_srtp_2_2.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_2_2.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/150_srtp_2_2.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/200_tcp.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/200_tcp.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/200_tcp.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/200_tcp.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/300_ice_0_1.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/300_ice_0_1.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/300_ice_0_1.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/300_ice_0_1.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/300_ice_1_0.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/300_ice_1_0.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/300_ice_1_0.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/300_ice_1_0.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/300_ice_1_1.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/300_ice_1_1.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/300_ice_1_1.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/300_ice_1_1.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/301_ice_public_a.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/301_ice_public_a.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/301_ice_public_a.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/301_ice_public_a.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/301_ice_public_b.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/301_ice_public_b.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/301_ice_public_b.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/301_ice_public_b.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/305_ice_comp_1_2.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/305_ice_comp_1_2.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/305_ice_comp_1_2.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/305_ice_comp_1_2.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/305_ice_comp_2_1.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/305_ice_comp_2_1.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/305_ice_comp_2_1.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/305_ice_comp_2_1.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/350_prack_a.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/350_prack_a.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/350_prack_a.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/350_prack_a.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/350_prack_b.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/350_prack_b.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/350_prack_b.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/350_prack_b.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_16.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_11_16.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_16.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_11_16.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_22.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_11_22.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_22.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_11_22.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_32.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_11_32.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_32.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_11_32.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_44.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_11_44.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_44.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_11_44.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_48.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_11_48.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_48.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_11_48.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_8.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_11_8.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_8.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_11_8.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_11.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_8_11.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_11.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_8_11.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_16.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_8_16.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_16.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_8_16.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_22.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_8_22.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_22.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_8_22.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_32.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_8_32.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_32.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_8_32.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_44.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_8_44.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_44.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_8_44.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_48.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_8_48.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_48.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_8_48.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/100_defaults.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/100_defaults.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/100_defaults.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/100_defaults.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/101_defaults.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/101_defaults.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/101_defaults.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/101_defaults.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_g711a.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_g711a.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_g711a.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_g711a.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_g711u.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_g711u.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_g711u.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_g711u.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_g722.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_g722.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_g722.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_g722.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_gsm.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_gsm.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_gsm.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_gsm.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_ilbc.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_ilbc.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_ilbc.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_ilbc.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_l16_16000.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_l16_16000.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_l16_16000.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_l16_16000.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_l16_16000_stereo.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_l16_16000_stereo.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_l16_16000_stereo.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_l16_16000_stereo.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_l16_8000.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_l16_8000.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_l16_8000.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_l16_8000.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_l16_8000_stereo.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_l16_8000_stereo.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_l16_8000_stereo.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_l16_8000_stereo.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_speex_16000.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_speex_16000.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_speex_16000.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_speex_16000.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_speex_8000.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_speex_8000.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_speex_8000.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_speex_8000.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_g711a.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_g711a.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_g711a.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_g711a.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_g711u.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_g711u.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_g711u.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_g711u.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_g722.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_g722.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_g722.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_g722.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_gsm.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_gsm.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_gsm.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_gsm.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_ilbc.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_ilbc.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_ilbc.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_ilbc.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_l16_16000.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_l16_16000.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_l16_16000.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_l16_16000.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_l16_16000_stereo.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_l16_16000_stereo.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_l16_16000_stereo.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_l16_16000_stereo.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_l16_8000.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_l16_8000.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_l16_8000.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_l16_8000.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_l16_8000_stereo.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_l16_8000_stereo.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_l16_8000_stereo.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_l16_8000_stereo.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_speex_16000.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_speex_16000.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_speex_16000.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_speex_16000.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_speex_8000.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_speex_8000.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_speex_8000.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_speex_8000.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pres/100_peertopeer.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pres/100_peertopeer.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pres/100_peertopeer.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pres/100_peertopeer.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pres/200_publish.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pres/200_publish.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pres/200_publish.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pres/200_publish.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/200_reg_good_enocredentiall.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/200_reg_good_enocredentiall.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/200_reg_good_enocredentiall.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/200_reg_good_enocredentiall.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/201_reg_good_ok.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/201_reg_good_ok.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/201_reg_good_ok.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/201_reg_good_ok.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/202_reg_good_ok_wildcard.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/202_reg_good_ok_wildcard.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/202_reg_good_ok_wildcard.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/202_reg_good_ok_wildcard.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/205_reg_good_no_realm.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/205_reg_good_no_realm.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/205_reg_good_no_realm.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/205_reg_good_no_realm.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/206_reg_good_efailedcredential.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/206_reg_good_efailedcredential.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/206_reg_good_efailedcredential.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/206_reg_good_efailedcredential.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/208_reg_good_retry_nonce_ok.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/208_reg_good_retry_nonce_ok.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/208_reg_good_retry_nonce_ok.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/208_reg_good_retry_nonce_ok.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/215_reg_good_multi_ok.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/215_reg_good_multi_ok.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/215_reg_good_multi_ok.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/215_reg_good_multi_ok.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/220_reg_good_ims_ok.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/220_reg_good_ims_ok.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/220_reg_good_ims_ok.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/220_reg_good_ims_ok.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/230_reg_bad_fail_stale_true.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/230_reg_bad_fail_stale_true.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/230_reg_bad_fail_stale_true.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/230_reg_bad_fail_stale_true.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/231_reg_bad_fail_stale_false_nonce_changed.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/231_reg_bad_fail_stale_false_nonce_changed.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/231_reg_bad_fail_stale_false_nonce_changed.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/231_reg_bad_fail_stale_false_nonce_changed.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/234_reg_bad_stale_ok.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/234_reg_bad_stale_ok.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/234_reg_bad_stale_ok.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/234_reg_bad_stale_ok.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-run/100_simple.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-run/100_simple.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-run/100_simple.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-run/100_simple.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-run/200_register.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-run/200_register.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-run/200_register.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-run/200_register.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_1.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_1.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_1.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_1.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_2.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_2.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_2.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_2.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_3.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_3.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_3.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_3.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_4.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_4.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_4.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_4.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_5.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_5.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_5.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_5.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/100_simplecall.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/100_simplecall.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/100_simplecall.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/100_simplecall.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/110_tel_uri.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/110_tel_uri.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/110_tel_uri.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/110_tel_uri.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/120_sdp_with_video_dynamic_1.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/120_sdp_with_video_dynamic_1.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/120_sdp_with_video_dynamic_1.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/120_sdp_with_video_dynamic_1.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/120_sdp_with_video_dynamic_2.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/120_sdp_with_video_dynamic_2.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/120_sdp_with_video_dynamic_2.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/120_sdp_with_video_dynamic_2.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/121_sdp_with_video_static_1.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/121_sdp_with_video_static_1.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/121_sdp_with_video_static_1.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/121_sdp_with_video_static_1.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/121_sdp_with_video_static_2.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/121_sdp_with_video_static_2.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/121_sdp_with_video_static_2.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/121_sdp_with_video_static_2.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/122_sdp_with_unknown_dynamic_1.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/122_sdp_with_unknown_dynamic_1.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/122_sdp_with_unknown_dynamic_1.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/122_sdp_with_unknown_dynamic_1.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/122_sdp_with_unknown_dynamic_2.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/122_sdp_with_unknown_dynamic_2.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/122_sdp_with_unknown_dynamic_2.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/122_sdp_with_unknown_dynamic_2.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/123_sdp_with_unknown_static_1.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/123_sdp_with_unknown_static_1.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/123_sdp_with_unknown_static_1.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/123_sdp_with_unknown_static_1.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/123_sdp_with_unknown_static_2.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/123_sdp_with_unknown_static_2.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/123_sdp_with_unknown_static_2.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/123_sdp_with_unknown_static_2.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/124_sdp_with_unknown_static_unknown_transport.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/124_sdp_with_unknown_static_unknown_transport.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/124_sdp_with_unknown_static_unknown_transport.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/124_sdp_with_unknown_static_unknown_transport.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_0.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_0.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_0.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_0.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_1.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_1.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_1.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_1.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_2.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_2.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_2.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_2.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_3.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_3.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_3.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_3.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_4.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_4.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_4.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_4.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/150_err_extension.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/150_err_extension.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/150_err_extension.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/150_err_extension.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/151_err_sdp_video.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/151_err_sdp_video.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/151_err_sdp_video.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/151_err_sdp_video.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/152_err_sdp_no_media.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/152_err_sdp_no_media.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/152_err_sdp_no_media.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/152_err_sdp_no_media.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/153_err_sdp_unsupported_codec.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/153_err_sdp_unsupported_codec.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/153_err_sdp_unsupported_codec.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/153_err_sdp_unsupported_codec.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/155_err_sdp_bad_syntax.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/155_err_sdp_bad_syntax.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/155_err_sdp_bad_syntax.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/155_err_sdp_bad_syntax.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/156_err_sdp_bad_net_type.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/156_err_sdp_bad_net_type.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/156_err_sdp_bad_net_type.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/156_err_sdp_bad_net_type.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/157_err_sdp_bad_addr_type.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/157_err_sdp_bad_addr_type.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/157_err_sdp_bad_addr_type.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/157_err_sdp_bad_addr_type.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/158_err_sdp_bad_transport_type.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/158_err_sdp_bad_transport_type.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/158_err_sdp_bad_transport_type.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/158_err_sdp_bad_transport_type.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/159_no_rport.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/159_no_rport.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/159_no_rport.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/159_no_rport.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/159_no_rport_nit.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/159_no_rport_nit.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/159_no_rport_nit.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/159_no_rport_nit.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/160_err_duplicate_replaces.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/160_err_duplicate_replaces.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/160_err_duplicate_replaces.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/160_err_duplicate_replaces.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/161_err_replaces_dlg_not_found.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/161_err_replaces_dlg_not_found.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/161_err_replaces_dlg_not_found.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/161_err_replaces_dlg_not_found.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/200_ice_no_ice.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/200_ice_no_ice.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/200_ice_no_ice.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/200_ice_no_ice.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/200_ice_success_1.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/200_ice_success_1.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/200_ice_success_1.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/200_ice_success_1.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/200_ice_success_2.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/200_ice_success_2.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/200_ice_success_2.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/200_ice_success_2.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/200_ice_success_3.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/200_ice_success_3.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/200_ice_success_3.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/200_ice_success_3.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/200_ice_success_4.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/200_ice_success_4.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/200_ice_success_4.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/200_ice_success_4.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/201_ice_mismatch_1.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/201_ice_mismatch_1.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/201_ice_mismatch_1.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/201_ice_mismatch_1.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/201_ice_mismatch_2.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/201_ice_mismatch_2.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/201_ice_mismatch_2.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/201_ice_mismatch_2.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/201_ice_mismatch_3.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/201_ice_mismatch_3.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/201_ice_mismatch_3.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/201_ice_mismatch_3.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_crypto_case_insensitive.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/300_srtp_crypto_case_insensitive.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_crypto_case_insensitive.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/300_srtp_crypto_case_insensitive.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_duplicated_crypto_tag.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/300_srtp_duplicated_crypto_tag.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_duplicated_crypto_tag.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/300_srtp_duplicated_crypto_tag.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_invalid_crypto_tag_non_numeric.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/300_srtp_invalid_crypto_tag_non_numeric.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_invalid_crypto_tag_non_numeric.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/300_srtp_invalid_crypto_tag_non_numeric.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_invalid_crypto_tag_zero.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/300_srtp_receive_crypto_tag_zero.py similarity index 66% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_invalid_crypto_tag_zero.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/300_srtp_receive_crypto_tag_zero.py index 1fc2b53d6002cf045ed9effc4edd7ebdd551f76d..1276573b14b33724ddda1a37033d796204688619 100644 --- a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_invalid_crypto_tag_zero.py +++ b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/300_srtp_receive_crypto_tag_zero.py @@ -1,4 +1,4 @@ -# $Id: 300_srtp_invalid_crypto_tag_zero.py 2036 2008-06-20 17:43:55Z nanang $ +# $Id: 300_srtp_receive_crypto_tag_zero.py 2794 2009-06-24 16:00:36Z nanang $ import inc_sip as sip import inc_sdp as sdp @@ -21,6 +21,6 @@ args = "--null-audio --auto-answer 200 --max-calls 1 --use-srtp 1 --srtp-secure include = [] exclude = [] -sendto_cfg = sip.SendtoCfg( "caller has used invalid crypto tag (zero), callee must not accept the call", - pjsua_args=args, sdp=sdp, resp_code=406, +sendto_cfg = sip.SendtoCfg( "caller has used crypto tag zero, callee must accept the call", + pjsua_args=args, sdp=sdp, resp_code=200, resp_inc=include, resp_exc=exclude) diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_1.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_1.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_1.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_1.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_2.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_2.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_2.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_2.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_3.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_3.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_3.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_3.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/301_srtp0_recv_avp.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/301_srtp0_recv_avp.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/301_srtp0_recv_avp.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/301_srtp0_recv_avp.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/301_srtp0_recv_savp.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/301_srtp0_recv_savp.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/301_srtp0_recv_savp.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/301_srtp0_recv_savp.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/310_srtp1_no_crypto.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/310_srtp1_no_crypto.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/310_srtp1_no_crypto.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/310_srtp1_no_crypto.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/311_srtp1_recv_avp.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/311_srtp1_recv_avp.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/311_srtp1_recv_avp.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/311_srtp1_recv_avp.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/312_srtp1_recv_savp.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/312_srtp1_recv_savp.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/312_srtp1_recv_savp.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/312_srtp1_recv_savp.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/313_srtp1_unsupported_crypto.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/313_srtp1_unsupported_crypto.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/313_srtp1_unsupported_crypto.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/313_srtp1_unsupported_crypto.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/320_srtp2_no_crypto.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/320_srtp2_no_crypto.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/320_srtp2_no_crypto.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/320_srtp2_no_crypto.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/320_srtp_with_unknown_media_1.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/320_srtp_with_unknown_media_1.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/320_srtp_with_unknown_media_1.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/320_srtp_with_unknown_media_1.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/320_srtp_with_unknown_media_2.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/320_srtp_with_unknown_media_2.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/320_srtp_with_unknown_media_2.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/320_srtp_with_unknown_media_2.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/320_srtp_with_unknown_transport_1.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/320_srtp_with_unknown_transport_1.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/320_srtp_with_unknown_transport_1.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/320_srtp_with_unknown_transport_1.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/320_srtp_with_unknown_transport_2.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/320_srtp_with_unknown_transport_2.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/320_srtp_with_unknown_transport_2.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/320_srtp_with_unknown_transport_2.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/321_srtp2_recv_avp.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/321_srtp2_recv_avp.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/321_srtp2_recv_avp.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/321_srtp2_recv_avp.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/322_srtp2_recv_savp.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/322_srtp2_recv_savp.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/322_srtp2_recv_savp.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/322_srtp2_recv_savp.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/323_srtp2_unsupported_crypto.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/323_srtp2_unsupported_crypto.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/323_srtp2_unsupported_crypto.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/323_srtp2_unsupported_crypto.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/330_srtp_prefer_rtp_savp.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/330_srtp_prefer_rtp_savp.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/330_srtp_prefer_rtp_savp.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/330_srtp_prefer_rtp_savp.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/331_srtp_prefer_rtp_avp.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/331_srtp_prefer_rtp_avp.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/331_srtp_prefer_rtp_avp.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/331_srtp_prefer_rtp_avp.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/360_non_sip_uri.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/360_non_sip_uri.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/360_non_sip_uri.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/360_non_sip_uri.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/361_non_sip_uri.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/361_non_sip_uri.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/361_non_sip_uri.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/361_non_sip_uri.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/362_non_sip_uri.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/362_non_sip_uri.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/362_non_sip_uri.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/362_non_sip_uri.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/363_non_sip_uri_subscribe.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/363_non_sip_uri_subscribe.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/363_non_sip_uri_subscribe.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/363_non_sip_uri_subscribe.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/364_non_sip_uri_subscribe.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/364_non_sip_uri_subscribe.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/364_non_sip_uri_subscribe.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/364_non_sip_uri_subscribe.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/400_fmtp_g7221_with_bitrate.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/400_fmtp_g7221_with_bitrate.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/400_fmtp_g7221_with_bitrate.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/400_fmtp_g7221_with_bitrate.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_24000.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_24000.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_24000.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_24000.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_32000.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_32000.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_32000.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_32000.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/410_fmtp_amrnb_offer_octet_align.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/410_fmtp_amrnb_offer_octet_align.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/410_fmtp_amrnb_offer_octet_align.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/410_fmtp_amrnb_offer_octet_align.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/411_fmtp_amrnb_offer_band_eff.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/411_fmtp_amrnb_offer_band_eff.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/411_fmtp_amrnb_offer_band_eff.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/411_fmtp_amrnb_offer_band_eff.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/412_fmtp_amrnb_offer_band_eff2.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/412_fmtp_amrnb_offer_band_eff2.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/412_fmtp_amrnb_offer_band_eff2.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/412_fmtp_amrnb_offer_band_eff2.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/500_pres_subscribe_with_bad_event.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/500_pres_subscribe_with_bad_event.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/500_pres_subscribe_with_bad_event.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/500_pres_subscribe_with_bad_event.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/999_asterisk_err.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/999_asterisk_err.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/999_asterisk_err.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/999_asterisk_err.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/999_message_no_body.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/999_message_no_body.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/999_message_no_body.py rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/999_message_no_body.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sipp/inv_401_retry_after_100.xml b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sipp/inv_401_retry_after_100.xml similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sipp/inv_401_retry_after_100.xml rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sipp/inv_401_retry_after_100.xml diff --git a/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sipp/uas-cancel-no-final.xml b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sipp/uas-cancel-no-final.xml new file mode 100644 index 0000000000000000000000000000000000000000..e96f2a37402b7187a1e8c95e3ec9cc1427252150 --- /dev/null +++ b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sipp/uas-cancel-no-final.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="ISO-8859-1" ?> +<!DOCTYPE scenario SYSTEM "sipp.dtd"> + +<scenario name="Basic UAS responder"> + <recv request="INVITE" crlf="true"> + </recv> + + <send> + <![CDATA[ + + SIP/2.0 100 Trying + [last_Via:] + [last_From:] + [last_To:] + [last_Call-ID:] + [last_CSeq:] + Content-Length: 0 + + ]]> + </send> + + <send> + <![CDATA[ + + SIP/2.0 180 Ringing + [last_Via:] + [last_From:] + [last_To:];tag=[call_number] + [last_Call-ID:] + [last_CSeq:] + Contact: <sip:192.168.0.15> + Content-Length: 0 + + ]]> + </send> + + <!-- Wait for CANCEL --> + <recv request="CANCEL" crlf="true"> + </recv> + + <send> + <![CDATA[ + SIP/2.0 200 OK + [last_Via:] + [last_From:] + [last_To:] + [last_Call-ID:] + [last_CSeq:] + Content-Length: 0 + + ]]> + </send> + + + <!-- definition of the response time repartition table (unit is ms) --> + <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/> + + <!-- definition of the call length repartition table (unit is ms) --> + <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/> + +</scenario> + diff --git a/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sipp/uas-early-bye.xml b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sipp/uas-early-bye.xml new file mode 100644 index 0000000000000000000000000000000000000000..216b8b45bf706d8e5fe437a467c238c4d0a83f22 --- /dev/null +++ b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sipp/uas-early-bye.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="ISO-8859-1" ?> +<!DOCTYPE scenario SYSTEM "sipp.dtd"> + +<scenario name="Early BYE"> + <recv request="INVITE" crlf="true"> + <action> + <ereg regexp=".*" search_in="hdr" header="From" assign_to="3"/> + <ereg regexp="sip:(.*)>" search_in="hdr" header="Contact" assign_to="4,5"/> + <assign assign_to="4" variable="5" /> + </action> + </recv> + + <send> + <![CDATA[ + SIP/2.0 100 Trying + [last_Via:] + [last_From:] + [last_To:] + [last_Call-ID:] + [last_CSeq:] + Content-Length: 0 + + ]]> + </send> + + <send> + <![CDATA[ + + SIP/2.0 180 Ringing + [last_Via:] + [last_From:] + [last_To:];tag=[call_number] + [last_Call-ID:] + [last_CSeq:] + Contact: sip:sipp@[local_ip]:[local_port] + Content-Length: 0 + + ]]> + </send> + + <send retrans="500"> + <![CDATA[ + + BYE sip:[$5] SIP/2.0 + Via: SIP/2.0/[transport] [local_ip]:[local_port] + From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[call_number] + To[$3] + Call-ID: [call_id] + Cseq: 1 BYE + Contact: sip:sipp@[local_ip]:[local_port] + Max-Forwards: 70 + Content-Length: 0 + + ]]> + </send> + + <recv response="200"> + </recv> + + + <!-- definition of the response time repartition table (unit is ms) --> + <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/> + + <!-- definition of the call length repartition table (unit is ms) --> + <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/> + +</scenario> + diff --git a/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sipp/uas-forked-200.xml b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sipp/uas-forked-200.xml new file mode 100644 index 0000000000000000000000000000000000000000..229f7d89d8cb682b14deb05633eb98508090cfc6 --- /dev/null +++ b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sipp/uas-forked-200.xml @@ -0,0 +1,143 @@ +<?xml version="1.0" encoding="ISO-8859-1" ?> +<!DOCTYPE scenario SYSTEM "sipp.dtd"> + +<!-- This program is free software; you can redistribute it and/or --> +<!-- modify it under the terms of the GNU General Public License as --> +<!-- published by the Free Software Foundation; either version 2 of the --> +<!-- License, or (at your option) any later version. --> +<!-- --> +<!-- This program is distributed in the hope that it will be useful, --> +<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of --> +<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --> +<!-- GNU General Public License for more details. --> +<!-- --> +<!-- You should have received a copy of the GNU General Public License --> +<!-- along with this program; if not, write to the --> +<!-- Free Software Foundation, Inc., --> +<!-- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> +<!-- --> +<!-- Sipp default 'uas' scenario. --> +<!-- --> + +<scenario name="Forked INVITE, one of them require PRACK"> + <recv request="INVITE" crlf="true"> + <action> + <ereg regexp="branch=([0-9a-zA-Z]*)" + search_in="hdr" + header="Via" + assign_to="1,2"/> + <assign assign_to="1" variable="2"/> + </action> + </recv> + + <send> + <![CDATA[ + SIP/2.0 100 Trying + [last_Via:] + [last_From:] + [last_To:];tag=[call_number] + [last_Call-ID:] + [last_CSeq:] + ]]> + </send> + + <!-- Call leg 1: 200/OK --> + <send> + <![CDATA[ + SIP/2.0 200 OK + Via: SIP/2.0/UDP 127.0.0.1;received=127.0.0.1;rport=5080;branch=[$2] + [last_From:] + [last_To:];tag=UA_1 + [last_Call-ID:] + [last_CSeq:] + Contact: <sip:UA_1@[local_ip]:[local_port]> + Content-Type: application/sdp + + v=0 + o=- 3442013205 3442013205 IN IP4 192.168.0.13 + s=pjsip + c=IN IP4 192.168.0.13 + t=0 0 + m=audio 4002 RTP/AVP 0 + a=rtpmap:0 PCMU/8000 + ]]> + </send> + + <!-- Call leg 2: 200/OK --> + <send> + <![CDATA[ + SIP/2.0 200 OK + Via: SIP/2.0/UDP 127.0.0.1;received=127.0.0.1;rport=5080;branch=[$2] + [last_From:] + [last_To:];tag=UA_2 + [last_Call-ID:] + [last_CSeq:] + Contact: <sip:UA_2@[local_ip]:[local_port]> + Content-Type: application/sdp + + v=0 + o=- 3442013205 3442013205 IN IP4 192.168.0.13 + s=pjsip + c=IN IP4 192.168.0.13 + t=0 0 + m=audio 4002 RTP/AVP 0 + a=rtpmap:0 PCMU/8000 + ]]> + </send> + + <!-- Receive ACK --> + <recv request="ACK" + optional="false" + rtd="true" + crlf="true"> + </recv> + + <!-- Receive BYE --> + <recv request="BYE" crlf="true"> + </recv> + + <!-- Send 200/OK to BYE --> + <send> + <![CDATA[ + SIP/2.0 200 OK + [last_Via:] + [last_From:] + [last_To:] + [last_Call-ID:] + [last_CSeq:] + ]]> + </send> + + + + <!-- Receive ACK --> + <recv request="ACK" + optional="false" + rtd="true" + crlf="true"> + </recv> + + <!-- Receive BYE --> + <recv request="BYE" crlf="true"> + </recv> + + <!-- Send 200/OK to BYE --> + <send> + <![CDATA[ + SIP/2.0 200 OK + [last_Via:] + [last_From:] + [last_To:] + [last_Call-ID:] + [last_CSeq:] + ]]> + </send> + + <!-- definition of the response time repartition table (unit is ms) --> + <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/> + + <!-- definition of the call length repartition table (unit is ms) --> + <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/> + +</scenario> + diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sipp/uas-template.xml b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sipp/uas-template.xml similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sipp/uas-template.xml rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sipp/uas-template.xml diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/tools/cmp_wav.c b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/tools/cmp_wav.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/tools/cmp_wav.c rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/tools/cmp_wav.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/README.txt b/sflphone-common/libs/pjproject-1.0.3/third_party/README.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/README.txt rename to sflphone-common/libs/pjproject-1.0.3/third_party/README.txt diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/Makefile b/sflphone-common/libs/pjproject-1.0.3/third_party/build/Makefile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/Makefile rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/Makefile diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/gsm/Makefile b/sflphone-common/libs/pjproject-1.0.3/third_party/build/gsm/Makefile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/gsm/Makefile rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/gsm/Makefile diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/gsm/config.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/gsm/config.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/gsm/config.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/gsm/config.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/gsm/libgsmcodec.dsp b/sflphone-common/libs/pjproject-1.0.3/third_party/build/gsm/libgsmcodec.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/gsm/libgsmcodec.dsp rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/gsm/libgsmcodec.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/gsm/libgsmcodec.vcp b/sflphone-common/libs/pjproject-1.0.3/third_party/build/gsm/libgsmcodec.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/gsm/libgsmcodec.vcp rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/gsm/libgsmcodec.vcp diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/gsm/libgsmcodec.vcproj b/sflphone-common/libs/pjproject-1.0.3/third_party/build/gsm/libgsmcodec.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/gsm/libgsmcodec.vcproj rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/gsm/libgsmcodec.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/ilbc/Makefile b/sflphone-common/libs/pjproject-1.0.3/third_party/build/ilbc/Makefile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/ilbc/Makefile rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/ilbc/Makefile diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/ilbc/libilbccodec.dsp b/sflphone-common/libs/pjproject-1.0.3/third_party/build/ilbc/libilbccodec.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/ilbc/libilbccodec.dsp rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/ilbc/libilbccodec.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/ilbc/libilbccodec.vcp b/sflphone-common/libs/pjproject-1.0.3/third_party/build/ilbc/libilbccodec.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/ilbc/libilbccodec.vcp rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/ilbc/libilbccodec.vcp diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/ilbc/libilbccodec.vcproj b/sflphone-common/libs/pjproject-1.0.3/third_party/build/ilbc/libilbccodec.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/ilbc/libilbccodec.vcproj rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/ilbc/libilbccodec.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/os-auto.mak.in b/sflphone-common/libs/pjproject-1.0.3/third_party/build/os-auto.mak.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/os-auto.mak.in rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/os-auto.mak.in diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/os-darwinos.mak b/sflphone-common/libs/pjproject-1.0.3/third_party/build/os-darwinos.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/os-darwinos.mak rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/os-darwinos.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/os-linux.mak b/sflphone-common/libs/pjproject-1.0.3/third_party/build/os-linux.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/os-linux.mak rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/os-linux.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/os-win32.mak b/sflphone-common/libs/pjproject-1.0.3/third_party/build/os-win32.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/os-win32.mak rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/os-win32.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/Makefile b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/Makefile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/Makefile rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/Makefile diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/libportaudio.dsp b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/libportaudio.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/libportaudio.dsp rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/libportaudio.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/libportaudio.vcp b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/libportaudio.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/libportaudio.vcp rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/libportaudio.vcp diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/libportaudio.vcproj b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/libportaudio.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/libportaudio.vcproj rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/libportaudio.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/os-auto.mak.in b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/os-auto.mak.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/os-auto.mak.in rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/os-auto.mak.in diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/os-linux.mak b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/os-linux.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/os-linux.mak rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/os-linux.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_allocation.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_allocation.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_allocation.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_allocation.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_allocation.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_allocation.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_allocation.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_allocation.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_converters.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_converters.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_converters.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_converters.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_converters.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_converters.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_converters.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_converters.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_cpuload.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_cpuload.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_cpuload.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_cpuload.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_cpuload.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_cpuload.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_cpuload.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_cpuload.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_debugprint.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_debugprint.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_debugprint.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_debugprint.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_debugprint.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_debugprint.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_debugprint.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_debugprint.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_dither.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_dither.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_dither.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_dither.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_dither.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_dither.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_dither.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_dither.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_endianness.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_endianness.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_endianness.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_endianness.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_front.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_front.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_front.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_front.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_hostapi.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_hostapi.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_hostapi.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_hostapi.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_linux_alsa.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_linux_alsa.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_linux_alsa.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_linux_alsa.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_linux_alsa.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_linux_alsa.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_linux_alsa.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_linux_alsa.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_core.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_core.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_core.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_core.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_blocking.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_core_blocking.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_blocking.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_core_blocking.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_blocking.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_core_blocking.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_blocking.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_core_blocking.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_internal.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_core_internal.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_internal.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_core_internal.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_old.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_core_old.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_old.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_core_old.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_utilities.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_core_utilities.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_utilities.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_core_utilities.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_utilities.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_core_utilities.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_utilities.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_core_utilities.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_hostapis.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_hostapis.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_hostapis.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_hostapis.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_process.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_process.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_process.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_process.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_process.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_process.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_process.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_process.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_ringbuffer.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_ringbuffer.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_ringbuffer.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_ringbuffer.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_ringbuffer.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_ringbuffer.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_ringbuffer.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_ringbuffer.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_skeleton.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_skeleton.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_skeleton.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_skeleton.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_stream.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_stream.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_stream.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_stream.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_stream.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_stream.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_stream.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_stream.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_trace.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_trace.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_trace.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_trace.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_trace.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_trace.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_trace.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_trace.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_types.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_types.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_types.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_types.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_unix_hostapis.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_unix_hostapis.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_unix_hostapis.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_unix_hostapis.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_unix_oss.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_unix_oss.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_unix_oss.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_unix_oss.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_unix_util.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_unix_util.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_unix_util.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_unix_util.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_unix_util.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_unix_util.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_unix_util.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_unix_util.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_util.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_util.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_util.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_util.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_hostapis.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_win_hostapis.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_hostapis.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_win_hostapis.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_util.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_win_util.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_util.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_win_util.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_waveformat.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_win_waveformat.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_waveformat.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_win_waveformat.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_waveformat.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_win_waveformat.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_waveformat.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_win_waveformat.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_wmme.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_win_wmme.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_wmme.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_win_wmme.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_wmme.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_win_wmme.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_wmme.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_win_wmme.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/portaudio.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/portaudio.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/portaudio.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/portaudio.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/Makefile b/sflphone-common/libs/pjproject-1.0.3/third_party/build/resample/Makefile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/Makefile rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/resample/Makefile diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/config.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/resample/config.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/config.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/resample/config.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/libresample.dsp b/sflphone-common/libs/pjproject-1.0.3/third_party/build/resample/libresample.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/libresample.dsp rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/resample/libresample.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/libresample.vcp b/sflphone-common/libs/pjproject-1.0.3/third_party/build/resample/libresample.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/libresample.vcp rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/resample/libresample.vcp diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/libresample.vcproj b/sflphone-common/libs/pjproject-1.0.3/third_party/build/resample/libresample.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/libresample.vcproj rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/resample/libresample.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/libresample_dll.dsp b/sflphone-common/libs/pjproject-1.0.3/third_party/build/resample/libresample_dll.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/libresample_dll.dsp rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/resample/libresample_dll.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/libresample_dll.vcproj b/sflphone-common/libs/pjproject-1.0.3/third_party/build/resample/libresample_dll.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/libresample_dll.vcproj rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/resample/libresample_dll.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/samplerate/README.txt b/sflphone-common/libs/pjproject-1.0.3/third_party/build/samplerate/README.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/samplerate/README.txt rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/samplerate/README.txt diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/samplerate/Static.msvc b/sflphone-common/libs/pjproject-1.0.3/third_party/build/samplerate/Static.msvc similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/samplerate/Static.msvc rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/samplerate/Static.msvc diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/samplerate/libsamplerate_static.dsp b/sflphone-common/libs/pjproject-1.0.3/third_party/build/samplerate/libsamplerate_static.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/samplerate/libsamplerate_static.dsp rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/samplerate/libsamplerate_static.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/Makefile b/sflphone-common/libs/pjproject-1.0.3/third_party/build/speex/Makefile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/Makefile rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/speex/Makefile diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/config.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/speex/config.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/config.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/speex/config.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/libspeex.dsp b/sflphone-common/libs/pjproject-1.0.3/third_party/build/speex/libspeex.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/libspeex.dsp rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/speex/libspeex.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/libspeex.vcp b/sflphone-common/libs/pjproject-1.0.3/third_party/build/speex/libspeex.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/libspeex.vcp rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/speex/libspeex.vcp diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/libspeex.vcproj b/sflphone-common/libs/pjproject-1.0.3/third_party/build/speex/libspeex.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/libspeex.vcproj rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/speex/libspeex.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/speex/speex_config_types.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/speex/speex/speex_config_types.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/speex/speex_config_types.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/speex/speex/speex_config_types.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/srtp/Makefile b/sflphone-common/libs/pjproject-1.0.3/third_party/build/srtp/Makefile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/srtp/Makefile rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/srtp/Makefile diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/srtp/libsrtp.dsp b/sflphone-common/libs/pjproject-1.0.3/third_party/build/srtp/libsrtp.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/srtp/libsrtp.dsp rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/srtp/libsrtp.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/srtp/libsrtp.vcp b/sflphone-common/libs/pjproject-1.0.3/third_party/build/srtp/libsrtp.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/srtp/libsrtp.vcp rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/srtp/libsrtp.vcp diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/srtp/libsrtp.vcproj b/sflphone-common/libs/pjproject-1.0.3/third_party/build/srtp/libsrtp.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/srtp/libsrtp.vcproj rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/srtp/libsrtp.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/srtp/srtp_config.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/srtp/srtp_config.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/srtp/srtp_config.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/srtp/srtp_config.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/COPYRIGHT b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/COPYRIGHT similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/COPYRIGHT rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/COPYRIGHT diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/ChangeLog b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/ChangeLog similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/ChangeLog rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/ChangeLog diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/INSTALL b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/INSTALL similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/INSTALL rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/INSTALL diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/MACHINES b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/MACHINES similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/MACHINES rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/MACHINES diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/MANIFEST b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/MANIFEST similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/MANIFEST rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/MANIFEST diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/Makefile b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/Makefile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/Makefile rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/Makefile diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/README b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/README similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/README rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/README diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/add-test/add_test.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/add-test/add_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/add-test/add_test.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/add-test/add_test.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/add-test/add_test.dta b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/add-test/add_test.dta similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/add-test/add_test.dta rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/add-test/add_test.dta diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/config.h b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/inc/config.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/config.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/inc/config.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/gsm.h b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/inc/gsm.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/gsm.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/inc/gsm.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/private.h b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/inc/private.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/private.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/inc/private.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/proto.h b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/inc/proto.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/proto.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/inc/proto.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/toast.h b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/inc/toast.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/toast.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/inc/toast.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/unproto.h b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/inc/unproto.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/unproto.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/inc/unproto.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/man/gsm.3 b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/man/gsm.3 similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/man/gsm.3 rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/man/gsm.3 diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/man/gsm_explode.3 b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/man/gsm_explode.3 similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/man/gsm_explode.3 rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/man/gsm_explode.3 diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/man/gsm_option.3 b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/man/gsm_option.3 similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/man/gsm_option.3 rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/man/gsm_option.3 diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/man/gsm_print.3 b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/man/gsm_print.3 similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/man/gsm_print.3 rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/man/gsm_print.3 diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/add.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/add.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/add.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/add.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/code.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/code.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/code.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/code.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/debug.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/debug.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/debug.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/debug.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/decode.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/decode.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/decode.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/decode.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_create.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/gsm_create.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_create.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/gsm_create.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_decode.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/gsm_decode.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_decode.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/gsm_decode.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_destroy.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/gsm_destroy.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_destroy.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/gsm_destroy.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_encode.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/gsm_encode.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_encode.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/gsm_encode.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_explode.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/gsm_explode.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_explode.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/gsm_explode.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_implode.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/gsm_implode.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_implode.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/gsm_implode.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_option.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/gsm_option.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_option.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/gsm_option.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_print.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/gsm_print.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_print.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/gsm_print.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/long_term.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/long_term.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/long_term.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/long_term.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/lpc.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/lpc.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/lpc.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/lpc.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/preprocess.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/preprocess.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/preprocess.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/preprocess.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/rpe.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/rpe.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/rpe.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/rpe.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/short_term.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/short_term.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/short_term.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/short_term.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/table.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/table.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/table.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/table.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/toast.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/toast.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/toast.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/toast.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/toast_alaw.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/toast_alaw.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/toast_alaw.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/toast_alaw.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/toast_audio.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/toast_audio.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/toast_audio.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/toast_audio.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/toast_lin.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/toast_lin.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/toast_lin.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/toast_lin.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/toast_ulaw.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/toast_ulaw.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/toast_ulaw.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/toast_ulaw.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/bitter.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/bitter.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/bitter.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/bitter.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/bitter.dta b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/bitter.dta similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/bitter.dta rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/bitter.dta diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/ginger.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/ginger.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/ginger.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/ginger.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/sour.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/sour.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/sour.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/sour.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/sour1.dta b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/sour1.dta similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/sour1.dta rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/sour1.dta diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/sour2.dta b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/sour2.dta similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/sour2.dta rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/sour2.dta diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/sweet.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/sweet.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/sweet.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/sweet.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/taste.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/taste.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/taste.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/taste.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/taste.h b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/taste.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/taste.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/taste.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/cod2lin.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tst/cod2lin.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/cod2lin.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tst/cod2lin.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/cod2txt.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tst/cod2txt.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/cod2txt.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tst/cod2txt.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/gsm2cod.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tst/gsm2cod.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/gsm2cod.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tst/gsm2cod.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/lin2cod.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tst/lin2cod.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/lin2cod.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tst/lin2cod.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/lin2txt.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tst/lin2txt.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/lin2txt.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tst/lin2txt.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/run b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tst/run similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/run rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tst/run diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/FrameClassify.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/FrameClassify.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/FrameClassify.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/FrameClassify.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/FrameClassify.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/FrameClassify.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/FrameClassify.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/FrameClassify.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/LPCdecode.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/LPCdecode.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/LPCdecode.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/LPCdecode.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/LPCdecode.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/LPCdecode.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/LPCdecode.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/LPCdecode.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/LPCencode.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/LPCencode.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/LPCencode.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/LPCencode.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/LPCencode.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/LPCencode.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/LPCencode.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/LPCencode.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/StateConstructW.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/StateConstructW.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/StateConstructW.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/StateConstructW.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/StateConstructW.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/StateConstructW.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/StateConstructW.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/StateConstructW.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/StateSearchW.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/StateSearchW.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/StateSearchW.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/StateSearchW.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/StateSearchW.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/StateSearchW.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/StateSearchW.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/StateSearchW.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/anaFilter.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/anaFilter.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/anaFilter.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/anaFilter.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/anaFilter.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/anaFilter.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/anaFilter.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/anaFilter.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/constants.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/constants.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/constants.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/constants.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/constants.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/constants.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/constants.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/constants.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/createCB.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/createCB.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/createCB.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/createCB.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/createCB.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/createCB.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/createCB.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/createCB.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/doCPLC.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/doCPLC.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/doCPLC.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/doCPLC.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/doCPLC.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/doCPLC.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/doCPLC.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/doCPLC.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/enhancer.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/enhancer.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/enhancer.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/enhancer.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/enhancer.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/enhancer.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/enhancer.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/enhancer.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/filter.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/filter.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/filter.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/filter.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/filter.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/filter.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/filter.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/filter.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/gainquant.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/gainquant.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/gainquant.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/gainquant.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/gainquant.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/gainquant.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/gainquant.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/gainquant.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/getCBvec.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/getCBvec.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/getCBvec.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/getCBvec.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/getCBvec.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/getCBvec.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/getCBvec.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/getCBvec.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/helpfun.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/helpfun.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/helpfun.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/helpfun.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/helpfun.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/helpfun.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/helpfun.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/helpfun.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/hpInput.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/hpInput.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/hpInput.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/hpInput.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/hpInput.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/hpInput.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/hpInput.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/hpInput.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/hpOutput.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/hpOutput.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/hpOutput.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/hpOutput.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/hpOutput.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/hpOutput.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/hpOutput.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/hpOutput.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iCBConstruct.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iCBConstruct.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iCBConstruct.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iCBConstruct.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iCBConstruct.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iCBConstruct.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iCBConstruct.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iCBConstruct.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iCBSearch.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iCBSearch.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iCBSearch.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iCBSearch.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iCBSearch.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iCBSearch.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iCBSearch.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iCBSearch.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_decode.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iLBC_decode.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_decode.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iLBC_decode.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_decode.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iLBC_decode.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_decode.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iLBC_decode.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_define.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iLBC_define.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_define.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iLBC_define.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_encode.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iLBC_encode.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_encode.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iLBC_encode.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_encode.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iLBC_encode.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_encode.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iLBC_encode.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_test.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iLBC_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_test.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iLBC_test.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/lsf.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/lsf.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/lsf.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/lsf.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/lsf.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/lsf.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/lsf.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/lsf.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/packing.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/packing.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/packing.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/packing.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/packing.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/packing.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/packing.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/packing.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/syntFilter.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/syntFilter.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/syntFilter.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/syntFilter.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/syntFilter.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/syntFilter.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/syntFilter.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/syntFilter.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/mp3/BladeMP3EncDLL.h b/sflphone-common/libs/pjproject-1.0.3/third_party/mp3/BladeMP3EncDLL.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/mp3/BladeMP3EncDLL.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/mp3/BladeMP3EncDLL.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/mp3/mp3_port.h b/sflphone-common/libs/pjproject-1.0.3/third_party/mp3/mp3_port.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/mp3/mp3_port.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/mp3/mp3_port.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/mp3/mp3_writer.c b/sflphone-common/libs/pjproject-1.0.3/third_party/mp3/mp3_writer.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/mp3/mp3_writer.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/mp3/mp3_writer.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/Doxyfile b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/Doxyfile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/Doxyfile rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/Doxyfile diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/LICENSE.txt b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/LICENSE.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/LICENSE.txt rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/LICENSE.txt diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/README.txt b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/README.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/README.txt rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/README.txt diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/SConstruct b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/SConstruct similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/SConstruct rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/SConstruct diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/dev-cpp/Makefile-dll b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/dev-cpp/Makefile-dll similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/dev-cpp/Makefile-dll rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/dev-cpp/Makefile-dll diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/dev-cpp/Makefile-static b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/dev-cpp/Makefile-static similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/dev-cpp/Makefile-static rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/dev-cpp/Makefile-static diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/dev-cpp/portaudio-dll.dev b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/dev-cpp/portaudio-dll.dev similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/dev-cpp/portaudio-dll.dev rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/dev-cpp/portaudio-dll.dev diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/dev-cpp/portaudio-static.dev b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/dev-cpp/portaudio-static.dev similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/dev-cpp/portaudio-static.dev rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/dev-cpp/portaudio-static.dev diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/dev-cpp/readme.txt b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/dev-cpp/readme.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/dev-cpp/readme.txt rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/dev-cpp/readme.txt diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/portaudio.def b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/msvc/portaudio.def similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/portaudio.def rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/msvc/portaudio.def diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/portaudio.dsp b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/msvc/portaudio.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/portaudio.dsp rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/msvc/portaudio.dsp diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/portaudio.dsw b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/msvc/portaudio.dsw similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/portaudio.dsw rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/msvc/portaudio.dsw diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/portaudio.sln b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/msvc/portaudio.sln similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/portaudio.sln rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/msvc/portaudio.sln diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/portaudio.vcproj b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/msvc/portaudio.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/portaudio.vcproj rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/msvc/portaudio.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/readme.txt b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/msvc/readme.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/readme.txt rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/msvc/readme.txt diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/scons/SConscript_common b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/scons/SConscript_common similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/scons/SConscript_common rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/scons/SConscript_common diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/scons/SConscript_opts b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/scons/SConscript_opts similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/scons/SConscript_opts rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/scons/SConscript_opts diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/config.guess b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/config.guess similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/config.guess rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/config.guess diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/config.sub b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/config.sub similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/config.sub rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/config.sub diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/configure b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/configure similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/configure rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/configure diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/configure.in b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/configure.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/configure.in rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/configure.in diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/depcomp b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/depcomp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/depcomp rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/depcomp diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/fixdir.bat b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/fixdir.bat similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/fixdir.bat rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/fixdir.bat diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/fixfile.bat b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/fixfile.bat similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/fixfile.bat rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/fixfile.bat diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_asio.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/include/pa_asio.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_asio.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/include/pa_asio.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_jack.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/include/pa_jack.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_jack.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/include/pa_jack.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_linux_alsa.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/include/pa_linux_alsa.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_linux_alsa.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/include/pa_linux_alsa.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_mac_core.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/include/pa_mac_core.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_mac_core.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/include/pa_mac_core.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_win_ds.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/include/pa_win_ds.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_win_ds.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/include/pa_win_ds.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_win_waveformat.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/include/pa_win_waveformat.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_win_waveformat.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/include/pa_win_waveformat.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_win_wmme.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/include/pa_win_wmme.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_win_wmme.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/include/pa_win_wmme.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/portaudio.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/include/portaudio.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/portaudio.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/include/portaudio.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/index.html b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/index.html similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/index.html rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/index.html diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/install-sh b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/install-sh similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/install-sh rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/install-sh diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/ltmain.sh b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/ltmain.sh similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/ltmain.sh rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/ltmain.sh diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/missing b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/missing similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/missing rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/missing diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/README.txt b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/pablio/README.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/README.txt rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/pablio/README.txt diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/pablio.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/pablio/pablio.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/pablio.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/pablio/pablio.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/pablio.def b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/pablio/pablio.def similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/pablio.def rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/pablio/pablio.def diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/pablio.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/pablio/pablio.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/pablio.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/pablio/pablio.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/test_rw.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/pablio/test_rw.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/test_rw.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/pablio/test_rw.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/test_rw_echo.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/pablio/test_rw_echo.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/test_rw_echo.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/pablio/test_rw_echo.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/test_w_saw.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/pablio/test_w_saw.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/test_w_saw.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/pablio/test_w_saw.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/test_w_saw8.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/pablio/test_w_saw8.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/test_w_saw8.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/pablio/test_w_saw8.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/portaudio-2.0.pc.in b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/portaudio-2.0.pc.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/portaudio-2.0.pc.in rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/portaudio-2.0.pc.in diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/SConscript b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/SConscript similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/SConscript rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/SConscript diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_allocation.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_allocation.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_allocation.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_allocation.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_allocation.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_allocation.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_allocation.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_allocation.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_converters.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_converters.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_converters.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_converters.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_converters.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_converters.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_converters.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_converters.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_cpuload.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_cpuload.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_cpuload.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_cpuload.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_cpuload.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_cpuload.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_cpuload.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_cpuload.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_debugprint.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_debugprint.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_debugprint.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_debugprint.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_debugprint.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_debugprint.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_debugprint.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_debugprint.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_dither.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_dither.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_dither.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_dither.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_dither.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_dither.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_dither.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_dither.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_endianness.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_endianness.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_endianness.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_endianness.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_front.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_front.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_front.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_front.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_hostapi.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_hostapi.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_hostapi.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_hostapi.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_memorybarrier.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_memorybarrier.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_memorybarrier.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_memorybarrier.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_process.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_process.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_process.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_process.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_process.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_process.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_process.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_process.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_ringbuffer.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_ringbuffer.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_ringbuffer.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_ringbuffer.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_ringbuffer.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_ringbuffer.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_ringbuffer.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_ringbuffer.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_skeleton.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_skeleton.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_skeleton.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_skeleton.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_stream.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_stream.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_stream.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_stream.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_stream.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_stream.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_stream.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_stream.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_trace.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_trace.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_trace.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_trace.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_trace.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_trace.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_trace.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_trace.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_types.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_types.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_types.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_types.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_util.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_util.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_util.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_util.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/alsa/pa_linux_alsa.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/alsa/pa_linux_alsa.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/alsa/pa_linux_alsa.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/alsa/pa_linux_alsa.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asihpi/pa_linux_asihpi.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/asihpi/pa_linux_asihpi.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asihpi/pa_linux_asihpi.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/asihpi/pa_linux_asihpi.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/ASIO-README.txt b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/asio/ASIO-README.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/ASIO-README.txt rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/asio/ASIO-README.txt diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/Callback_adaptation_.pdf b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/asio/Callback_adaptation_.pdf similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/Callback_adaptation_.pdf rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/asio/Callback_adaptation_.pdf diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/Pa_ASIO.pdf b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/asio/Pa_ASIO.pdf similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/Pa_ASIO.pdf rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/asio/Pa_ASIO.pdf diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/iasiothiscallresolver.cpp b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/asio/iasiothiscallresolver.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/iasiothiscallresolver.cpp rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/asio/iasiothiscallresolver.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/iasiothiscallresolver.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/asio/iasiothiscallresolver.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/iasiothiscallresolver.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/asio/iasiothiscallresolver.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/pa_asio.cpp b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/asio/pa_asio.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/pa_asio.cpp rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/asio/pa_asio.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/notes.txt b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/coreaudio/notes.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/notes.txt rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/coreaudio/notes.txt diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_internal.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_internal.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_internal.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_internal.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_old.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_old.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_old.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_old.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/dsound/pa_win_ds.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/dsound/pa_win_ds.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/dsound/pa_win_ds.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/dsound/pa_win_ds.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/jack/pa_jack.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/jack/pa_jack.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/jack/pa_jack.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/jack/pa_jack.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/oss/low_latency_tip.txt b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/oss/low_latency_tip.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/oss/low_latency_tip.txt rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/oss/low_latency_tip.txt diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/oss/pa_unix_oss.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/oss/pa_unix_oss.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/oss/pa_unix_oss.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/oss/pa_unix_oss.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/oss/recplay.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/oss/recplay.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/oss/recplay.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/oss/recplay.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/wasapi/pa_win_wasapi.cpp b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/wasapi/pa_win_wasapi.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/wasapi/pa_win_wasapi.cpp rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/wasapi/pa_win_wasapi.cpp diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/wdmks/pa_win_wdmks.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/wdmks/pa_win_wdmks.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/wdmks/pa_win_wdmks.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/wdmks/pa_win_wdmks.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/wdmks/readme.txt b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/wdmks/readme.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/wdmks/readme.txt rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/wdmks/readme.txt diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/wmme/pa_win_wmme.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/wmme/pa_win_wmme.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/wmme/pa_win_wmme.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/wmme/pa_win_wmme.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/unix/pa_unix_hostapis.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/unix/pa_unix_hostapis.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/unix/pa_unix_hostapis.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/unix/pa_unix_hostapis.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/unix/pa_unix_util.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/unix/pa_unix_util.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/unix/pa_unix_util.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/unix/pa_unix_util.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/unix/pa_unix_util.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/unix/pa_unix_util.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/unix/pa_unix_util.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/unix/pa_unix_util.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_win_hostapis.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/win/pa_win_hostapis.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_win_hostapis.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/win/pa_win_hostapis.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_win_util.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/win/pa_win_util.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_win_util.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/win/pa_win_util.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_win_waveformat.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/win/pa_win_waveformat.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_win_waveformat.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/win/pa_win_waveformat.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_win_wdmks_utils.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/win/pa_win_wdmks_utils.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_win_wdmks_utils.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/win/pa_win_wdmks_utils.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_win_wdmks_utils.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/win/pa_win_wdmks_utils.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_win_wdmks_utils.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/win/pa_win_wdmks_utils.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_x86_plain_converters.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/win/pa_x86_plain_converters.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_x86_plain_converters.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/win/pa_x86_plain_converters.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_x86_plain_converters.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/win/pa_x86_plain_converters.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_x86_plain_converters.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/win/pa_x86_plain_converters.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/testcvs/changeme.txt b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/testcvs/changeme.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/testcvs/changeme.txt rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/testcvs/changeme.txt diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/resample/COPYING b/sflphone-common/libs/pjproject-1.0.3/third_party/resample/COPYING similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/resample/COPYING rename to sflphone-common/libs/pjproject-1.0.3/third_party/resample/COPYING diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/resample/README.resample b/sflphone-common/libs/pjproject-1.0.3/third_party/resample/README.resample similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/resample/README.resample rename to sflphone-common/libs/pjproject-1.0.3/third_party/resample/README.resample diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/resample/include/resamplesubs.h b/sflphone-common/libs/pjproject-1.0.3/third_party/resample/include/resamplesubs.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/resample/include/resamplesubs.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/resample/include/resamplesubs.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/largefilter.h b/sflphone-common/libs/pjproject-1.0.3/third_party/resample/src/largefilter.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/largefilter.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/resample/src/largefilter.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/libresample_dll.c b/sflphone-common/libs/pjproject-1.0.3/third_party/resample/src/libresample_dll.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/libresample_dll.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/resample/src/libresample_dll.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/resample.h b/sflphone-common/libs/pjproject-1.0.3/third_party/resample/src/resample.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/resample.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/resample/src/resample.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/resamplesubs.c b/sflphone-common/libs/pjproject-1.0.3/third_party/resample/src/resamplesubs.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/resamplesubs.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/resample/src/resamplesubs.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/smallfilter.h b/sflphone-common/libs/pjproject-1.0.3/third_party/resample/src/smallfilter.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/smallfilter.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/resample/src/smallfilter.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/stddefs.h b/sflphone-common/libs/pjproject-1.0.3/third_party/resample/src/stddefs.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/stddefs.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/resample/src/stddefs.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/AUTHORS b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/AUTHORS similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/AUTHORS rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/AUTHORS diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/COPYING b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/COPYING similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/COPYING rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/COPYING diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_bits.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_bits.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_bits.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_bits.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_buffer.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_buffer.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_buffer.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_buffer.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_callbacks.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_callbacks.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_callbacks.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_callbacks.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_config_types.h.in b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_config_types.h.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_config_types.h.in rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_config_types.h.in diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_echo.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_echo.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_echo.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_echo.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_header.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_header.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_header.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_header.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_jitter.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_jitter.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_jitter.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_jitter.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_preprocess.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_preprocess.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_preprocess.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_preprocess.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_resampler.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_resampler.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_resampler.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_resampler.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_stereo.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_stereo.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_stereo.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_stereo.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_types.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_types.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_types.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_types.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/_kiss_fft_guts.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/_kiss_fft_guts.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/_kiss_fft_guts.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/_kiss_fft_guts.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/arch.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/arch.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/arch.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/arch.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/bits.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/bits.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/bits.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/bits.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/buffer.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/buffer.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/buffer.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/buffer.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/cb_search.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/cb_search.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/cb_search.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/cb_search.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/cb_search.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/cb_search.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/cb_search.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/cb_search.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/cb_search_arm4.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/cb_search_arm4.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/cb_search_arm4.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/cb_search_arm4.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/cb_search_bfin.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/cb_search_bfin.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/cb_search_bfin.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/cb_search_bfin.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/cb_search_sse.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/cb_search_sse.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/cb_search_sse.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/cb_search_sse.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/echo_diagnostic.m b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/echo_diagnostic.m similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/echo_diagnostic.m rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/echo_diagnostic.m diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_10_16_table.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/exc_10_16_table.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_10_16_table.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/exc_10_16_table.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_10_32_table.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/exc_10_32_table.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_10_32_table.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/exc_10_32_table.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_20_32_table.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/exc_20_32_table.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_20_32_table.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/exc_20_32_table.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_5_256_table.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/exc_5_256_table.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_5_256_table.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/exc_5_256_table.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_5_64_table.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/exc_5_64_table.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_5_64_table.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/exc_5_64_table.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_8_128_table.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/exc_8_128_table.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_8_128_table.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/exc_8_128_table.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fftwrap.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/fftwrap.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fftwrap.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/fftwrap.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fftwrap.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/fftwrap.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fftwrap.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/fftwrap.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filterbank.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/filterbank.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filterbank.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/filterbank.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filterbank.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/filterbank.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filterbank.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/filterbank.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filters.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/filters.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filters.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/filters.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filters.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/filters.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filters.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/filters.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filters_arm4.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/filters_arm4.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filters_arm4.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/filters_arm4.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filters_bfin.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/filters_bfin.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filters_bfin.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/filters_bfin.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filters_sse.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/filters_sse.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filters_sse.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/filters_sse.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fixed_arm4.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/fixed_arm4.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fixed_arm4.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/fixed_arm4.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fixed_arm5e.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/fixed_arm5e.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fixed_arm5e.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/fixed_arm5e.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fixed_bfin.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/fixed_bfin.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fixed_bfin.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/fixed_bfin.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fixed_debug.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/fixed_debug.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fixed_debug.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/fixed_debug.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fixed_generic.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/fixed_generic.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fixed_generic.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/fixed_generic.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/gain_table.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/gain_table.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/gain_table.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/gain_table.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/gain_table_lbr.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/gain_table_lbr.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/gain_table_lbr.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/gain_table_lbr.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/hexc_10_32_table.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/hexc_10_32_table.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/hexc_10_32_table.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/hexc_10_32_table.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/hexc_table.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/hexc_table.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/hexc_table.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/hexc_table.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/high_lsp_tables.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/high_lsp_tables.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/high_lsp_tables.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/high_lsp_tables.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/jitter.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/jitter.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/jitter.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/jitter.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/kiss_fft.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/kiss_fft.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/kiss_fft.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/kiss_fft.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/kiss_fft.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/kiss_fft.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/kiss_fft.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/kiss_fft.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/kiss_fftr.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/kiss_fftr.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/kiss_fftr.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/kiss_fftr.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/kiss_fftr.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/kiss_fftr.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/kiss_fftr.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/kiss_fftr.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lpc.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/lpc.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lpc.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/lpc.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lpc.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/lpc.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lpc.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/lpc.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lpc_bfin.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/lpc_bfin.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lpc_bfin.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/lpc_bfin.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lsp.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/lsp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lsp.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/lsp.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lsp.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/lsp.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lsp.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/lsp.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lsp_bfin.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/lsp_bfin.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lsp_bfin.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/lsp_bfin.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lsp_tables_nb.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/lsp_tables_nb.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lsp_tables_nb.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/lsp_tables_nb.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/ltp.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/ltp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/ltp.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/ltp.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/ltp.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/ltp.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/ltp.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/ltp.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/ltp_arm4.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/ltp_arm4.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/ltp_arm4.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/ltp_arm4.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/ltp_bfin.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/ltp_bfin.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/ltp_bfin.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/ltp_bfin.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/ltp_sse.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/ltp_sse.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/ltp_sse.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/ltp_sse.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/math_approx.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/math_approx.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/math_approx.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/math_approx.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/mdf.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/mdf.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/mdf.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/mdf.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/misc_bfin.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/misc_bfin.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/misc_bfin.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/misc_bfin.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/modes.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/modes.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/modes.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/modes.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/modes.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/modes.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/modes.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/modes.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/modes_wb.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/modes_wb.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/modes_wb.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/modes_wb.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/nb_celp.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/nb_celp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/nb_celp.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/nb_celp.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/nb_celp.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/nb_celp.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/nb_celp.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/nb_celp.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/os_support.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/os_support.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/os_support.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/os_support.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/preprocess.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/preprocess.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/preprocess.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/preprocess.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/pseudofloat.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/pseudofloat.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/pseudofloat.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/pseudofloat.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/quant_lsp.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/quant_lsp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/quant_lsp.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/quant_lsp.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/quant_lsp.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/quant_lsp.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/quant_lsp.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/quant_lsp.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/quant_lsp_bfin.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/quant_lsp_bfin.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/quant_lsp_bfin.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/quant_lsp_bfin.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/resample.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/resample.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/resample.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/resample.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/resample_sse.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/resample_sse.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/resample_sse.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/resample_sse.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/sb_celp.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/sb_celp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/sb_celp.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/sb_celp.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/sb_celp.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/sb_celp.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/sb_celp.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/sb_celp.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/scal.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/scal.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/scal.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/scal.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/smallft.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/smallft.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/smallft.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/smallft.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/smallft.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/smallft.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/smallft.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/smallft.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/speex.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/speex.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/speex.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/speex.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/speex_callbacks.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/speex_callbacks.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/speex_callbacks.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/speex_callbacks.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/speex_header.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/speex_header.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/speex_header.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/speex_header.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/stack_alloc.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/stack_alloc.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/stack_alloc.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/stack_alloc.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/stereo.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/stereo.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/stereo.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/stereo.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testdenoise.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/testdenoise.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testdenoise.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/testdenoise.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testecho.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/testecho.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testecho.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/testecho.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testenc.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/testenc.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testenc.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/testenc.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testenc_uwb.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/testenc_uwb.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testenc_uwb.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/testenc_uwb.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testenc_wb.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/testenc_wb.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testenc_wb.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/testenc_wb.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testjitter.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/testjitter.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testjitter.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/testjitter.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testresample.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/testresample.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testresample.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/testresample.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vbr.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vbr.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vbr.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vbr.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vbr.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vbr.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vbr.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vbr.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vorbis_psy.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vorbis_psy.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vorbis_psy.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vorbis_psy.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vorbis_psy.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vorbis_psy.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vorbis_psy.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vorbis_psy.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vq.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vq.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vq.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vq.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vq.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vq.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vq.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vq.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vq_arm4.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vq_arm4.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vq_arm4.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vq_arm4.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vq_bfin.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vq_bfin.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vq_bfin.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vq_bfin.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vq_sse.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vq_sse.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vq_sse.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vq_sse.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/window.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/window.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/window.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/window.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/symbian/config.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/symbian/config.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/symbian/config.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/symbian/config.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/win32/config.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/win32/config.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/win32/config.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/win32/config.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/CHANGES b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/CHANGES similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/CHANGES rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/CHANGES diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/LICENSE b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/LICENSE similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/LICENSE rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/LICENSE diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/README b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/README similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/README rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/README diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/TODO b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/TODO similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/TODO rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/TODO diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/VERSION b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/VERSION similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/VERSION rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/VERSION diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/config.guess b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/config.guess similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/config.guess rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/config.guess diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/config.h_win32vc7 b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/config.h_win32vc7 similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/config.h_win32vc7 rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/config.h_win32vc7 diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/config.hw b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/config.hw similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/config.hw rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/config.hw diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/config.sub b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/config.sub similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/config.sub rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/config.sub diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/config_in.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/config_in.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/config_in.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/config_in.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/configure b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/configure similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/configure rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/configure diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/configure.in b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/configure.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/configure.in rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/configure.in diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/Makefile b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/Makefile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/Makefile rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/Makefile diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/VERSION b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/VERSION similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/VERSION rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/VERSION diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/ae_xfm/xfm.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/ae_xfm/xfm.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/ae_xfm/xfm.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/ae_xfm/xfm.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/cipher/aes.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/cipher/aes.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/cipher/aes.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/cipher/aes.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/cipher/aes_cbc.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/cipher/aes_cbc.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/cipher/aes_cbc.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/cipher/aes_cbc.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/cipher/aes_icm.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/cipher/aes_icm.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/cipher/aes_icm.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/cipher/aes_icm.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/cipher/cipher.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/cipher/cipher.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/cipher/cipher.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/cipher/cipher.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/cipher/null_cipher.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/cipher/null_cipher.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/cipher/null_cipher.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/cipher/null_cipher.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/hash/auth.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/hash/auth.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/hash/auth.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/hash/auth.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/hash/hmac.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/hash/hmac.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/hash/hmac.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/hash/hmac.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/hash/null_auth.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/hash/null_auth.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/hash/null_auth.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/hash/null_auth.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/hash/sha1.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/hash/sha1.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/hash/sha1.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/hash/sha1.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/aes.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/aes.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/aes.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/aes.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/aes_cbc.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/aes_cbc.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/aes_cbc.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/aes_cbc.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/aes_icm.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/aes_icm.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/aes_icm.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/aes_icm.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/alloc.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/alloc.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/alloc.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/alloc.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/auth.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/auth.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/auth.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/auth.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/cipher.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/cipher.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/cipher.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/cipher.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/crypto.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/crypto.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/crypto.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/crypto.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/crypto_kernel.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/crypto_kernel.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/crypto_kernel.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/crypto_kernel.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/crypto_math.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/crypto_math.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/crypto_math.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/crypto_math.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/crypto_types.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/crypto_types.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/crypto_types.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/crypto_types.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/cryptoalg.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/cryptoalg.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/cryptoalg.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/cryptoalg.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/datatypes.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/datatypes.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/datatypes.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/datatypes.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/err.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/err.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/err.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/err.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/gf2_8.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/gf2_8.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/gf2_8.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/gf2_8.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/hmac.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/hmac.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/hmac.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/hmac.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/integers.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/integers.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/integers.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/integers.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/kernel_compat.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/kernel_compat.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/kernel_compat.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/kernel_compat.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/key.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/key.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/key.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/key.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/null_auth.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/null_auth.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/null_auth.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/null_auth.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/null_cipher.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/null_cipher.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/null_cipher.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/null_cipher.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/prng.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/prng.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/prng.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/prng.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/rand_source.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/rand_source.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/rand_source.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/rand_source.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/rdb.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/rdb.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/rdb.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/rdb.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/rdbx.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/rdbx.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/rdbx.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/rdbx.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/sha1.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/sha1.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/sha1.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/sha1.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/stat.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/stat.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/stat.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/stat.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/xfm.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/xfm.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/xfm.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/xfm.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/kernel/alloc.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/kernel/alloc.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/kernel/alloc.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/kernel/alloc.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/kernel/crypto_kernel.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/kernel/crypto_kernel.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/kernel/crypto_kernel.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/kernel/crypto_kernel.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/kernel/err.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/kernel/err.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/kernel/err.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/kernel/err.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/kernel/key.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/kernel/key.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/kernel/key.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/kernel/key.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/math/datatypes.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/math/datatypes.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/math/datatypes.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/math/datatypes.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/math/gf2_8.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/math/gf2_8.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/math/gf2_8.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/math/gf2_8.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/math/math.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/math/math.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/math/math.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/math/math.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/math/stat.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/math/stat.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/math/stat.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/math/stat.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/replay/rdb.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/replay/rdb.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/replay/rdb.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/replay/rdb.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/replay/rdbx.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/replay/rdbx.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/replay/rdbx.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/replay/rdbx.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/replay/ut_sim.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/replay/ut_sim.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/replay/ut_sim.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/replay/ut_sim.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/rng/ctr_prng.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/rng/ctr_prng.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/rng/ctr_prng.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/rng/ctr_prng.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/rng/prng.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/rng/prng.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/rng/prng.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/rng/prng.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/rng/rand_linux_kernel.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/rng/rand_linux_kernel.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/rng/rand_linux_kernel.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/rng/rand_linux_kernel.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/rng/rand_source.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/rng/rand_source.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/rng/rand_source.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/rng/rand_source.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/aes_calc.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/aes_calc.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/aes_calc.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/aes_calc.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/auth_driver.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/auth_driver.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/auth_driver.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/auth_driver.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/cipher_driver.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/cipher_driver.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/cipher_driver.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/cipher_driver.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/datatypes_driver.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/datatypes_driver.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/datatypes_driver.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/datatypes_driver.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/env.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/env.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/env.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/env.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/kernel_driver.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/kernel_driver.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/kernel_driver.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/kernel_driver.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/rand_gen.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/rand_gen.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/rand_gen.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/rand_gen.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/sha1_driver.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/sha1_driver.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/sha1_driver.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/sha1_driver.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/stat_driver.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/stat_driver.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/stat_driver.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/stat_driver.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/getopt_s.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/include/getopt_s.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/getopt_s.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/include/getopt_s.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/rtp.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/include/rtp.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/rtp.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/include/rtp.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/rtp_priv.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/include/rtp_priv.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/rtp_priv.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/include/rtp_priv.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/srtp.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/include/srtp.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/srtp.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/include/srtp.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/srtp_priv.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/include/srtp_priv.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/srtp_priv.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/include/srtp_priv.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/ut_sim.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/include/ut_sim.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/ut_sim.h rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/include/ut_sim.h diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/install-sh b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/install-sh similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/install-sh rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/install-sh diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/pjlib/srtp_err.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/pjlib/srtp_err.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/pjlib/srtp_err.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/pjlib/srtp_err.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/srtp.def b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/srtp.def similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/srtp.def rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/srtp.def diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/srtp.vcproj b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/srtp.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/srtp.vcproj rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/srtp.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/srtp/srtp.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/srtp/srtp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/srtp/srtp.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/srtp/srtp.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/srtp7.sln b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/srtp7.sln similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/srtp7.sln rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/srtp7.sln diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/srtp7.vcproj b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/srtp7.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/srtp7.vcproj rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/srtp7.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/tables/aes_tables.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/tables/aes_tables.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/tables/aes_tables.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/tables/aes_tables.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/dtls_srtp_driver.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/dtls_srtp_driver.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/dtls_srtp_driver.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/dtls_srtp_driver.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/getopt_s.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/getopt_s.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/getopt_s.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/getopt_s.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/lfsr.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/lfsr.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/lfsr.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/lfsr.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/rdbx_driver.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/rdbx_driver.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/rdbx_driver.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/rdbx_driver.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/replay_driver.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/replay_driver.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/replay_driver.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/replay_driver.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/roc_driver.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/roc_driver.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/roc_driver.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/roc_driver.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/rtp.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/rtp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/rtp.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/rtp.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/rtpw.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/rtpw.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/rtpw.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/rtpw.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/rtpw_test.sh b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/rtpw_test.sh similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/rtpw_test.sh rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/rtpw_test.sh diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/srtp_driver.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/srtp_driver.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/srtp_driver.c rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/srtp_driver.c diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/timing b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/timing similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/timing rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/timing diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/undos.sh b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/undos.sh similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/undos.sh rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/undos.sh diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/update.sh b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/update.sh similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/update.sh rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/update.sh diff --git a/sflphone-common/libs/pjproject-1.0.2/user.mak.sample b/sflphone-common/libs/pjproject-1.0.3/user.mak.sample similarity index 100% rename from sflphone-common/libs/pjproject-1.0.2/user.mak.sample rename to sflphone-common/libs/pjproject-1.0.3/user.mak.sample diff --git a/sflphone-common/src/audio/audiortp.cpp b/sflphone-common/src/audio/audiortp.cpp index 51f7f7286e7662f22c2ae4cdd8c18131e6307fef..2f0005241bb689bd35cbf1f9ef0a7fcc065ed91c 100644 --- a/sflphone-common/src/audio/audiortp.cpp +++ b/sflphone-common/src/audio/audiortp.cpp @@ -110,7 +110,6 @@ AudioRtp::closeRtpSession () // This will make RTP threads finish. _debug ("AudioRtp::Stopping rtp session\n"); - try { delete _RTXThread; _RTXThread = 0; @@ -119,22 +118,11 @@ AudioRtp::closeRtpSession () throw; } - // AudioLayer* audiolayer = Manager::instance().getAudioDriver(); - // audiolayer->stopStream(); - _debug ("AudioRtp::Audio rtp stopped\n"); return true; } - -AudioRtpRTX* -AudioRtp::getRTX() -{ - return _RTXThread; -} - - void AudioRtp::setRecording() { @@ -144,10 +132,6 @@ AudioRtp::setRecording() } - - - - //////////////////////////////////////////////////////////////////////////////// // AudioRtpRTX Class // //////////////////////////////////////////////////////////////////////////////// @@ -382,23 +366,18 @@ AudioRtpRTX::processDataEncode() if (_audiocodec->getClockRate() != _layerSampleRate) { int nb_sample_up = nbSample; - // _debug("_nbSample audiolayer->getMic(): %i \n", nbSample); + //_debug("_nbSample audiolayer->getMic(): %i \n", nbSample); // Store the length of the mic buffer in samples for recording _nSamplesMic = nbSample; - - // int nbSamplesMax = _layerFrameSize * _audiocodec->getClockRate() / 1000; nbSample = reSampleData (micData , micDataConverted, _audiocodec->getClockRate(), nb_sample_up, DOWN_SAMPLING); compSize = _audiocodec->codecEncode (micDataEncoded, micDataConverted, nbSample*sizeof (int16)); } else { // no resampling required - - // int nbSamplesMax = _codecFrameSize; compSize = _audiocodec->codecEncode (micDataEncoded, micData, nbSample*sizeof (int16)); - } return compSize; diff --git a/sflphone-common/src/audio/audiortp.h b/sflphone-common/src/audio/audiortp.h index e40f7a39798c0f154afdf32de62418d81b2b7055..49330c2fd8a90781baadef125d3ada416dec4697 100644 --- a/sflphone-common/src/audio/audiortp.h +++ b/sflphone-common/src/audio/audiortp.h @@ -256,11 +256,6 @@ class AudioRtp { */ bool closeRtpSession( void ); - /** - * Return a pointer to the RTP thead - */ - AudioRtpRTX* getRTX(); - /** * Start recording */ @@ -268,6 +263,10 @@ class AudioRtp { friend class RtpTest; + /** + * + */ + inline AudioRtpRTX * getAudioRtpRtxThread(void) { return _RTXThread; } private: // copy constructor AudioRtp(const AudioRtp& rh); diff --git a/sflphone-common/src/audio/audiostream.cpp b/sflphone-common/src/audio/audiostream.cpp index 8054c1e10ea9bb01056a214127dec0eb77b40029..4af1e26c0416bed42f3663bb3ef61f19d7446578 100644 --- a/sflphone-common/src/audio/audiostream.cpp +++ b/sflphone-common/src/audio/audiostream.cpp @@ -23,18 +23,21 @@ static pa_channel_map channel_map ; -AudioStream::AudioStream (pa_context* context, int type, std::string desc, double vol UNUSED) - : _audiostream (NULL), _streamType (type), _streamDescription (desc), flag (PA_STREAM_AUTO_TIMING_UPDATE), sample_spec(), _volume() +AudioStream::AudioStream (PulseLayerType * driver) + : _audiostream (NULL), + _context (driver->context), + _streamType (driver->type), + _streamDescription (driver->description), + _volume(), + _mainloop(driver->mainloop), + flag (PA_STREAM_AUTO_TIMING_UPDATE), + sample_spec() { sample_spec.format = PA_SAMPLE_S16LE; sample_spec.rate = 44100; sample_spec.channels = 1; channel_map.channels = 1; pa_cvolume_set (&_volume , 1 , PA_VOLUME_NORM) ; // * vol / 100 ; - - _context = context; - - // connectStream(); } AudioStream::~AudioStream() @@ -59,10 +62,14 @@ AudioStream::disconnectStream (void) ost::MutexLock guard (_mutex); _debug ("Destroy audio streams\n"); - pa_stream_disconnect (_audiostream); - pa_stream_unref (_audiostream); - - _audiostream = NULL; + + pa_threaded_mainloop_lock(_mainloop); + if(_audiostream) { + pa_stream_disconnect (_audiostream); + pa_stream_unref (_audiostream); + _audiostream = NULL; + } + pa_threaded_mainloop_unlock(_mainloop); return true; } @@ -70,13 +77,16 @@ AudioStream::disconnectStream (void) void -AudioStream::stream_state_callback (pa_stream* s, void* user_data UNUSED) +AudioStream::stream_state_callback (pa_stream* s, void* user_data) { - - + pa_threaded_mainloop *m; + _debug ("AudioStream::stream_state_callback :: The state of the stream changed\n"); assert (s); + m = (pa_threaded_mainloop*) user_data; + assert(m); + switch (pa_stream_get_state (s)) { case PA_STREAM_CREATING: @@ -85,7 +95,7 @@ AudioStream::stream_state_callback (pa_stream* s, void* user_data UNUSED) case PA_STREAM_TERMINATED: _debug ("Stream is terminating...\n"); - PulseLayer::streamState++; + pa_threaded_mainloop_signal(m, 0); break; case PA_STREAM_READY: @@ -162,7 +172,7 @@ AudioStream::createStream (pa_context* c) _debug ("Stream type unknown \n"); } - pa_stream_set_state_callback (s , stream_state_callback, NULL); + pa_stream_set_state_callback (s , stream_state_callback, _mainloop); free (attributes); diff --git a/sflphone-common/src/audio/audiostream.h b/sflphone-common/src/audio/audiostream.h index f21e4b0d27654a5efa5f28e919de6817de075d0b..2314d31670ac28fede04fb0036e9b605210e1a57 100644 --- a/sflphone-common/src/audio/audiostream.h +++ b/sflphone-common/src/audio/audiostream.h @@ -27,6 +27,7 @@ #include "ringbuffer.h" #include "audioloop.h" + #include <cc++/thread.h> /** @@ -38,16 +39,23 @@ enum STREAM_TYPE { UPLOAD_STREAM }; +struct PulseLayerType { + pa_context * context; + pa_threaded_mainloop * mainloop; + + std::string description; + + int type; + double volume; +}; class AudioStream { public: /** * Constructor - * @param context The pulseaudio context - * @param type The type of audio stream - * @param desc The stream name + * @param context The PulseLayerType structure containing various information. */ - AudioStream(pa_context* context , int type, std::string desc, double vol); + AudioStream(PulseLayerType * driver); /** * Destructor @@ -166,6 +174,8 @@ class AudioStream { pa_sample_spec sample_spec ; pa_cvolume _volume; + pa_threaded_mainloop * _mainloop; + ost::Mutex _mutex; }; diff --git a/sflphone-common/src/audio/pulselayer.cpp b/sflphone-common/src/audio/pulselayer.cpp index 9d586d2041301be4440f6631b55335459a95c87c..39d3ba887d32ab28d818043428f879ea55078013 100644 --- a/sflphone-common/src/audio/pulselayer.cpp +++ b/sflphone-common/src/audio/pulselayer.cpp @@ -21,8 +21,6 @@ int framesPerBuffer = 2048; -int PulseLayer::streamState; - static void audioCallback (pa_stream* s, size_t bytes, void* userdata) { assert (s && bytes); @@ -39,7 +37,6 @@ PulseLayer::PulseLayer (ManagerImpl* manager) , playback() , record() { - PulseLayer::streamState = 0; _debug ("PulseLayer::Pulse audio constructor: Create context\n"); } @@ -48,9 +45,6 @@ PulseLayer::PulseLayer (ManagerImpl* manager) PulseLayer::~PulseLayer (void) { closeLayer (); - - // pa_context_disconnect( context ); - // pa_context_unref( context ); } bool @@ -61,17 +55,16 @@ PulseLayer::closeLayer (void) playback->disconnectStream(); record->disconnectStream(); - while (PulseLayer::streamState != 2); - - PulseLayer::streamState = 0; - - //TODO Remove this ugly hack - sleep (2); - - pa_context_disconnect (context); - - pa_context_unref (context); - + pa_threaded_mainloop_lock (m); + pa_threaded_mainloop_wait(m); + if(m) { + pa_context_disconnect (context); + pa_context_unref (context); + } + pa_threaded_mainloop_unlock (m); + + pa_threaded_mainloop_free (m); + return true; } @@ -167,18 +160,29 @@ bool PulseLayer::createStreams (pa_context* c) { _debug ("PulseLayer::createStreams \n"); - playback = new AudioStream (c, PLAYBACK_STREAM, PLAYBACK_STREAM_NAME, _manager->getSpkrVolume()); + PulseLayerType * playbackParam = new PulseLayerType(); + playbackParam->context = c; + playbackParam->type = PLAYBACK_STREAM; + playbackParam->description = PLAYBACK_STREAM_NAME; + playbackParam->volume = _manager->getSpkrVolume(); + playbackParam->mainloop = m; + + playback = new AudioStream (playbackParam); playback->connectStream(); pa_stream_set_write_callback (playback->pulseStream(), audioCallback, this); - // pa_stream_set_overflow_callback( playback->pulseStream() , overflow , this); - // pa_stream_set_suspended_callback( playback->pulseStream(), stream_suspended_callback, this); - - record = new AudioStream (c, CAPTURE_STREAM, CAPTURE_STREAM_NAME , _manager->getMicVolume()); + delete playbackParam; + + PulseLayerType * recordParam = new PulseLayerType(); + recordParam->context = c; + recordParam->type = CAPTURE_STREAM; + recordParam->description = CAPTURE_STREAM_NAME; + recordParam->volume = _manager->getMicVolume(); + recordParam->mainloop = m; + + record = new AudioStream (recordParam); record->connectStream(); pa_stream_set_read_callback (record->pulseStream() , audioCallback, this); - // pa_stream_set_underflow_callback( record->pulseStream() , underflow , this); - // pa_stream_set_suspended_callback(record->pulseStream(), stream_suspended_callback, this); - + delete recordParam; pa_threaded_mainloop_signal (m , 0); diff --git a/sflphone-common/src/audio/pulselayer.h b/sflphone-common/src/audio/pulselayer.h index 698cc9bf6b68b6ff7009b35efcccba3c664d2729..8c1fa083842f9990b73f141730cf849146655280 100644 --- a/sflphone-common/src/audio/pulselayer.h +++ b/sflphone-common/src/audio/pulselayer.h @@ -197,7 +197,6 @@ class PulseLayer : public AudioLayer { // private: public: - static int streamState; friend class AudioLayerTest; }; diff --git a/sflphone-common/src/samplerateconverter.cpp b/sflphone-common/src/samplerateconverter.cpp index ccdb09da238437baf77d8273298b7774f603368b..f7425a14ac4dd85fd952f1d8f8b411b886e48ee0 100644 --- a/sflphone-common/src/samplerateconverter.cpp +++ b/sflphone-common/src/samplerateconverter.cpp @@ -82,6 +82,20 @@ void SamplerateConverter::init (void) _floatBufferUpSpkr = new float32[nbSamplesMax]; } +void +SamplerateConverter::Short2FloatArray (const short *in, float *out, int len) +{ + // factor is 1/(2^15), used to rescale the short int range to the + // [-1.0 - 1.0] float range. +#define S2F_FACTOR .000030517578125f; + + while (len) { + len--; + out[len] = (float) in[len] * S2F_FACTOR; + } +} + + //TODO Add ifdef for int16 or float32 type int SamplerateConverter::upsampleData (SFLDataFormat* dataIn , SFLDataFormat* dataOut, int samplerate1 , int samplerate2 , int nbSamples) { @@ -99,7 +113,9 @@ int SamplerateConverter::upsampleData (SFLDataFormat* dataIn , SFLDataFormat* da src_data.src_ratio = upsampleFactor; src_data.end_of_input = 0; // More data will come //_debug("upsample %d %d %f %d\n" , src_data.input_frames , src_data.output_frames, src_data.src_ratio , nbSamples); - src_short_to_float_array (dataIn , _floatBufferDownSpkr, nbSamples); + // Override libsamplerate conversion function + Short2FloatArray (dataIn , _floatBufferDownSpkr, nbSamples); + //src_short_to_float_array (dataIn , _floatBufferDownSpkr, nbSamples); //_debug("upsample %d %f %d\n" , src_data.output_frames, src_data.src_ratio , nbSamples); src_process (_src_state_spkr, &src_data); //_debug("upsample %d %d %d\n" , samplerate1, samplerate2 , nbSamples); @@ -128,7 +144,9 @@ int SamplerateConverter::downsampleData (SFLDataFormat* dataIn , SFLDataFormat* src_data.src_ratio = downsampleFactor; src_data.end_of_input = 0; // More data will come //_debug("downsample %d %f %d\n" , src_data.output_frames, src_data.src_ratio , nbSamples); - src_short_to_float_array (dataIn, _floatBufferUpMic, nbSamples); + // Override libsamplerate conversion function + Short2FloatArray (dataIn , _floatBufferUpMic, nbSamples); + //src_short_to_float_array (dataIn, _floatBufferUpMic, nbSamples); //_debug("downsample %d %f %d\n" , src_data.output_frames, src_data.src_ratio , nbSamples); src_process (_src_state_mic, &src_data); //_debug("downsample %d %f %d\n" , src_data.output_frames, src_data.src_ratio , nbSamples); diff --git a/sflphone-common/src/samplerateconverter.h b/sflphone-common/src/samplerateconverter.h index f6423197fadcf268ae851fd0f1d9c88167ffddd2..d4d37035e0c008f68c35ed3f7d87f3eb185e681b 100644 --- a/sflphone-common/src/samplerateconverter.h +++ b/sflphone-common/src/samplerateconverter.h @@ -26,63 +26,72 @@ #include "manager.h" class SamplerateConverter { - public: - /** Constructor */ - SamplerateConverter( void ); - SamplerateConverter( int freq , int fs ); - /** Destructor */ - ~SamplerateConverter( void ); - - /** - * Upsample from the samplerate1 to the samplerate2 - * @param data The data buffer - * @param SamplerateConverter1 The lower sample rate - * @param SamplerateConverter2 The higher sample rate - * @param nbSamples The number of samples to process - * @return int The number of samples after the operation - */ - int upsampleData( SFLDataFormat* dataIn , SFLDataFormat* dataOut , int samplerate1 , int samplerate2 , int nbSamples ); - - /** - * Downsample from the samplerate1 to the samplerate2 - * @param data The data buffer - * @param SamplerateConverter1 The lower sample rate - * @param SamplerateConverter2 The higher sample rate - * @param nbSamples The number of samples to process - * @return int The number of samples after the operation - */ - int downsampleData( SFLDataFormat* dataIn , SFLDataFormat* dataOut , int samplerate1 , int samplerate2 , int nbSamples ); - - int getFrequence( void ) { return _frequence; } - - int getFramesize( void ) { return _framesize; } - - private: - // Copy Constructor - SamplerateConverter(const SamplerateConverter& rh); - - // Assignment Operator - SamplerateConverter& operator=( const SamplerateConverter& rh); - - void init( void ); - - /** Audio layer caracteristics */ - int _frequence; - int _framesize; - - /** Downsampled/Upsampled float buffers for the mic data processing */ - float32* _floatBufferDownMic; - float32* _floatBufferUpMic; - /** libSamplerateConverter converter for outgoing voice */ - SRC_STATE* _src_state_mic; - - /** Downsampled/Upsampled float buffers for the speaker data processing */ - float32* _floatBufferDownSpkr; - float32* _floatBufferUpSpkr; - /** libSamplerateConverter converter for incoming voice */ - SRC_STATE* _src_state_spkr; - /** libSamplerateConverter error */ - int _src_err; + public: + /** Constructor */ + SamplerateConverter( void ); + SamplerateConverter( int freq , int fs ); + /** Destructor */ + ~SamplerateConverter( void ); + + /** + * Upsample from the samplerate1 to the samplerate2 + * @param data The data buffer + * @param SamplerateConverter1 The lower sample rate + * @param SamplerateConverter2 The higher sample rate + * @param nbSamples The number of samples to process + * @return int The number of samples after the operation + */ + int upsampleData( SFLDataFormat* dataIn , SFLDataFormat* dataOut , int samplerate1 , int samplerate2 , int nbSamples ); + + /** + * Downsample from the samplerate1 to the samplerate2 + * @param data The data buffer + * @param SamplerateConverter1 The lower sample rate + * @param SamplerateConverter2 The higher sample rate + * @param nbSamples The number of samples to process + * @return int The number of samples after the operation + */ + int downsampleData( SFLDataFormat* dataIn , SFLDataFormat* dataOut , int samplerate1 , int samplerate2 , int nbSamples ); + + int getFrequence( void ) { return _frequence; } + + int getFramesize( void ) { return _framesize; } + + /** + * Convert short table to floats for audio processing + * @param in the input (short) array + * @param out The resulting (float) array + * @param len The number of elements in both tables + */ + void Short2FloatArray (const short *in, float *out, int len); + + + private: + // Copy Constructor + SamplerateConverter(const SamplerateConverter& rh); + + // Assignment Operator + SamplerateConverter& operator=( const SamplerateConverter& rh); + + void init( void ); + + /** Audio layer caracteristics */ + int _frequence; + int _framesize; + + /** Downsampled/Upsampled float buffers for the mic data processing */ + float32* _floatBufferDownMic; + float32* _floatBufferUpMic; + /** libSamplerateConverter converter for outgoing voice */ + SRC_STATE* _src_state_mic; + + /** Downsampled/Upsampled float buffers for the speaker data processing */ + float32* _floatBufferDownSpkr; + float32* _floatBufferUpSpkr; + /** libSamplerateConverter converter for incoming voice */ + SRC_STATE* _src_state_spkr; + /** libSamplerateConverter error */ + int _src_err; }; #endif //_SAMPLE_RATE_H diff --git a/sflphone-common/src/sdp.cpp b/sflphone-common/src/sdp.cpp index 1a4005d4c722e06fa23ba7e58e18a2674a182820..9256b238b8ca8db8dd1cf6341e296940d5b1c4da 100644 --- a/sflphone-common/src/sdp.cpp +++ b/sflphone-common/src/sdp.cpp @@ -195,7 +195,7 @@ int Sdp::receiving_initial_offer (pjmedia_sdp_session* remote) } // Retrieve some useful remote information - this->fetch_media_transport_info_from_remote_sdp (remote); + this->set_media_transport_info_from_remote_sdp (remote); status = pjmedia_sdp_neg_create_w_remote_offer (_pool, get_local_sdp_session(), remote, &_negociator); @@ -314,8 +314,6 @@ void Sdp::set_negociated_offer (const pjmedia_sdp_session *sdp) _negociated_offer = (pjmedia_sdp_session*) sdp; - //this->fetch_remote_ip_from_sdp ((pjmedia_sdp_session*)sdp); - codecs_list = Manager::instance().getCodecDescriptorMap().getCodecsMap(); // retrieve the media information @@ -358,7 +356,7 @@ AudioCodec* Sdp::get_session_media (void) AudioCodec *codec = NULL; std::vector<sdpMedia*> media_list; - _debug ("sdp line 314 - get_session_media ()\n"); + _debug ("sdp line %d - get_session_media ()\n", __LINE__); media_list = get_session_media_list (); nb_media = media_list.size(); @@ -470,17 +468,15 @@ std::string Sdp::convert_int_to_string (int value) return result.str(); } -void Sdp::fetch_remote_ip_from_sdp (pjmedia_sdp_session *r_sdp) +void Sdp::set_remote_ip_from_sdp (const pjmedia_sdp_session *r_sdp) { - std::string remote_ip; - - remote_ip = r_sdp->conn->addr.ptr; + std::string remote_ip(r_sdp->conn->addr.ptr, r_sdp->conn->addr.slen); _debug (" Remote IP from fetching SDP: %s\n", remote_ip.c_str()); this->set_remote_ip (remote_ip); } -void Sdp::fetch_remote_audio_port_from_sdp (pjmedia_sdp_media *r_media) +void Sdp::set_remote_audio_port_from_sdp (pjmedia_sdp_media *r_media) { int remote_port; @@ -490,7 +486,7 @@ void Sdp::fetch_remote_audio_port_from_sdp (pjmedia_sdp_media *r_media) this->set_remote_audio_port (remote_port); } -void Sdp::fetch_media_transport_info_from_remote_sdp (pjmedia_sdp_session *remote_sdp) +void Sdp::set_media_transport_info_from_remote_sdp (const pjmedia_sdp_session *remote_sdp) { _debug ("Fetching media from sdp\n"); @@ -504,12 +500,12 @@ void Sdp::fetch_media_transport_info_from_remote_sdp (pjmedia_sdp_session *remot return; } - this->fetch_remote_audio_port_from_sdp (r_media); + this->set_remote_audio_port_from_sdp (r_media); - this->fetch_remote_ip_from_sdp (remote_sdp); + this->set_remote_ip_from_sdp (remote_sdp); } -void Sdp::get_remote_sdp_media_from_offer (pjmedia_sdp_session* remote_sdp, pjmedia_sdp_media** r_media) +void Sdp::get_remote_sdp_media_from_offer (const pjmedia_sdp_session* remote_sdp, pjmedia_sdp_media** r_media) { int count, i; diff --git a/sflphone-common/src/sdp.h b/sflphone-common/src/sdp.h index 3a0eee5c6e67f4ed7c90757d21368bf2539d1598..ec3178955b57c5370872d43ada2c92302f9f18af 100644 --- a/sflphone-common/src/sdp.h +++ b/sflphone-common/src/sdp.h @@ -179,7 +179,7 @@ class Sdp { */ unsigned int get_remote_audio_port() { return _remote_audio_port; } - void fetch_media_transport_info_from_remote_sdp (pjmedia_sdp_session *remote_sdp); + void set_media_transport_info_from_remote_sdp (const pjmedia_sdp_session *remote_sdp); std::vector<sdpMedia*> get_session_media_list (void) { return _session_media; } @@ -298,11 +298,11 @@ class Sdp { std::string convert_int_to_string (int value); - void fetch_remote_ip_from_sdp (pjmedia_sdp_session *r_sdp); + void set_remote_ip_from_sdp (const pjmedia_sdp_session *r_sdp); - void fetch_remote_audio_port_from_sdp (pjmedia_sdp_media *r_media); + void set_remote_audio_port_from_sdp (pjmedia_sdp_media *r_media); - void get_remote_sdp_media_from_offer (pjmedia_sdp_session* r_sdp, pjmedia_sdp_media** r_media); + void get_remote_sdp_media_from_offer (const pjmedia_sdp_session* r_sdp, pjmedia_sdp_media** r_media); //////////////////////////////////////////////////////////////////3 //////////////////////////////////////////////////////////////////// diff --git a/sflphone-common/src/sipvoiplink.cpp b/sflphone-common/src/sipvoiplink.cpp index 6d8d8f4b964a7754c4ce4baa051be474303c00ad..af41b6d268c760870fcca500204e488df9331432 100644 --- a/sflphone-common/src/sipvoiplink.cpp +++ b/sflphone-common/src/sipvoiplink.cpp @@ -341,8 +341,8 @@ int SIPVoIPLink::sendRegister (AccountID id) account = dynamic_cast<SIPAccount *> (Manager::instance().getAccount (id)); hostname = account->getHostname(); username = account->getUsername(); - password = account->getPassword(); - + password = account->getPassword(); + _mutexSIP.enterMutex(); /* Get the client registration information for this particular account */ @@ -545,16 +545,9 @@ SIPVoIPLink::newOutgoingCall (const CallID& id, const std::string& toUrl) } if (SIPOutgoingInvite (call)) { - call->setConnectionState (Call::Progressing); call->setState (Call::Active); addCall (call); - - // _audiortp->start(); - - // call->setAudioStart ( true ); - - } else { delete call; call = 0; @@ -608,8 +601,6 @@ SIPVoIPLink::answer (const CallID& id) call->setConnectionState (Call::Connected); call->setState (Call::Active); - ; - return true; } else { // Create and send a 488/Not acceptable here @@ -624,6 +615,7 @@ SIPVoIPLink::answer (const CallID& id) _debug ("SIPVoIPLink::answer: fail terminate call %s \n",call->getCallId().c_str()); terminateOneCall (call->getCallId()); removeCall (call->getCallId()); + _audiortp->closeRtpSession (); return false; } } @@ -841,17 +833,8 @@ SIPVoIPLink::offhold (const CallID& id) if (status != PJ_SUCCESS) return false; - // Enable audio - _debug ("* SIP Info: Starting AudioRTP when offhold\n"); - call->setState (Call::Active); - // it's sure that this is the current call id... - - _audiortp->start(); - - call->setAudioStart (true); - return true; } @@ -1211,39 +1194,25 @@ SIPVoIPLink::SIPCheckUrl (const std::string& url UNUSED) void SIPVoIPLink::SIPCallServerFailure (SIPCall *call) { - //if (!event->response) { return; } - //switch(event->response->status_code) { - //case SIP_SERVICE_UNAVAILABLE: // 500 - //case SIP_BUSY_EVRYWHERE: // 600 - //case SIP_DECLINE: // 603 - //SIPCall* call = findSIPCallWithCid(event->cid); if (call != 0) { _debug ("Server error!\n"); CallID id = call->getCallId(); Manager::instance().callFailure (id); terminateOneCall (id); removeCall (id); + _audiortp->closeRtpSession(); } - - //break; - //} } void SIPVoIPLink::SIPCallClosed (SIPCall *call) { - - - // it was without did before - //SIPCall* call = findSIPCallWithCid(event->cid); if (!call) { return; } CallID id = call->getCallId(); - //call->setDid(event->did); - if (Manager::instance().isCurrentCall (id)) { call->setAudioStart (false); _debug ("* SIP Info: Stopping AudioRTP when closing\n"); @@ -1261,9 +1230,6 @@ SIPVoIPLink::SIPCallClosed (SIPCall *call) void SIPVoIPLink::SIPCallReleased (SIPCall *call) { - // do cleanup if exists - // only cid because did is always 0 in these case.. - //SIPCall* call = findSIPCallWithCid(event->cid); if (!call) { return; } @@ -1287,51 +1253,16 @@ SIPVoIPLink::SIPCallAnswered (SIPCall *call, pjsip_rx_data *rdata) _debug ("SIPCallAnswered\n"); - pjmedia_sdp_session *r_sdp; - if (!call) { _debug ("! SIP Failure: unknown call\n"); return; } if (call->getConnectionState() != Call::Connected) { - _debug ("Get remote SDP from offer\n"); - get_remote_sdp_from_offer (rdata, &r_sdp); - - if (r_sdp==NULL) { - _debug ("SIP Failure: no remote sdp session\n"); - return; - } - - _debug ("Get remote media information from offer\n"); - - call->getLocalSDP()->fetch_media_transport_info_from_remote_sdp (r_sdp); - - // _audiortp->getRTX()->setRtpSessionRemoteIp(); - _debug ("Update call state , id = %s\n", call->getCallId().c_str()); call->setConnectionState (Call::Connected); call->setState (Call::Active); - Manager::instance().peerAnsweredCall (call->getCallId()); - - if (Manager::instance().isCurrentCall (call->getCallId())) { - /* - _debug("CREATE NEW RTP SESSION FROM SIPCALLANSWERED\n"); - try { - _audiortp->createNewSession (call); - call->setAudioStart(true); - } catch (...) { - _debug("Failed to create rtp thread from answer\n"); - } - */ - - call->setAudioStart (true); - - _audiortp->start(); - - } - } else { _debug ("* SIP Info: Answering call (on/off hold to send ACK)\n"); } @@ -1405,7 +1336,6 @@ bool SIPVoIPLink::new_ip_to_ip_call (const CallID& id, const std::string& to) _debug ("! SIP Failure: Unable to create RTP Session in SIPVoIPLink::new_ip_to_ip_call (%s:%d)\n", __FILE__, __LINE__); } - // Generate the contact URI // uri_contact << "<" << uri_from << ":" << call->getLocalSDP()->get_local_extern_audio_port() << ">"; uri_contact << "<" << uri_from << ":" << _localExternPort << ">"; @@ -1450,10 +1380,6 @@ bool SIPVoIPLink::new_ip_to_ip_call (const CallID& id, const std::string& to) call->setState (Call::Active); addCall (call); - // _audiortp->start(); - - // call->setAudioStart ( true ); - return true; } else return false; @@ -1813,10 +1739,6 @@ int SIPVoIPLink::createUDPServer (void) return PJ_SUCCESS; } - - - - bool SIPVoIPLink::loadSIPLocalIP() { @@ -1940,7 +1862,6 @@ void set_voicemail_info (AccountID account, pjsip_msg_body *body) void SIPVoIPLink::handle_reinvite (SIPCall *call) { - // Close the previous RTP session _audiortp->closeRtpSession (); call->setAudioStart (false); @@ -1952,12 +1873,6 @@ void SIPVoIPLink::handle_reinvite (SIPCall *call) } catch (...) { _debug ("! SIP Failure: Unable to create RTP Session (%s:%d)\n", __FILE__, __LINE__); } - - _audiortp->start(); - - call->setAudioStart (true); - - } @@ -2117,25 +2032,22 @@ void call_on_state_changed (pjsip_inv_session *inv, pjsip_event *e) break; default: - _debug ("sipvoiplink.cpp - line 1635 : Unhandled call state. This is probably a bug.\n"); + _debug ("sipvoiplink.cpp - line %d : Unhandled call state. This is probably a bug.\n", __LINE__); break; } } - - } } void call_on_media_update (pjsip_inv_session *inv, pj_status_t status) { - _debug ("--------------------- call_on_media_update --------------------- \n"); - - AccountID accId; - SIPVoIPLink *link; - - const pjmedia_sdp_session *r_sdp; - SIPCall *call; + + const pjmedia_sdp_session *local_sdp; + const pjmedia_sdp_session *remote_sdp; + + SIPVoIPLink * link = NULL; + SIPCall * call; if (status != PJ_SUCCESS) { _debug ("Error while negociating the offer\n"); @@ -2143,48 +2055,38 @@ void call_on_media_update (pjsip_inv_session *inv, pj_status_t status) } // Get the new sdp, result of the negociation - pjmedia_sdp_neg_get_active_local (inv->neg, &r_sdp); - + pjmedia_sdp_neg_get_active_local (inv->neg, &local_sdp); + pjmedia_sdp_neg_get_active_remote(inv->neg, &remote_sdp); + call = reinterpret_cast<SIPCall *> (inv->mod_data[getModId() ]); if (!call) { _debug ("Call declined by peer, SDP negociation stopped\n"); return; } - + // Clean the resulting sdp offer to create a new one (in case of a reinvite) call->getLocalSDP()->clean_session_media(); - + // Set the fresh negociated one - call->getLocalSDP()->set_negociated_offer (r_sdp); - - // call->getLocalSDP()->fetch_media_transport_info_from_remote_sdp( r_sdp ); - // call->getLocalSDP()->fetch_remote_ip_from_sdp( r_sdp ); - // call->getLocalSDP()->fetch_remote_audio_port_from_sdp( r_sdp ); - - accId = Manager::instance().getAccountFromCall (call->getCallId()); - - link = dynamic_cast<SIPVoIPLink *> (Manager::instance().getAccountLink (accId)); - - if (!link) { - _debug ("No Voip Account Link, impossible to init RTP session with SDP info"); + call->getLocalSDP()->set_negociated_offer (local_sdp); + + // Set remote ip / port + call->getLocalSDP()->set_media_transport_info_from_remote_sdp (remote_sdp); + + link = dynamic_cast<SIPVoIPLink *> (Manager::instance().getAccountLink(AccountNULL)); + if(link == NULL) { + _debug ("Failed to get sip link\n"); return; } - - if (call->getState() != Call::Hold) { - _debug ("Set media parameters in RTP session\n"); - // link->_audiortp->getRTX()->setRtpSessionMedia(); - // link->_audiortp->getRTX()->setRtpSessionRemoteIp(); - - // link->_audiortp->start(); - - // call->setAudioStart ( true ); - // link->_audiortp->start(); - } else { - _debug ("Didn't set RTP parameters since call is on hold\n"); + + try { + call->setAudioStart (true); + link->getAudioRtp()->start(); + } catch(exception& rtpException) { + _debug("%s\n", rtpException.what()); } - } void call_on_forked (pjsip_inv_session *inv, pjsip_event *e) @@ -2924,7 +2826,7 @@ void on_rx_offer (pjsip_inv_session *inv, const pjmedia_sdp_session *offer) #ifdef CAN_REINVITE - _debug ("reinvite SIP\n"); + _debug ("%s (%d): on_rx_offer REINVITE\n", __FILE__, __LINE__); SIPCall *call; pj_status_t status; diff --git a/sflphone-common/src/sipvoiplink.h b/sflphone-common/src/sipvoiplink.h index 028fcd8a2fd6173135816df5c1682348813daaa4..3a0387c36ef7f044f3a5952601c6b5f6b27b8bd9 100644 --- a/sflphone-common/src/sipvoiplink.h +++ b/sflphone-common/src/sipvoiplink.h @@ -284,8 +284,8 @@ class SIPVoIPLink : public VoIPLink /** when we init the listener, how many times we try to bind a port? */ int _nbTryListenAddr; - /** Starting sound */ - AudioRtp* _audiortp; + /** Returns a pointer to the AudioRtp object */ + inline AudioRtp * getAudioRtp(void) { return _audiortp; } /** Increment the number of SIP account connected to this link */ void incrementClients (void) { _clients++; } @@ -363,6 +363,9 @@ class SIPVoIPLink : public VoIPLink std::string getLocalIP() {return _localExternAddress;} + /** Starting sound */ + AudioRtp* _audiortp; + /** For registration use only */ int _regPort; diff --git a/tools/build-system/distributions/mandriva/sflphone-common.spec b/tools/build-system/distributions/mandriva/sflphone-common.spec index 11921a1d76bc92257bd4c53f44c54606aae8debd..6a0bebbcd47b58073296aa3ce257624b1106bb8e 100644 --- a/tools/build-system/distributions/mandriva/sflphone-common.spec +++ b/tools/build-system/distributions/mandriva/sflphone-common.spec @@ -59,7 +59,7 @@ Authors: %setup -q %build -cd libs/pjproject-1.0.2 +cd libs/pjproject-1.0.3 ./autogen.sh --prefix=%{_prefix} make dep make clean @@ -69,13 +69,13 @@ cd - make -j %install -cd libs/pjproject-1.0.2 +cd libs/pjproject-1.0.3 make DESTDIR=%{buildroot} install cd - make DESTDIR=%{buildroot} install %clean -cd libs/pjproject-1.0.2 +cd libs/pjproject-1.0.3 make clean cd - make clean diff --git a/tools/build-system/distributions/opensuse/sflphone-common.spec b/tools/build-system/distributions/opensuse/sflphone-common.spec index 34280a5b9562151479d52e1d98b6f8f28e734dc7..6cd41354c378bfac5a4d0e34b7d23ccab2a46aaf 100644 --- a/tools/build-system/distributions/opensuse/sflphone-common.spec +++ b/tools/build-system/distributions/opensuse/sflphone-common.spec @@ -58,7 +58,7 @@ Authors: %setup -q %build -cd libs/pjproject-1.0.2 +cd libs/pjproject-1.0.3 ./autogen.sh --prefix=%{_prefix} make dep make clean @@ -68,13 +68,13 @@ cd - make -j %install -cd libs/pjproject-1.0.2 +cd libs/pjproject-1.0.3 make DESTDIR=%{buildroot} install cd - make DESTDIR=%{buildroot} install %clean -cd libs/pjproject-1.0.2 +cd libs/pjproject-1.0.3 make clean cd - make clean diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-common/rules b/tools/build-system/distributions/ubuntu/debian-sflphone-common/rules index d7235ece2b796b4f95933ac297042bd87a12058f..2ca6f99f329b1e55babd80850a265225ac7f4d68 100755 --- a/tools/build-system/distributions/ubuntu/debian-sflphone-common/rules +++ b/tools/build-system/distributions/ubuntu/debian-sflphone-common/rules @@ -21,7 +21,7 @@ configure-stamp: dh_testdir # Add here commands to configure the package. ./autogen.sh --prefix=/usr - cd libs/pjproject-1.0.2; ./autogen.sh --prefix=/usr + cd libs/pjproject-1.0.3; ./autogen.sh --prefix=/usr touch configure-stamp #Architecture @@ -31,7 +31,7 @@ build-arch: build-arch-stamp build-arch-stamp: configure-stamp # Add here commands to compile the arch part of the package. - cd libs/pjproject-1.0.2; $(MAKE) dep; $(MAKE) clean; $(MAKE) + cd libs/pjproject-1.0.3; $(MAKE) dep; $(MAKE) clean; $(MAKE) cd -; $(MAKE) touch $@ @@ -72,7 +72,7 @@ install-arch: # Add here commands to install the arch part of the package into # debian/tmp. $(MAKE) DESTDIR=$(CURDIR)/debian/$(package) install - cd libs/pjproject-1.0.2; $(MAKE) prefix=$(CURDIR)/debian/$(package)/usr install + cd libs/pjproject-1.0.3; $(MAKE) prefix=$(CURDIR)/debian/$(package)/usr install rm -rf $(CURDIR)/debian/$(package)/usr/include dh_install -s # Must not depend on anything. This is to be called by diff --git a/tools/build-system/launch-build-machine.sh b/tools/build-system/launch-build-machine.sh index 33ba1a9fb56e60f9573d4adda72c171b29cb8b4c..8a5f0ff2143576b251488be599fd027a9a612de6 100755 --- a/tools/build-system/launch-build-machine.sh +++ b/tools/build-system/launch-build-machine.sh @@ -7,7 +7,7 @@ # Author: Julien Bonjean (julien@bonjean.info) # # Creation Date: 2009-04-20 -# Last Modified: 2009-06-23 10:31:34 -0400 +# Last Modified: 2009-07-03 17:02:33 -0400 ##################################################### # @@ -30,6 +30,12 @@ SCP_BASE="scp ${SSH_OPTIONS} -r -P 50001" # home directory ROOT_DIR="/home/projects/sflphone" +# local hidden repository (only for changelog commit) +LOCAL_REPOSITORY=${ROOT_DIR}/.sflphone-repository + +# gpg passphrase file +GPG_FILE="${ROOT_DIR}/.gpg-sflphone" + # vbox config directory export VBOX_USER_HOME="${ROOT_DIR}/vbox" @@ -62,8 +68,9 @@ USER="sflphone" RELEASE_MODE= -SNAPSHOT_TAG=`date +%s` +SNAPSHOT_TAG=`date +%Y%m%d` +DO_CLEAN=1 DO_PREPARE=1 DO_PUSH=1 DO_MAIN_LOOP=1 @@ -95,6 +102,7 @@ do --help) echo echo "Options :" + echo " --skip-clean" echo " --skip-prepare" echo " --skip-push" echo " --skip-main-loop" @@ -106,6 +114,8 @@ do echo " --list-machines" echo exit 0;; + --skip-clean) + unset DO_CLEAN;; --skip-prepare) unset DO_PREPARE;; --skip-push) @@ -155,7 +165,9 @@ if [ "${WHO}" != "${USER}" ]; then fi # logging -rm -rf ${PACKAGING_RESULT_DIR} 2>/dev/null +if [ ${DO_CLEAN} ]; then + rm -rf ${PACKAGING_RESULT_DIR} 2>/dev/null +fi mkdir ${PACKAGING_RESULT_DIR} 2>/dev/null if [ ${DO_LOGGING} ]; then @@ -231,26 +243,28 @@ if [ ${DO_PREPARE} ]; then fi echo "Version is : ${VERSION}" - # if push is activated - if [ ${DO_PUSH} ];then - - # first changelog generation for commit - echo "Update debian changelogs (1/2)" - - ${SCRIPTS_DIR}/sfl-git-dch.sh ${VERSION} ${RELEASE_MODE} + # generate the changelog, according to the distribution and the git commit messages + echo "Update debian changelogs" + cd ${REPOSITORY_DIR} + ${SCRIPTS_DIR}/sfl-git-dch.sh ${VERSION} ${RELEASE_MODE} + + if [ "$?" -ne "0" ]; then + echo "!! Cannot update debian changelogs" + exit -1 + fi - if [ "$?" -ne "0" ]; then - echo "!! Cannot update debian changelogs" - exit -1 - fi + # if push is activated + if [[ ${DO_PUSH} && ${RELEASE_MODE} ]];then echo " Doing commit" - cd ${REPOSITORY_DIR} + cd ${LOCAL_REPOSITORY} git commit -m "[#1262] Updated debian changelogs (${VERSION})" . echo " Pushing commit" git push origin master + + cd - fi # change current branch if needed @@ -260,17 +274,7 @@ if [ ${DO_PREPARE} ]; then else echo "Using master branch" fi - - # generate the changelog, according to the distribution and the git commit messages - echo "Update debian changelogs (2/2)" - cd ${REPOSITORY_DIR} - ${SCRIPTS_DIR}/sfl-git-dch.sh ${VERSION} ${RELEASE_MODE} - if [ "$?" -ne "0" ]; then - echo "!! Cannot update debian changelogs" - exit -1 - fi - echo "Write version numbers for following processes" echo "${VERSION}" > ${REPOSITORY_DIR}/sflphone-common/VERSION echo "${VERSION}" > ${REPOSITORY_DIR}/sflphone-client-gnome/VERSION @@ -375,27 +379,9 @@ fi if [ ${DO_SIGNATURES} ]; then - echo - echo "Sign packages" - echo - - echo "Check GPG agent" - pgrep -u "sflphone" gpg-agent > /dev/null - if [ "$?" -ne "0" ]; then - echo "!! GPG agent is not running" - exit -1 - fi - GPG_AGENT_INFO=`cat $HOME/.gpg-agent-info 2> /dev/null` - export ${GPG_AGENT_INFO} - - if [ "${GPG_AGENT_INFO}" == "" ]; then - echo "!! Cannot get GPG agent info" - exit -1 - fi - echo "Sign packages" - find ${PACKAGING_RESULT_DIR}/deb/dists -name "*.deb" -exec dpkg-sig -k 'Savoir-Faire Linux Inc.' --sign builder --sign-changes full {} \; >/dev/null 2>&1 - find ${PACKAGING_RESULT_DIR}/deb/dists -name "*.changes" -printf "debsign -k'Savoir-Faire Linux Inc.' %p\n" | sh >/dev/null 2>&1 + find ${PACKAGING_RESULT_DIR}/deb/dists -name "*.deb" -exec dpkg-sig -g '-q --passphrase `cat '${GPG_FILE}'`' -k 'Savoir-Faire Linux Inc.' --sign builder --sign-changes full {} \; + find ${PACKAGING_RESULT_DIR}/deb/dists -name "*.changes" -exec gpg --local-user 'Savoir-Faire Linux Inc.' --passphrase `cat ${GPG_FILE}` --clearsign --list-options no-show-policy-urls --armor --textmode --output {}.asc {} \; fi ######################### diff --git a/tools/build-system/remote/update-repository.sh b/tools/build-system/remote/update-repository.sh index f03e3b232e6e52166a6d4d38b83930f716324864..a488a297455839de1a60b981a1293ace0d20b882 100755 --- a/tools/build-system/remote/update-repository.sh +++ b/tools/build-system/remote/update-repository.sh @@ -6,6 +6,10 @@ # @date: 2008 Jan 16 ROOT_DIR="/var/repos/sflphone/debian" + +# gpg passphrase file +GPG_FILE="${ROOT_DIR}/.gpg-sflphone" + USER="sflphone-package-manager" export LANG=en_CA.UTF-8 @@ -18,19 +22,9 @@ if [ "${WHO}" != "${USER}" ]; then exit -1; fi -echo "Check GPG agent" -pgrep -u "sflphone-package-manager" gpg-agent > /dev/null -if [ "$?" -ne "0" ]; then - echo "!! GPG agent is not running" - exit -1 -fi -GPG_AGENT_INFO=`cat $HOME/.gpg-agent-info 2> /dev/null` -export ${GPG_AGENT_INFO} - -if [ "${GPG_AGENT_INFO}" == "" ]; then - echo "!! Cannot get GPG agent info" - exit -1 -fi +echo "Remove cache files" +rm -f packages-i386.db +rm -f packages-amd64.db apt-ftparchive generate conf/apt-ftparchive.conf @@ -52,23 +46,23 @@ echo "Sign the Release files" rm -f dists/intrepid/Release.gpg rm -f dists/intrepid-testing/Release.gpg rm -f dists/intrepid-daily/Release.gpg -gpg --no-tty -u C842D122 --output dists/intrepid/Release.gpg -ba dists/intrepid/Release -gpg --no-tty -u C842D122 --output dists/intrepid-testing/Release.gpg -ba dists/intrepid-testing/Release -gpg --no-tty -u C842D122 --output dists/intrepid-daily/Release.gpg -ba dists/intrepid-daily/Release +gpg --passphrase `cat ${GPG_FILE}` --no-tty -u C842D122 --output dists/intrepid/Release.gpg -ba dists/intrepid/Release +gpg --passphrase `cat ${GPG_FILE}` --no-tty -u C842D122 --output dists/intrepid-testing/Release.gpg -ba dists/intrepid-testing/Release +gpg --passphrase `cat ${GPG_FILE}` --no-tty -u C842D122 --output dists/intrepid-daily/Release.gpg -ba dists/intrepid-daily/Release rm -f dists/hardy/Release.gpg rm -f dists/hardy-testing/Release.gpg rm -f dists/hardy-daily/Release.gpg -gpg --no-tty -u C842D122 --output dists/hardy/Release.gpg -ba dists/hardy/Release -gpg --no-tty -u C842D122 --output dists/hardy-testing/Release.gpg -ba dists/hardy-testing/Release -gpg --no-tty -u C842D122 --output dists/hardy-daily/Release.gpg -ba dists/hardy-daily/Release +gpg --passphrase `cat ${GPG_FILE}` --no-tty -u C842D122 --output dists/hardy/Release.gpg -ba dists/hardy/Release +gpg --passphrase `cat ${GPG_FILE}` --no-tty -u C842D122 --output dists/hardy-testing/Release.gpg -ba dists/hardy-testing/Release +gpg --passphrase `cat ${GPG_FILE}` --no-tty -u C842D122 --output dists/hardy-daily/Release.gpg -ba dists/hardy-daily/Release rm -f dists/jaunty/Release.gpg rm -f dists/jaunty-testing/Release.gpg rm -f dists/jaunty-daily/Release.gpg -gpg --no-tty -u C842D122 --output dists/jaunty/Release.gpg -ba dists/jaunty/Release -gpg --no-tty -u C842D122 --output dists/jaunty-testing/Release.gpg -ba dists/jaunty-testing/Release -gpg --no-tty -u C842D122 --output dists/jaunty-daily/Release.gpg -ba dists/jaunty-daily/Release +gpg --passphrase `cat ${GPG_FILE}` --no-tty -u C842D122 --output dists/jaunty/Release.gpg -ba dists/jaunty/Release +gpg --passphrase `cat ${GPG_FILE}` --no-tty -u C842D122 --output dists/jaunty-testing/Release.gpg -ba dists/jaunty-testing/Release +gpg --passphrase `cat ${GPG_FILE}` --no-tty -u C842D122 --output dists/jaunty-daily/Release.gpg -ba dists/jaunty-daily/Release echo "All done" exit 0