diff --git a/Pod/VialerPJSIP.a b/Pod/VialerPJSIP.a
index 250e0afa..39ba5254 100644
--- a/Pod/VialerPJSIP.a
+++ b/Pod/VialerPJSIP.a
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8f7f8313146f422f4cde8f5e4e19ad121d3546b6447ff88ce6a22e5978891c48
-size 190635536
+oid sha256:48a736cca25f7148e4752604da5655c00e690d7c16ce0074316be9e10d99270f
+size 138629072
diff --git a/Pod/vialer-pjsip-include/pj/compat/assert.h b/Pod/vialer-pjsip-include/pj/compat/assert.h
index f1b5c965..fd5394f1 100644
--- a/Pod/vialer-pjsip-include/pj/compat/assert.h
+++ b/Pod/vialer-pjsip-include/pj/compat/assert.h
@@ -1,4 +1,4 @@
-/* $Id: assert.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id: assert.h 5692 2017-11-13 06:06:25Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -28,13 +28,6 @@
 #if defined(PJ_HAS_ASSERT_H) && PJ_HAS_ASSERT_H != 0
 #  include <assert.h>
 
-#elif defined(PJ_LINUX_KERNEL) && PJ_LINUX_KERNEL != 0
-#  define assert(expr) do { \
-			if (!(expr)) \
-			  printk("!!ASSERTION FAILED: [%s:%d] \"" #expr "\"\n",\
-				 __FILE__, __LINE__); \
-		       } while (0)
-
 #else
 #  warning "assert() is not implemented"
 #  define assert(expr)
diff --git a/Pod/vialer-pjsip-include/pj/compat/high_precision.h b/Pod/vialer-pjsip-include/pj/compat/high_precision.h
index 277389f6..cf997727 100644
--- a/Pod/vialer-pjsip-include/pj/compat/high_precision.h
+++ b/Pod/vialer-pjsip-include/pj/compat/high_precision.h
@@ -1,4 +1,4 @@
-/* $Id: high_precision.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id: high_precision.h 5692 2017-11-13 06:06:25Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -31,21 +31,6 @@
 #   define PJ_HIGHPREC_VALUE_IS_ZERO(a)     (a==0)
 #   define pj_highprec_mod(a,b)             (a=fmod(a,b))
 
-#elif defined(PJ_LINUX_KERNEL) && PJ_LINUX_KERNEL != 0
-
-#   include <asm/div64.h>
-    
-    typedef pj_int64_t pj_highprec_t;
-
-#   define pj_highprec_div(a1,a2)   do_div(a1,a2)
-#   define pj_highprec_mod(a1,a2)   (a1=do_mod(a1, a2))
-
-    PJ_INLINE(pj_int64_t) do_mod( pj_int64_t a1, pj_int64_t a2)
-    {
-	return do_div(a1,a2);
-    }
-    
-    
 #elif defined(PJ_HAS_INT64) && PJ_HAS_INT64 != 0
     /*
      * Next choice is to use 64-bit arithmatics.
diff --git a/Pod/vialer-pjsip-include/pj/compat/os_auto.h b/Pod/vialer-pjsip-include/pj/compat/os_auto.h
index 7c66d361..092c620f 100644
--- a/Pod/vialer-pjsip-include/pj/compat/os_auto.h
+++ b/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 5543 2017-01-24 05:36:50Z nanang $ */
+/* $Id: os_auto.h.in 5725 2018-01-15 08:52:29Z ming $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -220,6 +220,9 @@
 #ifndef PJ_HAS_SSL_SOCK
 #define PJ_HAS_SSL_SOCK 1
 #endif
+#ifndef PJ_SSL_SOCK_IMP
+#   define PJ_SSL_SOCK_IMP PJ_SSL_SOCK_IMP_OPENSSL
+#endif
 
 
 #endif	/* __PJ_COMPAT_OS_AUTO_H__ */
diff --git a/Pod/vialer-pjsip-include/pj/compat/os_auto.h.in b/Pod/vialer-pjsip-include/pj/compat/os_auto.h.in
index 311888d7..6c4f4cb6 100644
--- a/Pod/vialer-pjsip-include/pj/compat/os_auto.h.in
+++ b/Pod/vialer-pjsip-include/pj/compat/os_auto.h.in
@@ -1,4 +1,4 @@
-/* $Id: os_auto.h.in 5543 2017-01-24 05:36:50Z nanang $ */
+/* $Id: os_auto.h.in 5725 2018-01-15 08:52:29Z ming $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -219,6 +219,9 @@
 #ifndef PJ_HAS_SSL_SOCK
 #undef PJ_HAS_SSL_SOCK
 #endif
+#ifndef PJ_SSL_SOCK_IMP
+#   define PJ_SSL_SOCK_IMP	PJ_SSL_SOCK_IMP_NONE
+#endif
 
 
 #endif	/* __PJ_COMPAT_OS_AUTO_H__ */
diff --git a/Pod/vialer-pjsip-include/pj/compat/rand.h b/Pod/vialer-pjsip-include/pj/compat/rand.h
index 32467eed..115705a2 100644
--- a/Pod/vialer-pjsip-include/pj/compat/rand.h
+++ b/Pod/vialer-pjsip-include/pj/compat/rand.h
@@ -1,4 +1,4 @@
-/* $Id: rand.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id: rand.h 5692 2017-11-13 06:06:25Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -44,20 +44,6 @@
 #      define platform_rand rand
 #  endif
 
-#elif defined(PJ_LINUX_KERNEL) && PJ_LINUX_KERNEL != 0
-   /*
-    * Linux kernel mode random number generator.
-    */
-#  include <linux/random.h>
-#  define platform_srand(seed)
-
-   PJ_INLINE(int) platform_rand(void)
-   {
-     int value;
-     get_random_bytes((void*)&value, sizeof(value));
-     return value;
-   }
-
 #else
 #  warning "platform_rand() is not implemented"
 #  define platform_rand()	1
diff --git a/Pod/vialer-pjsip-include/pj/compat/setjmp.h b/Pod/vialer-pjsip-include/pj/compat/setjmp.h
index 0aea2184..1cd41eb8 100644
--- a/Pod/vialer-pjsip-include/pj/compat/setjmp.h
+++ b/Pod/vialer-pjsip-include/pj/compat/setjmp.h
@@ -1,4 +1,4 @@
-/* $Id: setjmp.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id: setjmp.h 5692 2017-11-13 06:06:25Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -35,54 +35,6 @@
 #    define pj_longjmp(buf,d)	longjmp(buf,d)
 #  endif
 
-#elif defined(PJ_LINUX_KERNEL) && PJ_LINUX_KERNEL != 0 && \
-      defined(PJ_M_I386) && PJ_M_I386 != 0
-
-    /*
-     * These are taken from uClibc.
-     * Copyright (C) 2000-2003 Erik Andersen <andersen@uclibc.org>
-     */
-#   if defined __USE_MISC || defined _ASM
-#	define JB_BX	0
-#	define JB_SI	1
-#	define JB_DI	2
-#	define JB_BP	3
-#	define JB_SP	4
-#	define JB_PC	5
-#	define JB_SIZE 24
-#   endif
-
-# ifndef _ASM
-	typedef int __jmp_buf[6];
-
-    /* A `sigset_t' has a bit for each signal.  */
-#   define _SIGSET_NWORDS	(1024 / (8 * sizeof (unsigned long int)))
-    typedef struct __sigset_t_tag
-    {
-	unsigned long int __val[_SIGSET_NWORDS];
-    } __sigset_t;
-
-    /* Calling environment, plus possibly a saved signal mask.  */
-    typedef struct __jmp_buf_tag    /* C++ doesn't like tagless structs.  */
-    {
-	/* NOTE: The machine-dependent definitions of `__sigsetjmp'
-	   assume that a `jmp_buf' begins with a `__jmp_buf' and that
-	   `__mask_was_saved' follows it.  Do not move these members
-	   or add others before it.  */
-	__jmp_buf __jmpbuf;		/* Calling environment.  */
-	int __mask_was_saved;		/* Saved the signal mask?  */
-	// we never saved the mask.
-	__sigset_t __saved_mask;	/* Saved signal mask.  */
-    } jmp_buf[1];
-
-    typedef jmp_buf sigjmp_buf;
-    typedef jmp_buf pj_jmp_buf;
-
-    PJ_DECL(int) pj_setjmp(pj_jmp_buf env);
-    PJ_DECL(void) pj_longjmp(pj_jmp_buf env, int val) __attribute__((noreturn));
-
-# endif   /* _ASM */
-
 #elif defined(PJ_SYMBIAN) && PJ_SYMBIAN!=0
     /* Symbian framework don't use setjmp/longjmp */
     
diff --git a/Pod/vialer-pjsip-include/pj/compat/socket.h b/Pod/vialer-pjsip-include/pj/compat/socket.h
index c7b45319..dc8d1877 100644
--- a/Pod/vialer-pjsip-include/pj/compat/socket.h
+++ b/Pod/vialer-pjsip-include/pj/compat/socket.h
@@ -1,4 +1,4 @@
-/* $Id: socket.h 5445 2016-10-05 09:52:39Z riza $ */
+/* $Id: socket.h 5692 2017-11-13 06:06:25Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -184,34 +184,6 @@
 #undef s6_addr
 #undef sin_zero
 
-/*
- * Linux kernel specifics
- */
-#if defined(PJ_LINUX_KERNEL)
-#   include <linux/net.h>
-#   include <asm/ioctls.h>		/* FIONBIO	*/
-#   include <linux/syscalls.h>	/* sys_select() */
-#   include <asm/uaccess.h>	/* set/get_fs()	*/
-
-    typedef int socklen_t;
-#   define getsockopt  sys_getsockopt
-
-    /*
-     * Wrapper for select() in Linux kernel.
-     */
-    PJ_INLINE(int) select(int n, fd_set *inp, fd_set *outp, fd_set *exp,
-		          struct timeval *tvp)
-    {
-        int count;
-        mm_segment_t oldfs = get_fs();
-        set_fs(KERNEL_DS);
-        count = sys_select(n, inp, outp, exp, tvp);
-        set_fs(oldfs);
-        return count;
-    }
-#endif	/* PJ_LINUX_KERNEL */
-
-
 /*
  * This will finally be obsoleted, since it should be declared in
  * os_auto.h
diff --git a/Pod/vialer-pjsip-include/pj/config.h b/Pod/vialer-pjsip-include/pj/config.h
index fda0c4bd..29f886e6 100644
--- a/Pod/vialer-pjsip-include/pj/config.h
+++ b/Pod/vialer-pjsip-include/pj/config.h
@@ -1,4 +1,4 @@
-/* $Id: config.h 5683 2017-11-08 03:03:22Z ming $ */
+/* $Id: config.h 5725 2018-01-15 08:52:29Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -115,12 +115,6 @@
 #   define PJ_WIN32 1
 #   include <pj/compat/os_win32.h>
 
-#elif defined(PJ_LINUX_KERNEL) && PJ_LINUX_KERNEL!=0
-    /*
-     * Linux kernel
-     */
-#  include <pj/compat/os_linux_kernel.h>
-
 #elif defined(PJ_LINUX) || defined(linux) || defined(__linux)
     /*
      * Linux
@@ -918,8 +912,9 @@
 
 /**
  * Enable secure socket. For most platforms, this is implemented using
- * OpenSSL, so this will require OpenSSL to be installed. For Symbian
- * platform, this is implemented natively using CSecureSocket.
+ * OpenSSL or GnuTLS, so this will require one of those libraries to
+ * be installed. For Symbian platform, this is implemented natively
+ * using CSecureSocket.
  *
  * Default: 0 (for now)
  */
