updated pjsip stack
There is still a bug on incoming calls when buiding for android
diff --git a/jni/pjproject-android/pjnath/docs/doc_ice.h b/jni/pjproject-android/pjnath/docs/doc_ice.h
index 6be7ecb..6343e33 100644
--- a/jni/pjproject-android/pjnath/docs/doc_ice.h
+++ b/jni/pjproject-android/pjnath/docs/doc_ice.h
@@ -1,4 +1,4 @@
-/* $Id: doc_ice.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/pjnath/docs/doc_mainpage.h b/jni/pjproject-android/pjnath/docs/doc_mainpage.h
index 58f27da..202d1bc 100644
--- a/jni/pjproject-android/pjnath/docs/doc_mainpage.h
+++ b/jni/pjproject-android/pjnath/docs/doc_mainpage.h
@@ -1,4 +1,4 @@
-/* $Id: doc_mainpage.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/pjnath/docs/doc_nat.h b/jni/pjproject-android/pjnath/docs/doc_nat.h
index 1fdda7a..d4f71fe 100644
--- a/jni/pjproject-android/pjnath/docs/doc_nat.h
+++ b/jni/pjproject-android/pjnath/docs/doc_nat.h
@@ -1,4 +1,4 @@
-/* $Id: doc_nat.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/pjnath/docs/doc_samples.h b/jni/pjproject-android/pjnath/docs/doc_samples.h
index 68d4f6f..4df242d 100644
--- a/jni/pjproject-android/pjnath/docs/doc_samples.h
+++ b/jni/pjproject-android/pjnath/docs/doc_samples.h
@@ -1,4 +1,4 @@
-/* $Id: doc_samples.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/pjnath/docs/doc_stun.h b/jni/pjproject-android/pjnath/docs/doc_stun.h
index 6f4fdb0..32c032d 100644
--- a/jni/pjproject-android/pjnath/docs/doc_stun.h
+++ b/jni/pjproject-android/pjnath/docs/doc_stun.h
@@ -1,4 +1,4 @@
-/* $Id: doc_stun.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/pjnath/docs/doc_turn.h b/jni/pjproject-android/pjnath/docs/doc_turn.h
index e24cfdc..c13417b 100644
--- a/jni/pjproject-android/pjnath/docs/doc_turn.h
+++ b/jni/pjproject-android/pjnath/docs/doc_turn.h
@@ -1,4 +1,4 @@
-/* $Id: doc_turn.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/pjnath/include/pjnath.h b/jni/pjproject-android/pjnath/include/pjnath.h
index fc5eebb..0e5f755 100644
--- a/jni/pjproject-android/pjnath/include/pjnath.h
+++ b/jni/pjproject-android/pjnath/include/pjnath.h
@@ -1,4 +1,4 @@
-/* $Id: pjnath.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/pjnath/include/pjnath/config.h b/jni/pjproject-android/pjnath/include/pjnath/config.h
index 3ee5d91..5a30f70 100644
--- a/jni/pjproject-android/pjnath/include/pjnath/config.h
+++ b/jni/pjproject-android/pjnath/include/pjnath/config.h
@@ -1,4 +1,4 @@
-/* $Id: config.h 4199 2012-07-05 10:52:55Z 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/pjnath/include/pjnath/errno.h b/jni/pjproject-android/pjnath/include/pjnath/errno.h
index 054fd1e..7322e00 100644
--- a/jni/pjproject-android/pjnath/include/pjnath/errno.h
+++ b/jni/pjproject-android/pjnath/include/pjnath/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/pjnath/include/pjnath/ice_session.h b/jni/pjproject-android/pjnath/include/pjnath/ice_session.h
index e21f520..8cd4586 100644
--- a/jni/pjproject-android/pjnath/include/pjnath/ice_session.h
+++ b/jni/pjproject-android/pjnath/include/pjnath/ice_session.h
@@ -1,4 +1,4 @@
-/* $Id: ice_session.h 4360 2013-02-21 11:26:35Z 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/pjnath/include/pjnath/ice_strans.h b/jni/pjproject-android/pjnath/include/pjnath/ice_strans.h
index 81d8eca..fe38ff5 100644
--- a/jni/pjproject-android/pjnath/include/pjnath/ice_strans.h
+++ b/jni/pjproject-android/pjnath/include/pjnath/ice_strans.h
@@ -1,4 +1,4 @@
-/* $Id: ice_strans.h 4538 2013-06-19 09:06:55Z 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/pjnath/include/pjnath/nat_detect.h b/jni/pjproject-android/pjnath/include/pjnath/nat_detect.h
index 8d217ce..b8820de 100644
--- a/jni/pjproject-android/pjnath/include/pjnath/nat_detect.h
+++ b/jni/pjproject-android/pjnath/include/pjnath/nat_detect.h
@@ -1,4 +1,4 @@
-/* $Id: nat_detect.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/pjnath/include/pjnath/stun_auth.h b/jni/pjproject-android/pjnath/include/pjnath/stun_auth.h
index 5cf1817..97a8b3b 100644
--- a/jni/pjproject-android/pjnath/include/pjnath/stun_auth.h
+++ b/jni/pjproject-android/pjnath/include/pjnath/stun_auth.h
@@ -1,4 +1,4 @@
-/* $Id: stun_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/pjnath/include/pjnath/stun_config.h b/jni/pjproject-android/pjnath/include/pjnath/stun_config.h
index e5a0b98..d23096e 100644
--- a/jni/pjproject-android/pjnath/include/pjnath/stun_config.h
+++ b/jni/pjproject-android/pjnath/include/pjnath/stun_config.h
@@ -1,4 +1,4 @@
-/* $Id: stun_config.h 4199 2012-07-05 10:52:55Z 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/pjnath/include/pjnath/stun_msg.h b/jni/pjproject-android/pjnath/include/pjnath/stun_msg.h
index 9d3d246..6887283 100644
--- a/jni/pjproject-android/pjnath/include/pjnath/stun_msg.h
+++ b/jni/pjproject-android/pjnath/include/pjnath/stun_msg.h
@@ -1,4 +1,4 @@
-/* $Id: stun_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/pjnath/include/pjnath/stun_session.h b/jni/pjproject-android/pjnath/include/pjnath/stun_session.h
index dd12e91..88dc78d 100644
--- a/jni/pjproject-android/pjnath/include/pjnath/stun_session.h
+++ b/jni/pjproject-android/pjnath/include/pjnath/stun_session.h
@@ -1,4 +1,4 @@
-/* $Id: stun_session.h 4360 2013-02-21 11:26:35Z 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/pjnath/include/pjnath/stun_sock.h b/jni/pjproject-android/pjnath/include/pjnath/stun_sock.h
index c5c87dd..081f36d 100644
--- a/jni/pjproject-android/pjnath/include/pjnath/stun_sock.h
+++ b/jni/pjproject-android/pjnath/include/pjnath/stun_sock.h
@@ -1,4 +1,4 @@
-/* $Id: stun_sock.h 4538 2013-06-19 09:06:55Z 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/pjnath/include/pjnath/stun_transaction.h b/jni/pjproject-android/pjnath/include/pjnath/stun_transaction.h
index 2acb56c..41344aa 100644
--- a/jni/pjproject-android/pjnath/include/pjnath/stun_transaction.h
+++ b/jni/pjproject-android/pjnath/include/pjnath/stun_transaction.h
@@ -1,4 +1,4 @@
-/* $Id: stun_transaction.h 4360 2013-02-21 11:26:35Z 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/pjnath/include/pjnath/turn_session.h b/jni/pjproject-android/pjnath/include/pjnath/turn_session.h
index eb6d16b..d3adc79 100644
--- a/jni/pjproject-android/pjnath/include/pjnath/turn_session.h
+++ b/jni/pjproject-android/pjnath/include/pjnath/turn_session.h
@@ -1,4 +1,4 @@
-/* $Id: turn_session.h 4360 2013-02-21 11:26:35Z 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/pjnath/include/pjnath/turn_sock.h b/jni/pjproject-android/pjnath/include/pjnath/turn_sock.h
index c700f26..eddac51 100644
--- a/jni/pjproject-android/pjnath/include/pjnath/turn_sock.h
+++ b/jni/pjproject-android/pjnath/include/pjnath/turn_sock.h
@@ -1,4 +1,4 @@
-/* $Id: turn_sock.h 4538 2013-06-19 09:06:55Z 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/pjnath/include/pjnath/types.h b/jni/pjproject-android/pjnath/include/pjnath/types.h
index a845b04..1ac6276 100644
--- a/jni/pjproject-android/pjnath/include/pjnath/types.h
+++ b/jni/pjproject-android/pjnath/include/pjnath/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/pjnath/src/pjnath-test/concur_test.c b/jni/pjproject-android/pjnath/src/pjnath-test/concur_test.c
index 3b965e4..9d2fa65 100644
--- a/jni/pjproject-android/pjnath/src/pjnath-test/concur_test.c
+++ b/jni/pjproject-android/pjnath/src/pjnath-test/concur_test.c
@@ -1,4 +1,4 @@
-/* $Id: concur_test.c 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/pjnath/src/pjnath-test/ice_test.c b/jni/pjproject-android/pjnath/src/pjnath-test/ice_test.c
index 2b74811..66d4831 100644
--- a/jni/pjproject-android/pjnath/src/pjnath-test/ice_test.c
+++ b/jni/pjproject-android/pjnath/src/pjnath-test/ice_test.c
@@ -1,4 +1,4 @@
-/* $Id: ice_test.c 4412 2013-03-05 03:12:32Z 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/pjnath/src/pjnath-test/main.c b/jni/pjproject-android/pjnath/src/pjnath-test/main.c
index c12d09d..878adef 100644
--- a/jni/pjproject-android/pjnath/src/pjnath-test/main.c
+++ b/jni/pjproject-android/pjnath/src/pjnath-test/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c 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/pjnath/src/pjnath-test/server.c b/jni/pjproject-android/pjnath/src/pjnath-test/server.c
index c9e63a3..0b07180 100644
--- a/jni/pjproject-android/pjnath/src/pjnath-test/server.c
+++ b/jni/pjproject-android/pjnath/src/pjnath-test/server.c
@@ -1,4 +1,4 @@
-/* $Id: server.c 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/pjnath/src/pjnath-test/server.h b/jni/pjproject-android/pjnath/src/pjnath-test/server.h
index f8093bb..4ac61e9 100644
--- a/jni/pjproject-android/pjnath/src/pjnath-test/server.h
+++ b/jni/pjproject-android/pjnath/src/pjnath-test/server.h
@@ -1,4 +1,4 @@
-/* $Id: server.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/pjnath/src/pjnath-test/sess_auth.c b/jni/pjproject-android/pjnath/src/pjnath-test/sess_auth.c
index 795fa3f..4093c1b 100644
--- a/jni/pjproject-android/pjnath/src/pjnath-test/sess_auth.c
+++ b/jni/pjproject-android/pjnath/src/pjnath-test/sess_auth.c
@@ -1,4 +1,4 @@
-/* $Id: sess_auth.c 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/pjnath/src/pjnath-test/stun.c b/jni/pjproject-android/pjnath/src/pjnath-test/stun.c
index 4a136cb..3070d17 100644
--- a/jni/pjproject-android/pjnath/src/pjnath-test/stun.c
+++ b/jni/pjproject-android/pjnath/src/pjnath-test/stun.c
@@ -1,4 +1,4 @@
-/* $Id: stun.c 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/pjnath/src/pjnath-test/stun_sock_test.c b/jni/pjproject-android/pjnath/src/pjnath-test/stun_sock_test.c
index 3c3cecc..ebf5a2b 100644
--- a/jni/pjproject-android/pjnath/src/pjnath-test/stun_sock_test.c
+++ b/jni/pjproject-android/pjnath/src/pjnath-test/stun_sock_test.c
@@ -1,4 +1,4 @@
-/* $Id: stun_sock_test.c 4360 2013-02-21 11:26:35Z 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/pjnath/src/pjnath-test/test.c b/jni/pjproject-android/pjnath/src/pjnath-test/test.c
index a8f95b9..e8f9308 100644
--- a/jni/pjproject-android/pjnath/src/pjnath-test/test.c
+++ b/jni/pjproject-android/pjnath/src/pjnath-test/test.c
@@ -1,4 +1,4 @@
-/* $Id: test.c 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/pjnath/src/pjnath-test/test.h b/jni/pjproject-android/pjnath/src/pjnath-test/test.h
index 504f2f7..6a57bc0 100644
--- a/jni/pjproject-android/pjnath/src/pjnath-test/test.h
+++ b/jni/pjproject-android/pjnath/src/pjnath-test/test.h
@@ -1,4 +1,4 @@
-/* $Id: test.h 4360 2013-02-21 11:26:35Z 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/pjnath/src/pjnath-test/turn_sock_test.c b/jni/pjproject-android/pjnath/src/pjnath-test/turn_sock_test.c
index f2be81d..c58ca26 100644
--- a/jni/pjproject-android/pjnath/src/pjnath-test/turn_sock_test.c
+++ b/jni/pjproject-android/pjnath/src/pjnath-test/turn_sock_test.c
@@ -1,4 +1,4 @@
-/* $Id: turn_sock_test.c 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/pjnath/src/pjnath/errno.c b/jni/pjproject-android/pjnath/src/pjnath/errno.c
index 389e9ad..df4bdcb 100644
--- a/jni/pjproject-android/pjnath/src/pjnath/errno.c
+++ b/jni/pjproject-android/pjnath/src/pjnath/errno.c
@@ -1,4 +1,4 @@
-/* $Id: errno.c 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/pjnath/src/pjnath/ice_session.c b/jni/pjproject-android/pjnath/src/pjnath/ice_session.c
index 2829ea8..5dfbef7 100644
--- a/jni/pjproject-android/pjnath/src/pjnath/ice_session.c
+++ b/jni/pjproject-android/pjnath/src/pjnath/ice_session.c
@@ -1,4 +1,4 @@
-/* $Id: ice_session.c 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>
@@ -899,9 +899,6 @@
PJ_CHECK_STACK();
- pj_ansi_strcpy(laddr, pj_sockaddr_print(&lcand->addr, laddr,
- sizeof(laddr), 0));
-
len = pj_ansi_snprintf(buffer, bufsize,
"%d: [%d] %s:%d-->%s:%d",
(int)GET_CHECK_ID(clist, check),
diff --git a/jni/pjproject-android/pjnath/src/pjnath/ice_strans.c b/jni/pjproject-android/pjnath/src/pjnath/ice_strans.c
index 53eec62..0907af0 100644
--- a/jni/pjproject-android/pjnath/src/pjnath/ice_strans.c
+++ b/jni/pjproject-android/pjnath/src/pjnath/ice_strans.c
@@ -1,4 +1,4 @@
-/* $Id: ice_strans.c 4538 2013-06-19 09:06:55Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -1182,7 +1182,7 @@
* https://trac.pjsip.org/repos/ticket/1416:
* Once ICE has failed, also send data with the default candidate.
*/
- if (ice_st->ice && ice_st->state < PJ_ICE_STRANS_STATE_FAILED) {
+ if (ice_st->ice && ice_st->state == PJ_ICE_STRANS_STATE_RUNNING) {
if (comp->turn_sock) {
pj_turn_sock_lock(comp->turn_sock);
}
diff --git a/jni/pjproject-android/pjnath/src/pjnath/nat_detect.c b/jni/pjproject-android/pjnath/src/pjnath/nat_detect.c
index 6f13851..a4fa588 100644
--- a/jni/pjproject-android/pjnath/src/pjnath/nat_detect.c
+++ b/jni/pjproject-android/pjnath/src/pjnath/nat_detect.c
@@ -1,4 +1,4 @@
-/* $Id: nat_detect.c 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>
@@ -75,7 +75,7 @@
typedef struct nat_detect_session
{
pj_pool_t *pool;
- pj_mutex_t *mutex;
+ pj_grp_lock_t *grp_lock;
pj_timer_heap_t *timer_heap;
pj_timer_entry timer;
@@ -133,7 +133,7 @@
static void on_sess_timer(pj_timer_heap_t *th,
pj_timer_entry *te);
static void sess_destroy(nat_detect_session *sess);
-
+static void sess_on_destroy(void *member);
/*
* Get the NAT name from the specified NAT type.
@@ -233,10 +233,16 @@
sess->user_data = user_data;
sess->cb = cb;
- status = pj_mutex_create_recursive(pool, pool->obj_name, &sess->mutex);
- if (status != PJ_SUCCESS)
- goto on_error;
-
+ status = pj_grp_lock_create(pool, NULL, &sess->grp_lock);
+ if (status != PJ_SUCCESS) {
+ /* Group lock not created yet, just destroy pool and return */
+ pj_pool_release(pool);
+ return status;
+ }
+
+ pj_grp_lock_add_ref(sess->grp_lock);
+ pj_grp_lock_add_handler(sess->grp_lock, pool, sess, &sess_on_destroy);
+
pj_memcpy(&sess->server, server, sizeof(pj_sockaddr_in));
/*
@@ -294,9 +300,9 @@
pj_bzero(&ioqueue_cb, sizeof(ioqueue_cb));
ioqueue_cb.on_read_complete = &on_read_complete;
- status = pj_ioqueue_register_sock(sess->pool, stun_cfg->ioqueue,
- sess->sock, sess, &ioqueue_cb,
- &sess->key);
+ status = pj_ioqueue_register_sock2(sess->pool, stun_cfg->ioqueue,
+ sess->sock, sess->grp_lock, sess,
+ &ioqueue_cb, &sess->key);
if (status != PJ_SUCCESS)
goto on_error;
@@ -307,7 +313,7 @@
sess_cb.on_request_complete = &on_request_complete;
sess_cb.on_send_msg = &on_send_msg;
status = pj_stun_session_create(stun_cfg, pool->obj_name, &sess_cb,
- PJ_FALSE, NULL, &sess->stun_sess);
+ PJ_FALSE, sess->grp_lock, &sess->stun_sess);
if (status != PJ_SUCCESS)
goto on_error;
@@ -338,24 +344,31 @@
{
if (sess->stun_sess) {
pj_stun_session_destroy(sess->stun_sess);
+ sess->stun_sess = NULL;
}
if (sess->key) {
pj_ioqueue_unregister(sess->key);
+ sess->key = NULL;
+ sess->sock = PJ_INVALID_SOCKET;
} else if (sess->sock && sess->sock != PJ_INVALID_SOCKET) {
pj_sock_close(sess->sock);
+ sess->sock = PJ_INVALID_SOCKET;
}
- if (sess->mutex) {
- pj_mutex_destroy(sess->mutex);
+ if (sess->grp_lock) {
+ pj_grp_lock_dec_ref(sess->grp_lock);
}
+}
+static void sess_on_destroy(void *member)
+{
+ nat_detect_session *sess = (nat_detect_session*)member;
if (sess->pool) {
pj_pool_release(sess->pool);
}
}
-
static void end_session(nat_detect_session *sess,
pj_status_t status,
pj_stun_nat_type nat_type)
@@ -402,7 +415,11 @@
sess = (nat_detect_session *) pj_ioqueue_get_user_data(key);
pj_assert(sess != NULL);
- pj_mutex_lock(sess->mutex);
+ pj_grp_lock_acquire(sess->grp_lock);
+
+ /* Ignore packet when STUN session has been destroyed */
+ if (!sess->stun_sess)
+ goto on_return;
if (bytes_read < 0) {
if (-bytes_read != PJ_STATUS_FROM_OS(OSERR_EWOULDBLOCK) &&
@@ -435,7 +452,7 @@
}
on_return:
- pj_mutex_unlock(sess->mutex);
+ pj_grp_lock_release(sess->grp_lock);
}
@@ -490,7 +507,7 @@
sess = (nat_detect_session*) pj_stun_session_get_user_data(stun_sess);
- pj_mutex_lock(sess->mutex);
+ pj_grp_lock_acquire(sess->grp_lock);
/* Find errors in the response */
if (status == PJ_SUCCESS) {
@@ -786,7 +803,7 @@
}
on_return:
- pj_mutex_unlock(sess->mutex);
+ pj_grp_lock_release(sess->grp_lock);
}
@@ -865,12 +882,12 @@
sess = (nat_detect_session*) te->user_data;
if (te->id == TIMER_DESTROY) {
- pj_mutex_lock(sess->mutex);
+ pj_grp_lock_acquire(sess->grp_lock);
pj_ioqueue_unregister(sess->key);
sess->key = NULL;
sess->sock = PJ_INVALID_SOCKET;
te->id = 0;
- pj_mutex_unlock(sess->mutex);
+ pj_grp_lock_release(sess->grp_lock);
sess_destroy(sess);
@@ -878,7 +895,7 @@
pj_bool_t next_timer;
- pj_mutex_lock(sess->mutex);
+ pj_grp_lock_acquire(sess->grp_lock);
next_timer = PJ_FALSE;
@@ -903,7 +920,7 @@
te->id = 0;
}
- pj_mutex_unlock(sess->mutex);
+ pj_grp_lock_release(sess->grp_lock);
} else {
pj_assert(!"Invalid timer ID");
diff --git a/jni/pjproject-android/pjnath/src/pjnath/stun_auth.c b/jni/pjproject-android/pjnath/src/pjnath/stun_auth.c
index d89c414..06cb499 100644
--- a/jni/pjproject-android/pjnath/src/pjnath/stun_auth.c
+++ b/jni/pjproject-android/pjnath/src/pjnath/stun_auth.c
@@ -1,4 +1,4 @@
-/* $Id: stun_auth.c 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/pjnath/src/pjnath/stun_msg.c b/jni/pjproject-android/pjnath/src/pjnath/stun_msg.c
index dc5f304..ffdf09f 100644
--- a/jni/pjproject-android/pjnath/src/pjnath/stun_msg.c
+++ b/jni/pjproject-android/pjnath/src/pjnath/stun_msg.c
@@ -1,4 +1,4 @@
-/* $Id: stun_msg.c 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/pjnath/src/pjnath/stun_msg_dump.c b/jni/pjproject-android/pjnath/src/pjnath/stun_msg_dump.c
index 13f5d95..6428d97 100644
--- a/jni/pjproject-android/pjnath/src/pjnath/stun_msg_dump.c
+++ b/jni/pjproject-android/pjnath/src/pjnath/stun_msg_dump.c
@@ -1,4 +1,4 @@
-/* $Id: stun_msg_dump.c 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/pjnath/src/pjnath/stun_session.c b/jni/pjproject-android/pjnath/src/pjnath/stun_session.c
index a507522..23c3c99 100644
--- a/jni/pjproject-android/pjnath/src/pjnath/stun_session.c
+++ b/jni/pjproject-android/pjnath/src/pjnath/stun_session.c
@@ -1,4 +1,4 @@
-/* $Id: stun_session.c 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/pjnath/src/pjnath/stun_sock.c b/jni/pjproject-android/pjnath/src/pjnath/stun_sock.c
index 04b04fa..eadec9c 100644
--- a/jni/pjproject-android/pjnath/src/pjnath/stun_sock.c
+++ b/jni/pjproject-android/pjnath/src/pjnath/stun_sock.c
@@ -1,4 +1,4 @@
-/* $Id: stun_sock.c 4538 2013-06-19 09:06:55Z 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/pjnath/src/pjnath/stun_transaction.c b/jni/pjproject-android/pjnath/src/pjnath/stun_transaction.c
index 58eca26..33fccea 100644
--- a/jni/pjproject-android/pjnath/src/pjnath/stun_transaction.c
+++ b/jni/pjproject-android/pjnath/src/pjnath/stun_transaction.c
@@ -1,4 +1,4 @@
-/* $Id: stun_transaction.c 4413 2013-03-05 06:29:15Z 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/pjnath/src/pjnath/turn_session.c b/jni/pjproject-android/pjnath/src/pjnath/turn_session.c
index 39f19e5..42fa635 100644
--- a/jni/pjproject-android/pjnath/src/pjnath/turn_session.c
+++ b/jni/pjproject-android/pjnath/src/pjnath/turn_session.c
@@ -1,4 +1,4 @@
-/* $Id: turn_session.c 4551 2013-07-05 08:00:06Z 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/pjnath/src/pjnath/turn_sock.c b/jni/pjproject-android/pjnath/src/pjnath/turn_sock.c
index 00844a0..42beb22 100644
--- a/jni/pjproject-android/pjnath/src/pjnath/turn_sock.c
+++ b/jni/pjproject-android/pjnath/src/pjnath/turn_sock.c
@@ -1,4 +1,4 @@
-/* $Id: turn_sock.c 4538 2013-06-19 09:06:55Z 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/pjnath/src/pjturn-client/client_main.c b/jni/pjproject-android/pjnath/src/pjturn-client/client_main.c
index 67ec5cc..1a86672 100644
--- a/jni/pjproject-android/pjnath/src/pjturn-client/client_main.c
+++ b/jni/pjproject-android/pjnath/src/pjturn-client/client_main.c
@@ -1,4 +1,4 @@
-/* $Id: client_main.c 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/pjnath/src/pjturn-srv/allocation.c b/jni/pjproject-android/pjnath/src/pjturn-srv/allocation.c
index f267bf8..b13f02f 100644
--- a/jni/pjproject-android/pjnath/src/pjturn-srv/allocation.c
+++ b/jni/pjproject-android/pjnath/src/pjturn-srv/allocation.c
@@ -1,4 +1,4 @@
-/* $Id: allocation.c 4360 2013-02-21 11:26:35Z 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/pjnath/src/pjturn-srv/auth.c b/jni/pjproject-android/pjnath/src/pjturn-srv/auth.c
index 6d95ca4..82e182d 100644
--- a/jni/pjproject-android/pjnath/src/pjturn-srv/auth.c
+++ b/jni/pjproject-android/pjnath/src/pjturn-srv/auth.c
@@ -1,4 +1,4 @@
-/* $Id: auth.c 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/pjnath/src/pjturn-srv/auth.h b/jni/pjproject-android/pjnath/src/pjturn-srv/auth.h
index ed68701..c403952 100644
--- a/jni/pjproject-android/pjnath/src/pjturn-srv/auth.h
+++ b/jni/pjproject-android/pjnath/src/pjturn-srv/auth.h
@@ -1,4 +1,4 @@
-/* $Id: 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/pjnath/src/pjturn-srv/listener_tcp.c b/jni/pjproject-android/pjnath/src/pjturn-srv/listener_tcp.c
index 89e8544..796ed47 100644
--- a/jni/pjproject-android/pjnath/src/pjturn-srv/listener_tcp.c
+++ b/jni/pjproject-android/pjnath/src/pjturn-srv/listener_tcp.c
@@ -1,4 +1,4 @@
-/* $Id: listener_tcp.c 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/pjnath/src/pjturn-srv/listener_udp.c b/jni/pjproject-android/pjnath/src/pjturn-srv/listener_udp.c
index c4d2171..9eec80a 100644
--- a/jni/pjproject-android/pjnath/src/pjturn-srv/listener_udp.c
+++ b/jni/pjproject-android/pjnath/src/pjturn-srv/listener_udp.c
@@ -1,4 +1,4 @@
-/* $Id: listener_udp.c 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/pjnath/src/pjturn-srv/main.c b/jni/pjproject-android/pjnath/src/pjturn-srv/main.c
index 5bf5bbb..674298d 100644
--- a/jni/pjproject-android/pjnath/src/pjturn-srv/main.c
+++ b/jni/pjproject-android/pjnath/src/pjturn-srv/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c 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/pjnath/src/pjturn-srv/server.c b/jni/pjproject-android/pjnath/src/pjturn-srv/server.c
index f27d3a9..f53243d 100644
--- a/jni/pjproject-android/pjnath/src/pjturn-srv/server.c
+++ b/jni/pjproject-android/pjnath/src/pjturn-srv/server.c
@@ -1,4 +1,4 @@
-/* $Id: server.c 4360 2013-02-21 11:26:35Z 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/pjnath/src/pjturn-srv/turn.h b/jni/pjproject-android/pjnath/src/pjturn-srv/turn.h
index 2fe9f9d..2267ec1 100644
--- a/jni/pjproject-android/pjnath/src/pjturn-srv/turn.h
+++ b/jni/pjproject-android/pjnath/src/pjturn-srv/turn.h
@@ -1,4 +1,4 @@
-/* $Id: turn.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>