Merge branch 'release/1.1.0'

CHANGELOG.md

@@ -0,0 +1,11 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+---
+
+## [1.1.0](https://github.com/VoIPGRID/Vialer-pjsip-iOS/tree/1.1.0) (12/08/2016)
+Released on Thursday, December 8, 2016.
+
+#### Changed
+* Fixed the include issue for inttypes.h [#7](https://github.com/VoIPGRID/Vialer-pjsip-iOS/pull/7)
+* PJSIP will no longer do symmetrical SDP negotiation. [#6](https://github.com/VoIPGRID/Vialer-pjsip-iOS/pull/6)

Pod/vialer-pjsip-include/pj/compat/os_auto.h

@@ -1,5 +1,5 @@
 /* pjlib/include/pj/compat/os_auto.h.  Generated from os_auto.h.in by configure.  */
-/* $Id: os_auto.h.in 5403 2016-08-02 08:35:28Z ming $ */
+/* $Id: os_auto.h.in 5485 2016-11-17 04:38:25Z ming $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <[email protected]>
@@ -167,6 +167,9 @@
 #   define PJ_OS_HAS_CHECK_STACK    0
 #endif
 
+/* Is localtime_r() available? */
+#define PJ_HAS_LOCALTIME_R 1
+
 /* Unicode? */
 #define PJ_NATIVE_STRING_IS_UNICODE 0
 
@@ -177,13 +180,18 @@
 #define PJ_ATOMIC_VALUE_TYPE long
 
 #if defined(PJ_DARWINOS) && PJ_DARWINOS!=0
+     /* Disable local host resolution in pj_gethostip() (see ticket #1342) */
+#    define PJ_GETHOSTIP_DISABLE_LOCAL_RESOLUTION 1
+     /* Use pj_getaddrinfo() (instead of pj_inet_pton()) in
+      * pj_sockaddr_set_str_addr()
+      */
+#    define PJ_SOCKADDR_USE_GETADDRINFO 1
+
 #    include "TargetConditionals.h"
 #    if TARGET_OS_IPHONE
 #	include "Availability.h"
 	/* Use CFHost API for pj_getaddrinfo() (see ticket #1246) */
 #	define PJ_GETADDRINFO_USE_CFHOST 1
-	/* Disable local host resolution in pj_gethostip() (see ticket #1342) */
-#	define PJ_GETHOSTIP_DISABLE_LOCAL_RESOLUTION 1
 #    	ifdef __IPHONE_4_0
  	    /* Is multitasking support available?  (see ticket #1107) */
 #	    define PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT 	1

Pod/vialer-pjsip-include/pj/compat/os_auto.h.in

@@ -1,4 +1,4 @@
-/* $Id: os_auto.h.in 5403 2016-08-02 08:35:28Z ming $ */
+/* $Id: os_auto.h.in 5485 2016-11-17 04:38:25Z ming $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <[email protected]>
@@ -166,6 +166,9 @@
 #   define PJ_OS_HAS_CHECK_STACK    0
 #endif
 
+/* Is localtime_r() available? */
+#undef PJ_HAS_LOCALTIME_R
+
 /* Unicode? */
 #undef PJ_NATIVE_STRING_IS_UNICODE
 
@@ -176,13 +179,18 @@
 #undef PJ_ATOMIC_VALUE_TYPE
 
 #if defined(PJ_DARWINOS) && PJ_DARWINOS!=0
+     /* Disable local host resolution in pj_gethostip() (see ticket #1342) */
+#    define PJ_GETHOSTIP_DISABLE_LOCAL_RESOLUTION 1
+     /* Use pj_getaddrinfo() (instead of pj_inet_pton()) in
+      * pj_sockaddr_set_str_addr()
+      */
+#    define PJ_SOCKADDR_USE_GETADDRINFO 1
+
 #    include "TargetConditionals.h"
 #    if TARGET_OS_IPHONE
 #	include "Availability.h"
 	/* Use CFHost API for pj_getaddrinfo() (see ticket #1246) */
 #	define PJ_GETADDRINFO_USE_CFHOST 1
-	/* Disable local host resolution in pj_gethostip() (see ticket #1342) */
-#	define PJ_GETHOSTIP_DISABLE_LOCAL_RESOLUTION 1
 #    	ifdef __IPHONE_4_0
  	    /* Is multitasking support available?  (see ticket #1107) */
 #	    define PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT 	1

Pod/vialer-pjsip-include/pj/compat/os_darwinos.h

@@ -1,4 +1,4 @@
-/* $Id: os_darwinos.h 4626 2013-10-21 07:04:38Z ming $ */
+/* $Id: os_darwinos.h 5458 2016-10-13 04:32:29Z riza $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <[email protected]>
@@ -55,6 +55,8 @@
 #define PJ_HAS_WINSOCK_H	    0
 #define PJ_HAS_WINSOCK2_H	    0
 
+#define PJ_HAS_LOCALTIME_R	    1
+
 /* Is errno a good way to retrieve OS errors?
  */
 #define PJ_HAS_ERRNO_VAR	    1

Pod/vialer-pjsip-include/pj/compat/os_linux.h

@@ -1,4 +1,4 @@
-/* $Id: os_linux.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id: os_linux.h 5458 2016-10-13 04:32:29Z riza $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <[email protected]>
@@ -55,6 +55,8 @@
 #define PJ_HAS_WINSOCK_H	    0
 #define PJ_HAS_WINSOCK2_H	    0
 
+#define PJ_HAS_LOCALTIME_R	    1
+
 #define PJ_SOCK_HAS_INET_ATON	    1
 
 /* Set 1 if native sockaddr_in has sin_len member. 

Pod/vialer-pjsip-include/pj/compat/socket.h

@@ -1,4 +1,4 @@
-/* $Id: socket.h 5312 2016-05-20 07:19:26Z riza $ */
+/* $Id: socket.h 5445 2016-10-05 09:52:39Z riza $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <[email protected]>
@@ -158,16 +158,22 @@
 #  define OSERR_EINPROGRESS    WSAEINPROGRESS
 #  define OSERR_ECONNRESET     WSAECONNRESET
 #  define OSERR_ENOTCONN       WSAENOTCONN
+#  define OSERR_EAFNOSUPPORT   WSAEAFNOSUPPORT
+#  define OSERR_ENOPROTOOPT    WSAENOPROTOOPT
 #elif defined(PJ_SYMBIAN) && PJ_SYMBIAN!=0
 #  define OSERR_EWOULDBLOCK    -1
 #  define OSERR_EINPROGRESS    -1
 #  define OSERR_ECONNRESET     -1
 #  define OSERR_ENOTCONN       -1
+#  define OSERR_EAFNOSUPPORT   -1
+#  define OSERR_ENOPROTOOPT    -1
 #else
 #  define OSERR_EWOULDBLOCK    EWOULDBLOCK
 #  define OSERR_EINPROGRESS    EINPROGRESS
 #  define OSERR_ECONNRESET     ECONNRESET
 #  define OSERR_ENOTCONN       ENOTCONN
+#  define OSERR_EAFNOSUPPORT   EAFNOSUPPORT
+#  define OSERR_ENOPROTOOPT    ENOPROTOOPT
 #endif
 
 

Pod/vialer-pjsip-include/pj/config.h

@@ -1,4 +1,4 @@
-/* $Id: config.h 5396 2016-07-21 07:18:06Z ming $ */
+/* $Id: config.h 5472 2016-10-27 07:58:01Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <[email protected]>
@@ -842,6 +842,9 @@
 /** QoS backend for Symbian */
 #define PJ_QOS_SYMBIAN	    4
 
+/** QoS backend for Darwin */
+#define PJ_QOS_DARWIN	    5
+
 /**
  * Force the use of some QoS backend API for some platforms.
  */
@@ -887,6 +890,16 @@
 #endif
 
 
+/**
+ * Define the maximum number of curves supported by the secure socket.
+ *
+ * Default: 32
+ */
+#ifndef PJ_SSL_SOCK_MAX_CURVES
+#  define PJ_SSL_SOCK_MAX_CURVES   32
+#endif
+
+
 /**
  * Disable WSAECONNRESET error for UDP sockets on Win32 platforms. See
  * https://trac.pjsip.org/repos/ticket/1197.

Pod/vialer-pjsip-include/pj/config_site.h

@@ -1,2 +1,5 @@
+// this version of PJSIP will no longer do symmetrical SDP negotiation, because with reinvites it will use its own numbering for codecs again
+// and Asterisk will not adopt to those changes.
+#define PJMEDIA_SDP_NEG_ANSWER_SYMMETRIC_PT 0
 #define PJ_CONFIG_IPHONE 1
 #include <pj/config_site_sample.h>

Pod/vialer-pjsip-include/pj/config_site_sample.h

@@ -477,7 +477,6 @@
 #   define PJ_DEBUG			0
 #   define PJSIP_SAFE_MODULE		0
 #   define PJ_HAS_STRICMP_ALNUM		0
-#   define PJ_HASH_USE_OWN_TOLOWER	1
 #   define PJSIP_UNESCAPE_IN_PLACE	1
 
 #   if defined(PJ_WIN32) || defined(PJ_WIN64) 

Pod/vialer-pjsip-include/pj/sock.h

@@ -1,4 +1,4 @@
-/* $Id: sock.h 4860 2014-06-19 05:07:12Z riza $ */
+/* $Id: sock.h 5444 2016-10-05 09:07:17Z riza $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <[email protected]>
@@ -276,6 +276,19 @@ extern const pj_uint16_t PJ_IPTOS_MINCOST;
 #endif
 
 
+/** IPV6_TCLASS optname in setsockopt(). @see pj_IPV6_TCLASS() */
+extern const pj_uint16_t PJ_IPV6_TCLASS;
+
+
+#if defined(PJ_DLL)
+    /** Get #PJ_IPV6_TCLASS constant */
+    PJ_DECL(int) pj_IPV6_TCLASS(void);
+#else
+    /** Get #PJ_IPV6_TCLASS constant */
+#   define pj_IPV6_TCLASS()	PJ_IPV6_TCLASS
+#endif
+
+
 /**
  * Values to be specified as \c optname when calling #pj_sock_setsockopt() 
  * or #pj_sock_getsockopt().

Pod/vialer-pjsip-include/pj/sock_qos.h

@@ -1,4 +1,4 @@
-/* $Id: sock_qos.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id: sock_qos.h 5445 2016-10-05 09:52:39Z riza $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <[email protected]>
@@ -121,10 +121,11 @@ PJ_BEGIN_DECL
      typedef enum pj_qos_type
      {
 	PJ_QOS_TYPE_BEST_EFFORT,
-	PJ_QOS_TYPE_BACKGROUND,
+	PJ_QOS_TYPE_BACKGROUND,	
 	PJ_QOS_TYPE_VIDEO,
 	PJ_QOS_TYPE_VOICE,
-	PJ_QOS_TYPE_CONTROL
+	PJ_QOS_TYPE_CONTROL,
+	PJ_QOS_TYPE_SIGNALLING
      } pj_qos_type;
     \endcode
 
@@ -141,6 +142,7 @@ PJ_BEGIN_DECL
     VIDEO 		0x28 		VI (Video) 		5
     VOICE 		0x30 		VO (Voice) 		6
     CONTROL 		0x38 		VO (Voice) 		7
+    SIGNALLING 		0x28 		VI (Video) 		5
     =================================================================
     \endcode
 
@@ -235,10 +237,11 @@ typedef enum pj_qos_type
     PJ_QOS_TYPE_BEST_EFFORT,	/**< Best effort traffic (default value).
 				     Any QoS function calls with specifying
 				     this value are effectively no-op	*/
-    PJ_QOS_TYPE_BACKGROUND,	/**< Background traffic.		*/
+    PJ_QOS_TYPE_BACKGROUND,	/**< Background traffic.		*/    
     PJ_QOS_TYPE_VIDEO,		/**< Video traffic.			*/
     PJ_QOS_TYPE_VOICE,		/**< Voice traffic.			*/
-    PJ_QOS_TYPE_CONTROL		/**< Control traffic.			*/
+    PJ_QOS_TYPE_CONTROL,	/**< Control traffic.			*/
+    PJ_QOS_TYPE_SIGNALLING	/**< Signalling traffic.		*/
 } pj_qos_type;
 
 /**