@@ -928,6 +923,28 @@
 #endif
 
 
+/*
+ * Secure socket implementation.
+ * Select one of these implementations in PJ_SSL_SOCK_IMP.
+ */
+#define PJ_SSL_SOCK_IMP_NONE 	    0	/**< Disable SSL socket.    */
+#define PJ_SSL_SOCK_IMP_OPENSSL	    1	/**< Using OpenSSL.	    */
+#define PJ_SSL_SOCK_IMP_GNUTLS      2	/**< Using GnuTLS.	    */
+
+
+/**
+ * Select which SSL socket implementation to use. Currently pjlib supports
+ * PJ_SSL_SOCK_IMP_OPENSSL, which uses OpenSSL, and PJ_SSL_SOCK_IMP_GNUTLS,
+ * which uses GnuTLS. Setting this to PJ_SSL_SOCK_IMP_NONE will disable
+ * secure socket.
+ *
+ * Default is PJ_SSL_SOCK_IMP_NONE
+ */
+#ifndef PJ_SSL_SOCK_IMP
+#   define PJ_SSL_SOCK_IMP		    PJ_SSL_SOCK_IMP_NONE
+#endif
+
+
 /**
  * Define the maximum number of ciphers supported by the secure socket.
  *
@@ -971,6 +988,17 @@
 #endif
 
 
+/**
+ * Maximum number of socket options in pj_sockopt_params.
+ *
+ * Default: 4
+ */
+#ifndef PJ_MAX_SOCKOPT_PARAMS
+#   define PJ_MAX_SOCKOPT_PARAMS	    4
+#endif
+
+
+
 /** @} */
 
 /********************************************************************
@@ -1299,7 +1327,7 @@ PJ_BEGIN_DECL
  * Extra suffix for the version (e.g. "-trunk"), or empty for
  * web release version.
  */
-#define PJ_VERSION_NUM_EXTRA	""
+#define PJ_VERSION_NUM_EXTRA	"-svn"
 
 /**
  * PJLIB version number consists of three bytes with the following format:
diff --git a/Pod/vialer-pjsip-include/pj/config_site.h b/Pod/vialer-pjsip-include/pj/config_site.h
index 6a5a02ea..f796e97a 100644
--- a/Pod/vialer-pjsip-include/pj/config_site.h
+++ b/Pod/vialer-pjsip-include/pj/config_site.h
@@ -5,5 +5,6 @@
 #define PJMEDIA_VIDEO_DEV_HAS_OPENGL_ES 1
 #define PJMEDIA_VIDEO_DEV_HAS_IOS_OPENGL 1
 #include <OpenGLES/ES3/glext.h>
+ #define PJ_HAS_IPV6 1
 #define PJMEDIA_SDP_NEG_ANSWER_SYMMETRIC_PT 0
 #include <pj/config_site_sample.h>
diff --git a/Pod/vialer-pjsip-include/pj/config_site_sample.h b/Pod/vialer-pjsip-include/pj/config_site_sample.h
index 31bfd6e1..57fe3d45 100644
--- a/Pod/vialer-pjsip-include/pj/config_site_sample.h
+++ b/Pod/vialer-pjsip-include/pj/config_site_sample.h
@@ -411,6 +411,9 @@
     #define PJSIP_MAX_DIALOG_COUNT 		31
     #define PJSUA_MAX_CALLS			4
 
+    /* Separate worker thread for timer and ioqueue */
+    // #define PJSUA_SEPARATE_WORKER_FOR_TIMER	1
+
     /* Other pjsua settings */
     #define PJSUA_MAX_ACC			4
     #define PJSUA_MAX_PLAYERS			4
diff --git a/Pod/vialer-pjsip-include/pj/sock.h b/Pod/vialer-pjsip-include/pj/sock.h
index 19e25d33..fc72c540 100644
--- a/Pod/vialer-pjsip-include/pj/sock.h
+++ b/Pod/vialer-pjsip-include/pj/sock.h
@@ -1,4 +1,4 @@
-/* $Id: sock.h 5636 2017-08-02 02:51:59Z ming $ */
+/* $Id: sock.h 5719 2018-01-05 09:48:31Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -629,8 +629,6 @@ typedef struct pj_ip_mreq {
     pj_in_addr imr_interface;	/**< local IP address of interface. */
 } pj_ip_mreq;
 
-/* Maximum number of socket options. */
-#define PJ_MAX_SOCKOPT_PARAMS 4
 
 /**
  * Options to be set for the socket. 
diff --git a/Pod/vialer-pjsip-include/pj/ssl_sock.h b/Pod/vialer-pjsip-include/pj/ssl_sock.h
index ebab8e78..a7da3ebb 100644
--- a/Pod/vialer-pjsip-include/pj/ssl_sock.h
+++ b/Pod/vialer-pjsip-include/pj/ssl_sock.h
@@ -1,4 +1,4 @@
-/* $Id: ssl_sock.h 5472 2016-10-27 07:58:01Z ming $ */
+/* $Id: ssl_sock.h 5725 2018-01-15 08:52:29Z ming $ */
 /* 
  * Copyright (C) 2009-2011 Teluu Inc. (http://www.teluu.com)
  *
@@ -184,6 +184,11 @@ typedef struct pj_ssl_cert_info {
     pj_str_t raw;		    /**< Raw certificate in PEM format, only
 					 available for remote certificate. */
 
+    struct {
+        unsigned    	cnt;        /**< # of entry     */
+        pj_str_t       *cert_raw;
+    } raw_chain;
+
 } pj_ssl_cert_info;
 
 
diff --git a/Pod/vialer-pjsip-include/pjlib-util/cli.h b/Pod/vialer-pjsip-include/pjlib-util/cli.h
index a91fb3de..267afe65 100644
--- a/Pod/vialer-pjsip-include/pjlib-util/cli.h
+++ b/Pod/vialer-pjsip-include/pjlib-util/cli.h
@@ -400,12 +400,14 @@ PJ_DECL(void) pj_cli_register_front_end(pj_cli_t *cli,
  * Create a new complete command specification from an XML node text and
  * register it to the CLI application.
  *
+ * Note that the input string MUST be NULL terminated.
+ *
  * @param cli		The CLI application.
  * @param group		Optional group to which this command will be added
  * 			to, or specify NULL if this command is a root
  * 			command.
  * @param xml		Input string containing XML node text for the
- * 			command.
+ * 			command, MUST be NULL terminated.
  * @param handler	Function handler for the command. This must be NULL
  * 			if the command specifies a command group.
  * @param p_cmd		Optional pointer to store the newly created
diff --git a/Pod/vialer-pjsip-include/pjlib-util/scanner.h b/Pod/vialer-pjsip-include/pjlib-util/scanner.h
index f47a8f03..99acce85 100644
--- a/Pod/vialer-pjsip-include/pjlib-util/scanner.h
+++ b/Pod/vialer-pjsip-include/pjlib-util/scanner.h
@@ -1,4 +1,4 @@
-/* $Id: scanner.h 4537 2013-06-19 06:47:43Z riza $ */
+/* $Id: scanner.h 5693 2017-11-14 08:20:15Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -216,16 +216,14 @@ typedef struct pj_scan_state
 
 
 /**
- * Initialize the scanner. Note that the input string buffer must have
- * length at least buflen+1 because the scanner will NULL terminate the
- * string during initialization.
+ * Initialize the scanner.
+ * Note that the input string buffer MUST be NULL terminated and have
+ * length at least buflen+1 (buflen MUST NOT include the NULL terminator).
  *
  * @param scanner   The scanner to be initialized.
- * @param bufstart  The input buffer to scan. Note that buffer[buflen] will be 
- *		    filled with NULL char until scanner is destroyed, so
- *		    the actual buffer length must be at least buflen+1.
+ * @param bufstart  The input buffer to scan, which must be NULL terminated.
  * @param buflen    The length of the input buffer, which normally is
- *		    strlen(bufstart).
+ *		    strlen(bufstart), hence not counting the NULL terminator.
  * @param options   Zero, or combination of PJ_SCAN_AUTOSKIP_WS or
  *		    PJ_SCAN_AUTOSKIP_WS_HEADER
  * @param callback  Callback to be called when the scanner encounters syntax
diff --git a/Pod/vialer-pjsip-include/pjlib-util/xml.h b/Pod/vialer-pjsip-include/pjlib-util/xml.h
index 81dc6c75..17355325 100644
--- a/Pod/vialer-pjsip-include/pjlib-util/xml.h
+++ b/Pod/vialer-pjsip-include/pjlib-util/xml.h
@@ -1,4 +1,4 @@
-/* $Id: xml.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id: xml.h 5697 2017-11-17 04:07:43Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -73,9 +73,12 @@ struct pj_xml_node
  * XML comments ("<!--"), however such constructs will be ignored and will not 
  * be included in the resulted XML node tree.
  *
+ * Note that the XML message input buffer MUST be NULL terminated and have
+ * length at least len+1 (len MUST NOT include the NULL terminator).
+ *
  * @param pool	    Pool to allocate memory from.
- * @param msg	    The XML message to parse.
- * @param len	    The length of the message.
+ * @param msg	    The XML message to parse, MUST be NULL terminated.
+ * @param len	    The length of the message, not including NULL terminator.
  *
  * @return	    XML root node, or NULL if the XML document can not be parsed.
  */
diff --git a/Pod/vialer-pjsip-include/pjmedia/config.h b/Pod/vialer-pjsip-include/pjmedia/config.h
index d60c1550..d1944edd 100644
--- a/Pod/vialer-pjsip-include/pjmedia/config.h
+++ b/Pod/vialer-pjsip-include/pjmedia/config.h
@@ -1,4 +1,4 @@
-/* $Id: config.h 5643 2017-08-22 04:59:57Z riza $ */
+/* $Id: config.h 5702 2017-11-27 03:29:07Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -74,6 +74,16 @@
 #   define PJMEDIA_CONF_SWITCH_BOARD_BUF_SIZE    PJMEDIA_MAX_MTU
 #endif
 
+/**
+ * Specify whether the conference bridge uses AGC, an automatic adjustment to
+ * avoid dramatic change in the signal level which can cause noise.
+ *
+ * Default: 1 (enabled)
+ */
+#ifndef PJMEDIA_CONF_USE_AGC
+#   define PJMEDIA_CONF_USE_AGC    	    1
+#endif
+
 
 /*
  * Types of sound stream backends.
diff --git a/Pod/vialer-pjsip-include/pjmedia/sdp.h b/Pod/vialer-pjsip-include/pjmedia/sdp.h
index bababefb..79467cbd 100644
--- a/Pod/vialer-pjsip-include/pjmedia/sdp.h
+++ b/Pod/vialer-pjsip-include/pjmedia/sdp.h
@@ -1,4 +1,4 @@
-/* $Id: sdp.h 4367 2013-02-21 20:49:19Z nanang $ */
+/* $Id: sdp.h 5697 2017-11-17 04:07:43Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -645,9 +645,12 @@ typedef struct pjmedia_sdp_session pjmedia_sdp_session;
 /**
  * Parse SDP message.
  *
+ * Note that the input message buffer MUST be NULL terminated and have
+ * length at least len+1 (len MUST NOT include the NULL terminator).
+ *
  * @param pool	    The pool to allocate SDP session description.
- * @param buf	    The message buffer.
- * @param len	    The length of the message.
+ * @param buf	    The message buffer, MUST be NULL terminated.
+ * @param len	    The length of the message, excluding NULL terminator.
  * @param p_sdp	    Pointer to receive the SDP session descriptor.
  *
  * @return	    PJ_SUCCESS if message was successfully parsed into
diff --git a/Pod/vialer-pjsip-include/pjsip-simple/iscomposing.h b/Pod/vialer-pjsip-include/pjsip-simple/iscomposing.h
index 61d5c726..82c77cb3 100644
--- a/Pod/vialer-pjsip-include/pjsip-simple/iscomposing.h
+++ b/Pod/vialer-pjsip-include/pjsip-simple/iscomposing.h
@@ -1,4 +1,4 @@
-/* $Id: iscomposing.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id: iscomposing.h 5697 2017-11-17 04:07:43Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -104,9 +104,12 @@ PJ_DECL(pjsip_msg_body*) pjsip_iscomposing_create_body( pj_pool_t *pool,
  * Parse the buffer and return message composition indication in the 
  * message.
  *
+ * Note that the input string buffer MUST be NULL terminated and have
+ * length at least len+1 (len MUST NOT include the NULL terminator).
+ *
  * @param pool		    Pool to allocate memory for the parsing process.
- * @param msg		    The message to be parsed.
- * @param len		    Length of the message.
+ * @param msg		    The message to be parsed, MUST be NULL terminated.
+ * @param len		    Length of the message, excluding NULL terminator.
  * @param p_is_composing    Optional pointer to receive iscomposing status.
  * @param p_last_active	    Optional pointer to receive last active attribute.
  * @param p_content_type    Optional pointer to receive content type attribute.
diff --git a/Pod/vialer-pjsip-include/pjsip-simple/xpidf.h b/Pod/vialer-pjsip-include/pjsip-simple/xpidf.h
index 911a4299..6f3cf114 100644
--- a/Pod/vialer-pjsip-include/pjsip-simple/xpidf.h
+++ b/Pod/vialer-pjsip-include/pjsip-simple/xpidf.h
@@ -1,4 +1,4 @@
-/* $Id: xpidf.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id: xpidf.h 5697 2017-11-17 04:07:43Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -60,9 +60,12 @@ PJ_DECL(pjxpidf_pres*) pjxpidf_create(pj_pool_t *pool, const pj_str_t *uri);
 /**
  * Parse XPIDF document.
  *
+ * Note that the input text buffer MUST be NULL terminated and have
+ * length at least len+1 (len MUST NOT include the NULL terminator).
+ *
  * @param pool	    Pool.
- * @param text	    Input text.
- * @param len	    Length of input text.
+ * @param text	    Input text, MUST be NULL terminated.
+ * @param len	    Length of input text, NOT including the NULL terminator.
  *
  * @return	    XPIDF document.
  */
diff --git a/Pod/vialer-pjsip-include/pjsip/sip_config.h b/Pod/vialer-pjsip-include/pjsip/sip_config.h
index c7a9f687..aa64e2f6 100644
--- a/Pod/vialer-pjsip-include/pjsip/sip_config.h
+++ b/Pod/vialer-pjsip-include/pjsip/sip_config.h
@@ -1,4 +1,4 @@
-/* $Id: sip_config.h 5668 2017-09-29 02:43:05Z ming $ */
+/* $Id: sip_config.h 5716 2017-12-18 09:46:03Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -157,6 +157,19 @@ typedef struct pjsip_cfg_t
 	 */
 	pj_bool_t disable_secure_dlg_check;
 
+	/**
+	 * Encode SIP headers in their short forms to reduce size. By default,
+	 * SIP headers in outgoing messages will be encoded in their full names.
+	 * If this option is enabled, then SIP headers for outgoing messages
+	 * will be encoded in their short forms, to reduce message size. 
+	 * Note that this does not affect the ability of PJSIP to parse incoming
+	 * SIP messages, as the parser always supports parsing both the long
+	 * and short version of the headers.
+	 *
+	 * Default is PJSIP_ENCODE_SHORT_HNAME
+	 */
+	pj_bool_t use_compact_form;
+
     } endpt;
 
     /** Transaction layer settings. */
@@ -464,18 +477,8 @@ PJ_INLINE(pjsip_cfg_t*) pjsip_cfg(void)
  * SIP messages, as the parser always supports parsing both the long
  * and short version of the headers.
  *
- * Note that there is also an undocumented variable defined in sip_msg.c
- * to control whether compact form should be used for encoding SIP
- * headers. The default value of this variable is PJSIP_ENCODE_SHORT_HNAME.
- * To change PJSIP behavior during run-time, application can use the 
- * following construct:
- *
- \verbatim
-   extern pj_bool_t pjsip_use_compact_form;
- 
-   // enable compact form
-   pjsip_use_compact_form = PJ_TRUE;
- \endverbatim
+ * This option can also be controlled at run-time by the
+ * \a use_compact_form setting in pjsip_cfg_t.
  *
  * Default is 0 (no)
  */
@@ -799,12 +802,16 @@ PJ_INLINE(pjsip_cfg_t*) pjsip_cfg(void)
  * will slightly affect stack usage, since each entry will occupy about
  * 32 bytes of stack memory.
  *
- * Default: 8
+ * Default: 16 (or 32 if IPv6 support is enabled)
  *
  * @see PJSIP_HAS_RESOLVER
  */
 #ifndef PJSIP_MAX_RESOLVED_ADDRESSES
-#   define PJSIP_MAX_RESOLVED_ADDRESSES	    8
+#   if defined(PJ_HAS_IPV6) && PJ_HAS_IPV6
+#       define PJSIP_MAX_RESOLVED_ADDRESSES	    32
+#   else
+#       define PJSIP_MAX_RESOLVED_ADDRESSES	    16
+#   endif
 #endif
 
 
diff --git a/Pod/vialer-pjsip-include/pjsip/sip_parser.h b/Pod/vialer-pjsip-include/pjsip/sip_parser.h
index f87cb44e..08f4fbd7 100644
--- a/Pod/vialer-pjsip-include/pjsip/sip_parser.h
+++ b/Pod/vialer-pjsip-include/pjsip/sip_parser.h
@@ -1,4 +1,4 @@
-/* $Id: sip_parser.h 5682 2017-11-08 02:58:18Z riza $ */
+/* $Id: sip_parser.h 5697 2017-11-17 04:07:43Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -196,6 +196,8 @@ PJ_DECL(pj_status_t) pjsip_unregister_uri_parser( const char *scheme,
 
 /**
  * Parse an URI in the input and return the correct instance of URI.
+ * Note that the input string buffer MUST be NULL terminated and have
+ * length at least size+1 (size MUST NOT include the NULL terminator).
  *
  * @param pool		The pool to get memory allocations.
  * @param buf		The input buffer, which MUST be NULL terminated.
@@ -216,6 +218,8 @@ PJ_DECL(pjsip_uri*) pjsip_parse_uri( pj_pool_t *pool,
 
 /**
  * Parse SIP status line.
+ * Note that the input string buffer MUST be NULL terminated and have
+ * length at least size+1 (size MUST NOT include the NULL terminator).
  *
  * @param buf		Text buffer to parse, which MUST be NULL terminated.
  * @param size		The size of the buffer, excluding the NULL character.
@@ -234,6 +238,9 @@ PJ_DECL(pj_status_t) pjsip_parse_status_line(char *buf, pj_size_t size,
  * treated as a text block, ie. the function will not try to parse the content
  * of the body.
  *
+ * Note that the input string buffer MUST be NULL terminated and have
+ * length at least size+1 (size MUST NOT include the NULL terminator).
+ *
  * @param pool		The pool to allocate memory.
  * @param buf		The input buffer, which MUST be NULL terminated.
  * @param size		The length of the string (not counting NULL terminator).
@@ -256,6 +263,9 @@ PJ_DECL(pjsip_msg *) pjsip_parse_msg( pj_pool_t *pool,
  *
  * This function is normally called by the transport layer.
  *
+ * Note that the input string buffer MUST be NULL terminated and have
+ * length at least size+1 (size MUST NOT include the NULL terminator).
+ *
  * @param buf		The input buffer, which MUST be NULL terminated.
  * @param size		The length of the string (not counting NULL terminator).
  * @param rdata         The receive data buffer to store the message and
@@ -269,9 +279,11 @@ PJ_DECL(pjsip_msg *) pjsip_parse_rdata( char *buf, pj_size_t size,
 /**
  * Check incoming packet to see if a (probably) valid SIP message has been 
  * received.
+ * Note that the input string buffer MUST be NULL terminated and have
+ * length at least size+1 (size MUST NOT include the NULL terminator).
  *
  * @param buf		The input buffer, which must be NULL terminated.
- * @param size		The buffer size.
+ * @param size		The length of the string (not counting NULL terminator).
  * @param is_datagram	Put non-zero if transport is datagram oriented.
  * @param msg_size	[out] If message is valid, this parameter will contain
  *			the size of the SIP message (including body, if any).
@@ -288,6 +300,9 @@ PJ_DECL(pj_status_t) pjsip_find_msg(const char *buf,
  * This function parses the content of a header (ie. part after colon) according
  * to the expected name, and will return the correct instance of header.
  *
+ * Note that the input string buffer MUST be NULL terminated and have
+ * length at least size+1 (size MUST NOT include the NULL terminator). 
+ *
  * @param pool		Pool to allocate memory for the header.
  * @param hname		Header name which is used to find the correct function
  *			to parse the header.
@@ -314,9 +329,12 @@ PJ_DECL(void*) pjsip_parse_hdr( pj_pool_t *pool, const pj_str_t *hname,
  * a newline (as in SIP message) or ampersand mark (as in URI). This separator
  * is optional for the last header.
  *
+ * Note that the input string buffer MUST be NULL terminated and have
+ * length at least size+1 (size MUST NOT include the NULL terminator).
+ *
  * @param pool		The pool.
  * @param input		The input text to parse, which must be NULL terminated.
- * @param size		The text length.
+ * @param size		The text length (not counting NULL terminator).
  * @param hlist		The header list to store the parsed headers.
  *			This list must have been initialized before calling 
  *			this function.
diff --git a/Pod/vialer-pjsip-include/pjsua-lib/pjsua.h b/Pod/vialer-pjsip-include/pjsua-lib/pjsua.h
index 7e8d81ab..88db7f94 100644
--- a/Pod/vialer-pjsip-include/pjsua-lib/pjsua.h
+++ b/Pod/vialer-pjsip-include/pjsua-lib/pjsua.h
@@ -1,4 +1,4 @@
-/* $Id: pjsua.h 5677 2017-10-27 06:30:50Z ming $ */
+/* $Id: pjsua.h 5721 2018-01-08 04:08:35Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -351,6 +351,22 @@ typedef struct pj_stun_resolve_result pj_stun_resolve_result;
 #endif
 
 
+/**
+ * Specify whether timer heap events will be polled by a separate worker
+ * thread. If this is set/enabled, a worker thread will be dedicated to
+ * poll timer heap events only, and the rest worker thread(s) will poll
+ * ioqueue/network events only.
+ *
+ * Note that if worker thread count setting (i.e: pjsua_config.thread_cnt)
+ * is set to zero, this setting will be ignored.
+ *
+ * Default: 0 (disabled)
+ */
+#ifndef PJSUA_SEPARATE_WORKER_FOR_TIMER
+#   define PJSUA_SEPARATE_WORKER_FOR_TIMER	0
+#endif
+
+
 /**
  * This enumeration represents pjsua state.
  */
