diff -Nru libosip2-4.0.0/ChangeLog libosip2-4.1.0/ChangeLog --- libosip2-4.0.0/ChangeLog 2012-11-15 08:50:50.000000000 +0000 +++ libosip2-4.1.0/ChangeLog 2013-12-18 15:23:39.000000000 +0000 @@ -1,3 +1,16 @@ +libosip2 (4.1.0) + * fix sdp re-allocation + * increase max length size + * support for Visual Studio 2012 (v110 and v110 for XP) + * support for Windows Phone 8 + * osip_trace_initialize returns 0 if log are compiled. + * timer e and timer g will use #define DEFAULT_T2 instead of 4000. + * handle additionnal possible malloc failure. + * fix compatibility with old UA for INVITE retransmission. + * fix osip_sem_destroy leak on apple. + * accept lowercase sip/2.0. + * increase max default size for logs on windows. + libosip2 (4.0.0) * implement time compensation for android. * reduce path len // remove path in front of logs. diff -Nru libosip2-4.0.0/configure libosip2-4.1.0/configure --- libosip2-4.0.0/configure 2012-11-15 10:10:12.000000000 +0000 +++ libosip2-4.1.0/configure 2013-12-18 17:51:52.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.82 . +# From configure.ac Revision: 1.82 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69. # @@ -2292,10 +2292,10 @@ OSIP_MAJOR_VERSION=4 -OSIP_MINOR_VERSION=0 +OSIP_MINOR_VERSION=1 OSIP_MICRO_VERSION=0 -SONAME_MAJOR_VERSION=10 +SONAME_MAJOR_VERSION=11 SONAME_MINOR_VERSION=0 SONAME_MICRO_VERSION=0 @@ -12505,6 +12505,46 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5 +$as_echo_n "checking for clock_gettime in -lrt... " >&6; } +if ${ac_cv_lib_rt_clock_gettime+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lrt $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char clock_gettime (); +int +main () +{ +return clock_gettime (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_rt_clock_gettime=yes +else + ac_cv_lib_rt_clock_gettime=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5 +$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; } +if test "x$ac_cv_lib_rt_clock_gettime" = xyes; then : + FSM_LIB="$FSM_LIB -lrt" +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wall works" >&5 $as_echo_n "checking whether -Wall works... " >&6; } @@ -13199,7 +13239,7 @@ fi -ac_config_files="$ac_config_files libosip2.pc Makefile scripts/Makefile src/Makefile src/osipparser2/Makefile src/osip2/Makefile src/test/Makefile src/test/res/Makefile include/Makefile include/osip2/Makefile include/osipparser2/Makefile include/osipparser2/headers/Makefile help/Makefile help/man/Makefile help/doxygen/Makefile platform/Makefile platform/rpm/Makefile platform/vsnet/Makefile platform/wince/Makefile include/osip2/doxygen.dox" +ac_config_files="$ac_config_files libosip2.pc Makefile scripts/Makefile src/Makefile src/osipparser2/Makefile src/osip2/Makefile src/test/Makefile src/test/res/Makefile include/Makefile include/osip2/Makefile include/osipparser2/Makefile include/osipparser2/headers/Makefile help/Makefile help/man/Makefile help/doxygen/Makefile platform/Makefile platform/rpm/Makefile platform/vsnet/Makefile include/osip2/doxygen.dox" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -14234,7 +14274,6 @@ "platform/Makefile") CONFIG_FILES="$CONFIG_FILES platform/Makefile" ;; "platform/rpm/Makefile") CONFIG_FILES="$CONFIG_FILES platform/rpm/Makefile" ;; "platform/vsnet/Makefile") CONFIG_FILES="$CONFIG_FILES platform/vsnet/Makefile" ;; - "platform/wince/Makefile") CONFIG_FILES="$CONFIG_FILES platform/wince/Makefile" ;; "include/osip2/doxygen.dox") CONFIG_FILES="$CONFIG_FILES include/osip2/doxygen.dox" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; diff -Nru libosip2-4.0.0/configure.ac libosip2-4.1.0/configure.ac --- libosip2-4.0.0/configure.ac 1970-01-01 00:00:00.000000000 +0000 +++ libosip2-4.1.0/configure.ac 2013-12-18 17:51:42.000000000 +0000 @@ -0,0 +1,390 @@ +dnl Process this file with autoconf to produce a configure script. +AC_REVISION($Revision: 1.82 $)dnl +AC_PREREQ(2.50) +AC_INIT(include/osip2/osip.h) + +AC_MSG_NOTICE([osip2 The GNU Open SIP library.]) +AC_MSG_NOTICE([Copyright (C) 2001-2012 Aymeric MOIZARD - ]) + + +dnl ********************************************************************* +dnl Source packaging numbers +OSIP_MAJOR_VERSION=4 +OSIP_MINOR_VERSION=1 +OSIP_MICRO_VERSION=0 + +SONAME_MAJOR_VERSION=11 +SONAME_MINOR_VERSION=0 +SONAME_MICRO_VERSION=0 + +OSIP_VERSION=$OSIP_MAJOR_VERSION.$OSIP_MINOR_VERSION.$OSIP_MICRO_VERSION + +LIBOSIP_SO_VERSION=$SONAME_MAJOR_VERSION:$SONAME_MINOR_VERSION:$SONAME_MICRO_VERSION + +AC_SUBST(LIBOSIP_SO_VERSION, $LIBOSIP_SO_VERSION) + +AC_SUBST(OSIP_VERSION) + +if test "x$PRERELEASE" = "x"; then + VERSION=$OSIP_VERSION +else + VERSION="$OSIP_VERSION-$PRERELEASE" +fi + +PACKAGE=libosip2 + +AC_MSG_RESULT([Configuring ${PACKAGE} ${VERSION}]) +OS=`uname|sed -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` +AC_MSG_RESULT([Building Package on ${OS}]) + + + +dnl ********************************************************************* +dnl Initialize automake stuff +AC_CONFIG_AUX_DIR(scripts) +AC_CONFIG_HEADERS(osip-config.h) +AM_INIT_AUTOMAKE($PACKAGE, $VERSION) +AM_ACLOCAL_INCLUDE(scripts) + +AC_CANONICAL_HOST + +dnl Checks for programs. + +AC_PROG_CC +AC_PROG_CPP +AC_PROG_INSTALL + + +dnl Initialize libtool +AC_LIBTOOL_WIN32_DLL +LT_AC_PROG_SED +AC_PROG_LIBTOOL + +dnl declare --enable-* args and collect ac_help strings + +AC_ARG_ENABLE(debug, +[ --enable-debug turn on debugging.], +enable_debug=$enableval,enable_debug="yes") + +AC_ARG_ENABLE(trace, +[ --enable-trace turn on trace.], +enable_trace=$enableval,enable_trace="yes") + +AC_ARG_ENABLE(mpatrol, +[ --enable-mpatrol turn on memory leak detection with patrol.], +enable_mpatrol=$enableval,enable_mpatrol="no") + +AC_ARG_ENABLE(gprof, +[ --enable-gprof turn on profiling support.], +enable_gprof=$enableval,enable_gprof="no") + +dnl build with multithreaded support (need semaphore). +AC_ARG_ENABLE(mt, +[ --enable-mt compile oSIP without multi-thread support.], +enable_mt=$enableval,enable_mt="yes") + +dnl support for linux-thread or posix thread (pthread.h) +AC_ARG_ENABLE(pthread, +[ --enable-pthread enable support for POSIX threads. (default=autodetect)], +enable_pthread=$enableval,enable_pthread="no") + +dnl support for semaphore.h (linux/sun...) +AC_ARG_ENABLE(semaphore, +[ --enable-semaphore enable support for semaphore (semaphore.h)], +enable_semaphore=$enableval,enable_semaphore="no") + +dnl support for sysV semaphore in sys/sem.h (BSD/linux...) +AC_ARG_ENABLE(sysv, +[ --enable-sysv enable support for sysV semaphore (sys/sem.h).], +enable_sysv=$enableval,enable_sysv="no") + +dnl support for gperf. +AC_ARG_ENABLE(gperf, +[ --enable-gperf enable support for gperf (improve the parser speed).], +enable_gperf=$enableval,enable_gperf="no") + +dnl libdict support. +AC_ARG_ENABLE(hashtable, +[ --enable-hashtable compile oSIP with hashtable (libdict) support.], +enable_hashtable=$enableval,enable_hashtable="no") + +dnl support for gperf. +AC_ARG_ENABLE(test, +[ --enable-test enable building test programs).], +enable_test=$enableval,enable_test="no") + +dnl minimize size of code. +AC_ARG_ENABLE(minisize, +[ --enable-minisize only compile minimal voip related code).], +enable_minisize=$enableval,enable_minisize="no") + +dnl compile with mt support +if test "x$enable_mt" = "xyes"; then + if test "x$enable_pthread" = "xyes"; then + SIP_FSM_FLAGS="-DHAVE_PTHREAD" + else + ACX_PTHREAD() + fi +else + SIP_FSM_FLAGS="-DOSIP_MONOTHREAD" +fi + +AM_CONDITIONAL(BUILD_MT, test x$enable_mt = xyes) + +if test "x$enable_gperf" = "xyes"; then + SIP_PARSER_FLAGS="$SIP_PARSER_FLAGS -DUSE_GPERF" +fi + +AM_CONDITIONAL(COMPILE_TESTS, test "x$enable_test" != "xno") + +if test "x$enable_semaphore" = "xyes"; then + SIP_FSM_FLAGS="$SIP_FSM_FLAGS -DHAVE_SEMAPHORE_H" + AC_CHECK_HEADERS(semaphore.h) +elif test "x$enable_sysv" = "xyes"; then + SIP_FSM_FLAGS="$SIP_FSM_FLAGS -DHAVE_SYS_SEM_H" + AC_CHECK_HEADERS(sys/sem.h) +else + AC_CHECK_HEADERS(semaphore.h) + AC_CHECK_HEADERS(sys/sem.h) +fi + +if test "x$host_cpu" = "x$build_cpu"; then + case $OS in + linux*) + SIP_EXTRA_FLAGS="$SIP_EXTRA_FLAGS -pedantic" + ;; + irix*) + ;; + hpux* | hp-ux*) + ;; + aix*) + ;; + osf*) + ;; + sunos*) + ;; + darwin*) + ;; + *) + ;; + esac +else + AC_MSG_NOTICE([Cross compiling osip.]) +fi + +case $host_cpu in + arc*) + ;; + *) + ;; +esac + +if test "x$enable_hashtable" = "xyes"; then + AC_CHECK_HEADERS([dict/dict.h], + [AC_DEFINE([HAVE_DICT_DICT_H], [], [Define to 1 if you have header file])], + [AC_MSG_ERROR([libdict library not installed. Please install or use --disable-hashtable])]) + EXTRA_LIB="$EXTRA_LIB -ldict" +fi + +if test "x$enable_debug" = "xyes"; then + SIP_EXTRA_FLAGS="$SIP_EXTRA_FLAGS -g" + CFLAGS=`echo $CFLAGS | sed 's/-O.//'` +fi + +if test "x$enable_trace" = "xyes"; then + SIP_EXTRA_FLAGS="$SIP_EXTRA_FLAGS -DENABLE_TRACE" +fi + +if test "x$enable_mpatrol" = "xyes"; then + SIP_EXTRA_FLAGS="$SIP_EXTRA_FLAGS -DENABLE_MPATROL" + EXTRA_LIB="$EXTRA_LIB -lmpatrolmt -lelf -lpthread" +fi + +if test "x$enable_gprof" = "xyes"; then + SIP_EXTRA_FLAGS="$SIP_EXTRA_FLAGS -pg" + EXTRA_LIB="$EXTRA_LIB -lc_p" +fi + +if test "x$enable_minisize" = "xyes"; then + SIP_EXTRA_FLAGS="$SIP_EXTRA_FLAGS -DMINISIZE" +fi +AM_CONDITIONAL(BUILD_MAXSIZE, test x$enable_minisize = xno) + +dnl Checks for libraries. (those one are needed for sun) +AC_CHECK_LIB(posix4,sem_open,[FSM_LIB="$FSM_LIB -lposix4 -mt"]) +AC_CHECK_LIB(nsl,nis_add,[FSM_LIB="$FSM_LIB -lnsl"]) +AC_CHECK_LIB(socket,sendto,[FSM_LIB="$FSM_LIB -lsocket"]) +AC_CHECK_LIB(c, lrand48, AC_DEFINE([HAVE_LRAND48], [], [Defined if you have lrand48])) +AC_CHECK_LIB(rt,clock_gettime,[FSM_LIB="$FSM_LIB -lrt"]) + +AC_CACHE_CHECK([whether -Wall works], Wall_cv_flag, [ + saved_CPPFLAGS=$CPPFLAGS + CPPFLAGS="-Wall" + AC_TRY_COMPILE(, , Wall_cv_flag=yes, Wall_cv_flag=no) + CPPFLAGS=$saved_CPPFLAGS +]) + +if test "x$Wall_cv_flag" = xyes; then + CPPFLAGS="$CPPFLAGS -Wall" +fi + +AC_CACHE_CHECK([whether -Wcast-align works], Wcast_align_cv_flag, [ + saved_CPPFLAGS=$CPPFLAGS + CPPFLAGS="-Wcast-align" + AC_TRY_COMPILE(, , Wcast_align_cv_flag=yes, Wcast_align_cv_flag=no) + CPPFLAGS=$saved_CPPFLAGS +]) + +if test "x$Wcast_align_cv_flag" = xyes; then + CPPFLAGS="$CPPFLAGS -Wcast-align" +fi + +AC_CACHE_CHECK([whether -Wchar-subscripts works], Wchar_subscripts_cv_flag, [ + saved_CPPFLAGS=$CPPFLAGS + CPPFLAGS="-Wchar-subscripts" + AC_TRY_COMPILE(, , Wchar_subscripts_cv_flag=yes, Wchar_subscripts_cv_flag=no) + CPPFLAGS=$saved_CPPFLAGS +]) + +if test "x$Wchar_subscripts_cv_flag" = xyes; then + CPPFLAGS="$CPPFLAGS -Wchar-subscripts" +fi + +AC_CACHE_CHECK([whether -Wformat works], Wformat_cv_flag, [ + saved_CPPFLAGS=$CPPFLAGS + CPPFLAGS="-Wformat" + AC_TRY_COMPILE(, , Wformat_cv_flag=yes, Wformat_cv_flag=no) + CPPFLAGS=$saved_CPPFLAGS +]) + +if test "x$Wformat_cv_flag" = xyes; then + CPPFLAGS="$CPPFLAGS -Wformat" +fi + +AC_CACHE_CHECK([whether -Winline works], Winline_cv_flag, [ + saved_CPPFLAGS=$CPPFLAGS + CPPFLAGS="-Winline" + AC_TRY_COMPILE(, , Winline_cv_flag=yes, Winline_cv_flag=no) + CPPFLAGS=$saved_CPPFLAGS +]) + +if test "x$Winline_cv_flag" = xyes; then + CPPFLAGS="$CPPFLAGS -Winline" +fi + +AC_CACHE_CHECK([whether -Wmissing-declarations works], Wmissing_declarations_cv_flag, [ + saved_CPPFLAGS=$CPPFLAGS + CPPFLAGS="-Wmissing-declarations" + AC_TRY_COMPILE(, , Wmissing_declarations_cv_flag=yes, Wmissing_declarations_cv_flag=no) + CPPFLAGS=$saved_CPPFLAGS +]) + +if test "x$Wmissing_declarations_cv_flag" = xyes; then + CPPFLAGS="$CPPFLAGS -Wmissing-declarations" +fi + +AC_CACHE_CHECK([whether -Wmissing-prototypes works], Wmissing_prototypes_cv_flag, [ + saved_CPPFLAGS=$CPPFLAGS + CPPFLAGS="-Wmissing-prototypes" + AC_TRY_COMPILE(, , Wmissing_prototypes_cv_flag=yes, Wmissing_prototypes_cv_flag=no) + CPPFLAGS=$saved_CPPFLAGS +]) + +if test "x$Wmissing_prototypes_cv_flag" = xyes; then + CPPFLAGS="$CPPFLAGS -Wmissing-prototypes" +fi + +AC_CACHE_CHECK([whether -Wnested-externs works], Wnested_externs_cv_flag, [ + saved_CPPFLAGS=$CPPFLAGS + CPPFLAGS="-Wnested-externs" + AC_TRY_COMPILE(, , Wnested_externs_cv_flag=yes, Wnested_externs_cv_flag=no) + CPPFLAGS=$saved_CPPFLAGS +]) + +if test "x$Wnested_externs_cv_flag" = xyes; then + CPPFLAGS="$CPPFLAGS -Wnested-externs" +fi + +AC_CACHE_CHECK([whether -Wpointer-arith works], Wpointer_arith_cv_flag, [ + saved_CPPFLAGS=$CPPFLAGS + CPPFLAGS="-Wpointer-arith" + AC_TRY_COMPILE(, , Wpointer_arith_cv_flag=yes, Wpointer_arith_cv_flag=no) + CPPFLAGS=$saved_CPPFLAGS +]) + +if test "x$Wpointer_arith_cv_flag" = xyes; then + CPPFLAGS="$CPPFLAGS -Wpointer-arith" +fi + +SIP_CFLAGS="$SIP_CFLAGS $CFLAGS" + +AC_SUBST(SIP_CFLAGS) + +AC_SUBST(SIP_EXTRA_FLAGS) +AC_SUBST(SIP_PARSER_FLAGS) +AC_SUBST(SIP_FSM_FLAGS) + +AC_SUBST(EXTRA_LIB) +AC_SUBST(PARSER_LIB) +AC_SUBST(FSM_LIB) + +dnl Checks for header files. + +dnl This is to be removed for autoconf2.50 +AC_HEADER_STDC +AC_CHECK_HEADERS(string.h) +AC_CHECK_HEADERS(strings.h) +AC_CHECK_HEADERS(stdlib.h) +AC_CHECK_HEADERS(unistd.h) +AC_CHECK_HEADERS(sys/types.h) +dnl !This is to be removed for autoconf2.50 + +AC_CHECK_HEADERS(sys/unistd.h) +AC_CHECK_HEADERS(syslog.h) +AC_CHECK_HEADERS(ctype.h) +AC_CHECK_HEADERS(stdio.h) +AC_CHECK_HEADERS(stdarg.h) +AC_CHECK_HEADERS(varargs.h) +AC_CHECK_HEADERS(fcntl.h) +AC_CHECK_HEADERS(time.h) +AC_CHECK_HEADERS(sys/time.h) +AC_CHECK_HEADERS(sys/select.h) +AC_CHECK_HEADERS(assert.h) +AC_CHECK_HEADERS(signal.h) +AC_CHECK_HEADERS(sys/signal.h) +AC_CHECK_HEADERS(malloc.h) + +AC_CHECK_TYPES([struct timeval],,,[ + #if TIME_WITH_SYS_TIME + # include + # include + #else + # if HAVE_SYS_TIME_H + # include + # else + # include + # endif + #endif +]) + +AC_OUTPUT( +libosip2.pc +Makefile +scripts/Makefile +src/Makefile +src/osipparser2/Makefile +src/osip2/Makefile +src/test/Makefile +src/test/res/Makefile +include/Makefile +include/osip2/Makefile +include/osipparser2/Makefile +include/osipparser2/headers/Makefile +help/Makefile +help/man/Makefile +help/doxygen/Makefile +platform/Makefile +platform/rpm/Makefile +platform/vsnet/Makefile +include/osip2/doxygen.dox) + diff -Nru libosip2-4.0.0/configure.in libosip2-4.1.0/configure.in --- libosip2-4.0.0/configure.in 2012-11-15 10:02:02.000000000 +0000 +++ libosip2-4.1.0/configure.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,390 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_REVISION($Revision: 1.82 $)dnl -AC_PREREQ(2.50) -AC_INIT(include/osip2/osip.h) - -AC_MSG_NOTICE([osip2 The GNU Open SIP library.]) -AC_MSG_NOTICE([Copyright (C) 2001-2012 Aymeric MOIZARD - ]) - - -dnl ********************************************************************* -dnl Source packaging numbers -OSIP_MAJOR_VERSION=4 -OSIP_MINOR_VERSION=0 -OSIP_MICRO_VERSION=0 - -SONAME_MAJOR_VERSION=10 -SONAME_MINOR_VERSION=0 -SONAME_MICRO_VERSION=0 - -OSIP_VERSION=$OSIP_MAJOR_VERSION.$OSIP_MINOR_VERSION.$OSIP_MICRO_VERSION - -LIBOSIP_SO_VERSION=$SONAME_MAJOR_VERSION:$SONAME_MINOR_VERSION:$SONAME_MICRO_VERSION - -AC_SUBST(LIBOSIP_SO_VERSION, $LIBOSIP_SO_VERSION) - -AC_SUBST(OSIP_VERSION) - -if test "x$PRERELEASE" = "x"; then - VERSION=$OSIP_VERSION -else - VERSION="$OSIP_VERSION-$PRERELEASE" -fi - -PACKAGE=libosip2 - -AC_MSG_RESULT([Configuring ${PACKAGE} ${VERSION}]) -OS=`uname|sed -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` -AC_MSG_RESULT([Building Package on ${OS}]) - - - -dnl ********************************************************************* -dnl Initialize automake stuff -AC_CONFIG_AUX_DIR(scripts) -AC_CONFIG_HEADERS(osip-config.h) -AM_INIT_AUTOMAKE($PACKAGE, $VERSION) -AM_ACLOCAL_INCLUDE(scripts) - -AC_CANONICAL_HOST - -dnl Checks for programs. - -AC_PROG_CC -AC_PROG_CPP -AC_PROG_INSTALL - - -dnl Initialize libtool -AC_LIBTOOL_WIN32_DLL -LT_AC_PROG_SED -AC_PROG_LIBTOOL - -dnl declare --enable-* args and collect ac_help strings - -AC_ARG_ENABLE(debug, -[ --enable-debug turn on debugging.], -enable_debug=$enableval,enable_debug="yes") - -AC_ARG_ENABLE(trace, -[ --enable-trace turn on trace.], -enable_trace=$enableval,enable_trace="yes") - -AC_ARG_ENABLE(mpatrol, -[ --enable-mpatrol turn on memory leak detection with patrol.], -enable_mpatrol=$enableval,enable_mpatrol="no") - -AC_ARG_ENABLE(gprof, -[ --enable-gprof turn on profiling support.], -enable_gprof=$enableval,enable_gprof="no") - -dnl build with multithreaded support (need semaphore). -AC_ARG_ENABLE(mt, -[ --enable-mt compile oSIP without multi-thread support.], -enable_mt=$enableval,enable_mt="yes") - -dnl support for linux-thread or posix thread (pthread.h) -AC_ARG_ENABLE(pthread, -[ --enable-pthread enable support for POSIX threads. (default=autodetect)], -enable_pthread=$enableval,enable_pthread="no") - -dnl support for semaphore.h (linux/sun...) -AC_ARG_ENABLE(semaphore, -[ --enable-semaphore enable support for semaphore (semaphore.h)], -enable_semaphore=$enableval,enable_semaphore="no") - -dnl support for sysV semaphore in sys/sem.h (BSD/linux...) -AC_ARG_ENABLE(sysv, -[ --enable-sysv enable support for sysV semaphore (sys/sem.h).], -enable_sysv=$enableval,enable_sysv="no") - -dnl support for gperf. -AC_ARG_ENABLE(gperf, -[ --enable-gperf enable support for gperf (improve the parser speed).], -enable_gperf=$enableval,enable_gperf="no") - -dnl libdict support. -AC_ARG_ENABLE(hashtable, -[ --enable-hashtable compile oSIP with hashtable (libdict) support.], -enable_hashtable=$enableval,enable_hashtable="no") - -dnl support for gperf. -AC_ARG_ENABLE(test, -[ --enable-test enable building test programs).], -enable_test=$enableval,enable_test="no") - -dnl minimize size of code. -AC_ARG_ENABLE(minisize, -[ --enable-minisize only compile minimal voip related code).], -enable_minisize=$enableval,enable_minisize="no") - -dnl compile with mt support -if test "x$enable_mt" = "xyes"; then - if test "x$enable_pthread" = "xyes"; then - SIP_FSM_FLAGS="-DHAVE_PTHREAD" - else - ACX_PTHREAD() - fi -else - SIP_FSM_FLAGS="-DOSIP_MONOTHREAD" -fi - -AM_CONDITIONAL(BUILD_MT, test x$enable_mt = xyes) - -if test "x$enable_gperf" = "xyes"; then - SIP_PARSER_FLAGS="$SIP_PARSER_FLAGS -DUSE_GPERF" -fi - -AM_CONDITIONAL(COMPILE_TESTS, test "x$enable_test" != "xno") - -if test "x$enable_semaphore" = "xyes"; then - SIP_FSM_FLAGS="$SIP_FSM_FLAGS -DHAVE_SEMAPHORE_H" - AC_CHECK_HEADERS(semaphore.h) -elif test "x$enable_sysv" = "xyes"; then - SIP_FSM_FLAGS="$SIP_FSM_FLAGS -DHAVE_SYS_SEM_H" - AC_CHECK_HEADERS(sys/sem.h) -else - AC_CHECK_HEADERS(semaphore.h) - AC_CHECK_HEADERS(sys/sem.h) -fi - -if test "x$host_cpu" = "x$build_cpu"; then - case $OS in - linux*) - SIP_EXTRA_FLAGS="$SIP_EXTRA_FLAGS -pedantic" - ;; - irix*) - ;; - hpux* | hp-ux*) - ;; - aix*) - ;; - osf*) - ;; - sunos*) - ;; - darwin*) - ;; - *) - ;; - esac -else - AC_MSG_NOTICE([Cross compiling osip.]) -fi - -case $host_cpu in - arc*) - ;; - *) - ;; -esac - -if test "x$enable_hashtable" = "xyes"; then - AC_CHECK_HEADERS([dict/dict.h], - [AC_DEFINE([HAVE_DICT_DICT_H], [], [Define to 1 if you have header file])], - [AC_MSG_ERROR([libdict library not installed. Please install or use --disable-hashtable])]) - EXTRA_LIB="$EXTRA_LIB -ldict" -fi - -if test "x$enable_debug" = "xyes"; then - SIP_EXTRA_FLAGS="$SIP_EXTRA_FLAGS -g" - CFLAGS=`echo $CFLAGS | sed 's/-O.//'` -fi - -if test "x$enable_trace" = "xyes"; then - SIP_EXTRA_FLAGS="$SIP_EXTRA_FLAGS -DENABLE_TRACE" -fi - -if test "x$enable_mpatrol" = "xyes"; then - SIP_EXTRA_FLAGS="$SIP_EXTRA_FLAGS -DENABLE_MPATROL" - EXTRA_LIB="$EXTRA_LIB -lmpatrolmt -lelf -lpthread" -fi - -if test "x$enable_gprof" = "xyes"; then - SIP_EXTRA_FLAGS="$SIP_EXTRA_FLAGS -pg" - EXTRA_LIB="$EXTRA_LIB -lc_p" -fi - -if test "x$enable_minisize" = "xyes"; then - SIP_EXTRA_FLAGS="$SIP_EXTRA_FLAGS -DMINISIZE" -fi -AM_CONDITIONAL(BUILD_MAXSIZE, test x$enable_minisize = xno) - -dnl Checks for libraries. (those one are needed for sun) -AC_CHECK_LIB(posix4,sem_open,[FSM_LIB="$FSM_LIB -lposix4 -mt"]) -AC_CHECK_LIB(nsl,nis_add,[FSM_LIB="$FSM_LIB -lnsl"]) -AC_CHECK_LIB(socket,sendto,[FSM_LIB="$FSM_LIB -lsocket"]) -AC_CHECK_LIB(c, lrand48, AC_DEFINE([HAVE_LRAND48], [], [Defined if you have lrand48])) - -AC_CACHE_CHECK([whether -Wall works], Wall_cv_flag, [ - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="-Wall" - AC_TRY_COMPILE(, , Wall_cv_flag=yes, Wall_cv_flag=no) - CPPFLAGS=$saved_CPPFLAGS -]) - -if test "x$Wall_cv_flag" = xyes; then - CPPFLAGS="$CPPFLAGS -Wall" -fi - -AC_CACHE_CHECK([whether -Wcast-align works], Wcast_align_cv_flag, [ - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="-Wcast-align" - AC_TRY_COMPILE(, , Wcast_align_cv_flag=yes, Wcast_align_cv_flag=no) - CPPFLAGS=$saved_CPPFLAGS -]) - -if test "x$Wcast_align_cv_flag" = xyes; then - CPPFLAGS="$CPPFLAGS -Wcast-align" -fi - -AC_CACHE_CHECK([whether -Wchar-subscripts works], Wchar_subscripts_cv_flag, [ - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="-Wchar-subscripts" - AC_TRY_COMPILE(, , Wchar_subscripts_cv_flag=yes, Wchar_subscripts_cv_flag=no) - CPPFLAGS=$saved_CPPFLAGS -]) - -if test "x$Wchar_subscripts_cv_flag" = xyes; then - CPPFLAGS="$CPPFLAGS -Wchar-subscripts" -fi - -AC_CACHE_CHECK([whether -Wformat works], Wformat_cv_flag, [ - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="-Wformat" - AC_TRY_COMPILE(, , Wformat_cv_flag=yes, Wformat_cv_flag=no) - CPPFLAGS=$saved_CPPFLAGS -]) - -if test "x$Wformat_cv_flag" = xyes; then - CPPFLAGS="$CPPFLAGS -Wformat" -fi - -AC_CACHE_CHECK([whether -Winline works], Winline_cv_flag, [ - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="-Winline" - AC_TRY_COMPILE(, , Winline_cv_flag=yes, Winline_cv_flag=no) - CPPFLAGS=$saved_CPPFLAGS -]) - -if test "x$Winline_cv_flag" = xyes; then - CPPFLAGS="$CPPFLAGS -Winline" -fi - -AC_CACHE_CHECK([whether -Wmissing-declarations works], Wmissing_declarations_cv_flag, [ - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="-Wmissing-declarations" - AC_TRY_COMPILE(, , Wmissing_declarations_cv_flag=yes, Wmissing_declarations_cv_flag=no) - CPPFLAGS=$saved_CPPFLAGS -]) - -if test "x$Wmissing_declarations_cv_flag" = xyes; then - CPPFLAGS="$CPPFLAGS -Wmissing-declarations" -fi - -AC_CACHE_CHECK([whether -Wmissing-prototypes works], Wmissing_prototypes_cv_flag, [ - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="-Wmissing-prototypes" - AC_TRY_COMPILE(, , Wmissing_prototypes_cv_flag=yes, Wmissing_prototypes_cv_flag=no) - CPPFLAGS=$saved_CPPFLAGS -]) - -if test "x$Wmissing_prototypes_cv_flag" = xyes; then - CPPFLAGS="$CPPFLAGS -Wmissing-prototypes" -fi - -AC_CACHE_CHECK([whether -Wnested-externs works], Wnested_externs_cv_flag, [ - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="-Wnested-externs" - AC_TRY_COMPILE(, , Wnested_externs_cv_flag=yes, Wnested_externs_cv_flag=no) - CPPFLAGS=$saved_CPPFLAGS -]) - -if test "x$Wnested_externs_cv_flag" = xyes; then - CPPFLAGS="$CPPFLAGS -Wnested-externs" -fi - -AC_CACHE_CHECK([whether -Wpointer-arith works], Wpointer_arith_cv_flag, [ - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="-Wpointer-arith" - AC_TRY_COMPILE(, , Wpointer_arith_cv_flag=yes, Wpointer_arith_cv_flag=no) - CPPFLAGS=$saved_CPPFLAGS -]) - -if test "x$Wpointer_arith_cv_flag" = xyes; then - CPPFLAGS="$CPPFLAGS -Wpointer-arith" -fi - -SIP_CFLAGS="$SIP_CFLAGS $CFLAGS" - -AC_SUBST(SIP_CFLAGS) - -AC_SUBST(SIP_EXTRA_FLAGS) -AC_SUBST(SIP_PARSER_FLAGS) -AC_SUBST(SIP_FSM_FLAGS) - -AC_SUBST(EXTRA_LIB) -AC_SUBST(PARSER_LIB) -AC_SUBST(FSM_LIB) - -dnl Checks for header files. - -dnl This is to be removed for autoconf2.50 -AC_HEADER_STDC -AC_CHECK_HEADERS(string.h) -AC_CHECK_HEADERS(strings.h) -AC_CHECK_HEADERS(stdlib.h) -AC_CHECK_HEADERS(unistd.h) -AC_CHECK_HEADERS(sys/types.h) -dnl !This is to be removed for autoconf2.50 - -AC_CHECK_HEADERS(sys/unistd.h) -AC_CHECK_HEADERS(syslog.h) -AC_CHECK_HEADERS(ctype.h) -AC_CHECK_HEADERS(stdio.h) -AC_CHECK_HEADERS(stdarg.h) -AC_CHECK_HEADERS(varargs.h) -AC_CHECK_HEADERS(fcntl.h) -AC_CHECK_HEADERS(time.h) -AC_CHECK_HEADERS(sys/time.h) -AC_CHECK_HEADERS(sys/select.h) -AC_CHECK_HEADERS(assert.h) -AC_CHECK_HEADERS(signal.h) -AC_CHECK_HEADERS(sys/signal.h) -AC_CHECK_HEADERS(malloc.h) - -AC_CHECK_TYPES([struct timeval],,,[ - #if TIME_WITH_SYS_TIME - # include - # include - #else - # if HAVE_SYS_TIME_H - # include - # else - # include - # endif - #endif -]) - -AC_OUTPUT( -libosip2.pc -Makefile -scripts/Makefile -src/Makefile -src/osipparser2/Makefile -src/osip2/Makefile -src/test/Makefile -src/test/res/Makefile -include/Makefile -include/osip2/Makefile -include/osipparser2/Makefile -include/osipparser2/headers/Makefile -help/Makefile -help/man/Makefile -help/doxygen/Makefile -platform/Makefile -platform/rpm/Makefile -platform/vsnet/Makefile -platform/wince/Makefile -include/osip2/doxygen.dox) - diff -Nru libosip2-4.0.0/debian/changelog libosip2-4.1.0/debian/changelog --- libosip2-4.0.0/debian/changelog 2014-01-16 02:24:01.000000000 +0000 +++ libosip2-4.1.0/debian/changelog 2014-06-25 11:55:15.000000000 +0000 @@ -1,17 +1,18 @@ -libosip2 (4.0.0-3ubuntu2) trusty; urgency=medium +libosip2 (4.1.0-2) unstable; urgency=low - * Use dh-autoreconf instead of autotools-dev to also fix FTBFS on ppc64el by - getting new libtool macros (still updates config.{sub,guess}). + * Upload to unstable - coordinated through debian-release - -- Logan Rosen Wed, 15 Jan 2014 21:23:42 -0500 + -- Mark Purcell Wed, 25 Jun 2014 21:54:30 +1000 -libosip2 (4.0.0-3ubuntu1) trusty; urgency=low +libosip2 (4.1.0-1) experimental; urgency=low - * Merge from Debian unstable. Remaining changes: - - debian/rules: Fix --with-autotools-dev to --with autotools_dev so it does - something. + * New upstream release + * NEW package libosip2-11 - match soname + * Fix "use dh-autoreconf instead of autotools-dev to fix FTBFS on + ppc64el" patch from ~logan (Closes: #735640) + * Drop all debian/patches - included upstream - -- William Grant Mon, 28 Oct 2013 12:46:29 +1100 + -- Mark Purcell Mon, 20 Jan 2014 20:24:38 +1100 libosip2 (4.0.0-3) unstable; urgency=low @@ -35,13 +36,6 @@ -- Mark Purcell Sun, 23 Dec 2012 13:45:52 +1100 -libosip2 (3.6.0-4ubuntu1) saucy; urgency=low - - * debian/rules: Fix --with-autotools-dev to --with autotools_dev so it does - something. - - -- William Grant Wed, 16 Oct 2013 14:32:04 +1100 - libosip2 (3.6.0-4) unstable; urgency=low * weezey polish @@ -274,7 +268,6 @@ * ABI change to 3 -- ARAKI Yasuhiro Fri, 4 Feb 2005 14:46:08 +0900 - libosip2 (2.0.9-2) unstable; urgency=low * fix for ABI change (close: #285079) @@ -325,4 +318,3 @@ * Initial Release. -- Anand Kumria Tue, 30 Sep 2003 16:09:51 +1000 - diff -Nru libosip2-4.0.0/debian/control libosip2-4.1.0/debian/control --- libosip2-4.0.0/debian/control 2014-01-16 02:23:41.000000000 +0000 +++ libosip2-4.1.0/debian/control 2014-01-20 09:25:06.000000000 +0000 @@ -1,11 +1,10 @@ Source: libosip2 Section: comm Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian VoIP Team +Maintainer: Debian VoIP Team Uploaders: Mark Purcell , Kilian Krause Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.13.19), dh-autoreconf, docbook-to-man -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Homepage: http://www.gnu.org/software/osip/ Vcs-Svn: svn://anonscm.debian.org/pkg-voip/libosip2/trunk/ Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-voip/libosip2/trunk/ @@ -13,7 +12,7 @@ Package: libosip2-dev Section: libdevel Architecture: any -Depends: ${misc:Depends}, libosip2-10 (= ${binary:Version}) +Depends: ${misc:Depends}, libosip2-11 (= ${binary:Version}) Recommends: pkg-config Description: development files for the SIP library libosip2 header files and static libraries to assist in development of @@ -30,7 +29,7 @@ parser, and library to handle "SIP transactions" as defined by the SIP standards (RFC3261). -Package: libosip2-10 +Package: libosip2-11 Section: libs Pre-Depends: ${misc:Pre-Depends} Architecture: any diff -Nru libosip2-4.0.0/debian/libosip2-10.install libosip2-4.1.0/debian/libosip2-10.install --- libosip2-4.0.0/debian/libosip2-10.install 2012-12-23 02:48:11.000000000 +0000 +++ libosip2-4.1.0/debian/libosip2-10.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/*/lib*.so.* diff -Nru libosip2-4.0.0/debian/libosip2-11.install libosip2-4.1.0/debian/libosip2-11.install --- libosip2-4.0.0/debian/libosip2-11.install 1970-01-01 00:00:00.000000000 +0000 +++ libosip2-4.1.0/debian/libosip2-11.install 2014-01-20 09:25:06.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/*/lib*.so.* diff -Nru libosip2-4.0.0/debian/patches/hurd.diff libosip2-4.1.0/debian/patches/hurd.diff --- libosip2-4.0.0/debian/patches/hurd.diff 2013-07-07 02:58:32.000000000 +0000 +++ libosip2-4.1.0/debian/patches/hurd.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -Author: Pino Toscano -Description: Fix build on GNU/Hurd - GNU/Hurd uses a Mach-based microkernel (gnumach), so __MACH__ is defined too; - since the code is specific to the Mac OS X variant of Mach, change the - condition to __APPLE__. - ---- a/src/osip2/osip_time.c -+++ b/src/osip2/osip_time.c -@@ -21,7 +21,7 @@ - #include - #include - --#ifdef __MACH__ -+#ifdef __APPLE__ - #include - #include - #endif -@@ -151,7 +151,7 @@ _osip_gettimeofday_realtime (struct time - return 0; - } - --#elif defined(__MACH__) -+#elif defined(__APPLE__) - - int - osip_gettimeofday (struct timeval *tp, void *tz) diff -Nru libosip2-4.0.0/debian/patches/manpage-section-mismatch.patch libosip2-4.1.0/debian/patches/manpage-section-mismatch.patch --- libosip2-4.0.0/debian/patches/manpage-section-mismatch.patch 2013-10-16 10:40:28.000000000 +0000 +++ libosip2-4.1.0/debian/patches/manpage-section-mismatch.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -usr/share/man/man1/osip.1.gz:1 1 != SECTION - -A man page usually should contain a .TH header, specifying the section. -The section in this manpage doesn't match with the section in the filename. - -Refer to the groff_man(7) manual page and the man(1) manual page for details. -Severity: normal; Certainty: certain - -Index: libosip2-4.0.0/help/man/osip.sgml -=================================================================== ---- libosip2-4.0.0.orig/help/man/osip.sgml 2012-07-17 20:36:07.000000000 +1000 -+++ libosip2-4.0.0/help/man/osip.sgml 2012-12-23 13:41:17.000000000 +1100 -@@ -4,7 +4,7 @@ - Aymeric"> - MOIZARD"> - Jan 15, 2005"> -- SECTION"> -+ 1"> - jack at atosc.org"> - - libosip"> diff -Nru libosip2-4.0.0/debian/patches/series libosip2-4.1.0/debian/patches/series --- libosip2-4.0.0/debian/patches/series 2013-10-16 10:40:28.000000000 +0000 +++ libosip2-4.1.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -spelling-error-in-binary.diff -manpage-section-mismatch.patch -hurd.diff diff -Nru libosip2-4.0.0/debian/patches/spelling-error-in-binary.diff libosip2-4.1.0/debian/patches/spelling-error-in-binary.diff --- libosip2-4.0.0/debian/patches/spelling-error-in-binary.diff 2013-10-16 10:40:28.000000000 +0000 +++ libosip2-4.1.0/debian/patches/spelling-error-in-binary.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -Description: spelling-error-in-binary -Bug-Debian: http://lintian.debian.org/tags/spelling-error-in-binary.html - -Index: libosip2-4.0.0/src/osip2/osip_transaction.c -=================================================================== ---- libosip2-4.0.0.orig/src/osip2/osip_transaction.c 2012-11-17 08:24:10.000000000 +1100 -+++ libosip2-4.0.0/src/osip2/osip_transaction.c 2012-12-23 13:38:03.000000000 +1100 -@@ -133,7 +133,7 @@ - osip_id_mutex_lock (osip); - (*transaction)->transactionid = osip->transactionid++; - osip_id_mutex_unlock (osip); -- OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, "allocating transaction ressource %i %s\n", (*transaction)->transactionid, request->call_id->number)); -+ OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, "allocating transaction resource %i %s\n", (*transaction)->transactionid, request->call_id->number)); - - /* those lines must be called before "osip_transaction_free" */ - (*transaction)->ctx_type = ctx_type; -@@ -243,7 +243,7 @@ - when a transaction goes in the TERMINATED STATE. - However the user might want to just take the context out of - the SIP stack andf keep it for future use without freeing -- all ressource.... This way the transaction context can be -+ all resource.... This way the transaction context can be - kept without being used by the oSIP stack. - - new methods that replace this one: -@@ -278,7 +278,7 @@ - if (transaction == NULL) - return OSIP_BADPARAMETER; - if (transaction->orig_request != NULL && transaction->orig_request->call_id != NULL && transaction->orig_request->call_id->number != NULL) { -- OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, "free transaction ressource %i %s\n", transaction->transactionid, transaction->orig_request->call_id->number)); -+ OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, "free transaction resource %i %s\n", transaction->transactionid, transaction->orig_request->call_id->number)); - } - if (transaction->ctx_type == ICT) { - __osip_ict_free (transaction->ict_context); diff -Nru libosip2-4.0.0/debian/rules libosip2-4.1.0/debian/rules --- libosip2-4.0.0/debian/rules 2014-01-16 02:26:52.000000000 +0000 +++ libosip2-4.1.0/debian/rules 2014-01-20 09:25:06.000000000 +0000 @@ -15,6 +15,3 @@ override_dh_autoreconf: dh_autoreconf ./autogen.sh - -get-orig-source: - uscan --force-download diff -Nru libosip2-4.0.0/help/doxygen/DoxyFile libosip2-4.1.0/help/doxygen/DoxyFile --- libosip2-4.0.0/help/doxygen/DoxyFile 2012-11-16 19:55:42.000000000 +0000 +++ libosip2-4.1.0/help/doxygen/DoxyFile 2013-12-18 15:29:57.000000000 +0000 @@ -4,7 +4,7 @@ # General configuration options #--------------------------------------------------------------------------- PROJECT_NAME = libosip -PROJECT_NUMBER = 4.0.0 +PROJECT_NUMBER = 4.1.0 OUTPUT_DIRECTORY = help/doxygen/doc OUTPUT_LANGUAGE = English EXTRACT_ALL = NO diff -Nru libosip2-4.0.0/help/doxygen/Makefile.in libosip2-4.1.0/help/doxygen/Makefile.in --- libosip2-4.0.0/help/doxygen/Makefile.in 2012-12-10 15:07:10.000000000 +0000 +++ libosip2-4.1.0/help/doxygen/Makefile.in 2013-12-18 17:51:52.000000000 +0000 @@ -55,7 +55,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/scripts/aclocal-include.m4 \ $(top_srcdir)/scripts/acx_pthread.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs diff -Nru libosip2-4.0.0/help/Makefile.in libosip2-4.1.0/help/Makefile.in --- libosip2-4.0.0/help/Makefile.in 2012-11-15 10:10:12.000000000 +0000 +++ libosip2-4.1.0/help/Makefile.in 2013-12-18 17:51:52.000000000 +0000 @@ -55,7 +55,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/scripts/aclocal-include.m4 \ $(top_srcdir)/scripts/acx_pthread.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs diff -Nru libosip2-4.0.0/help/man/Makefile.in libosip2-4.1.0/help/man/Makefile.in --- libosip2-4.0.0/help/man/Makefile.in 2012-11-15 10:10:12.000000000 +0000 +++ libosip2-4.1.0/help/man/Makefile.in 2013-12-18 17:51:52.000000000 +0000 @@ -55,7 +55,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/scripts/aclocal-include.m4 \ $(top_srcdir)/scripts/acx_pthread.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs diff -Nru libosip2-4.0.0/help/man/osip.1 libosip2-4.1.0/help/man/osip.1 --- libosip2-4.0.0/help/man/osip.1 2012-07-18 17:32:27.000000000 +0000 +++ libosip2-4.1.0/help/man/osip.1 2013-12-18 17:52:07.000000000 +0000 @@ -0,0 +1,66 @@ +.TH "libosip" "1" +.SH "NAME" +libosip2 \(em The GNU oSIP library is a low layer SIP implementation. + +.SH "SYNOPSIS" +.PP +\fB#include \fR +.PP +\fB#include \fR +.PP +\fB#include \fR +.PP +\fB#include \fR +.PP +\fB#include \fR +.PP +\fB#include \fR +.PP +\fB#include \fR +.PP +\fB#include \fR +.PP +\fB#include \fR +.PP +\fB#include \fR +.PP +\fB#include \fR +.PP +\fB-losipparser2\fR [\fBThe uri, SIP and SDP parsers\fP] +.PP +\fB#include \fR +.PP +\fB#include \fR +.PP +\fB#include \fR +.PP +\fB#include \fR +.PP +\fB#include \fR +.PP +\fB#include //OBSOLETE\fR +.PP +\fB-losip2\fR [\fBThe SIP transaction and the dialog API\fP] +.SH "DESCRIPTION" +.PP +This manual page documents briefly the +\fBlibosip2\fR library. +.SH "API and Reference Documentation" +.PP +API reference & Doxygen documentation is available for +osip at http://www.gnu.org/software/osip/ +.SH "osip general overview." +.PP +The file help/man/osip.html in the source distribution +should give you a nice amount of informations about the +osip stack. +.SH "Free software projects \-send me your project name-" +.PP +antisip, linphone, bayonne +.SH "BUGS" +.PP +Please use the mailing list osip@atosc.org +.SH "AUTHOR" +.PP +This manual page was written by Aymeric Moizard amoizard at antisip.com. +.\" created by instant / docbook-to-man, Wed 18 Dec 2013, 18:52 diff -Nru libosip2-4.0.0/help/man/osip.sgml libosip2-4.1.0/help/man/osip.sgml --- libosip2-4.0.0/help/man/osip.sgml 2012-07-17 10:36:07.000000000 +0000 +++ libosip2-4.1.0/help/man/osip.sgml 2013-12-18 15:54:36.000000000 +0000 @@ -4,8 +4,8 @@ Aymeric"> MOIZARD"> Jan 15, 2005"> - SECTION"> - jack at atosc.org"> + 1"> + amoizard at antisip.com"> libosip"> diff -Nru libosip2-4.0.0/include/Makefile.in libosip2-4.1.0/include/Makefile.in --- libosip2-4.0.0/include/Makefile.in 2012-11-15 10:10:12.000000000 +0000 +++ libosip2-4.1.0/include/Makefile.in 2013-12-18 17:51:52.000000000 +0000 @@ -55,7 +55,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/scripts/aclocal-include.m4 \ $(top_srcdir)/scripts/acx_pthread.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs diff -Nru libosip2-4.0.0/include/osip2/internal.h libosip2-4.1.0/include/osip2/internal.h --- libosip2-4.0.0/include/osip2/internal.h 2012-11-16 21:24:10.000000000 +0000 +++ libosip2-4.1.0/include/osip2/internal.h 2013-12-18 18:36:46.000000000 +0000 @@ -152,8 +152,26 @@ typedef pthread_t osip_thread_t; #endif +#if (_MSC_VER >= 1700) && !defined(_USING_V110_SDK71_) +#include +#endif + /* Windows without Pthreads for Win32 */ -#if (defined(WIN32) || defined(_WIN32_WCE)) && !defined(HAVE_PTHREAD_WIN32) +#if (_MSC_VER >= 1700) && !defined(_USING_V110_SDK71_) +#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP) +#define HAVE_CPP11_THREAD +#elif defined(WINAPI_FAMILY) && WINAPI_FAMILY_ONE_PARTITION( WINAPI_FAMILY, WINAPI_PARTITION_APP ) +#define HAVE_CPP11_THREAD +#endif +#endif + +#if defined(HAVE_CPP11_THREAD) + +typedef struct { + void *h; +} osip_thread_t; + +#elif (defined(WIN32) || defined(_WIN32_WCE)) && !defined(HAVE_PTHREAD_WIN32) /* Prevent the inclusion of winsock.h */ #define _WINSOCKAPI_ diff -Nru libosip2-4.0.0/include/osip2/Makefile.in libosip2-4.1.0/include/osip2/Makefile.in --- libosip2-4.0.0/include/osip2/Makefile.in 2012-11-15 10:10:12.000000000 +0000 +++ libosip2-4.1.0/include/osip2/Makefile.in 2013-12-18 17:51:52.000000000 +0000 @@ -57,7 +57,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/scripts/aclocal-include.m4 \ $(top_srcdir)/scripts/acx_pthread.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs diff -Nru libosip2-4.0.0/include/osip2/osip.h libosip2-4.1.0/include/osip2/osip.h --- libosip2-4.0.0/include/osip2/osip.h 2012-11-16 21:24:10.000000000 +0000 +++ libosip2-4.1.0/include/osip2/osip.h 2013-12-18 18:36:46.000000000 +0000 @@ -1030,7 +1030,7 @@ osip_event_t *osip_new_outgoing_sipmessage (osip_message_t * sip); /** - * Free all ressource in a sipevent. + * Free all resource in a sipevent. * @param event The event to free. */ void osip_event_free (osip_event_t * event); diff -Nru libosip2-4.0.0/include/osipparser2/headers/Makefile.in libosip2-4.1.0/include/osipparser2/headers/Makefile.in --- libosip2-4.0.0/include/osipparser2/headers/Makefile.in 2012-11-15 10:10:12.000000000 +0000 +++ libosip2-4.1.0/include/osipparser2/headers/Makefile.in 2013-12-18 17:51:52.000000000 +0000 @@ -57,7 +57,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/scripts/aclocal-include.m4 \ $(top_srcdir)/scripts/acx_pthread.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs diff -Nru libosip2-4.0.0/include/osipparser2/internal.h libosip2-4.1.0/include/osipparser2/internal.h --- libosip2-4.0.0/include/osipparser2/internal.h 2012-11-16 21:24:10.000000000 +0000 +++ libosip2-4.1.0/include/osipparser2/internal.h 2013-12-18 18:36:46.000000000 +0000 @@ -57,10 +57,21 @@ #define snprintf _snprintf +#if (_MSC_VER >= 1700) && !defined(_USING_V110_SDK71_) +#include +#endif + /* use win32 crypto routines for random number generation */ /* only use for vs .net (compiler v. 1300) or greater */ #if _MSC_VER >= 1300 #define WIN32_USE_CRYPTO 1 +#if (_MSC_VER >= 1700) && !defined(_USING_V110_SDK71_) +#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP) +#undef WIN32_USE_CRYPTO +#elif defined(WINAPI_FAMILY) && WINAPI_FAMILY_ONE_PARTITION( WINAPI_FAMILY, WINAPI_PARTITION_APP ) +#undef WIN32_USE_CRYPTO +#endif +#endif #endif #endif diff -Nru libosip2-4.0.0/include/osipparser2/Makefile.in libosip2-4.1.0/include/osipparser2/Makefile.in --- libosip2-4.0.0/include/osipparser2/Makefile.in 2012-11-15 10:10:12.000000000 +0000 +++ libosip2-4.1.0/include/osipparser2/Makefile.in 2013-12-18 17:51:52.000000000 +0000 @@ -57,7 +57,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/scripts/aclocal-include.m4 \ $(top_srcdir)/scripts/acx_pthread.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs diff -Nru libosip2-4.0.0/include/osipparser2/osip_message.h libosip2-4.1.0/include/osipparser2/osip_message.h --- libosip2-4.0.0/include/osipparser2/osip_message.h 2012-11-17 13:37:25.000000000 +0000 +++ libosip2-4.1.0/include/osipparser2/osip_message.h 2013-12-18 18:36:46.000000000 +0000 @@ -115,7 +115,7 @@ /** * You can re-define your own maximum length for SIP message. */ -#define SIP_MESSAGE_MAX_LENGTH 4000 +#define SIP_MESSAGE_MAX_LENGTH 8000 #endif #ifndef BODY_MESSAGE_MAX_SIZE diff -Nru libosip2-4.0.0/include/osipparser2/osip_port.h libosip2-4.1.0/include/osipparser2/osip_port.h --- libosip2-4.0.0/include/osipparser2/osip_port.h 2012-11-16 21:24:10.000000000 +0000 +++ libosip2-4.1.0/include/osipparser2/osip_port.h 2013-12-18 18:36:46.000000000 +0000 @@ -185,7 +185,6 @@ char *osip_strdup_without_quote (const char *ch); int osip_tolower (char *word); int osip_clrspace (char *word); - char *__osip_sdp_append_string (char *string, size_t size, char *cur, char *string_osip_to_append); int __osip_set_next_token (char **dest, char *buf, int end_separator, char **next); /* find the next unescaped quote and return its index. */ char *__osip_quote_find (const char *qstring); @@ -231,7 +230,7 @@ without trace */ void osip_trace_initialize_func (osip_trace_level_t level, osip_trace_func_t * func); void osip_trace_initialize_syslog (osip_trace_level_t level, char *ident); - void osip_trace_initialize (osip_trace_level_t level, FILE * file); + int osip_trace_initialize (osip_trace_level_t level, FILE * file); void osip_trace_enable_until_level (osip_trace_level_t level); void osip_trace_enable_level (osip_trace_level_t level); void osip_trace_disable_level (osip_trace_level_t level); diff -Nru libosip2-4.0.0/Makefile.in libosip2-4.1.0/Makefile.in --- libosip2-4.0.0/Makefile.in 2012-11-16 18:06:19.000000000 +0000 +++ libosip2-4.1.0/Makefile.in 2013-12-18 17:51:51.000000000 +0000 @@ -59,7 +59,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/scripts/aclocal-include.m4 \ $(top_srcdir)/scripts/acx_pthread.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ diff -Nru libosip2-4.0.0/osip-config.h.in libosip2-4.1.0/osip-config.h.in --- libosip2-4.0.0/osip-config.h.in 2012-11-15 10:10:18.000000000 +0000 +++ libosip2-4.1.0/osip-config.h.in 2013-12-18 17:52:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* osip-config.h.in. Generated from configure.in by autoheader. */ +/* osip-config.h.in. Generated from configure.ac by autoheader. */ /* Define to 1 if you have the header file. */ #undef HAVE_ASSERT_H diff -Nru libosip2-4.0.0/platform/Makefile.am libosip2-4.1.0/platform/Makefile.am --- libosip2-4.0.0/platform/Makefile.am 2012-07-17 10:36:07.000000000 +0000 +++ libosip2-4.1.0/platform/Makefile.am 2013-12-18 17:51:35.000000000 +0000 @@ -1,5 +1,5 @@ -SUBDIRS = rpm vsnet wince +SUBDIRS = rpm vsnet rpm-package: cd rpm && $(MAKE) rpm-package diff -Nru libosip2-4.0.0/platform/Makefile.in libosip2-4.1.0/platform/Makefile.in --- libosip2-4.0.0/platform/Makefile.in 2012-11-15 10:10:12.000000000 +0000 +++ libosip2-4.1.0/platform/Makefile.in 2013-12-18 17:51:52.000000000 +0000 @@ -55,7 +55,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/scripts/aclocal-include.m4 \ $(top_srcdir)/scripts/acx_pthread.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs @@ -236,7 +236,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = rpm vsnet wince +SUBDIRS = rpm vsnet all: all-recursive .SUFFIXES: diff -Nru libosip2-4.0.0/platform/rpm/libosip.spec libosip2-4.1.0/platform/rpm/libosip.spec --- libosip2-4.0.0/platform/rpm/libosip.spec 2012-07-17 10:36:07.000000000 +0000 +++ libosip2-4.1.0/platform/rpm/libosip.spec 2013-12-18 15:33:48.000000000 +0000 @@ -1,7 +1,7 @@ Summary: The GNU oSIP library Summary(pl): Biblioteka GNU oSIP Name: libosip2 -Version: 2.2.3 +Version: 4.1.0 Release: 1 License: LGPL Group: Development/Libraries diff -Nru libosip2-4.0.0/platform/rpm/Makefile.in libosip2-4.1.0/platform/rpm/Makefile.in --- libosip2-4.0.0/platform/rpm/Makefile.in 2012-11-15 10:10:12.000000000 +0000 +++ libosip2-4.1.0/platform/rpm/Makefile.in 2013-12-18 17:51:52.000000000 +0000 @@ -55,7 +55,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/scripts/aclocal-include.m4 \ $(top_srcdir)/scripts/acx_pthread.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs diff -Nru libosip2-4.0.0/platform/vsnet/Makefile.am libosip2-4.1.0/platform/vsnet/Makefile.am --- libosip2-4.0.0/platform/vsnet/Makefile.am 2012-07-17 10:36:07.000000000 +0000 +++ libosip2-4.1.0/platform/vsnet/Makefile.am 2013-12-18 17:51:35.000000000 +0000 @@ -1,2 +1,2 @@ -EXTRA_DIST = osip.sln osip2.def osipparser2.def osip2.vcproj osipparser2.vcproj +EXTRA_DIST = osip.sln osip2.def osipparser2.def osip2.vcxproj osipparser2.vcxproj diff -Nru libosip2-4.0.0/platform/vsnet/Makefile.in libosip2-4.1.0/platform/vsnet/Makefile.in --- libosip2-4.0.0/platform/vsnet/Makefile.in 2012-11-15 10:10:12.000000000 +0000 +++ libosip2-4.1.0/platform/vsnet/Makefile.in 2013-12-18 17:51:52.000000000 +0000 @@ -55,7 +55,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/scripts/aclocal-include.m4 \ $(top_srcdir)/scripts/acx_pthread.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs @@ -196,7 +196,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = osip.sln osip2.def osipparser2.def osip2.vcproj osipparser2.vcproj +EXTRA_DIST = osip.sln osip2.def osipparser2.def osip2.vcxproj osipparser2.vcxproj all: all-am .SUFFIXES: diff -Nru libosip2-4.0.0/platform/vsnet/osip2.vcproj libosip2-4.1.0/platform/vsnet/osip2.vcproj --- libosip2-4.0.0/platform/vsnet/osip2.vcproj 2012-07-17 10:36:07.000000000 +0000 +++ libosip2-4.1.0/platform/vsnet/osip2.vcproj 1970-01-01 00:00:00.000000000 +0000 @@ -1,424 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libosip2-4.0.0/platform/vsnet/osip2.vcxproj libosip2-4.1.0/platform/vsnet/osip2.vcxproj --- libosip2-4.0.0/platform/vsnet/osip2.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ libosip2-4.1.0/platform/vsnet/osip2.vcxproj 2013-12-18 17:51:35.000000000 +0000 @@ -0,0 +1,184 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {85255507-5D16-4218-85E2-F683BB2F04DA} + osip2 + Win32Proj + + + + StaticLibrary + Unicode + v110 + + + StaticLibrary + Unicode + v110 + + + StaticLibrary + Unicode + v110 + + + StaticLibrary + Unicode + v110 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(PlatformToolset)\$(Platform)\$(Configuration)\ + $(SolutionDir)$(PlatformToolset)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)$(PlatformToolset)\$(Platform)\$(Configuration)\ + $(SolutionDir)$(PlatformToolset)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ + + + + Disabled + ..\..\..\osip\include;%(AdditionalIncludeDirectories) + ENABLE_TRACE;SYSTEM_LOGGER_ENABLED;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + $(IntDir)$(ProjectName)-vc80.pdb + Level3 + ProgramDatabase + + + $(OutDir)$(TargetName)$(TargetExt) + + + + + Disabled + ..\..\..\osip\include;%(AdditionalIncludeDirectories) + ENABLE_TRACE;SYSTEM_LOGGER_ENABLED;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + $(IntDir)$(ProjectName)-vc80.pdb + Level3 + ProgramDatabase + + + $(OutDir)$(TargetName)$(TargetExt) + + + + + ..\..\..\osip\include;%(AdditionalIncludeDirectories) + ENABLE_TRACE;SYSTEM_LOGGER_ENABLED;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + + + $(IntDir)$(ProjectName)-vc80.pdb + Level3 + + + + + $(OutDir)$(TargetName)$(TargetExt) + + + + + ..\..\..\osip\include;%(AdditionalIncludeDirectories) + ENABLE_TRACE;SYSTEM_LOGGER_ENABLED;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + + + $(IntDir)$(ProjectName)-vc80.pdb + Level3 + + + + + $(OutDir)$(TargetName)$(TargetExt) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {44f46b7e-0e51-4304-9735-330dfbab41e5} + false + + + + + + \ No newline at end of file diff -Nru libosip2-4.0.0/platform/vsnet/osipparser2.vcproj libosip2-4.1.0/platform/vsnet/osipparser2.vcproj --- libosip2-4.0.0/platform/vsnet/osipparser2.vcproj 2012-07-17 10:36:07.000000000 +0000 +++ libosip2-4.1.0/platform/vsnet/osipparser2.vcproj 1970-01-01 00:00:00.000000000 +0000 @@ -1,616 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libosip2-4.0.0/platform/vsnet/osipparser2.vcxproj libosip2-4.1.0/platform/vsnet/osipparser2.vcxproj --- libosip2-4.0.0/platform/vsnet/osipparser2.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ libosip2-4.1.0/platform/vsnet/osipparser2.vcxproj 2013-12-18 17:51:35.000000000 +0000 @@ -0,0 +1,227 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {44F46B7E-0E51-4304-9735-330DFBAB41E5} + osipparser2 + Win32Proj + + + + StaticLibrary + Unicode + v110 + + + StaticLibrary + Unicode + v110 + + + StaticLibrary + Unicode + v110 + + + StaticLibrary + Unicode + v110 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(PlatformToolset)\$(Platform)\$(Configuration)\ + $(SolutionDir)$(PlatformToolset)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)$(PlatformToolset)\$(Platform)\$(Configuration)\ + $(SolutionDir)$(PlatformToolset)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ + + + + Disabled + ..\..\..\osip\include;%(AdditionalIncludeDirectories) + ENABLE_TRACE;SYSTEM_LOGGER_ENABLED;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + $(IntDir)$(ProjectName)-vc80.pdb + Level3 + ProgramDatabase + + + $(OutDir)$(TargetName)$(TargetExt) + + + + + Disabled + ..\..\..\osip\include;%(AdditionalIncludeDirectories) + ENABLE_TRACE;SYSTEM_LOGGER_ENABLED;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + $(IntDir)$(ProjectName)-vc80.pdb + Level3 + ProgramDatabase + + + $(OutDir)$(TargetName)$(TargetExt) + + + + + ..\..\..\osip\include;%(AdditionalIncludeDirectories) + ENABLE_TRACE;SYSTEM_LOGGER_ENABLED;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + + + $(IntDir)$(ProjectName)-vc80.pdb + Level3 + + + + + $(OutDir)$(TargetName)$(TargetExt) + + + + + ..\..\..\osip\include;%(AdditionalIncludeDirectories) + ENABLE_TRACE;SYSTEM_LOGGER_ENABLED;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + + + $(IntDir)$(ProjectName)-vc80.pdb + Level3 + + + + + $(OutDir)$(TargetName)$(TargetExt) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -Nru libosip2-4.0.0/platform/vsnet/osip.sln libosip2-4.1.0/platform/vsnet/osip.sln --- libosip2-4.0.0/platform/vsnet/osip.sln 2012-07-17 10:36:07.000000000 +0000 +++ libosip2-4.1.0/platform/vsnet/osip.sln 2013-12-18 17:51:35.000000000 +0000 @@ -1,40 +1,35 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osip2", "osip2.vcproj", "{85255507-5D16-4218-85E2-F683BB2F04DA}" - ProjectSection(ProjectDependencies) = postProject - {44F46B7E-0E51-4304-9735-330DFBAB41E5} = {44F46B7E-0E51-4304-9735-330DFBAB41E5} - EndProjectSection +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Express 2012 for Windows Desktop +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osip2", "osip2.vcxproj", "{85255507-5D16-4218-85E2-F683BB2F04DA}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osipparser2", "osipparser2.vcproj", "{44F46B7E-0E51-4304-9735-330DFBAB41E5}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osipparser2", "osipparser2.vcxproj", "{44F46B7E-0E51-4304-9735-330DFBAB41E5}" EndProject Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Debug DLL = Debug DLL - Release = Release - Release DLL = Release DLL + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {85255507-5D16-4218-85E2-F683BB2F04DA}.Debug.ActiveCfg = Debug|Win32 - {85255507-5D16-4218-85E2-F683BB2F04DA}.Debug.Build.0 = Debug|Win32 - {85255507-5D16-4218-85E2-F683BB2F04DA}.Debug DLL.ActiveCfg = Debug DLL|Win32 - {85255507-5D16-4218-85E2-F683BB2F04DA}.Debug DLL.Build.0 = Debug DLL|Win32 - {85255507-5D16-4218-85E2-F683BB2F04DA}.Release.ActiveCfg = Release|Win32 - {85255507-5D16-4218-85E2-F683BB2F04DA}.Release.Build.0 = Release|Win32 - {85255507-5D16-4218-85E2-F683BB2F04DA}.Release DLL.ActiveCfg = Release DLL|Win32 - {85255507-5D16-4218-85E2-F683BB2F04DA}.Release DLL.Build.0 = Release DLL|Win32 - {44F46B7E-0E51-4304-9735-330DFBAB41E5}.Debug.ActiveCfg = Debug|Win32 - {44F46B7E-0E51-4304-9735-330DFBAB41E5}.Debug.Build.0 = Debug|Win32 - {44F46B7E-0E51-4304-9735-330DFBAB41E5}.Debug DLL.ActiveCfg = Debug DLL|Win32 - {44F46B7E-0E51-4304-9735-330DFBAB41E5}.Debug DLL.Build.0 = Debug DLL|Win32 - {44F46B7E-0E51-4304-9735-330DFBAB41E5}.Release.ActiveCfg = Release|Win32 - {44F46B7E-0E51-4304-9735-330DFBAB41E5}.Release.Build.0 = Release|Win32 - {44F46B7E-0E51-4304-9735-330DFBAB41E5}.Release DLL.ActiveCfg = Release DLL|Win32 - {44F46B7E-0E51-4304-9735-330DFBAB41E5}.Release DLL.Build.0 = Release DLL|Win32 + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {85255507-5D16-4218-85E2-F683BB2F04DA}.Debug|Win32.ActiveCfg = Debug|Win32 + {85255507-5D16-4218-85E2-F683BB2F04DA}.Debug|Win32.Build.0 = Debug|Win32 + {85255507-5D16-4218-85E2-F683BB2F04DA}.Debug|x64.ActiveCfg = Debug|x64 + {85255507-5D16-4218-85E2-F683BB2F04DA}.Debug|x64.Build.0 = Debug|x64 + {85255507-5D16-4218-85E2-F683BB2F04DA}.Release|Win32.ActiveCfg = Release|Win32 + {85255507-5D16-4218-85E2-F683BB2F04DA}.Release|Win32.Build.0 = Release|Win32 + {85255507-5D16-4218-85E2-F683BB2F04DA}.Release|x64.ActiveCfg = Release|x64 + {85255507-5D16-4218-85E2-F683BB2F04DA}.Release|x64.Build.0 = Release|x64 + {44F46B7E-0E51-4304-9735-330DFBAB41E5}.Debug|Win32.ActiveCfg = Debug|Win32 + {44F46B7E-0E51-4304-9735-330DFBAB41E5}.Debug|Win32.Build.0 = Debug|Win32 + {44F46B7E-0E51-4304-9735-330DFBAB41E5}.Debug|x64.ActiveCfg = Debug|x64 + {44F46B7E-0E51-4304-9735-330DFBAB41E5}.Debug|x64.Build.0 = Debug|x64 + {44F46B7E-0E51-4304-9735-330DFBAB41E5}.Release|Win32.ActiveCfg = Release|Win32 + {44F46B7E-0E51-4304-9735-330DFBAB41E5}.Release|Win32.Build.0 = Release|Win32 + {44F46B7E-0E51-4304-9735-330DFBAB41E5}.Release|x64.ActiveCfg = Release|x64 + {44F46B7E-0E51-4304-9735-330DFBAB41E5}.Release|x64.Build.0 = Release|x64 EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection EndGlobal diff -Nru libosip2-4.0.0/platform/wince/Makefile.am libosip2-4.1.0/platform/wince/Makefile.am --- libosip2-4.0.0/platform/wince/Makefile.am 2012-07-17 10:36:07.000000000 +0000 +++ libosip2-4.1.0/platform/wince/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -EXTRA_DIST = osip2.vcproj osipparser2.vcproj - diff -Nru libosip2-4.0.0/platform/wince/Makefile.in libosip2-4.1.0/platform/wince/Makefile.in --- libosip2-4.0.0/platform/wince/Makefile.in 2012-11-15 10:10:12.000000000 +0000 +++ libosip2-4.1.0/platform/wince/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,392 +0,0 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ - esac; \ - test $$am__dry = yes; \ - } -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = platform/wince -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/aclocal-include.m4 \ - $(top_srcdir)/scripts/acx_pthread.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/osip-config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -EXTRA_LIB = @EXTRA_LIB@ -FGREP = @FGREP@ -FSM_LIB = @FSM_LIB@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBOSIP_SO_VERSION = @LIBOSIP_SO_VERSION@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OSIP_VERSION = @OSIP_VERSION@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PARSER_LIB = @PARSER_LIB@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SIP_CFLAGS = @SIP_CFLAGS@ -SIP_EXTRA_FLAGS = @SIP_EXTRA_FLAGS@ -SIP_FSM_FLAGS = @SIP_FSM_FLAGS@ -SIP_PARSER_FLAGS = @SIP_PARSER_FLAGS@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -EXTRA_DIST = osip2.vcproj osipparser2.vcproj -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu platform/wince/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu platform/wince/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru libosip2-4.0.0/platform/wince/osip2.vcproj libosip2-4.1.0/platform/wince/osip2.vcproj --- libosip2-4.0.0/platform/wince/osip2.vcproj 2012-07-17 10:36:07.000000000 +0000 +++ libosip2-4.1.0/platform/wince/osip2.vcproj 1970-01-01 00:00:00.000000000 +0000 @@ -1,943 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libosip2-4.0.0/platform/wince/osipparser2.vcproj libosip2-4.1.0/platform/wince/osipparser2.vcproj --- libosip2-4.0.0/platform/wince/osipparser2.vcproj 2012-07-17 10:36:07.000000000 +0000 +++ libosip2-4.1.0/platform/wince/osipparser2.vcproj 1970-01-01 00:00:00.000000000 +0000 @@ -1,1111 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libosip2-4.0.0/scripts/Makefile.in libosip2-4.1.0/scripts/Makefile.in --- libosip2-4.0.0/scripts/Makefile.in 2012-11-15 10:10:12.000000000 +0000 +++ libosip2-4.1.0/scripts/Makefile.in 2013-12-18 17:51:52.000000000 +0000 @@ -56,7 +56,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/scripts/aclocal-include.m4 \ $(top_srcdir)/scripts/acx_pthread.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs diff -Nru libosip2-4.0.0/src/Makefile.in libosip2-4.1.0/src/Makefile.in --- libosip2-4.0.0/src/Makefile.in 2012-11-15 10:10:12.000000000 +0000 +++ libosip2-4.1.0/src/Makefile.in 2013-12-18 17:51:52.000000000 +0000 @@ -55,7 +55,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/scripts/aclocal-include.m4 \ $(top_srcdir)/scripts/acx_pthread.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs diff -Nru libosip2-4.0.0/src/osip2/ict.c libosip2-4.1.0/src/osip2/ict.c --- libosip2-4.0.0/src/osip2/ict.c 2012-11-16 21:24:10.000000000 +0000 +++ libosip2-4.1.0/src/osip2/ict.c 2013-12-18 18:36:46.000000000 +0000 @@ -144,7 +144,7 @@ { if (ict == NULL) return OSIP_SUCCESS; - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, "free ict ressource\n")); + OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, "free ict resource\n")); osip_free (ict->destination); osip_free (ict); diff -Nru libosip2-4.0.0/src/osip2/ist.c libosip2-4.1.0/src/osip2/ist.c --- libosip2-4.0.0/src/osip2/ist.c 2012-11-16 21:24:10.000000000 +0000 +++ libosip2-4.1.0/src/osip2/ist.c 2013-12-18 18:36:46.000000000 +0000 @@ -77,7 +77,7 @@ { if (ist == NULL) return OSIP_SUCCESS; - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, "free ist ressource\n")); + OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, "free ist resource\n")); osip_free (ist); return OSIP_SUCCESS; } diff -Nru libosip2-4.0.0/src/osip2/ist_fsm.c libosip2-4.1.0/src/osip2/ist_fsm.c --- libosip2-4.0.0/src/osip2/ist_fsm.c 2012-11-16 21:24:10.000000000 +0000 +++ libosip2-4.1.0/src/osip2/ist_fsm.c 2013-12-18 18:36:46.000000000 +0000 @@ -146,8 +146,8 @@ int i; ist->ist_context->timer_g_length = ist->ist_context->timer_g_length * 2; - if (ist->ist_context->timer_g_length > 4000) - ist->ist_context->timer_g_length = 4000; + if (ist->ist_context->timer_g_length > DEFAULT_T2) + ist->ist_context->timer_g_length = DEFAULT_T2; osip_gettimeofday (&ist->ist_context->timer_g_start, NULL); add_gettimeofday (&ist->ist_context->timer_g_start, ist->ist_context->timer_g_length); diff -Nru libosip2-4.0.0/src/osip2/Makefile.in libosip2-4.1.0/src/osip2/Makefile.in --- libosip2-4.0.0/src/osip2/Makefile.in 2012-11-15 10:10:12.000000000 +0000 +++ libosip2-4.1.0/src/osip2/Makefile.in 2013-12-18 17:51:52.000000000 +0000 @@ -57,7 +57,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/scripts/aclocal-include.m4 \ $(top_srcdir)/scripts/acx_pthread.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs diff -Nru libosip2-4.0.0/src/osip2/nict.c libosip2-4.1.0/src/osip2/nict.c --- libosip2-4.0.0/src/osip2/nict.c 2012-11-16 21:24:10.000000000 +0000 +++ libosip2-4.1.0/src/osip2/nict.c 2013-12-18 18:36:46.000000000 +0000 @@ -134,7 +134,7 @@ { if (nict == NULL) return OSIP_SUCCESS; - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, "free nict ressource\n")); + OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, "free nict resource\n")); osip_free (nict->destination); osip_free (nict); diff -Nru libosip2-4.0.0/src/osip2/nict_fsm.c libosip2-4.1.0/src/osip2/nict_fsm.c --- libosip2-4.0.0/src/osip2/nict_fsm.c 2012-11-16 21:24:10.000000000 +0000 +++ libosip2-4.1.0/src/osip2/nict_fsm.c 2013-12-18 18:36:46.000000000 +0000 @@ -183,11 +183,11 @@ /* reset timer */ if (nict->state == NICT_TRYING) { nict->nict_context->timer_e_length = nict->nict_context->timer_e_length * 2; - if (nict->nict_context->timer_e_length > 4000) - nict->nict_context->timer_e_length = 4000; + if (nict->nict_context->timer_e_length > DEFAULT_T2) + nict->nict_context->timer_e_length = DEFAULT_T2; } - else /* in PROCEEDING STATE, TIMER is always 4000 */ - nict->nict_context->timer_e_length = 4000; + else /* in PROCEEDING STATE, TIMER is always DEFAULT_T2 */ + nict->nict_context->timer_e_length = DEFAULT_T2; osip_gettimeofday (&nict->nict_context->timer_e_start, NULL); add_gettimeofday (&nict->nict_context->timer_e_start, nict->nict_context->timer_e_length); diff -Nru libosip2-4.0.0/src/osip2/nist.c libosip2-4.1.0/src/osip2/nist.c --- libosip2-4.0.0/src/osip2/nist.c 2012-11-16 21:24:10.000000000 +0000 +++ libosip2-4.1.0/src/osip2/nist.c 2013-12-18 18:36:46.000000000 +0000 @@ -70,7 +70,7 @@ { if (nist == NULL) return OSIP_SUCCESS; - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, "free nist ressource\n")); + OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, "free nist resource\n")); osip_free (nist); return OSIP_SUCCESS; diff -Nru libosip2-4.0.0/src/osip2/osip.c libosip2-4.1.0/src/osip2/osip.c --- libosip2-4.0.0/src/osip2/osip.c 2012-11-16 21:24:10.000000000 +0000 +++ libosip2-4.1.0/src/osip2/osip.c 2013-12-18 18:36:46.000000000 +0000 @@ -177,9 +177,12 @@ void osip_start_200ok_retransmissions (osip_t * osip, osip_dialog_t * dialog, osip_message_t * msg200ok, int sock) { + int i; ixt_t *ixt; - ixt_init (&ixt); + i = ixt_init (&ixt); + if (i != 0) + return; ixt->dialog = dialog; osip_message_clone (msg200ok, &ixt->msg2xx); ixt->sock = sock; @@ -251,8 +254,8 @@ { if (osip_timercmp (current, &ixt->start, >)) { ixt->interval = ixt->interval * 2; - if (ixt->interval > 4000) - ixt->interval = 4000; + if (ixt->interval > DEFAULT_T2) + ixt->interval = DEFAULT_T2; add_gettimeofday (&ixt->start, ixt->interval); if (ixt->ack != NULL) osip->cb_send_message (NULL, ixt->ack, ixt->dest, ixt->port, ixt->sock); diff -Nru libosip2-4.0.0/src/osip2/osip_dialog.c libosip2-4.1.0/src/osip2/osip_dialog.c --- libosip2-4.0.0/src/osip2/osip_dialog.c 2012-11-16 21:24:10.000000000 +0000 +++ libosip2-4.1.0/src/osip2/osip_dialog.c 2013-12-18 18:36:46.000000000 +0000 @@ -177,7 +177,10 @@ Personnaly, I would recommend to discard 1xx>=101 answers without To tags! Just my own feelings. */ - osip_call_id_to_str (answer->call_id, &tmp); + i = osip_call_id_to_str (answer->call_id, &tmp); + if (i != 0) + return i; + if (0 != strcmp (dlg->call_id, tmp)) { osip_free (tmp); return OSIP_UNDEFINED_ERROR; @@ -236,7 +239,9 @@ if (request == NULL || request->call_id == NULL || request->from == NULL || request->to == NULL) return OSIP_BADPARAMETER; - osip_call_id_to_str (request->call_id, &tmp); + i = osip_call_id_to_str (request->call_id, &tmp); + if (i != 0) + return i; if (0 != strcmp (dlg->call_id, tmp)) { osip_free (tmp); return OSIP_UNDEFINED_ERROR; diff -Nru libosip2-4.0.0/src/osip2/osip_time.c libosip2-4.1.0/src/osip2/osip_time.c --- libosip2-4.0.0/src/osip2/osip_time.c 2012-11-17 15:11:19.000000000 +0000 +++ libosip2-4.1.0/src/osip2/osip_time.c 2013-12-18 18:36:46.000000000 +0000 @@ -21,7 +21,7 @@ #include #include -#ifdef __MACH__ +#ifdef __APPLE__ #include #include #endif @@ -151,7 +151,7 @@ return 0; } -#elif defined(__MACH__) +#elif defined(__APPLE__) int osip_gettimeofday (struct timeval *tp, void *tz) diff -Nru libosip2-4.0.0/src/osip2/osip_transaction.c libosip2-4.1.0/src/osip2/osip_transaction.c --- libosip2-4.0.0/src/osip2/osip_transaction.c 2012-11-16 21:24:10.000000000 +0000 +++ libosip2-4.1.0/src/osip2/osip_transaction.c 2013-12-18 18:36:46.000000000 +0000 @@ -133,7 +133,7 @@ osip_id_mutex_lock (osip); (*transaction)->transactionid = osip->transactionid++; osip_id_mutex_unlock (osip); - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, "allocating transaction ressource %i %s\n", (*transaction)->transactionid, request->call_id->number)); + OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, "allocating transaction resource %i %s\n", (*transaction)->transactionid, request->call_id->number)); /* those lines must be called before "osip_transaction_free" */ (*transaction)->ctx_type = ctx_type; @@ -243,7 +243,7 @@ when a transaction goes in the TERMINATED STATE. However the user might want to just take the context out of the SIP stack andf keep it for future use without freeing - all ressource.... This way the transaction context can be + all resource.... This way the transaction context can be kept without being used by the oSIP stack. new methods that replace this one: @@ -278,7 +278,7 @@ if (transaction == NULL) return OSIP_BADPARAMETER; if (transaction->orig_request != NULL && transaction->orig_request->call_id != NULL && transaction->orig_request->call_id->number != NULL) { - OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, "free transaction ressource %i %s\n", transaction->transactionid, transaction->orig_request->call_id->number)); + OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO2, NULL, "free transaction resource %i %s\n", transaction->transactionid, transaction->orig_request->call_id->number)); } if (transaction->ctx_type == ICT) { __osip_ict_free (transaction->ict_context); @@ -762,7 +762,9 @@ } } else { - if (0 != osip_to_tag_match (tr->to, request->to)) + if (tr->orig_request == NULL || tr->orig_request->to == NULL) + return OSIP_UNDEFINED_ERROR; + if (0 != osip_to_tag_match (tr->orig_request->to, request->to)) return OSIP_UNDEFINED_ERROR; } if (0 != osip_from_tag_match (tr->from, request->from)) diff -Nru libosip2-4.0.0/src/osip2/port_condv.c libosip2-4.1.0/src/osip2/port_condv.c --- libosip2-4.0.0/src/osip2/port_condv.c 2012-11-16 21:24:10.000000000 +0000 +++ libosip2-4.1.0/src/osip2/port_condv.c 2013-12-18 18:36:46.000000000 +0000 @@ -238,7 +238,7 @@ if (i != 0) return i; - dwRet = WaitForSingleObject (sem, timeout_ms); + dwRet = WaitForSingleObjectEx (sem, timeout_ms, FALSE); i = osip_mutex_lock (_mut); if (i != 0) diff -Nru libosip2-4.0.0/src/osip2/port_sema.c libosip2-4.1.0/src/osip2/port_sema.c --- libosip2-4.0.0/src/osip2/port_sema.c 2012-11-16 21:24:10.000000000 +0000 +++ libosip2-4.1.0/src/osip2/port_sema.c 2013-12-18 18:36:46.000000000 +0000 @@ -236,6 +236,7 @@ if (semaphore_create (task, &sem->semid, policy, value) == KERN_SUCCESS) return (struct osip_sem *) sem; + osip_free (sem); return NULL; } @@ -247,8 +248,10 @@ if (sem == NULL) return OSIP_SUCCESS; - if (semaphore_destroy (task, sem->semid) == KERN_SUCCESS) + if (semaphore_destroy (task, sem->semid) == KERN_SUCCESS) { + osip_free (sem); return OSIP_SUCCESS; + } osip_free (sem); return OSIP_SUCCESS; @@ -495,8 +498,14 @@ if (mut == NULL) return NULL; +#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP) + if (InitializeCriticalSectionEx (&mut->h, OSIP_CRITICALSECTION_SPIN, CRITICAL_SECTION_NO_DEBUG_INFO) != 0) { + return (struct osip_mutex *) (mut); + } +#else if (InitializeCriticalSectionAndSpinCount (&mut->h, OSIP_CRITICALSECTION_SPIN) != 0) return (struct osip_mutex *) (mut); +#endif osip_free (mut); return (NULL); } @@ -593,8 +602,13 @@ if (sem == NULL) return NULL; +#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP) + if ((sem->h = CreateSemaphoreExW (NULL, value, LONG_MAX, NULL, 0, (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | SEMAPHORE_MODIFY_STATE))) != NULL) + return (struct osip_sem *) (sem); +#else if ((sem->h = CreateSemaphore (NULL, value, LONG_MAX, NULL)) != NULL) return (struct osip_sem *) (sem); +#endif osip_free (sem); return (NULL); } @@ -630,7 +644,7 @@ if (sem == NULL) return OSIP_BADPARAMETER; - if ((err = WaitForSingleObject (sem->h, INFINITE)) == WAIT_OBJECT_0) + if ((err = WaitForSingleObjectEx (sem->h, INFINITE, FALSE)) == WAIT_OBJECT_0) return (0); if (err == WAIT_TIMEOUT) return (-1); @@ -645,7 +659,7 @@ if (sem == NULL) return OSIP_BADPARAMETER; - if ((err = WaitForSingleObject (sem->h, 0)) == WAIT_OBJECT_0) + if ((err = WaitForSingleObjectEx (sem->h, 0, FALSE)) == WAIT_OBJECT_0) return (0); return (-1); } diff -Nru libosip2-4.0.0/src/osip2/port_thread.c libosip2-4.1.0/src/osip2/port_thread.c --- libosip2-4.0.0/src/osip2/port_thread.c 2012-11-16 21:24:10.000000000 +0000 +++ libosip2-4.1.0/src/osip2/port_thread.c 2013-12-18 18:36:46.000000000 +0000 @@ -91,6 +91,54 @@ #if (defined(WIN32) || defined(_WIN32_WCE)) && !defined(HAVE_PTHREAD_WIN32) +#if defined(HAVE_CPP11_THREAD) +#include +#include + +struct osip_thread * +osip_thread_create (int stacksize, void *(*func) (void *), void *arg) +{ + osip_thread_t *thread = (osip_thread_t *) osip_malloc (sizeof (osip_thread_t)); + + if (thread == NULL) + return NULL; + thread->h = new std::thread (func, arg); + if (thread->h == 0) { + osip_free (thread); + return NULL; + } + return (struct osip_thread *) thread; +} + +int +osip_thread_join (struct osip_thread *_thread) +{ + osip_thread_t *thread = (osip_thread_t *) _thread; + + std::thread * th; + if (thread == NULL) + return OSIP_BADPARAMETER; + th = (std::thread *) thread->h; + th->join (); + delete th; + + thread->h = NULL; + return (0); +} + +void +osip_thread_exit () +{ +} + +int +osip_thread_set_priority (struct osip_thread *thread, int priority) +{ + return OSIP_SUCCESS; +} + +#else + struct osip_thread * osip_thread_create (int stacksize, void *(*func) (void *), void *arg) { @@ -141,6 +189,7 @@ return OSIP_SUCCESS; } +#endif #endif diff -Nru libosip2-4.0.0/src/osipparser2/Makefile.in libosip2-4.1.0/src/osipparser2/Makefile.in --- libosip2-4.0.0/src/osipparser2/Makefile.in 2012-11-15 10:10:12.000000000 +0000 +++ libosip2-4.1.0/src/osipparser2/Makefile.in 2013-12-18 17:51:52.000000000 +0000 @@ -64,7 +64,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/scripts/aclocal-include.m4 \ $(top_srcdir)/scripts/acx_pthread.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs diff -Nru libosip2-4.0.0/src/osipparser2/osip_authorization.c libosip2-4.1.0/src/osipparser2/osip_authorization.c --- libosip2-4.0.0/src/osipparser2/osip_authorization.c 2012-11-16 21:24:10.000000000 +0000 +++ libosip2-4.1.0/src/osipparser2/osip_authorization.c 2013-12-18 18:36:46.000000000 +0000 @@ -554,7 +554,7 @@ */ i = osip_authorization_init (&au); - if (i == -1) /* allocation failed */ + if (i != 0) /* allocation failed */ return i; if (auth->auth_type != NULL) { au->auth_type = osip_strdup (auth->auth_type); diff -Nru libosip2-4.0.0/src/osipparser2/osip_content_type.c libosip2-4.1.0/src/osipparser2/osip_content_type.c --- libosip2-4.0.0/src/osipparser2/osip_content_type.c 2012-11-16 21:24:10.000000000 +0000 +++ libosip2-4.1.0/src/osipparser2/osip_content_type.c 2013-12-18 18:36:46.000000000 +0000 @@ -244,7 +244,6 @@ i = osip_generic_param_clone (u_param, &dest_param); if (i != 0) { osip_content_type_free (ct); - //osip_free(ct); return i; } osip_list_add (&ct->gen_params, dest_param, -1); diff -Nru libosip2-4.0.0/src/osipparser2/osip_from.c libosip2-4.1.0/src/osipparser2/osip_from.c --- libosip2-4.0.0/src/osipparser2/osip_from.c 2012-11-16 21:24:10.000000000 +0000 +++ libosip2-4.1.0/src/osipparser2/osip_from.c 2013-12-18 18:36:46.000000000 +0000 @@ -466,6 +466,7 @@ int __osip_generic_param_parseall (osip_list_t * gen_params, const char *params) { + int i; char *pname; char *pvalue; @@ -513,7 +514,12 @@ } osip_strncpy (pname, params + 1, equal - params - 1); - osip_generic_param_add (gen_params, pname, pvalue); + i = osip_generic_param_add (gen_params, pname, pvalue); + if (i != OSIP_SUCCESS) { + osip_free (pname); + osip_free (pvalue); + return OSIP_NOMEM; + } params = comma; equal = next_separator (params + 1, '=', ';'); @@ -560,7 +566,12 @@ } osip_strncpy (pname, params + 1, equal - params - 1); - osip_generic_param_add (gen_params, pname, pvalue); + i = osip_generic_param_add (gen_params, pname, pvalue); + if (i != OSIP_SUCCESS) { + osip_free (pname); + osip_free (pvalue); + return OSIP_NOMEM; + } return OSIP_SUCCESS; } diff -Nru libosip2-4.0.0/src/osipparser2/osip_message_parse.c libosip2-4.1.0/src/osipparser2/osip_message_parse.c --- libosip2-4.0.0/src/osipparser2/osip_message_parse.c 2012-11-16 21:24:10.000000000 +0000 +++ libosip2-4.1.0/src/osipparser2/osip_message_parse.c 2013-12-18 18:36:46.000000000 +0000 @@ -111,7 +111,7 @@ dest->req_uri = NULL; return OSIP_SYNTAXERROR; } - if (*hp != 'S' || *(hp + 1) != 'I' || *(hp + 2) != 'P' || *(hp + 3) != '/') { + if (((hp[0] != 'S') && (hp[0] != 's')) || ((hp[1] != 'I') && (hp[1] != 'i')) || ((hp[2] != 'P') && (hp[2] != 'p')) || (hp[3] != '/')) { OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, "No crlf found/No SIP/2.0 found\n")); osip_free (dest->sip_method); dest->sip_method = NULL; diff -Nru libosip2-4.0.0/src/osipparser2/osip_message_to_str.c libosip2-4.1.0/src/osipparser2/osip_message_to_str.c --- libosip2-4.0.0/src/osipparser2/osip_message_to_str.c 2012-11-16 21:24:10.000000000 +0000 +++ libosip2-4.1.0/src/osipparser2/osip_message_to_str.c 2013-12-18 18:36:46.000000000 +0000 @@ -29,9 +29,6 @@ static int strcat_simple_header (char **_string, size_t * malloc_size, char **_message, void *ptr_header, char *header_name, size_t size_of_header, int (*xxx_to_str) (void *, char **), char **next); static int strcat_headers_one_per_line (char **_string, size_t * malloc_size, char **_message, osip_list_t * headers, char *header, size_t size_of_header, int (*xxx_to_str) (void *, char **), char **next); -#if 0 -static int strcat_headers_all_on_one_line (char **_string, size_t * malloc_size, char **_message, osip_list_t * headers, char *header, size_t size_of_header, int (*xxx_to_str) (void *, char **), char **next); -#endif static int __osip_message_startline_to_strreq (osip_message_t * sip, char **dest) @@ -174,10 +171,12 @@ *malloc_size = message - string + size_of_header + 100; string = osip_realloc (string, *malloc_size); if (string == NULL) { + osip_free (*_string); /* pointer for string */ *_string = NULL; *_message = NULL; return OSIP_NOMEM; } + *_string = string; message = string + size; } message = osip_strn_append (message, header_name, size_of_header); @@ -195,10 +194,12 @@ *malloc_size = message - string + strlen (tmp) + 100; string = osip_realloc (string, *malloc_size); if (string == NULL) { + osip_free (*_string); /* pointer for string */ *_string = NULL; *_message = NULL; return OSIP_NOMEM; } + *_string = string; message = string + size; } @@ -237,10 +238,12 @@ *malloc_size = message - string + size_of_header + 100; string = osip_realloc (string, *malloc_size); if (string == NULL) { + osip_free (*_string); /* pointer for string */ *_string = NULL; *_message = NULL; return OSIP_NOMEM; } + *_string = string; message = string + size; } osip_strncpy (message, header, size_of_header); @@ -259,10 +262,12 @@ *malloc_size = message - string + strlen (tmp) + 100; string = osip_realloc (string, *malloc_size); if (string == NULL) { + osip_free (*_string); /* pointer for string */ *_string = NULL; *_message = NULL; return OSIP_NOMEM; } + *_string = string; message = string + size; } message = osip_str_append (message, tmp); @@ -276,78 +281,6 @@ return OSIP_SUCCESS; } -#if 0 -static int -strcat_headers_all_on_one_line (char **_string, size_t * malloc_size, char **_message, osip_list_t * headers, char *header, size_t size_of_header, int (*xxx_to_str) (void *, char **), char **next) -{ - char *string; - char *message; - char *tmp; - int pos = 0; - int i; - - string = *_string; - message = *_message; - - pos = 0; - while (!osip_list_eol (headers, pos)) { - if (*malloc_size < message - string + 100 + size_of_header) - /* take some memory avoid to osip_realloc too much often */ - { /* should not happen often */ - size_t size = message - string; - - *malloc_size = message - string + size_of_header + 100; - string = osip_realloc (string, *malloc_size); - if (string == NULL) { - *_string = NULL; - *_message = NULL; - return OSIP_NOMEM; - } - message = string + size; - } - message = osip_strn_append (message, header, size_of_header); - - while (!osip_list_eol (headers, pos)) { - void *elt; - - elt = (void *) osip_list_get (headers, pos); - i = xxx_to_str (elt, &tmp); - if (i != 0) { - *_string = string; - *_message = message; - *next = NULL; - return i; - } - if (*malloc_size < message - string + strlen (tmp) + 100) { - size_t size = message - string; - - *malloc_size = message - string + (int) strlen (tmp) + 100; - string = osip_realloc (string, *malloc_size); - if (string == NULL) { - *_string = NULL; - *_message = NULL; - return OSIP_NOMEM; - } - message = string + size; - } - - message = osip_str_append (message, tmp); - osip_free (tmp); - - pos++; - if (!osip_list_eol (headers, pos)) { - message = osip_strn_append (message, ", ", 2); - } - } - message = osip_strn_append (message, CRLF, 2); - } - *_string = string; - *_message = message; - *next = message; - return OSIP_SUCCESS; -} -#endif - /* return values: 1: structure and buffer "message" are identical. 2: buffer "message" is not up to date with the structure info (call osip_message_to_str to update it). diff -Nru libosip2-4.0.0/src/osipparser2/osip_port.c libosip2-4.1.0/src/osipparser2/osip_port.c --- libosip2-4.0.0/src/osipparser2/osip_port.c 2012-11-16 21:24:10.000000000 +0000 +++ libosip2-4.1.0/src/osipparser2/osip_port.c 2013-12-18 18:36:46.000000000 +0000 @@ -79,11 +79,23 @@ #include #elif defined(WIN32) #include +#if (_MSC_VER >= 1700) && !defined(_USING_V110_SDK71_) +#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP) +#include +#elif defined(WINAPI_FAMILY) && WINAPI_FAMILY_ONE_PARTITION( WINAPI_FAMILY, WINAPI_PARTITION_APP ) +#else +#ifdef WIN32_USE_CRYPTO +#include +#endif +#endif +#else #ifdef WIN32_USE_CRYPTO #include #endif #endif +#endif + #if defined (__rtems__) #include #endif @@ -302,7 +314,6 @@ srand (ticks); random_seed_set = 1; } - err = CryptAcquireContext (&crypto, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); if (err) { err = CryptGenRandom (crypto, sizeof (num), (BYTE *) & num); @@ -367,24 +378,13 @@ #endif -/* append string_osip_to_append to string at position cur - size is the current allocated size of the element -*/ -char * -__osip_sdp_append_string (char *string, size_t size, char *cur, char *string_osip_to_append) -{ - size_t length = strlen (string_osip_to_append); - - if (cur - string + length > size) { - size_t length2; - - length2 = cur - string; - string = osip_realloc (string, size + length + 10); - cur = string + length2; /* the initial allocation may have changed! */ - } - osip_strncpy (cur, string_osip_to_append, length); - return cur + strlen (cur); -} +#if (_MSC_VER >= 1700) && !defined(_USING_V110_SDK71_) +#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP) +#define HAVE_WINDOWSPHONE_API +#elif defined(WINAPI_FAMILY) && WINAPI_FAMILY_ONE_PARTITION( WINAPI_FAMILY, WINAPI_PARTITION_APP ) +#define HAVE_WINAPPSTORE_API +#endif +#endif void osip_usleep (int useconds) @@ -400,6 +400,22 @@ while (stoptime > TimGetTicks ()) /* I wish there was some type of yield function here */ ; +#elif defined(HAVE_WINDOWSPHONE_API) + struct timeval delay; + int sec; + + sec = (int) useconds / 1000000; + if (sec > 0) { + delay.tv_sec = sec; + delay.tv_usec = 0; + } + else { + delay.tv_sec = 0; + delay.tv_usec = useconds; + } + select (0, 0, 0, 0, &delay); +#elif defined(HAVE_WINAPPSTORE_API) + TODO #elif defined(WIN32) Sleep (useconds / 1000); #elif defined(__rtems__) @@ -771,9 +787,10 @@ { } -void +int osip_trace_initialize (osip_trace_level_t level, FILE * file) { + return OSIP_UNDEFINED_ERROR; } void @@ -796,7 +813,7 @@ /* initialize log */ /* all lower levels of level are logged in file. */ -void +int osip_trace_initialize (osip_trace_level_t level, FILE * file) { osip_trace_level_t i = TRACE_LEVEL0; @@ -818,6 +835,7 @@ tracing_table[i] = LOG_FALSE; i++; } + return 0; } void @@ -917,8 +935,12 @@ #endif #ifndef MAX_LENGTH_TR +#ifdef SYSTEM_LOGGER_ENABLED +#define MAX_LENGTH_TR 2024 /* NEVER DEFINE MORE THAN 2024 */ +#else #define MAX_LENGTH_TR 512 /* NEVER DEFINE MORE THAN 2024 */ #endif +#endif int osip_trace (char *filename_long, int li, osip_trace_level_t level, FILE * f, char *chfr, ...) @@ -1137,8 +1159,11 @@ #ifdef UNICODE { WCHAR wUnicode[MAX_LENGTH_TR * 2]; + int size; - MultiByteToWideChar (CP_UTF8, 0, buffer, -1, wUnicode, MAX_LENGTH_TR * 2); + size = MultiByteToWideChar (CP_UTF8, 0, buffer, -1, wUnicode, MAX_LENGTH_TR * 2); + wUnicode[size - 2] = '\n'; + wUnicode[size - 1] = '\0'; OutputDebugString (wUnicode); } #else diff -Nru libosip2-4.0.0/src/osipparser2/osip_uri.c libosip2-4.1.0/src/osipparser2/osip_uri.c --- libosip2-4.0.0/src/osipparser2/osip_uri.c 2012-11-16 21:24:10.000000000 +0000 +++ libosip2-4.1.0/src/osipparser2/osip_uri.c 2013-12-18 18:36:46.000000000 +0000 @@ -338,6 +338,7 @@ int osip_uri_parse_headers (osip_uri_t * url, const char *headers) { + int i; char *and; char *equal; @@ -387,7 +388,12 @@ __osip_uri_unescape (hvalue); } - osip_uri_uheader_add (url, hname, hvalue); + i = osip_uri_uheader_add (url, hname, hvalue); + if (i != OSIP_SUCCESS) { + osip_free (hname); + osip_free (hvalue); + return i; + } if (and == NULL) /* we just set the last header */ equal = NULL; @@ -407,6 +413,7 @@ int osip_uri_parse_params (osip_uri_t * url, const char *params) { + int i; char *pname; char *pvalue; @@ -446,7 +453,12 @@ osip_strncpy (pname, params + 1, equal - params - 1); __osip_uri_unescape (pname); - osip_uri_uparam_add (url, pname, pvalue); + i = osip_uri_uparam_add (url, pname, pvalue); + if (i != OSIP_SUCCESS) { + osip_free (pname); + osip_free (pvalue); + return OSIP_NOMEM; + } params = comma; equal = next_separator (params + 1, '=', ';'); @@ -482,7 +494,12 @@ osip_strncpy (pname, params + 1, equal - params - 1); __osip_uri_unescape (pname); - osip_uri_uparam_add (url, pname, pvalue); + i = osip_uri_uparam_add (url, pname, pvalue); + if (i != OSIP_SUCCESS) { + osip_free (pname); + osip_free (pvalue); + return OSIP_NOMEM; + } return OSIP_SUCCESS; } @@ -516,7 +533,6 @@ sprintf (buf, "%s:", scheme); buf = buf + strlen (scheme) + 1; sprintf (buf, "%s", url->string); - buf = buf + strlen (url->string); return OSIP_SUCCESS; } @@ -539,6 +555,11 @@ if (url->username != NULL) { char *tmp2 = __osip_uri_escape_userinfo (url->username); + if (tmp2 == NULL) { + osip_free (buf); + return OSIP_NOMEM; + } + sprintf (tmp, "%s", tmp2); osip_free (tmp2); tmp = tmp + strlen (tmp); @@ -546,6 +567,11 @@ if ((url->password != NULL) && (url->username != NULL)) { /* be sure that when a password is given, a username is also given */ char *tmp2 = __osip_uri_escape_password (url->password); + if (tmp2 == NULL) { + osip_free (buf); + return OSIP_NOMEM; + } + sprintf (tmp, ":%s", tmp2); osip_free (tmp2); tmp = tmp + strlen (tmp); @@ -574,18 +600,35 @@ while (!osip_list_eol (&url->url_params, pos)) { char *tmp1; char *tmp2 = NULL; + char *previous_buf; u_param = (osip_uri_param_t *) osip_list_get (&url->url_params, pos); tmp1 = __osip_uri_escape_uri_param (u_param->gname); + if (tmp1 == NULL) { + osip_free (buf); + return OSIP_SYNTAXERROR; + } if (u_param->gvalue == NULL) plen = strlen (tmp1) + 2; else { tmp2 = __osip_uri_escape_uri_param (u_param->gvalue); + if (tmp2 == NULL) { + osip_free (tmp1); + osip_free (buf); + return OSIP_SYNTAXERROR; + } plen = strlen (tmp1) + strlen (tmp2) + 3; } len = len + plen; + previous_buf = buf; buf = (char *) osip_realloc (buf, len); + if (buf == NULL) { + osip_free (previous_buf); + osip_free (tmp1); + osip_free (tmp2); + return OSIP_NOMEM; + } tmp = buf; tmp = tmp + strlen (tmp); if (u_param->gvalue == NULL) @@ -606,6 +649,7 @@ while (!osip_list_eol (&url->url_headers, pos)) { char *tmp1; char *tmp2; + char *previous_buf; u_header = (osip_uri_header_t *) osip_list_get (&url->url_headers, pos); tmp1 = __osip_uri_escape_header_param (u_header->gname); @@ -625,7 +669,14 @@ plen = strlen (tmp1) + strlen (tmp2) + 4; len = len + plen; + previous_buf = buf; buf = (char *) osip_realloc (buf, len); + if (buf == NULL) { + osip_free (previous_buf); + osip_free (tmp1); + osip_free (tmp2); + return OSIP_NOMEM; + } tmp = buf; tmp = tmp + strlen (tmp); if (pos == 0) @@ -875,10 +926,15 @@ /* encode it */ newlen += 2; /* the size grows with two, since this'll become a %XX */ if (newlen > alloc) { + char *previous_ns; + alloc *= 2; + previous_ns = ns; ns = osip_realloc (ns, alloc); - if (!ns) + if (!ns) { + osip_free (previous_ns); return NULL; + } } sprintf (&ns[index], "%%%02X", in); index += 3; diff -Nru libosip2-4.0.0/src/osipparser2/sdp_accessor.c libosip2-4.1.0/src/osipparser2/sdp_accessor.c --- libosip2-4.0.0/src/osipparser2/sdp_accessor.c 2012-11-16 21:24:10.000000000 +0000 +++ libosip2-4.1.0/src/osipparser2/sdp_accessor.c 2013-12-18 18:36:46.000000000 +0000 @@ -454,12 +454,15 @@ { sdp_key_t *key; sdp_media_t *med; + int i; if (sdp == NULL) return OSIP_BADPARAMETER; if ((pos_media != -1) && (osip_list_size (&sdp->m_medias) < pos_media + 1)) return OSIP_UNDEFINED_ERROR; - sdp_key_init (&key); + i = sdp_key_init (&key); + if (i != 0) + return i; key->k_keytype = keytype; key->k_keydata = keydata; if (pos_media == -1) { diff -Nru libosip2-4.0.0/src/osipparser2/sdp_message.c libosip2-4.1.0/src/osipparser2/sdp_message.c --- libosip2-4.0.0/src/osipparser2/sdp_message.c 2012-11-16 21:24:10.000000000 +0000 +++ libosip2-4.1.0/src/osipparser2/sdp_message.c 2013-12-18 18:36:46.000000000 +0000 @@ -44,12 +44,14 @@ static int sdp_message_parse_a (sdp_message_t * sdp, char *buf, char **next); static int sdp_message_parse_m (sdp_message_t * sdp, char *buf, char **next); -static int sdp_append_media (char *string, int size, char *tmp, sdp_media_t * media, char **next_tmp); -static int sdp_append_attribute (char *string, int size, char *tmp, sdp_attribute_t * attribute, char **next_tmp); -static int sdp_append_key (char *string, int size, char *tmp, sdp_key_t * key, char **next_tmp); -static int sdp_append_time_descr (char *string, int size, char *tmp, sdp_time_descr_t * time_descr, char **next_tmp); -static int sdp_append_bandwidth (char *string, int size, char *tmp, sdp_bandwidth_t * bandwidth, char **next_tmp); -static int sdp_append_connection (char *string, int size, char *tmp, sdp_connection_t * conn, char **next_tmp); +static int sdp_append_media (char **string, int *size, char *tmp, sdp_media_t * media, char **next_tmp); +static int sdp_append_attribute (char **string, int *size, char *tmp, sdp_attribute_t * attribute, char **next_tmp); +static int sdp_append_key (char **string, int *size, char *tmp, sdp_key_t * key, char **next_tmp); +static int sdp_append_time_descr (char **string, int *size, char *tmp, sdp_time_descr_t * time_descr, char **next_tmp); +static int sdp_append_bandwidth (char **string, int *size, char *tmp, sdp_bandwidth_t * bandwidth, char **next_tmp); +static int sdp_append_connection (char **string, int *size, char *tmp, sdp_connection_t * conn, char **next_tmp); + +static char *__osip_sdp_append_string (char **string, int *size, char *cur, char *string_osip_to_append); int sdp_bandwidth_init (sdp_bandwidth_t ** b) @@ -315,6 +317,26 @@ return OSIP_SUCCESS; } +/* append string_osip_to_append to string at position cur + size is the current allocated size of the element +*/ +static char * +__osip_sdp_append_string (char **string, int *size, char *cur, char *string_osip_to_append) +{ + int length = (int) strlen (string_osip_to_append); + + if (cur - (*string) + length > *size) { + int length2; + + length2 = (int) (cur - *string); + (*string) = osip_realloc ((*string), *size + length + 10); + *size = *size + length + 10; + cur = (*string) + length2; /* the initial allocation may have changed! */ + } + osip_strncpy (cur, string_osip_to_append, length); + return cur + strlen (cur); +} + static int sdp_message_parse_v (sdp_message_t * sdp, char *buf, char **next) { @@ -1615,7 +1637,7 @@ } static int -sdp_append_connection (char *string, int size, char *tmp, sdp_connection_t * conn, char **next_tmp) +sdp_append_connection (char **string, int *size, char *tmp, sdp_connection_t * conn, char **next_tmp) { if (conn->c_nettype == NULL) return -1; @@ -1644,7 +1666,7 @@ } static int -sdp_append_bandwidth (char *string, int size, char *tmp, sdp_bandwidth_t * bandwidth, char **next_tmp) +sdp_append_bandwidth (char **string, int *size, char *tmp, sdp_bandwidth_t * bandwidth, char **next_tmp) { if (bandwidth->b_bwtype == NULL) return -1; @@ -1662,7 +1684,7 @@ } static int -sdp_append_time_descr (char *string, int size, char *tmp, sdp_time_descr_t * time_descr, char **next_tmp) +sdp_append_time_descr (char **string, int *size, char *tmp, sdp_time_descr_t * time_descr, char **next_tmp) { int pos; @@ -1694,7 +1716,7 @@ } static int -sdp_append_key (char *string, int size, char *tmp, sdp_key_t * key, char **next_tmp) +sdp_append_key (char **string, int *size, char *tmp, sdp_key_t * key, char **next_tmp) { if (key->k_keytype == NULL) return -1; @@ -1711,7 +1733,7 @@ } static int -sdp_append_attribute (char *string, int size, char *tmp, sdp_attribute_t * attribute, char **next_tmp) +sdp_append_attribute (char **string, int *size, char *tmp, sdp_attribute_t * attribute, char **next_tmp) { if (attribute->a_att_field == NULL) return -1; @@ -1730,7 +1752,7 @@ /* internal facility */ static int -sdp_append_media (char *string, int size, char *tmp, sdp_media_t * media, char **next_tmp) +sdp_append_media (char **string, int *size, char *tmp, sdp_media_t * media, char **next_tmp) { int pos; @@ -1847,60 +1869,60 @@ return OSIP_NOMEM; string = tmp; - tmp = __osip_sdp_append_string (string, size, tmp, "v="); - tmp = __osip_sdp_append_string (string, size, tmp, sdp->v_version); - tmp = __osip_sdp_append_string (string, size, tmp, CRLF); - tmp = __osip_sdp_append_string (string, size, tmp, "o="); - tmp = __osip_sdp_append_string (string, size, tmp, sdp->o_username); - tmp = __osip_sdp_append_string (string, size, tmp, " "); - tmp = __osip_sdp_append_string (string, size, tmp, sdp->o_sess_id); - tmp = __osip_sdp_append_string (string, size, tmp, " "); - tmp = __osip_sdp_append_string (string, size, tmp, sdp->o_sess_version); - tmp = __osip_sdp_append_string (string, size, tmp, " "); - tmp = __osip_sdp_append_string (string, size, tmp, sdp->o_nettype); - tmp = __osip_sdp_append_string (string, size, tmp, " "); - tmp = __osip_sdp_append_string (string, size, tmp, sdp->o_addrtype); - tmp = __osip_sdp_append_string (string, size, tmp, " "); - tmp = __osip_sdp_append_string (string, size, tmp, sdp->o_addr); - tmp = __osip_sdp_append_string (string, size, tmp, CRLF); + tmp = __osip_sdp_append_string (&string, &size, tmp, "v="); + tmp = __osip_sdp_append_string (&string, &size, tmp, sdp->v_version); + tmp = __osip_sdp_append_string (&string, &size, tmp, CRLF); + tmp = __osip_sdp_append_string (&string, &size, tmp, "o="); + tmp = __osip_sdp_append_string (&string, &size, tmp, sdp->o_username); + tmp = __osip_sdp_append_string (&string, &size, tmp, " "); + tmp = __osip_sdp_append_string (&string, &size, tmp, sdp->o_sess_id); + tmp = __osip_sdp_append_string (&string, &size, tmp, " "); + tmp = __osip_sdp_append_string (&string, &size, tmp, sdp->o_sess_version); + tmp = __osip_sdp_append_string (&string, &size, tmp, " "); + tmp = __osip_sdp_append_string (&string, &size, tmp, sdp->o_nettype); + tmp = __osip_sdp_append_string (&string, &size, tmp, " "); + tmp = __osip_sdp_append_string (&string, &size, tmp, sdp->o_addrtype); + tmp = __osip_sdp_append_string (&string, &size, tmp, " "); + tmp = __osip_sdp_append_string (&string, &size, tmp, sdp->o_addr); + tmp = __osip_sdp_append_string (&string, &size, tmp, CRLF); if (sdp->s_name != NULL) { - tmp = __osip_sdp_append_string (string, size, tmp, "s="); - tmp = __osip_sdp_append_string (string, size, tmp, sdp->s_name); - tmp = __osip_sdp_append_string (string, size, tmp, CRLF); + tmp = __osip_sdp_append_string (&string, &size, tmp, "s="); + tmp = __osip_sdp_append_string (&string, &size, tmp, sdp->s_name); + tmp = __osip_sdp_append_string (&string, &size, tmp, CRLF); } if (sdp->i_info != NULL) { - tmp = __osip_sdp_append_string (string, size, tmp, "i="); - tmp = __osip_sdp_append_string (string, size, tmp, sdp->i_info); - tmp = __osip_sdp_append_string (string, size, tmp, CRLF); + tmp = __osip_sdp_append_string (&string, &size, tmp, "i="); + tmp = __osip_sdp_append_string (&string, &size, tmp, sdp->i_info); + tmp = __osip_sdp_append_string (&string, &size, tmp, CRLF); } if (sdp->u_uri != NULL) { - tmp = __osip_sdp_append_string (string, size, tmp, "u="); - tmp = __osip_sdp_append_string (string, size, tmp, sdp->u_uri); - tmp = __osip_sdp_append_string (string, size, tmp, CRLF); + tmp = __osip_sdp_append_string (&string, &size, tmp, "u="); + tmp = __osip_sdp_append_string (&string, &size, tmp, sdp->u_uri); + tmp = __osip_sdp_append_string (&string, &size, tmp, CRLF); } pos = 0; while (!osip_list_eol (&sdp->e_emails, pos)) { char *email = (char *) osip_list_get (&sdp->e_emails, pos); - tmp = __osip_sdp_append_string (string, size, tmp, "e="); - tmp = __osip_sdp_append_string (string, size, tmp, email); - tmp = __osip_sdp_append_string (string, size, tmp, CRLF); + tmp = __osip_sdp_append_string (&string, &size, tmp, "e="); + tmp = __osip_sdp_append_string (&string, &size, tmp, email); + tmp = __osip_sdp_append_string (&string, &size, tmp, CRLF); pos++; } pos = 0; while (!osip_list_eol (&sdp->p_phones, pos)) { char *phone = (char *) osip_list_get (&sdp->p_phones, pos); - tmp = __osip_sdp_append_string (string, size, tmp, "p="); - tmp = __osip_sdp_append_string (string, size, tmp, phone); - tmp = __osip_sdp_append_string (string, size, tmp, CRLF); + tmp = __osip_sdp_append_string (&string, &size, tmp, "p="); + tmp = __osip_sdp_append_string (&string, &size, tmp, phone); + tmp = __osip_sdp_append_string (&string, &size, tmp, CRLF); pos++; } if (sdp->c_connection != NULL) { char *next_tmp; int i; - i = sdp_append_connection (string, size, tmp, sdp->c_connection, &next_tmp); + i = sdp_append_connection (&string, &size, tmp, sdp->c_connection, &next_tmp); if (i != 0) { osip_free (string); return -1; @@ -1913,7 +1935,7 @@ char *next_tmp; int i; - i = sdp_append_bandwidth (string, size, tmp, header, &next_tmp); + i = sdp_append_bandwidth (&string, &size, tmp, header, &next_tmp); if (i != 0) { osip_free (string); return -1; @@ -1928,7 +1950,7 @@ char *next_tmp; int i; - i = sdp_append_time_descr (string, size, tmp, header, &next_tmp); + i = sdp_append_time_descr (&string, &size, tmp, header, &next_tmp); if (i != 0) { osip_free (string); return -1; @@ -1938,16 +1960,16 @@ } if (sdp->z_adjustments != NULL) { - tmp = __osip_sdp_append_string (string, size, tmp, "z="); - tmp = __osip_sdp_append_string (string, size, tmp, sdp->z_adjustments); - tmp = __osip_sdp_append_string (string, size, tmp, CRLF); + tmp = __osip_sdp_append_string (&string, &size, tmp, "z="); + tmp = __osip_sdp_append_string (&string, &size, tmp, sdp->z_adjustments); + tmp = __osip_sdp_append_string (&string, &size, tmp, CRLF); } if (sdp->k_key != NULL) { char *next_tmp; int i; - i = sdp_append_key (string, size, tmp, sdp->k_key, &next_tmp); + i = sdp_append_key (&string, &size, tmp, sdp->k_key, &next_tmp); if (i != 0) { osip_free (string); return -1; @@ -1961,7 +1983,7 @@ char *next_tmp; int i; - i = sdp_append_attribute (string, size, tmp, header, &next_tmp); + i = sdp_append_attribute (&string, &size, tmp, header, &next_tmp); if (i != 0) { osip_free (string); return -1; @@ -1976,7 +1998,7 @@ char *next_tmp; int i; - i = sdp_append_media (string, size, tmp, header, &next_tmp); + i = sdp_append_media (&string, &size, tmp, header, &next_tmp); if (i != 0) { osip_free (string); return -1; diff -Nru libosip2-4.0.0/src/test/Makefile.in libosip2-4.1.0/src/test/Makefile.in --- libosip2-4.0.0/src/test/Makefile.in 2012-11-15 10:10:12.000000000 +0000 +++ libosip2-4.1.0/src/test/Makefile.in 2013-12-18 17:51:52.000000000 +0000 @@ -62,7 +62,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/scripts/aclocal-include.m4 \ $(top_srcdir)/scripts/acx_pthread.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs diff -Nru libosip2-4.0.0/src/test/res/Makefile.in libosip2-4.1.0/src/test/res/Makefile.in --- libosip2-4.0.0/src/test/res/Makefile.in 2012-11-15 10:10:12.000000000 +0000 +++ libosip2-4.1.0/src/test/res/Makefile.in 2013-12-18 17:51:52.000000000 +0000 @@ -55,7 +55,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/scripts/aclocal-include.m4 \ $(top_srcdir)/scripts/acx_pthread.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs