updated pjsip stack
There is still a bug on incoming calls when buiding for android
diff --git a/jni/pjproject-android/pjsip/include/pjsip-simple/errno.h b/jni/pjproject-android/pjsip/include/pjsip-simple/errno.h
index 72450aa..62927ca 100644
--- a/jni/pjproject-android/pjsip/include/pjsip-simple/errno.h
+++ b/jni/pjproject-android/pjsip/include/pjsip-simple/errno.h
@@ -1,4 +1,4 @@
-/* $Id: errno.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip-simple/evsub.h b/jni/pjproject-android/pjsip/include/pjsip-simple/evsub.h
index 5184a79..b0159bf 100644
--- a/jni/pjproject-android/pjsip/include/pjsip-simple/evsub.h
+++ b/jni/pjproject-android/pjsip/include/pjsip-simple/evsub.h
@@ -1,4 +1,4 @@
-/* $Id: evsub.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip-simple/evsub_msg.h b/jni/pjproject-android/pjsip/include/pjsip-simple/evsub_msg.h
index 64035e2..b5016e4 100644
--- a/jni/pjproject-android/pjsip/include/pjsip-simple/evsub_msg.h
+++ b/jni/pjproject-android/pjsip/include/pjsip-simple/evsub_msg.h
@@ -1,4 +1,4 @@
-/* $Id: evsub_msg.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip-simple/iscomposing.h b/jni/pjproject-android/pjsip/include/pjsip-simple/iscomposing.h
index 61d5c72..9cd5e97 100644
--- a/jni/pjproject-android/pjsip/include/pjsip-simple/iscomposing.h
+++ b/jni/pjproject-android/pjsip/include/pjsip-simple/iscomposing.h
@@ -1,4 +1,4 @@
-/* $Id: iscomposing.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip-simple/mwi.h b/jni/pjproject-android/pjsip/include/pjsip-simple/mwi.h
index 4f59d40..9887cfe 100644
--- a/jni/pjproject-android/pjsip/include/pjsip-simple/mwi.h
+++ b/jni/pjproject-android/pjsip/include/pjsip-simple/mwi.h
@@ -1,4 +1,4 @@
-/* $Id: mwi.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
*
diff --git a/jni/pjproject-android/pjsip/include/pjsip-simple/pidf.h b/jni/pjproject-android/pjsip/include/pjsip-simple/pidf.h
index 6e26264..98828da 100644
--- a/jni/pjproject-android/pjsip/include/pjsip-simple/pidf.h
+++ b/jni/pjproject-android/pjsip/include/pjsip-simple/pidf.h
@@ -1,4 +1,4 @@
-/* $Id: pidf.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip-simple/presence.h b/jni/pjproject-android/pjsip/include/pjsip-simple/presence.h
index d266baa..f29489f 100644
--- a/jni/pjproject-android/pjsip/include/pjsip-simple/presence.h
+++ b/jni/pjproject-android/pjsip/include/pjsip-simple/presence.h
@@ -1,4 +1,4 @@
-/* $Id: presence.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip-simple/publish.h b/jni/pjproject-android/pjsip/include/pjsip-simple/publish.h
index 5940ab7..59a5870 100644
--- a/jni/pjproject-android/pjsip/include/pjsip-simple/publish.h
+++ b/jni/pjproject-android/pjsip/include/pjsip-simple/publish.h
@@ -1,4 +1,4 @@
-/* $Id: publish.h 4173 2012-06-20 10:39:05Z ming $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip-simple/rpid.h b/jni/pjproject-android/pjsip/include/pjsip-simple/rpid.h
index 1ee8982..6caf05a 100644
--- a/jni/pjproject-android/pjsip/include/pjsip-simple/rpid.h
+++ b/jni/pjproject-android/pjsip/include/pjsip-simple/rpid.h
@@ -1,4 +1,4 @@
-/* $Id: rpid.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip-simple/types.h b/jni/pjproject-android/pjsip/include/pjsip-simple/types.h
index 74eee03..f8c7f77 100644
--- a/jni/pjproject-android/pjsip/include/pjsip-simple/types.h
+++ b/jni/pjproject-android/pjsip/include/pjsip-simple/types.h
@@ -1,4 +1,4 @@
-/* $Id: types.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip-simple/xpidf.h b/jni/pjproject-android/pjsip/include/pjsip-simple/xpidf.h
index 911a429..bf6fbf2 100644
--- a/jni/pjproject-android/pjsip/include/pjsip-simple/xpidf.h
+++ b/jni/pjproject-android/pjsip/include/pjsip-simple/xpidf.h
@@ -1,4 +1,4 @@
-/* $Id: xpidf.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip-ua/sip_100rel.h b/jni/pjproject-android/pjsip/include/pjsip-ua/sip_100rel.h
index 1b01d24..d44b0f6 100644
--- a/jni/pjproject-android/pjsip/include/pjsip-ua/sip_100rel.h
+++ b/jni/pjproject-android/pjsip/include/pjsip-ua/sip_100rel.h
@@ -1,4 +1,4 @@
-/* $Id: sip_100rel.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip-ua/sip_inv.h b/jni/pjproject-android/pjsip/include/pjsip-ua/sip_inv.h
index 1bb0360..5782cf9 100644
--- a/jni/pjproject-android/pjsip/include/pjsip-ua/sip_inv.h
+++ b/jni/pjproject-android/pjsip/include/pjsip-ua/sip_inv.h
@@ -1,4 +1,4 @@
-/* $Id: sip_inv.h 4562 2013-07-15 04:23:31Z ming $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -172,6 +172,10 @@
* #pjsip_inv_set_sdp_answer() and the re-INVITE will be answered
* automatically.
*
+ * Remarks: Application may need to monitor on_tsx_state_changed()
+ * callback to check whether the re-INVITE is already answered
+ * automatically with 487 due to being cancelled.
+ *
* @param inv The invite session.
* @param offer Remote offer.
* @param rdata The received re-INVITE request.
diff --git a/jni/pjproject-android/pjsip/include/pjsip-ua/sip_regc.h b/jni/pjproject-android/pjsip/include/pjsip-ua/sip_regc.h
index 826d45e..80c7a33 100644
--- a/jni/pjproject-android/pjsip/include/pjsip-ua/sip_regc.h
+++ b/jni/pjproject-android/pjsip/include/pjsip-ua/sip_regc.h
@@ -1,4 +1,4 @@
-/* $Id: sip_regc.h 4173 2012-06-20 10:39:05Z ming $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -84,6 +84,22 @@
typedef void pjsip_regc_cb(struct pjsip_regc_cbparam *param);
/**
+ * Structure to hold parameters when calling application's callback
+ * specified in #pjsip_regc_set_reg_tsx_cb().
+ * To update contact address, application can set the field contact_cnt
+ * and contact inside the callback.
+ */
+struct pjsip_regc_tsx_cb_param
+{
+ struct pjsip_regc_cbparam cbparam;
+ int contact_cnt;
+ pj_str_t contact[PJSIP_REGC_MAX_CONTACT];
+};
+
+/** Type declaration for callback set in #pjsip_regc_set_reg_tsx_cb(). */
+typedef void pjsip_regc_tsx_cb(struct pjsip_regc_tsx_cb_param *param);
+
+/**
* Client registration information.
*/
struct pjsip_regc_info
@@ -191,6 +207,21 @@
pj_uint32_t expires);
/**
+ * Set callback to be called when the registration received a final response.
+ * This callback is different with the one specified during creation via
+ * #pjsip_regc_create(). This callback will be called for any final response
+ * (including 401/407/423) and before any subsequent requests are sent.
+ * In case of unregistration, this callback will not be called.
+ *
+ * @param regc The client registration structure.
+ * @param tsx_cb Pointer to callback function to receive registration status.
+ *
+ * @return PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjsip_regc_set_reg_tsx_cb(pjsip_regc *regc,
+ pjsip_regc_tsx_cb *tsx_cb);
+
+/**
* Set the "sent-by" field of the Via header for outgoing requests.
*
* @param regc The client registration structure.
diff --git a/jni/pjproject-android/pjsip/include/pjsip-ua/sip_replaces.h b/jni/pjproject-android/pjsip/include/pjsip-ua/sip_replaces.h
index 6293b0f..aff4449 100644
--- a/jni/pjproject-android/pjsip/include/pjsip-ua/sip_replaces.h
+++ b/jni/pjproject-android/pjsip/include/pjsip-ua/sip_replaces.h
@@ -1,4 +1,4 @@
-/* $Id: sip_replaces.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip-ua/sip_timer.h b/jni/pjproject-android/pjsip/include/pjsip-ua/sip_timer.h
index 6ef7931..aac4e68 100644
--- a/jni/pjproject-android/pjsip/include/pjsip-ua/sip_timer.h
+++ b/jni/pjproject-android/pjsip/include/pjsip-ua/sip_timer.h
@@ -1,4 +1,4 @@
-/* $Id: sip_timer.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2009-2011 Teluu Inc. (http://www.teluu.com)
*
diff --git a/jni/pjproject-android/pjsip/include/pjsip-ua/sip_xfer.h b/jni/pjproject-android/pjsip/include/pjsip-ua/sip_xfer.h
index b7b68d9..b8d8126 100644
--- a/jni/pjproject-android/pjsip/include/pjsip-ua/sip_xfer.h
+++ b/jni/pjproject-android/pjsip/include/pjsip-ua/sip_xfer.h
@@ -1,4 +1,4 @@
-/* $Id: sip_xfer.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip.h b/jni/pjproject-android/pjsip/include/pjsip.h
index a2021cd..25f6bd0 100644
--- a/jni/pjproject-android/pjsip/include/pjsip.h
+++ b/jni/pjproject-android/pjsip/include/pjsip.h
@@ -1,4 +1,4 @@
-/* $Id: pjsip.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip/print_util.h b/jni/pjproject-android/pjsip/include/pjsip/print_util.h
index e616fa3..6d82aad 100644
--- a/jni/pjproject-android/pjsip/include/pjsip/print_util.h
+++ b/jni/pjproject-android/pjsip/include/pjsip/print_util.h
@@ -1,4 +1,4 @@
-/* $Id: print_util.h 4537 2013-06-19 06:47:43Z riza $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip/sip_auth.h b/jni/pjproject-android/pjsip/include/pjsip/sip_auth.h
index cd59372..ce262ef 100644
--- a/jni/pjproject-android/pjsip/include/pjsip/sip_auth.h
+++ b/jni/pjproject-android/pjsip/include/pjsip/sip_auth.h
@@ -1,4 +1,4 @@
-/* $Id: sip_auth.h 4214 2012-07-25 14:29:28Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip/sip_auth_aka.h b/jni/pjproject-android/pjsip/include/pjsip/sip_auth_aka.h
index 0665bf2..291e2b0 100644
--- a/jni/pjproject-android/pjsip/include/pjsip/sip_auth_aka.h
+++ b/jni/pjproject-android/pjsip/include/pjsip/sip_auth_aka.h
@@ -1,4 +1,4 @@
-/* $Id: sip_auth_aka.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip/sip_auth_msg.h b/jni/pjproject-android/pjsip/include/pjsip/sip_auth_msg.h
index ee6da24..56dec78 100644
--- a/jni/pjproject-android/pjsip/include/pjsip/sip_auth_msg.h
+++ b/jni/pjproject-android/pjsip/include/pjsip/sip_auth_msg.h
@@ -1,4 +1,4 @@
-/* $Id: sip_auth_msg.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip/sip_auth_parser.h b/jni/pjproject-android/pjsip/include/pjsip/sip_auth_parser.h
index 703c52f..9685fcd 100644
--- a/jni/pjproject-android/pjsip/include/pjsip/sip_auth_parser.h
+++ b/jni/pjproject-android/pjsip/include/pjsip/sip_auth_parser.h
@@ -1,4 +1,4 @@
-/* $Id: sip_auth_parser.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip/sip_autoconf.h.in b/jni/pjproject-android/pjsip/include/pjsip/sip_autoconf.h.in
index 6cae772..38eda08 100644
--- a/jni/pjproject-android/pjsip/include/pjsip/sip_autoconf.h.in
+++ b/jni/pjproject-android/pjsip/include/pjsip/sip_autoconf.h.in
@@ -1,4 +1,4 @@
-/* $Id: sip_autoconf.h.in 3295 2010-08-25 12:51:29Z bennylp $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip/sip_config.h b/jni/pjproject-android/pjsip/include/pjsip/sip_config.h
index 11b82cb..ed93e92 100644
--- a/jni/pjproject-android/pjsip/include/pjsip/sip_config.h
+++ b/jni/pjproject-android/pjsip/include/pjsip/sip_config.h
@@ -1,4 +1,4 @@
-/* $Id: sip_config.h 4537 2013-06-19 06:47:43Z riza $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip/sip_dialog.h b/jni/pjproject-android/pjsip/include/pjsip/sip_dialog.h
index 63e12ac..9f37c32 100644
--- a/jni/pjproject-android/pjsip/include/pjsip/sip_dialog.h
+++ b/jni/pjproject-android/pjsip/include/pjsip/sip_dialog.h
@@ -1,4 +1,4 @@
-/* $Id: sip_dialog.h 4173 2012-06-20 10:39:05Z ming $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip/sip_endpoint.h b/jni/pjproject-android/pjsip/include/pjsip/sip_endpoint.h
index 63c65d7..265b7f2 100644
--- a/jni/pjproject-android/pjsip/include/pjsip/sip_endpoint.h
+++ b/jni/pjproject-android/pjsip/include/pjsip/sip_endpoint.h
@@ -1,4 +1,4 @@
-/* $Id: sip_endpoint.h 4275 2012-10-04 06:11:58Z bennylp $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip/sip_errno.h b/jni/pjproject-android/pjsip/include/pjsip/sip_errno.h
index 26e326e..afcecc4 100644
--- a/jni/pjproject-android/pjsip/include/pjsip/sip_errno.h
+++ b/jni/pjproject-android/pjsip/include/pjsip/sip_errno.h
@@ -1,4 +1,4 @@
-/* $Id: sip_errno.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip/sip_event.h b/jni/pjproject-android/pjsip/include/pjsip/sip_event.h
index d6c90af..4e002bc 100644
--- a/jni/pjproject-android/pjsip/include/pjsip/sip_event.h
+++ b/jni/pjproject-android/pjsip/include/pjsip/sip_event.h
@@ -1,4 +1,4 @@
-/* $Id: sip_event.h 4154 2012-06-05 10:41:17Z bennylp $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip/sip_module.h b/jni/pjproject-android/pjsip/include/pjsip/sip_module.h
index 45884cc..cc44fef 100644
--- a/jni/pjproject-android/pjsip/include/pjsip/sip_module.h
+++ b/jni/pjproject-android/pjsip/include/pjsip/sip_module.h
@@ -1,4 +1,4 @@
-/* $Id: sip_module.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip/sip_msg.h b/jni/pjproject-android/pjsip/include/pjsip/sip_msg.h
index 9031fa2..40fae8b 100644
--- a/jni/pjproject-android/pjsip/include/pjsip/sip_msg.h
+++ b/jni/pjproject-android/pjsip/include/pjsip/sip_msg.h
@@ -1,4 +1,4 @@
-/* $Id: sip_msg.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip/sip_multipart.h b/jni/pjproject-android/pjsip/include/pjsip/sip_multipart.h
index be8ae26..d04a1c7 100644
--- a/jni/pjproject-android/pjsip/include/pjsip/sip_multipart.h
+++ b/jni/pjproject-android/pjsip/include/pjsip/sip_multipart.h
@@ -1,4 +1,4 @@
-/* $Id: sip_multipart.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
*
diff --git a/jni/pjproject-android/pjsip/include/pjsip/sip_parser.h b/jni/pjproject-android/pjsip/include/pjsip/sip_parser.h
index 1f6f656..0d767f0 100644
--- a/jni/pjproject-android/pjsip/include/pjsip/sip_parser.h
+++ b/jni/pjproject-android/pjsip/include/pjsip/sip_parser.h
@@ -1,4 +1,4 @@
-/* $Id: sip_parser.h 4445 2013-03-20 11:29:08Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip/sip_private.h b/jni/pjproject-android/pjsip/include/pjsip/sip_private.h
index e139fa6..621ca8f 100644
--- a/jni/pjproject-android/pjsip/include/pjsip/sip_private.h
+++ b/jni/pjproject-android/pjsip/include/pjsip/sip_private.h
@@ -1,4 +1,4 @@
-/* $Id: sip_private.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip/sip_resolve.h b/jni/pjproject-android/pjsip/include/pjsip/sip_resolve.h
index 6f578a1..5a12cf7 100644
--- a/jni/pjproject-android/pjsip/include/pjsip/sip_resolve.h
+++ b/jni/pjproject-android/pjsip/include/pjsip/sip_resolve.h
@@ -1,4 +1,4 @@
-/* $Id: sip_resolve.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip/sip_tel_uri.h b/jni/pjproject-android/pjsip/include/pjsip/sip_tel_uri.h
index f85ec74..15766e8 100644
--- a/jni/pjproject-android/pjsip/include/pjsip/sip_tel_uri.h
+++ b/jni/pjproject-android/pjsip/include/pjsip/sip_tel_uri.h
@@ -1,4 +1,4 @@
-/* $Id: sip_tel_uri.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip/sip_transaction.h b/jni/pjproject-android/pjsip/include/pjsip/sip_transaction.h
index 575298a..e60f214 100644
--- a/jni/pjproject-android/pjsip/include/pjsip/sip_transaction.h
+++ b/jni/pjproject-android/pjsip/include/pjsip/sip_transaction.h
@@ -1,4 +1,4 @@
-/* $Id: sip_transaction.h 4420 2013-03-05 11:59:54Z bennylp $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip/sip_transport.h b/jni/pjproject-android/pjsip/include/pjsip/sip_transport.h
index 21b2238..4ff3597 100644
--- a/jni/pjproject-android/pjsip/include/pjsip/sip_transport.h
+++ b/jni/pjproject-android/pjsip/include/pjsip/sip_transport.h
@@ -1,4 +1,4 @@
-/* $Id: sip_transport.h 4275 2012-10-04 06:11:58Z bennylp $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip/sip_transport_loop.h b/jni/pjproject-android/pjsip/include/pjsip/sip_transport_loop.h
index 1883a02..9bb760b 100644
--- a/jni/pjproject-android/pjsip/include/pjsip/sip_transport_loop.h
+++ b/jni/pjproject-android/pjsip/include/pjsip/sip_transport_loop.h
@@ -1,4 +1,4 @@
-/* $Id: sip_transport_loop.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip/sip_transport_tcp.h b/jni/pjproject-android/pjsip/include/pjsip/sip_transport_tcp.h
index e35e814..7e7bc13 100644
--- a/jni/pjproject-android/pjsip/include/pjsip/sip_transport_tcp.h
+++ b/jni/pjproject-android/pjsip/include/pjsip/sip_transport_tcp.h
@@ -1,4 +1,4 @@
-/* $Id: sip_transport_tcp.h 4506 2013-04-26 06:01:43Z bennylp $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip/sip_transport_tls.h b/jni/pjproject-android/pjsip/include/pjsip/sip_transport_tls.h
index 6ed1ce7..00d8fe7 100644
--- a/jni/pjproject-android/pjsip/include/pjsip/sip_transport_tls.h
+++ b/jni/pjproject-android/pjsip/include/pjsip/sip_transport_tls.h
@@ -1,4 +1,4 @@
-/* $Id: sip_transport_tls.h 4506 2013-04-26 06:01:43Z bennylp $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip/sip_transport_udp.h b/jni/pjproject-android/pjsip/include/pjsip/sip_transport_udp.h
index f58d1e6..27c643a 100644
--- a/jni/pjproject-android/pjsip/include/pjsip/sip_transport_udp.h
+++ b/jni/pjproject-android/pjsip/include/pjsip/sip_transport_udp.h
@@ -1,4 +1,4 @@
-/* $Id: sip_transport_udp.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip/sip_types.h b/jni/pjproject-android/pjsip/include/pjsip/sip_types.h
index 9809983..d212dd2 100644
--- a/jni/pjproject-android/pjsip/include/pjsip/sip_types.h
+++ b/jni/pjproject-android/pjsip/include/pjsip/sip_types.h
@@ -1,4 +1,4 @@
-/* $Id: sip_types.h 4262 2012-09-20 06:00:23Z bennylp $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip/sip_ua_layer.h b/jni/pjproject-android/pjsip/include/pjsip/sip_ua_layer.h
index 4c69e45..d1df5b2 100644
--- a/jni/pjproject-android/pjsip/include/pjsip/sip_ua_layer.h
+++ b/jni/pjproject-android/pjsip/include/pjsip/sip_ua_layer.h
@@ -1,4 +1,4 @@
-/* $Id: sip_ua_layer.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip/sip_uri.h b/jni/pjproject-android/pjsip/include/pjsip/sip_uri.h
index 398085b..a6925d9 100644
--- a/jni/pjproject-android/pjsip/include/pjsip/sip_uri.h
+++ b/jni/pjproject-android/pjsip/include/pjsip/sip_uri.h
@@ -1,4 +1,4 @@
-/* $Id: sip_uri.h 4537 2013-06-19 06:47:43Z riza $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip/sip_util.h b/jni/pjproject-android/pjsip/include/pjsip/sip_util.h
index 018ad87..226dccd 100644
--- a/jni/pjproject-android/pjsip/include/pjsip/sip_util.h
+++ b/jni/pjproject-android/pjsip/include/pjsip/sip_util.h
@@ -1,4 +1,4 @@
-/* $Id: sip_util.h 4347 2013-02-13 10:19:25Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip_auth.h b/jni/pjproject-android/pjsip/include/pjsip_auth.h
index 3ab2c5e..7adf26b 100644
--- a/jni/pjproject-android/pjsip/include/pjsip_auth.h
+++ b/jni/pjproject-android/pjsip/include/pjsip_auth.h
@@ -1,4 +1,4 @@
-/* $Id: pjsip_auth.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip_simple.h b/jni/pjproject-android/pjsip/include/pjsip_simple.h
index af5acda..b60ce4c 100644
--- a/jni/pjproject-android/pjsip/include/pjsip_simple.h
+++ b/jni/pjproject-android/pjsip/include/pjsip_simple.h
@@ -1,4 +1,4 @@
-/* $Id: pjsip_simple.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsip_ua.h b/jni/pjproject-android/pjsip/include/pjsip_ua.h
index 59d5358..2f5da2e 100644
--- a/jni/pjproject-android/pjsip/include/pjsip_ua.h
+++ b/jni/pjproject-android/pjsip/include/pjsip_ua.h
@@ -1,4 +1,4 @@
-/* $Id: pjsip_ua.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/include/pjsua-lib/pjsua.h b/jni/pjproject-android/pjsip/include/pjsua-lib/pjsua.h
index 0707493..be5b08e 100644
--- a/jni/pjproject-android/pjsip/include/pjsua-lib/pjsua.h
+++ b/jni/pjproject-android/pjsip/include/pjsua-lib/pjsua.h
@@ -1,4 +1,4 @@
-/* $Id: pjsua.h 4555 2013-07-10 04:27:05Z ming $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -569,6 +569,39 @@
/**
+ * This enumeration specifies the contact rewrite method.
+ */
+typedef enum pjsua_contact_rewrite_method
+{
+ /**
+ * The Contact update will be done by sending unregistration
+ * to the currently registered Contact, while simultaneously sending new
+ * registration (with different Call-ID) for the updated Contact.
+ */
+ PJSUA_CONTACT_REWRITE_UNREGISTER = 1,
+
+ /**
+ * The Contact update will be done in a single, current
+ * registration session, by removing the current binding (by setting its
+ * Contact's expires parameter to zero) and adding a new Contact binding,
+ * all done in a single request.
+ */
+ PJSUA_CONTACT_REWRITE_NO_UNREG = 2,
+
+ /**
+ * The Contact update will be done when receiving any registration final
+ * response. If this flag is not specified, contact update will only be
+ * done upon receiving 2xx response. This flag MUST be used with
+ * PJSUA_CONTACT_REWRITE_UNREGISTER or PJSUA_CONTACT_REWRITE_NO_UNREG
+ * above to specify how the Contact update should be performed when
+ * receiving 2xx response.
+ */
+ PJSUA_CONTACT_REWRITE_ALWAYS_UPDATE = 4
+
+} pjsua_contact_rewrite_method;
+
+
+/**
* Call settings.
*/
typedef struct pjsua_call_setting
@@ -2501,16 +2534,6 @@
/**
- * This macro specifies the URI scheme to use in Contact header
- * when secure transport such as TLS is used. Application can specify
- * either "sip" or "sips".
- */
-#ifndef PJSUA_SECURE_SCHEME
-# define PJSUA_SECURE_SCHEME "sip"
-#endif
-
-
-/**
* Maximum time to wait for unpublication transaction(s) to complete
* during shutdown process, before sending unregistration. The library
* tries to wait for the unpublication (un-PUBLISH) to complete before
@@ -2540,25 +2563,18 @@
/**
* This macro specifies the default value for \a contact_rewrite_method
- * field in pjsua_acc_config. I specifies how Contact update will be
+ * field in pjsua_acc_config. It specifies how Contact update will be
* done with the registration, if \a allow_contact_rewrite is enabled in
- * the account config.
+ * the account config. See \a pjsua_contact_rewrite_method for the options.
*
- * If set to 1, the Contact update will be done by sending unregistration
- * to the currently registered Contact, while simultaneously sending new
- * registration (with different Call-ID) for the updated Contact.
+ * Value PJSUA_CONTACT_REWRITE_UNREGISTER(1) is the legacy behavior.
*
- * If set to 2, the Contact update will be done in a single, current
- * registration session, by removing the current binding (by setting its
- * Contact's expires parameter to zero) and adding a new Contact binding,
- * all done in a single request.
- *
- * Value 1 is the legacy behavior.
- *
- * Default value: 2
+ * Default value: PJSUA_CONTACT_REWRITE_NO_UNREG(2) |
+ * PJSUA_CONTACT_REWRITE_ALWAYS_UPDATE(4)
*/
#ifndef PJSUA_CONTACT_REWRITE_METHOD
-# define PJSUA_CONTACT_REWRITE_METHOD 2
+# define PJSUA_CONTACT_REWRITE_METHOD (PJSUA_CONTACT_REWRITE_NO_UNREG | \
+ PJSUA_CONTACT_REWRITE_ALWAYS_UPDATE)
#endif
@@ -3010,20 +3026,13 @@
/**
* Specify how Contact update will be done with the registration, if
- * \a allow_contact_rewrite is enabled.
+ * \a allow_contact_rewrite is enabled. The value is bitmask combination of
+ * \a pjsua_contact_rewrite_method. See also pjsua_contact_rewrite_method.
*
- * If set to 1, the Contact update will be done by sending unregistration
- * to the currently registered Contact, while simultaneously sending new
- * registration (with different Call-ID) for the updated Contact.
+ * Value PJSUA_CONTACT_REWRITE_UNREGISTER(1) is the legacy behavior.
*
- * If set to 2, the Contact update will be done in a single, current
- * registration session, by removing the current binding (by setting its
- * Contact's expires parameter to zero) and adding a new Contact binding,
- * all done in a single request.
- *
- * Value 1 is the legacy behavior.
- *
- * Default value: PJSUA_CONTACT_REWRITE_METHOD (2)
+ * Default value: PJSUA_CONTACT_REWRITE_METHOD
+ * (PJSUA_CONTACT_REWRITE_NO_UNREG | PJSUA_CONTACT_REWRITE_ALWAYS_UPDATE)
*/
int contact_rewrite_method;
@@ -3589,11 +3598,13 @@
* data is only valid until the account is destroyed.
*
* @param acc_id The account ID.
+ * @param pool Pool to duplicate the config.
* @param acc_cfg Structure to receive the settings.
*
* @return PJ_SUCCESS on success, or the appropriate error code.
*/
PJ_DECL(pj_status_t) pjsua_acc_get_config(pjsua_acc_id acc_id,
+ pj_pool_t *pool,
pjsua_acc_config *acc_cfg);
diff --git a/jni/pjproject-android/pjsip/include/pjsua-lib/pjsua_internal.h b/jni/pjproject-android/pjsip/include/pjsua-lib/pjsua_internal.h
index 444f559..dcf5020 100644
--- a/jni/pjproject-android/pjsip/include/pjsua-lib/pjsua_internal.h
+++ b/jni/pjproject-android/pjsip/include/pjsua-lib/pjsua_internal.h
@@ -1,4 +1,4 @@
-/* $Id: pjsua_internal.h 4543 2013-06-24 09:53:16Z bennylp $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -214,6 +214,7 @@
int index; /**< Index in accounts array. */
pj_str_t display; /**< Display name, if any. */
pj_str_t user_part; /**< User part of local URI. */
+ pj_bool_t is_sips; /**< Local URI uses "sips"? */
pj_str_t contact; /**< Our Contact header. */
pj_str_t reg_contact; /**< Contact header for REGISTER.
It may be different than acc