@@ -1968,8 +1984,9 @@ struct pjsua_msg_data
 {
     /**
      * Optional remote target URI (i.e. Target header). If NULL, the target
-     * will be set to the remote URI (To header). At the moment this field
-     * is only used by #pjsua_call_make_call() and #pjsua_im_send().
+     * will be set to the remote URI (To header). This field is used by
+     * pjsua_call_make_call(), pjsua_im_send(), pjsua_call_reinvite(),
+     * pjsua_call_set_hold(), and pjsua_call_update().
      */
     pj_str_t    target_uri;
 
@@ -2759,6 +2776,19 @@ PJ_DECL(pj_status_t) pjsua_transport_register(pjsip_transport *tp,
 					      pjsua_transport_id *p_id);
 
 
+/**
+ * Register transport factory that has been created by application.
+ * This function is useful if application wants to implement custom SIP
+ * transport and use it with pjsua.
+ *
+ * @param tf		Transport factory instance.
+ * @param p_id		Optional pointer to receive transport ID.
+ *
+ * @return		PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DEF(pj_status_t) pjsua_tpfactory_register( pjsip_tpfactory *tf,
+					      pjsua_transport_id *p_id);
+
 /**
  * Enumerate all transports currently created in the system. This function
  * will return all transport IDs, and application may then call 
@@ -4610,7 +4640,16 @@ typedef enum pjsua_call_flag
      * in IP address change situation, after the local account's Via has
      * been updated (typically with re-registration).
      */
-    PJSUA_CALL_UPDATE_VIA = 32
+    PJSUA_CALL_UPDATE_VIA = 32,
+
+    /**
+     * Update dialog target to URI specified in pjsua_msg_data.target_uri.
+     * This flag is only valid for pjsua_call_set_hold(),
+     * pjsua_call_reinvite(), and pjsua_call_update(). This flag can be
+     * useful in IP address change scenario where IP version has been changed
+     * and application needs to update target IP address.
+     */
+    PJSUA_CALL_UPDATE_TARGET = 64
 
 } pjsua_call_flag;
 
@@ -7015,6 +7054,69 @@ PJ_DECL(pj_status_t) pjsua_snd_get_setting(pjmedia_aud_dev_cap cap,
 					   void *pval);
 
 
+/**
+ * Opaque type of extra sound device, an additional sound device
+ * beside the primary sound device (the one instantiated via
+ * pjsua_set_snd_dev() or pjsua_set_snd_dev2()). This sound device is
+ * also registered to conference bridge so it can be used as a normal
+ * conference bridge port, e.g: connect it to/from other ports,
+ * adjust/check audio level, etc. The conference bridge port ID can be
+ * queried using pjsua_ext_snd_dev_get_conf_port().
+ *
+ * Application may also use this API to improve media clock. Normally
+ * media clock is driven by sound device in master port, but unfortunately
+ * some sound devices may produce jittery clock. To improve media clock,
+ * application can install Null Sound Device (i.e: using
+ * pjsua_set_null_snd_dev()), which will act as a master port, and instantiate
+ * the sound device as extra sound device. But note that extra sound device
+ * will not have auto-close upon idle feature.
+ */
+typedef struct pjsua_ext_snd_dev pjsua_ext_snd_dev;
+
+
+/**
+ * Create an extra sound device and register it to conference bridge.
+ *
+ * @param snd_param	Sound device port param.
+ * @param p_snd		The extra sound device instance.
+ *
+ * @return		PJ_SUCCESS on success or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_ext_snd_dev_create(pjmedia_snd_port_param *param,
+					      pjsua_ext_snd_dev **p_snd);
+
+
+/**
+ * Destroy an extra sound device and unregister it from conference bridge.
+ *
+ * @param p_snd		The extra sound device instance.
+ *
+ * @return		PJ_SUCCESS on success or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_ext_snd_dev_destroy(pjsua_ext_snd_dev *snd);
+
+
+/**
+ * Get sound port instance of an extra sound device.
+ *
+ * @param snd		The extra sound device instance.
+ *
+ * @return		The sound port instance.
+ */
+PJ_DECL(pjmedia_snd_port*) pjsua_ext_snd_dev_get_snd_port(
+					    pjsua_ext_snd_dev *snd);
+
+/**
+ * Get conference port ID of an extra sound device.
+ *
+ * @param snd		The extra sound device instance.
+ *
+ * @return		The conference port ID.
+ */
+PJ_DECL(pjsua_conf_port_id) pjsua_ext_snd_dev_get_conf_port(
+					    pjsua_ext_snd_dev *snd);
+
+
 /*****************************************************************************
  * Codecs.
  */
diff --git a/Pod/vialer-pjsip-include/pjsua2/endpoint.hpp b/Pod/vialer-pjsip-include/pjsua2/endpoint.hpp
index 184fedae..96a8e915 100644
--- a/Pod/vialer-pjsip-include/pjsua2/endpoint.hpp
+++ b/Pod/vialer-pjsip-include/pjsua2/endpoint.hpp
@@ -1,4 +1,4 @@
-/* $Id: endpoint.hpp 5676 2017-10-24 07:31:39Z ming $ */
+/* $Id: endpoint.hpp 5704 2017-11-27 08:37:37Z ming $ */
 /* 
  * Copyright (C) 2013 Teluu Inc. (http://www.teluu.com)
  *
@@ -459,6 +459,15 @@ struct UaConfig : public PersistentObject
      */
     StringVector	nameserver;
 
+    /**
+     * Specify the URL of outbound proxies to visit for all outgoing requests.
+     * The outbound proxies will be used for all accounts, and it will
+     * be used to build the route set for outgoing requests. The final
+     * route set for outgoing requests will consists of the outbound proxies
+     * and the proxy configured in the account.
+     */
+    StringVector	outboundProxies;
+
     /**
      * Optional user agent string (default empty). If it's empty, no
      * User-Agent header will be sent with outgoing requests.
@@ -494,8 +503,8 @@ struct UaConfig : public PersistentObject
      *
      * Default: FALSE
      */
-
     bool	    	stunTryIpv6;
+
     /**
      * This specifies if the library startup should ignore failure with the
      * STUN servers. If this is set to PJ_FALSE, the library will refuse to
diff --git a/Pod/vialer-pjsip-include/pjsua2/media.hpp b/Pod/vialer-pjsip-include/pjsua2/media.hpp
index 3613adb1..e153fd82 100644
--- a/Pod/vialer-pjsip-include/pjsua2/media.hpp
+++ b/Pod/vialer-pjsip-include/pjsua2/media.hpp
@@ -1,4 +1,4 @@
-/* $Id: media.hpp 5645 2017-09-06 03:44:35Z riza $ */
+/* $Id: media.hpp 5717 2017-12-19 01:45:37Z nanang $ */
 /*
  * Copyright (C) 2013 Teluu Inc. (http://www.teluu.com)
  *
@@ -1349,6 +1349,57 @@ class AudDevManager
 };
 
 
+/**
+ * Extra audio device. This class allows application to have multiple
+ * sound device instances active concurrently. Application may also use
+ * this class to improve media clock. Normally media clock is driven by
+ * sound device in master port, but unfortunately some sound devices may
+ * produce jittery clock. To improve media clock, application can install
+ * Null Sound Device (i.e: using AudDevManager::setNullDev()), which will
+ * act as a master port, and install the sound device as extra sound device.
+ * Note that extra sound device will not have auto-close upon idle feature.
+ */
+class ExtraAudioDevice : public AudioMedia
+{
+public:
+    /**
+     * Constructor
+     *
+     * @param playdev		Playback device ID.
+     * @param recdev		Record device ID.
+     */
+    ExtraAudioDevice(int playdev, int recdev);
+
+    /**
+     * Destructor
+     */
+    virtual ~ExtraAudioDevice();
+
+    /**
+     * Open the audio device using format (e.g.: clock rate, channel count,
+     * samples per frame) matched to the conference bridge's format.
+     */
+    void open();
+
+    /**
+     * Close the audio device.
+     */
+    void close();
+
+    /**
+     * Is the extra audio device opened?
+     *
+     * @return	    		'true' if it is opened.
+     */
+    bool isOpened();
+
+protected:
+    int playDev;
+    int recDev;
+    void *ext_snd_dev;
+};
+
+
 /*************************************************************************
 * Video media
 */
diff --git a/Vialer-pjsip-iOS.podspec b/Vialer-pjsip-iOS.podspec
index 8279b598..f8cd2df5 100644
--- a/Vialer-pjsip-iOS.podspec
+++ b/Vialer-pjsip-iOS.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 	s.name                  = "Vialer-pjsip-iOS"
-	s.version               = "3.3.0"
+	s.version               = "3.3.1"
 	s.summary               = "PJSIP 2.7.1 for iOS"
 	s.description           = "Pod for distributing PJSIP 2.7.1 wrapped in a framework. With Opus, OpenSSL and openh264."
 	s.homepage              = "https://www.wearespindle.com"
diff --git a/VialerPJSIP.framework/Versions/A/Headers/pj/compat/assert.h b/VialerPJSIP.framework/Versions/A/Headers/pj/compat/assert.h
index f1b5c965..fd5394f1 100644
--- a/VialerPJSIP.framework/Versions/A/Headers/pj/compat/assert.h
+++ b/VialerPJSIP.framework/Versions/A/Headers/pj/compat/assert.h
@@ -1,4 +1,4 @@
-/* $Id: assert.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id: assert.h 5692 2017-11-13 06:06:25Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -28,13 +28,6 @@
 #if defined(PJ_HAS_ASSERT_H) && PJ_HAS_ASSERT_H != 0
 #  include <assert.h>
 
-#elif defined(PJ_LINUX_KERNEL) && PJ_LINUX_KERNEL != 0
-#  define assert(expr) do { \
-			if (!(expr)) \
-			  printk("!!ASSERTION FAILED: [%s:%d] \"" #expr "\"\n",\
-				 __FILE__, __LINE__); \
-		       } while (0)
-
 #else
 #  warning "assert() is not implemented"
 #  define assert(expr)
diff --git a/VialerPJSIP.framework/Versions/A/Headers/pj/compat/high_precision.h b/VialerPJSIP.framework/Versions/A/Headers/pj/compat/high_precision.h
index 55fb5676..cf997727 100644
--- a/VialerPJSIP.framework/Versions/A/Headers/pj/compat/high_precision.h
+++ b/VialerPJSIP.framework/Versions/A/Headers/pj/compat/high_precision.h
@@ -1,4 +1,4 @@
-/* $Id: high_precision.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id: high_precision.h 5692 2017-11-13 06:06:25Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -31,21 +31,6 @@
 #   define PJ_HIGHPREC_VALUE_IS_ZERO(a)     (a==0)
 #   define pj_highprec_mod(a,b)             (a=fmod(a,b))
 
-#elif defined(PJ_LINUX_KERNEL) && PJ_LINUX_KERNEL != 0
-
-#   include <VialerPJSIP/asm/div64.h>
-    
-    typedef pj_int64_t pj_highprec_t;
-
-#   define pj_highprec_div(a1,a2)   do_div(a1,a2)
-#   define pj_highprec_mod(a1,a2)   (a1=do_mod(a1, a2))
-
-    PJ_INLINE(pj_int64_t) do_mod( pj_int64_t a1, pj_int64_t a2)
-    {
-	return do_div(a1,a2);
-    }
-    
-    
 #elif defined(PJ_HAS_INT64) && PJ_HAS_INT64 != 0
     /*
      * Next choice is to use 64-bit arithmatics.
diff --git a/VialerPJSIP.framework/Versions/A/Headers/pj/compat/os_auto.h b/VialerPJSIP.framework/Versions/A/Headers/pj/compat/os_auto.h
index 7c66d361..092c620f 100644
--- a/VialerPJSIP.framework/Versions/A/Headers/pj/compat/os_auto.h
+++ b/VialerPJSIP.framework/Versions/A/Headers/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 5543 2017-01-24 05:36:50Z nanang $ */
+/* $Id: os_auto.h.in 5725 2018-01-15 08:52:29Z ming $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -220,6 +220,9 @@
 #ifndef PJ_HAS_SSL_SOCK
 #define PJ_HAS_SSL_SOCK 1
 #endif
+#ifndef PJ_SSL_SOCK_IMP
+#   define PJ_SSL_SOCK_IMP PJ_SSL_SOCK_IMP_OPENSSL
+#endif
 
 
 #endif	/* __PJ_COMPAT_OS_AUTO_H__ */
diff --git a/VialerPJSIP.framework/Versions/A/Headers/pj/compat/os_auto.h.in b/VialerPJSIP.framework/Versions/A/Headers/pj/compat/os_auto.h.in
index 311888d7..6c4f4cb6 100644
--- a/VialerPJSIP.framework/Versions/A/Headers/pj/compat/os_auto.h.in
+++ b/VialerPJSIP.framework/Versions/A/Headers/pj/compat/os_auto.h.in
@@ -1,4 +1,4 @@
-/* $Id: os_auto.h.in 5543 2017-01-24 05:36:50Z nanang $ */
+/* $Id: os_auto.h.in 5725 2018-01-15 08:52:29Z ming $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -219,6 +219,9 @@
 #ifndef PJ_HAS_SSL_SOCK
 #undef PJ_HAS_SSL_SOCK
 #endif
+#ifndef PJ_SSL_SOCK_IMP
+#   define PJ_SSL_SOCK_IMP	PJ_SSL_SOCK_IMP_NONE
+#endif
 
 
 #endif	/* __PJ_COMPAT_OS_AUTO_H__ */
diff --git a/VialerPJSIP.framework/Versions/A/Headers/pj/compat/rand.h b/VialerPJSIP.framework/Versions/A/Headers/pj/compat/rand.h
index e2b3aaf6..115705a2 100644
--- a/VialerPJSIP.framework/Versions/A/Headers/pj/compat/rand.h
+++ b/VialerPJSIP.framework/Versions/A/Headers/pj/compat/rand.h
@@ -1,4 +1,4 @@
-/* $Id: rand.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id: rand.h 5692 2017-11-13 06:06:25Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -44,20 +44,6 @@
 #      define platform_rand rand
 #  endif
 
-#elif defined(PJ_LINUX_KERNEL) && PJ_LINUX_KERNEL != 0
-   /*
-    * Linux kernel mode random number generator.
-    */
-#  include <VialerPJSIP/linux/random.h>
-#  define platform_srand(seed)
-
-   PJ_INLINE(int) platform_rand(void)
-   {
-     int value;
-     get_random_bytes((void*)&value, sizeof(value));
-     return value;
-   }
-
 #else
 #  warning "platform_rand() is not implemented"
 #  define platform_rand()	1
diff --git a/VialerPJSIP.framework/Versions/A/Headers/pj/compat/setjmp.h b/VialerPJSIP.framework/Versions/A/Headers/pj/compat/setjmp.h
index 0aea2184..1cd41eb8 100644
--- a/VialerPJSIP.framework/Versions/A/Headers/pj/compat/setjmp.h
+++ b/VialerPJSIP.framework/Versions/A/Headers/pj/compat/setjmp.h
@@ -1,4 +1,4 @@
-/* $Id: setjmp.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id: setjmp.h 5692 2017-11-13 06:06:25Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -35,54 +35,6 @@
 #    define pj_longjmp(buf,d)	longjmp(buf,d)
 #  endif
 
-#elif defined(PJ_LINUX_KERNEL) && PJ_LINUX_KERNEL != 0 && \
-      defined(PJ_M_I386) && PJ_M_I386 != 0
-
-    /*
-     * These are taken from uClibc.
-     * Copyright (C) 2000-2003 Erik Andersen <andersen@uclibc.org>
-     */
-#   if defined __USE_MISC || defined _ASM
-#	define JB_BX	0
-#	define JB_SI	1
-#	define JB_DI	2
-#	define JB_BP	3
-#	define JB_SP	4
-#	define JB_PC	5
-#	define JB_SIZE 24
-#   endif
-
-# ifndef _ASM
-	typedef int __jmp_buf[6];
-
-    /* A `sigset_t' has a bit for each signal.  */
-#   define _SIGSET_NWORDS	(1024 / (8 * sizeof (unsigned long int)))
-    typedef struct __sigset_t_tag
-    {
-	unsigned long int __val[_SIGSET_NWORDS];
-    } __sigset_t;
-
-    /* Calling environment, plus possibly a saved signal mask.  */
-    typedef struct __jmp_buf_tag    /* C++ doesn't like tagless structs.  */
-    {
-	/* NOTE: The machine-dependent definitions of `__sigsetjmp'
-	   assume that a `jmp_buf' begins with a `__jmp_buf' and that
-	   `__mask_was_saved' follows it.  Do not move these members
-	   or add others before it.  */
-	__jmp_buf __jmpbuf;		/* Calling environment.  */
-	int __mask_was_saved;		/* Saved the signal mask?  */
-	// we never saved the mask.
-	__sigset_t __saved_mask;	/* Saved signal mask.  */
-    } jmp_buf[1];
-
-    typedef jmp_buf sigjmp_buf;
-    typedef jmp_buf pj_jmp_buf;
-
-    PJ_DECL(int) pj_setjmp(pj_jmp_buf env);
-    PJ_DECL(void) pj_longjmp(pj_jmp_buf env, int val) __attribute__((noreturn));
-
-# endif   /* _ASM */
-
 #elif defined(PJ_SYMBIAN) && PJ_SYMBIAN!=0
     /* Symbian framework don't use setjmp/longjmp */
     
diff --git a/VialerPJSIP.framework/Versions/A/Headers/pj/compat/socket.h b/VialerPJSIP.framework/Versions/A/Headers/pj/compat/socket.h
index 82f950a1..5f5ee9fa 100644
--- a/VialerPJSIP.framework/Versions/A/Headers/pj/compat/socket.h
+++ b/VialerPJSIP.framework/Versions/A/Headers/pj/compat/socket.h
@@ -1,4 +1,4 @@
-/* $Id: socket.h 5445 2016-10-05 09:52:39Z riza $ */
+/* $Id: socket.h 5692 2017-11-13 06:06:25Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -184,34 +184,6 @@
 #undef s6_addr
 #undef sin_zero
 
-/*
- * Linux kernel specifics
- */
-#if defined(PJ_LINUX_KERNEL)
-#   include <VialerPJSIP/linux/net.h>
-#   include <VialerPJSIP/asm/ioctls.h>		/* FIONBIO	*/
-#   include <VialerPJSIP/linux/syscalls.h>	/* sys_select() */
-#   include <VialerPJSIP/asm/uaccess.h>	/* set/get_fs()	*/
-
-    typedef int socklen_t;
-#   define getsockopt  sys_getsockopt
-
-    /*
-     * Wrapper for select() in Linux kernel.
-     */
-    PJ_INLINE(int) select(int n, fd_set *inp, fd_set *outp, fd_set *exp,
-		          struct timeval *tvp)
-    {
-        int count;
-        mm_segment_t oldfs = get_fs();
-        set_fs(KERNEL_DS);
-        count = sys_select(n, inp, outp, exp, tvp);
-        set_fs(oldfs);
-        return count;
-    }
-#endif	/* PJ_LINUX_KERNEL */
-
-
 /*
  * This will finally be obsoleted, since it should be declared in
  * os_auto.h
diff --git a/VialerPJSIP.framework/Versions/A/Headers/pj/config.h b/VialerPJSIP.framework/Versions/A/Headers/pj/config.h
index 8cb92c57..4070db64 100644
--- a/VialerPJSIP.framework/Versions/A/Headers/pj/config.h
+++ b/VialerPJSIP.framework/Versions/A/Headers/pj/config.h
@@ -1,4 +1,4 @@
-/* $Id: config.h 5683 2017-11-08 03:03:22Z ming $ */
+/* $Id: config.h 5725 2018-01-15 08:52:29Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -115,12 +115,6 @@
 #   define PJ_WIN32 1
 #   include <VialerPJSIP/pj/compat/os_win32.h>
 
-#elif defined(PJ_LINUX_KERNEL) && PJ_LINUX_KERNEL!=0
-    /*
-     * Linux kernel
-     */
-#  include <VialerPJSIP/pj/compat/os_linux_kernel.h>
-
 #elif defined(PJ_LINUX) || defined(linux) || defined(__linux)
     /*
      * Linux
@@ -918,8 +912,9 @@
 
 /**
  * Enable secure socket. For most platforms, this is implemented using
- * OpenSSL, so this will require OpenSSL to be installed. For Symbian
- * platform, this is implemented natively using CSecureSocket.
+ * OpenSSL or GnuTLS, so this will require one of those libraries to
+ * be installed. For Symbian platform, this is implemented natively
+ * using CSecureSocket.
  *
  * Default: 0 (for now)
  */
@@ -928,6 +923,28 @@
 #endif
 
 
+/*
+ * Secure socket implementation.
+ * Select one of these implementations in PJ_SSL_SOCK_IMP.
+ */
+#define PJ_SSL_SOCK_IMP_NONE 	    0	/**< Disable SSL socket.    */
+#define PJ_SSL_SOCK_IMP_OPENSSL	    1	/**< Using OpenSSL.	    */
+#define PJ_SSL_SOCK_IMP_GNUTLS      2	/**< Using GnuTLS.	    */
+
+
+/**
+ * Select which SSL socket implementation to use. Currently pjlib supports
+ * PJ_SSL_SOCK_IMP_OPENSSL, which uses OpenSSL, and PJ_SSL_SOCK_IMP_GNUTLS,
+ * which uses GnuTLS. Setting this to PJ_SSL_SOCK_IMP_NONE will disable
+ * secure socket.
+ *
+ * Default is PJ_SSL_SOCK_IMP_NONE
+ */
+#ifndef PJ_SSL_SOCK_IMP
+#   define PJ_SSL_SOCK_IMP		    PJ_SSL_SOCK_IMP_NONE
+#endif
+
+
 /**
  * Define the maximum number of ciphers supported by the secure socket.
  *
@@ -971,6 +988,17 @@
 #endif
 
 
+/**
+ * Maximum number of socket options in pj_sockopt_params.
+ *
+ * Default: 4
+ */
+#ifndef PJ_MAX_SOCKOPT_PARAMS
+#   define PJ_MAX_SOCKOPT_PARAMS	    4
+#endif
+
+
+
 /** @} */
 
 /********************************************************************
@@ -1299,7 +1327,7 @@ PJ_BEGIN_DECL
  * Extra suffix for the version (e.g. "-trunk"), or empty for
  * web release version.
  */
-#define PJ_VERSION_NUM_EXTRA	""
+#define PJ_VERSION_NUM_EXTRA	"-svn"
 
 /**
  * PJLIB version number consists of three bytes with the following format:
diff --git a/VialerPJSIP.framework/Versions/A/Headers/pj/config_site.h b/VialerPJSIP.framework/Versions/A/Headers/pj/config_site.h
index 447fd3ca..b8dd4145 100644
--- a/VialerPJSIP.framework/Versions/A/Headers/pj/config_site.h
+++ b/VialerPJSIP.framework/Versions/A/Headers/pj/config_site.h
@@ -5,5 +5,6 @@
 #define PJMEDIA_VIDEO_DEV_HAS_OPENGL_ES 1
 #define PJMEDIA_VIDEO_DEV_HAS_IOS_OPENGL 1
 #include <OpenGLES/ES3/glext.h>
+ #define PJ_HAS_IPV6 1
 #define PJMEDIA_SDP_NEG_ANSWER_SYMMETRIC_PT 0
 #include <VialerPJSIP/pj/config_site_sample.h>
diff --git a/VialerPJSIP.framework/Versions/A/Headers/pj/config_site_sample.h b/VialerPJSIP.framework/Versions/A/Headers/pj/config_site_sample.h
index 31bfd6e1..57fe3d45 100644
--- a/VialerPJSIP.framework/Versions/A/Headers/pj/config_site_sample.h
+++ b/VialerPJSIP.framework/Versions/A/Headers/pj/config_site_sample.h
@@ -411,6 +411,9 @@
     #define PJSIP_MAX_DIALOG_COUNT 		31
     #define PJSUA_MAX_CALLS			4
 
+    /* Separate worker thread for timer and ioqueue */
+    // #define PJSUA_SEPARATE_WORKER_FOR_TIMER	1
+
     /* Other pjsua settings */
     #define PJSUA_MAX_ACC			4
     #define PJSUA_MAX_PLAYERS			4
diff --git a/VialerPJSIP.framework/Versions/A/Headers/pj/sock.h b/VialerPJSIP.framework/Versions/A/Headers/pj/sock.h
index 2a09efe5..182c5917 100644
--- a/VialerPJSIP.framework/Versions/A/Headers/pj/sock.h
+++ b/VialerPJSIP.framework/Versions/A/Headers/pj/sock.h
@@ -1,4 +1,4 @@
-/* $Id: sock.h 5636 2017-08-02 02:51:59Z ming $ */
+/* $Id: sock.h 5719 2018-01-05 09:48:31Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -629,8 +629,6 @@ typedef struct pj_ip_mreq {
     pj_in_addr imr_interface;	/**< local IP address of interface. */
 } pj_ip_mreq;
 
-/* Maximum number of socket options. */
-#define PJ_MAX_SOCKOPT_PARAMS 4
 
 /**
  * Options to be set for the socket. 
diff --git a/VialerPJSIP.framework/Versions/A/Headers/pj/ssl_sock.h b/VialerPJSIP.framework/Versions/A/Headers/pj/ssl_sock.h
index 1bc4b31d..57277f9d 100644
--- a/VialerPJSIP.framework/Versions/A/Headers/pj/ssl_sock.h
+++ b/VialerPJSIP.framework/Versions/A/Headers/pj/ssl_sock.h
@@ -1,4 +1,4 @@
-/* $Id: ssl_sock.h 5472 2016-10-27 07:58:01Z ming $ */
+/* $Id: ssl_sock.h 5725 2018-01-15 08:52:29Z ming $ */
 /* 
  * Copyright (C) 2009-2011 Teluu Inc. (http://www.teluu.com)
  *
@@ -184,6 +184,11 @@ typedef struct pj_ssl_cert_info {
     pj_str_t raw;		    /**< Raw certificate in PEM format, only
 					 available for remote certificate. */
 
+    struct {
+        unsigned    	cnt;        /**< # of entry     */
+        pj_str_t       *cert_raw;
+    } raw_chain;
+
 } pj_ssl_cert_info;
 
 
diff --git a/VialerPJSIP.framework/Versions/A/Headers/pjlib-util/cli.h b/VialerPJSIP.framework/Versions/A/Headers/pjlib-util/cli.h
index 7e5e0223..6d307980 100644
--- a/VialerPJSIP.framework/Versions/A/Headers/pjlib-util/cli.h
+++ b/VialerPJSIP.framework/Versions/A/Headers/pjlib-util/cli.h
@@ -400,12 +400,14 @@ PJ_DECL(void) pj_cli_register_front_end(pj_cli_t *cli,
  * Create a new complete command specification from an XML node text and
  * register it to the CLI application.
  *
+ * Note that the input string MUST be NULL terminated.
+ *
  * @param cli		The CLI application.
  * @param group		Optional group to which this command will be added
  * 			to, or specify NULL if this command is a root
  * 			command.
  * @param xml		Input string containing XML node text for the
- * 			command.
+ * 			command, MUST be NULL terminated.
  * @param handler	Function handler for the command. This must be NULL
  * 			if the command specifies a command group.
  * @param p_cmd		Optional pointer to store the newly created
diff --git a/VialerPJSIP.framework/Versions/A/Headers/pjlib-util/scanner.h b/VialerPJSIP.framework/Versions/A/Headers/pjlib-util/scanner.h
index b5776a2c..775493b8 100644
--- a/VialerPJSIP.framework/Versions/A/Headers/pjlib-util/scanner.h
+++ b/VialerPJSIP.framework/Versions/A/Headers/pjlib-util/scanner.h
@@ -1,4 +1,4 @@
-/* $Id: scanner.h 4537 2013-06-19 06:47:43Z riza $ */
+/* $Id: scanner.h 5693 2017-11-14 08:20:15Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -216,16 +216,14 @@ typedef struct pj_scan_state
 
 
 /**
- * Initialize the scanner. Note that the input string buffer must have
- * length at least buflen+1 because the scanner will NULL terminate the
- * string during initialization.
+ * Initialize the scanner.
+ * Note that the input string buffer MUST be NULL terminated and have
+ * length at least buflen+1 (buflen MUST NOT include the NULL terminator).
  *
  * @param scanner   The scanner to be initialized.
- * @param bufstart  The input buffer to scan. Note that buffer[buflen] will be 
- *		    filled with NULL char until scanner is destroyed, so
- *		    the actual buffer length must be at least buflen+1.
+ * @param bufstart  The input buffer to scan, which must be NULL terminated.
  * @param buflen    The length of the input buffer, which normally is
- *		    strlen(bufstart).
+ *		    strlen(bufstart), hence not counting the NULL terminator.
  * @param options   Zero, or combination of PJ_SCAN_AUTOSKIP_WS or
  *		    PJ_SCAN_AUTOSKIP_WS_HEADER
  * @param callback  Callback to be called when the scanner encounters syntax
diff --git a/VialerPJSIP.framework/Versions/A/Headers/pjlib-util/xml.h b/VialerPJSIP.framework/Versions/A/Headers/pjlib-util/xml.h
index 715717ce..293083a3 100644
--- a/VialerPJSIP.framework/Versions/A/Headers/pjlib-util/xml.h
+++ b/VialerPJSIP.framework/Versions/A/Headers/pjlib-util/xml.h
@@ -1,4 +1,4 @@
-/* $Id: xml.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id: xml.h 5697 2017-11-17 04:07:43Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -73,9 +73,12 @@ struct pj_xml_node
  * XML comments ("<!--"), however such constructs will be ignored and will not 
  * be included in the resulted XML node tree.
  *
+ * Note that the XML message input buffer MUST be NULL terminated and have
+ * length at least len+1 (len MUST NOT include the NULL terminator).
+ *
  * @param pool	    Pool to allocate memory from.
- * @param msg	    The XML message to parse.
- * @param len	    The length of the message.
+ * @param msg	    The XML message to parse, MUST be NULL terminated.
+ * @param len	    The length of the message, not including NULL terminator.
  *
  * @return	    XML root node, or NULL if the XML document can not be parsed.
  */
diff --git a/VialerPJSIP.framework/Versions/A/Headers/pjmedia/config.h b/VialerPJSIP.framework/Versions/A/Headers/pjmedia/config.h
index 9f24f5d6..01ab31a0 100644
--- a/VialerPJSIP.framework/Versions/A/Headers/pjmedia/config.h
+++ b/VialerPJSIP.framework/Versions/A/Headers/pjmedia/config.h
@@ -1,4 +1,4 @@
-/* $Id: config.h 5643 2017-08-22 04:59:57Z riza $ */
+/* $Id: config.h 5702 2017-11-27 03:29:07Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -74,6 +74,16 @@
 #   define PJMEDIA_CONF_SWITCH_BOARD_BUF_SIZE    PJMEDIA_MAX_MTU
 #endif
 
+/**
+ * Specify whether the conference bridge uses AGC, an automatic adjustment to
+ * avoid dramatic change in the signal level which can cause noise.
+ *
+ * Default: 1 (enabled)
+ */
+#ifndef PJMEDIA_CONF_USE_AGC
+#   define PJMEDIA_CONF_USE_AGC    	    1
+#endif
+
 
 /*
  * Types of sound stream backends.
diff --git a/VialerPJSIP.framework/Versions/A/Headers/pjmedia/sdp.h b/VialerPJSIP.framework/Versions/A/Headers/pjmedia/sdp.h
index 1c96e327..11c9cbe9 100644
--- a/VialerPJSIP.framework/Versions/A/Headers/pjmedia/sdp.h
+++ b/VialerPJSIP.framework/Versions/A/Headers/pjmedia/sdp.h
@@ -1,4 +1,4 @@
-/* $Id: sdp.h 4367 2013-02-21 20:49:19Z nanang $ */
+/* $Id: sdp.h 5697 2017-11-17 04:07:43Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -645,9 +645,12 @@ typedef struct pjmedia_sdp_session pjmedia_sdp_session;
 /**
  * Parse SDP message.
  *
+ * Note that the input message buffer MUST be NULL terminated and have
+ * length at least len+1 (len MUST NOT include the NULL terminator).
+ *
  * @param pool	    The pool to allocate SDP session description.
- * @param buf	    The message buffer.
- * @param len	    The length of the message.
+ * @param buf	    The message buffer, MUST be NULL terminated.
+ * @param len	    The length of the message, excluding NULL terminator.
  * @param p_sdp	    Pointer to receive the SDP session descriptor.
  *
  * @return	    PJ_SUCCESS if message was successfully parsed into
diff --git a/VialerPJSIP.framework/Versions/A/Headers/pjsip-simple/iscomposing.h b/VialerPJSIP.framework/Versions/A/Headers/pjsip-simple/iscomposing.h
index 34d8a10f..13761056 100644
--- a/VialerPJSIP.framework/Versions/A/Headers/pjsip-simple/iscomposing.h
+++ b/VialerPJSIP.framework/Versions/A/Headers/pjsip-simple/iscomposing.h
@@ -1,4 +1,4 @@
-/* $Id: iscomposing.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id: iscomposing.h 5697 2017-11-17 04:07:43Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -104,9 +104,12 @@ PJ_DECL(pjsip_msg_body*) pjsip_iscomposing_create_body( pj_pool_t *pool,
  * Parse the buffer and return message composition indication in the 
  * message.
  *
+ * Note that the input string buffer MUST be NULL terminated and have
+ * length at least len+1 (len MUST NOT include the NULL terminator).
+ *
  * @param pool		    Pool to allocate memory for the parsing process.
- * @param msg		    The message to be parsed.
- * @param len		    Length of the message.
+ * @param msg		    The message to be parsed, MUST be NULL terminated.
+ * @param len		    Length of the message, excluding NULL terminator.
  * @param p_is_composing    Optional pointer to receive iscomposing status.
  * @param p_last_active	    Optional pointer to receive last active attribute.
  * @param p_content_type    Optional pointer to receive content type attribute.
diff --git a/VialerPJSIP.framework/Versions/A/Headers/pjsip-simple/xpidf.h b/VialerPJSIP.framework/Versions/A/Headers/pjsip-simple/xpidf.h
index 3a49a6d9..02806f6f 100644
--- a/VialerPJSIP.framework/Versions/A/Headers/pjsip-simple/xpidf.h
+++ b/VialerPJSIP.framework/Versions/A/Headers/pjsip-simple/xpidf.h
@@ -1,4 +1,4 @@
-/* $Id: xpidf.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id: xpidf.h 5697 2017-11-17 04:07:43Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -60,9 +60,12 @@ PJ_DECL(pjxpidf_pres*) pjxpidf_create(pj_pool_t *pool, const pj_str_t *uri);
 /**
  * Parse XPIDF document.
  *
+ * Note that the input text buffer MUST be NULL terminated and have
+ * length at least len+1 (len MUST NOT include the NULL terminator).
+ *
  * @param pool	    Pool.
- * @param text	    Input text.
- * @param len	    Length of input text.
+ * @param text	    Input text, MUST be NULL terminated.
+ * @param len	    Length of input text, NOT including the NULL terminator.
  *
  * @return	    XPIDF document.
  */
diff --git a/VialerPJSIP.framework/Versions/A/Headers/pjsip/sip_config.h b/VialerPJSIP.framework/Versions/A/Headers/pjsip/sip_config.h
index 2e564eb0..5400584f 100644
--- a/VialerPJSIP.framework/Versions/A/Headers/pjsip/sip_config.h
+++ b/VialerPJSIP.framework/Versions/A/Headers/pjsip/sip_config.h
@@ -1,4 +1,4 @@
-/* $Id: sip_config.h 5668 2017-09-29 02:43:05Z ming $ */
+/* $Id: sip_config.h 5716 2017-12-18 09:46:03Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -157,6 +157,19 @@ typedef struct pjsip_cfg_t
 	 */
 	pj_bool_t disable_secure_dlg_check;
 
+	/**
+	 * Encode SIP headers in their short forms to reduce size. By default,
+	 * SIP headers in outgoing messages will be encoded in their full names.
+	 * If this option is enabled, then SIP headers for outgoing messages
+	 * will be encoded in their short forms, to reduce message size. 
+	 * Note that this does not affect the ability of PJSIP to parse incoming
+	 * SIP messages, as the parser always supports parsing both the long
+	 * and short version of the headers.
+	 *
+	 * Default is PJSIP_ENCODE_SHORT_HNAME
+	 */
+	pj_bool_t use_compact_form;
+
     } endpt;
 
     /** Transaction layer settings. */
@@ -464,18 +477,8 @@ PJ_INLINE(pjsip_cfg_t*) pjsip_cfg(void)
  * SIP messages, as the parser always supports parsing both the long
  * and short version of the headers.
  *
- * Note that there is also an undocumented variable defined in sip_msg.c
- * to control whether compact form should be used for encoding SIP
- * headers. The default value of this variable is PJSIP_ENCODE_SHORT_HNAME.
- * To change PJSIP behavior during run-time, application can use the 
- * following construct:
- *
- \verbatim
-   extern pj_bool_t pjsip_use_compact_form;
- 
-   // enable compact form
-   pjsip_use_compact_form = PJ_TRUE;
- \endverbatim
+ * This option can also be controlled at run-time by the
+ * \a use_compact_form setting in pjsip_cfg_t.
  *
  * Default is 0 (no)
  */
@@ -799,12 +802,16 @@ PJ_INLINE(pjsip_cfg_t*) pjsip_cfg(void)
  * will slightly affect stack usage, since each entry will occupy about
  * 32 bytes of stack memory.
  *
- * Default: 8
+ * Default: 16 (or 32 if IPv6 support is enabled)
  *
  * @see PJSIP_HAS_RESOLVER
  */
 #ifndef PJSIP_MAX_RESOLVED_ADDRESSES
-#   define PJSIP_MAX_RESOLVED_ADDRESSES	    8
+#   if defined(PJ_HAS_IPV6) && PJ_HAS_IPV6
+#       define PJSIP_MAX_RESOLVED_ADDRESSES	    32
+#   else
+#       define PJSIP_MAX_RESOLVED_ADDRESSES	    16
+#   endif
 #endif
 
 
diff --git a/VialerPJSIP.framework/Versions/A/Headers/pjsip/sip_parser.h b/VialerPJSIP.framework/Versions/A/Headers/pjsip/sip_parser.h
index ebb8b522..7344753c 100644
--- a/VialerPJSIP.framework/Versions/A/Headers/pjsip/sip_parser.h
+++ b/VialerPJSIP.framework/Versions/A/Headers/pjsip/sip_parser.h
@@ -1,4 +1,4 @@
-/* $Id: sip_parser.h 5682 2017-11-08 02:58:18Z riza $ */
+/* $Id: sip_parser.h 5697 2017-11-17 04:07:43Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -196,6 +196,8 @@ PJ_DECL(pj_status_t) pjsip_unregister_uri_parser( const char *scheme,
 
 /**
  * Parse an URI in the input and return the correct instance of URI.
+ * Note that the input string buffer MUST be NULL terminated and have
+ * length at least size+1 (size MUST NOT include the NULL terminator).
  *
  * @param pool		The pool to get memory allocations.
  * @param buf		The input buffer, which MUST be NULL terminated.
@@ -216,6 +218,8 @@ PJ_DECL(pjsip_uri*) pjsip_parse_uri( pj_pool_t *pool,
 
 /**
  * Parse SIP status line.
+ * Note that the input string buffer MUST be NULL terminated and have
+ * length at least size+1 (size MUST NOT include the NULL terminator).
  *
  * @param buf		Text buffer to parse, which MUST be NULL terminated.
  * @param size		The size of the buffer, excluding the NULL character.
@@ -234,6 +238,9 @@ PJ_DECL(pj_status_t) pjsip_parse_status_line(char *buf, pj_size_t size,
  * treated as a text block, ie. the function will not try to parse the content
  * of the body.
  *
+ * Note that the input string buffer MUST be NULL terminated and have
+ * length at least size+1 (size MUST NOT include the NULL terminator).
+ *
  * @param pool		The pool to allocate memory.
  * @param buf		The input buffer, which MUST be NULL terminated.
  * @param size		The length of the string (not counting NULL terminator).
@@ -256,6 +263,9 @@ PJ_DECL(pjsip_msg *) pjsip_parse_msg( pj_pool_t *pool,
  *
  * This function is normally called by the transport layer.
  *
+ * Note that the input string buffer MUST be NULL terminated and have
+ * length at least size+1 (size MUST NOT include the NULL terminator).
+ *
  * @param buf		The input buffer, which MUST be NULL terminated.
  * @param size		The length of the string (not counting NULL terminator).
  * @param rdata         The receive data buffer to store the message and
@@ -269,9 +279,11 @@ PJ_DECL(pjsip_msg *) pjsip_parse_rdata( char *buf, pj_size_t size,
 /**
  * Check incoming packet to see if a (probably) valid SIP message has been 
  * received.
+ * Note that the input string buffer MUST be NULL terminated and have
+ * length at least size+1 (size MUST NOT include the NULL terminator).
  *
  * @param buf		The input buffer, which must be NULL terminated.
- * @param size		The buffer size.
+ * @param size		The length of the string (not counting NULL terminator).
  * @param is_datagram	Put non-zero if transport is datagram oriented.
  * @param msg_size	[out] If message is valid, this parameter will contain
  *			the size of the SIP message (including body, if any).
@@ -288,6 +300,9 @@ PJ_DECL(pj_status_t) pjsip_find_msg(const char *buf,
  * This function parses the content of a header (ie. part after colon) according
  * to the expected name, and will return the correct instance of header.
  *
+ * Note that the input string buffer MUST be NULL terminated and have
+ * length at least size+1 (size MUST NOT include the NULL terminator). 
+ *
  * @param pool		Pool to allocate memory for the header.
  * @param hname		Header name which is used to find the correct function
  *			to parse the header.
@@ -314,9 +329,12 @@ PJ_DECL(void*) pjsip_parse_hdr( pj_pool_t *pool, const pj_str_t *hname,
  * a newline (as in SIP message) or ampersand mark (as in URI). This separator
  * is optional for the last header.
  *
+ * Note that the input string buffer MUST be NULL terminated and have
+ * length at least size+1 (size MUST NOT include the NULL terminator).
+ *
  * @param pool		The pool.
  * @param input		The input text to parse, which must be NULL terminated.
- * @param size		The text length.
+ * @param size		The text length (not counting NULL terminator).
  * @param hlist		The header list to store the parsed headers.
  *			This list must have been initialized before calling 
  *			this function.
diff --git a/VialerPJSIP.framework/Versions/A/Headers/pjsua-lib/pjsua.h b/VialerPJSIP.framework/Versions/A/Headers/pjsua-lib/pjsua.h
index a5ad43b0..736c040d 100644
--- a/VialerPJSIP.framework/Versions/A/Headers/pjsua-lib/pjsua.h
+++ b/VialerPJSIP.framework/Versions/A/Headers/pjsua-lib/pjsua.h
@@ -1,4 +1,4 @@
-/* $Id: pjsua.h 5677 2017-10-27 06:30:50Z ming $ */
+/* $Id: pjsua.h 5721 2018-01-08 04:08:35Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -351,6 +351,22 @@ typedef struct pj_stun_resolve_result pj_stun_resolve_result;
 #endif
 
 
+/**
+ * Specify whether timer heap events will be polled by a separate worker
+ * thread. If this is set/enabled, a worker thread will be dedicated to
+ * poll timer heap events only, and the rest worker thread(s) will poll
+ * ioqueue/network events only.
+ *
+ * Note that if worker thread count setting (i.e: pjsua_config.thread_cnt)
+ * is set to zero, this setting will be ignored.
+ *
+ * Default: 0 (disabled)
+ */
+#ifndef PJSUA_SEPARATE_WORKER_FOR_TIMER
+#   define PJSUA_SEPARATE_WORKER_FOR_TIMER	0
+#endif
+
+
 /**
  * This enumeration represents pjsua state.
  */
@@ -1968,8 +1984,9 @@ struct pjsua_msg_data
 {
     /**
      * Optional remote target URI (i.e. Target header). If NULL, the target
-     * will be set to the remote URI (To header). At the moment this field
-     * is only used by #pjsua_call_make_call() and #pjsua_im_send().
+     * will be set to the remote URI (To header). This field is used by
+     * pjsua_call_make_call(), pjsua_im_send(), pjsua_call_reinvite(),
+     * pjsua_call_set_hold(), and pjsua_call_update().
      */
     pj_str_t    target_uri;
 
@@ -2759,6 +2776,19 @@ PJ_DECL(pj_status_t) pjsua_transport_register(pjsip_transport *tp,
 					      pjsua_transport_id *p_id);
 
 
+/**
+ * Register transport factory that has been created by application.
+ * This function is useful if application wants to implement custom SIP
+ * transport and use it with pjsua.
+ *
+ * @param tf		Transport factory instance.
+ * @param p_id		Optional pointer to receive transport ID.
+ *
+ * @return		PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DEF(pj_status_t) pjsua_tpfactory_register( pjsip_tpfactory *tf,
+					      pjsua_transport_id *p_id);
+
 /**
  * Enumerate all transports currently created in the system. This function
  * will return all transport IDs, and application may then call 
@@ -4610,7 +4640,16 @@ typedef enum pjsua_call_flag
      * in IP address change situation, after the local account's Via has
      * been updated (typically with re-registration).
      */
-    PJSUA_CALL_UPDATE_VIA = 32
+    PJSUA_CALL_UPDATE_VIA = 32,
+
+    /**
+     * Update dialog target to URI specified in pjsua_msg_data.target_uri.
+     * This flag is only valid for pjsua_call_set_hold(),
+     * pjsua_call_reinvite(), and pjsua_call_update(). This flag can be
+     * useful in IP address change scenario where IP version has been changed
+     * and application needs to update target IP address.
+     */
+    PJSUA_CALL_UPDATE_TARGET = 64
 
 } pjsua_call_flag;
 
@@ -7015,6 +7054,69 @@ PJ_DECL(pj_status_t) pjsua_snd_get_setting(pjmedia_aud_dev_cap cap,
 					   void *pval);
 
 
+/**
+ * Opaque type of extra sound device, an additional sound device
+ * beside the primary sound device (the one instantiated via
+ * pjsua_set_snd_dev() or pjsua_set_snd_dev2()). This sound device is
+ * also registered to conference bridge so it can be used as a normal
+ * conference bridge port, e.g: connect it to/from other ports,
+ * adjust/check audio level, etc. The conference bridge port ID can be
+ * queried using pjsua_ext_snd_dev_get_conf_port().
+ *
+ * Application may also use this API to improve media clock. Normally
+ * media clock is driven by sound device in master port, but unfortunately
+ * some sound devices may produce jittery clock. To improve media clock,
+ * application can install Null Sound Device (i.e: using
+ * pjsua_set_null_snd_dev()), which will act as a master port, and instantiate
+ * the sound device as extra sound device. But note that extra sound device
+ * will not have auto-close upon idle feature.
+ */
+typedef struct pjsua_ext_snd_dev pjsua_ext_snd_dev;
+
+
+/**
+ * Create an extra sound device and register it to conference bridge.
+ *
+ * @param snd_param	Sound device port param.
+ * @param p_snd		The extra sound device instance.
+ *
+ * @return		PJ_SUCCESS on success or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_ext_snd_dev_create(pjmedia_snd_port_param *param,
+					      pjsua_ext_snd_dev **p_snd);
+
+
+/**
+ * Destroy an extra sound device and unregister it from conference bridge.
+ *
+ * @param p_snd		The extra sound device instance.
+ *
+ * @return		PJ_SUCCESS on success or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_ext_snd_dev_destroy(pjsua_ext_snd_dev *snd);
+
+
+/**
+ * Get sound port instance of an extra sound device.
+ *
+ * @param snd		The extra sound device instance.
+ *
+ * @return		The sound port instance.
+ */
+PJ_DECL(pjmedia_snd_port*) pjsua_ext_snd_dev_get_snd_port(
+					    pjsua_ext_snd_dev *snd);
+
+/**
+ * Get conference port ID of an extra sound device.
+ *
+ * @param snd		The extra sound device instance.
+ *
+ * @return		The conference port ID.
+ */
+PJ_DECL(pjsua_conf_port_id) pjsua_ext_snd_dev_get_conf_port(
+					    pjsua_ext_snd_dev *snd);
+
+
 /*****************************************************************************
  * Codecs.
  */
diff --git a/VialerPJSIP.framework/Versions/A/Headers/pjsua2/endpoint.hpp b/VialerPJSIP.framework/Versions/A/Headers/pjsua2/endpoint.hpp
index 184fedae..96a8e915 100644
--- a/VialerPJSIP.framework/Versions/A/Headers/pjsua2/endpoint.hpp
+++ b/VialerPJSIP.framework/Versions/A/Headers/pjsua2/endpoint.hpp
@@ -1,4 +1,4 @@
-/* $Id: endpoint.hpp 5676 2017-10-24 07:31:39Z ming $ */
+/* $Id: endpoint.hpp 5704 2017-11-27 08:37:37Z ming $ */
 /* 
  * Copyright (C) 2013 Teluu Inc. (http://www.teluu.com)
  *
@@ -459,6 +459,15 @@ struct UaConfig : public PersistentObject
      */
     StringVector	nameserver;
 
+    /**
+     * Specify the URL of outbound proxies to visit for all outgoing requests.
+     * The outbound proxies will be used for all accounts, and it will
+     * be used to build the route set for outgoing requests. The final
+     * route set for outgoing requests will consists of the outbound proxies
+     * and the proxy configured in the account.
+     */
+    StringVector	outboundProxies;
+
     /**
      * Optional user agent string (default empty). If it's empty, no
      * User-Agent header will be sent with outgoing requests.
@@ -494,8 +503,8 @@ struct UaConfig : public PersistentObject
      *
      * Default: FALSE
      */
-
     bool	    	stunTryIpv6;
+
     /**
      * This specifies if the library startup should ignore failure with the
      * STUN servers. If this is set to PJ_FALSE, the library will refuse to
diff --git a/VialerPJSIP.framework/Versions/A/Headers/pjsua2/media.hpp b/VialerPJSIP.framework/Versions/A/Headers/pjsua2/media.hpp
index 3613adb1..e153fd82 100644
--- a/VialerPJSIP.framework/Versions/A/Headers/pjsua2/media.hpp
+++ b/VialerPJSIP.framework/Versions/A/Headers/pjsua2/media.hpp
@@ -1,4 +1,4 @@
-/* $Id: media.hpp 5645 2017-09-06 03:44:35Z riza $ */
+/* $Id: media.hpp 5717 2017-12-19 01:45:37Z nanang $ */
 /*
  * Copyright (C) 2013 Teluu Inc. (http://www.teluu.com)
  *
@@ -1349,6 +1349,57 @@ class AudDevManager
 };
 
 
+/**
+ * Extra audio device. This class allows application to have multiple
+ * sound device instances active concurrently. Application may also use
+ * this class to improve media clock. Normally media clock is driven by
+ * sound device in master port, but unfortunately some sound devices may
+ * produce jittery clock. To improve media clock, application can install
+ * Null Sound Device (i.e: using AudDevManager::setNullDev()), which will
+ * act as a master port, and install the sound device as extra sound device.
+ * Note that extra sound device will not have auto-close upon idle feature.
+ */
+class ExtraAudioDevice : public AudioMedia
+{
+public:
+    /**
+     * Constructor
+     *
+     * @param playdev		Playback device ID.
+     * @param recdev		Record device ID.
+     */
+    ExtraAudioDevice(int playdev, int recdev);
+
+    /**
+     * Destructor
+     */
+    virtual ~ExtraAudioDevice();
+
+    /**
+     * Open the audio device using format (e.g.: clock rate, channel count,
+     * samples per frame) matched to the conference bridge's format.
+     */
+    void open();
+
+    /**
+     * Close the audio device.
+     */
+    void close();
+
+    /**
+     * Is the extra audio device opened?
+     *
+     * @return	    		'true' if it is opened.
+     */
+    bool isOpened();
+
+protected:
+    int playDev;
+    int recDev;
+    void *ext_snd_dev;
+};
+
+
 /*************************************************************************
 * Video media
 */
diff --git a/VialerPJSIP.framework/Versions/A/VialerPJSIP b/VialerPJSIP.framework/Versions/A/VialerPJSIP
index 250e0afa..39ba5254 100644
--- a/VialerPJSIP.framework/Versions/A/VialerPJSIP
+++ b/VialerPJSIP.framework/Versions/A/VialerPJSIP
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8f7f8313146f422f4cde8f5e4e19ad121d3546b6447ff88ce6a22e5978891c48
-size 190635536
+oid sha256:48a736cca25f7148e4752604da5655c00e690d7c16ce0074316be9e10d99270f
+size 138629072
diff --git a/vialerbuild b/vialerbuild
index 3c14f79e..9248a401 100755
--- a/vialerbuild
+++ b/vialerbuild
@@ -8,7 +8,7 @@ AVIALABLE_ARCHS=(
 )
 export BASE_DIR=`pwd -P`
 export MIN_IOS_VERSION="9.0"
-export IOS_SDK_VERSION="10.0"
+export IOS_SDK_VERSION="11.2"
 export AVIALABLE_ARCHS
 export USE_ARCHS=()
 
@@ -22,7 +22,7 @@ export HAS_BITCODE=true
 export HAS_IPV6=false
 export SHOW_HELP=false
 
-export PJSIP_VERSION="latest"
+export PJSIP_VERSION="trunk"
 export PJSIP_BASE_URL="http://svn.pjsip.org/repos/pjproject"
 export PJSIP_DIR="$BASE_DIR/pjsip"
 export PJSIP_FINAL_LIB_DIR="$BASE_DIR/lib"
@@ -228,9 +228,9 @@ function build_h264 () {
         rm ${h264_makefile}.deleteme
         
         echo "--- Run make file for ${arch}"
-        make OS=ios ARCH=${arch} SDK_MIN=${MIN_IOS_VERSION} >> "${h264_log}"
-        make OS=ios ARCH=${arch} SDK_MIN=${MIN_IOS_VERSION} install >> "${h264_log}"
-        make OS=ios ARCH=${arch} SDK_MIN=${MIN_IOS_VERSION} clean >> "${h264_log}"
+        make OS=ios ARCH=${arch} SDK_MIN=${MIN_IOS_VERSION} v=No >> "${h264_log}"
+        make OS=ios ARCH=${arch} SDK_MIN=${MIN_IOS_VERSION} v=No install >> "${h264_log}"
+        make OS=ios ARCH=${arch} SDK_MIN=${MIN_IOS_VERSION} v=No clean >> "${h264_log}"
 
         mv "${h264_makefile_bak}" "${h264_makefile}"
 
@@ -244,7 +244,7 @@ function build_h264 () {
     fi
 
     echo "--- Lipo openH264"
-    lipo ${h264_lipo_args} -create -output "${H264_BUILD_DIR}/lib/libopenh264.a"
+    xcrun -sdk iphoneos lipo ${h264_lipo_args} -create -output "${H264_BUILD_DIR}/lib/libopenh264.a"
 
     echo "--- Copying header files"
     cp -R "${H264_BUILD_DIR}/build/${USE_ARCHS[0]}/include/" "${H264_BUILD_DIR}/include"
@@ -479,7 +479,7 @@ function config_site () {
     fi
 
     if [ $HAS_IPV6 = true ]; then
-        echo " #define PJ_HAS_IPV6 1"
+        echo " #define PJ_HAS_IPV6 1" >> $PJSIP_CONFIG_SITE_H
     fi
 
     while IFS=',' read -ra CONFIG_SITE_OPTION; do