* #36737: switch back to svn repo, remove assert in sip_transaction.c
diff --git a/jni/pjproject-android/pjlib/src/pj/activesock.c b/jni/pjproject-android/pjlib/src/pj/activesock.c
index 0f32283..b9004ef 100644
--- a/jni/pjproject-android/pjlib/src/pj/activesock.c
+++ b/jni/pjproject-android/pjlib/src/pj/activesock.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: activesock.c 4537 2013-06-19 06:47:43Z riza $ */
 /* 
  * 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/pjlib/src/pj/addr_resolv_linux_kernel.c b/jni/pjproject-android/pjlib/src/pj/addr_resolv_linux_kernel.c
index c2147bb..c6de670 100644
--- a/jni/pjproject-android/pjlib/src/pj/addr_resolv_linux_kernel.c
+++ b/jni/pjproject-android/pjlib/src/pj/addr_resolv_linux_kernel.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: addr_resolv_linux_kernel.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/addr_resolv_sock.c b/jni/pjproject-android/pjlib/src/pj/addr_resolv_sock.c
index fb730fd..84f7ed8 100644
--- a/jni/pjproject-android/pjlib/src/pj/addr_resolv_sock.c
+++ b/jni/pjproject-android/pjlib/src/pj/addr_resolv_sock.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: addr_resolv_sock.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/addr_resolv_symbian.cpp b/jni/pjproject-android/pjlib/src/pj/addr_resolv_symbian.cpp
index 924155f..ba29057 100644
--- a/jni/pjproject-android/pjlib/src/pj/addr_resolv_symbian.cpp
+++ b/jni/pjproject-android/pjlib/src/pj/addr_resolv_symbian.cpp
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: addr_resolv_symbian.cpp 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/array.c b/jni/pjproject-android/pjlib/src/pj/array.c
index 665b38d..5b39d19 100644
--- a/jni/pjproject-android/pjlib/src/pj/array.c
+++ b/jni/pjproject-android/pjlib/src/pj/array.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: array.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/compat/sigjmp.c b/jni/pjproject-android/pjlib/src/pj/compat/sigjmp.c
index 5300a31..912763b 100644
--- a/jni/pjproject-android/pjlib/src/pj/compat/sigjmp.c
+++ b/jni/pjproject-android/pjlib/src/pj/compat/sigjmp.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: sigjmp.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/compat/string.c b/jni/pjproject-android/pjlib/src/pj/compat/string.c
index 137691e..012f79b 100644
--- a/jni/pjproject-android/pjlib/src/pj/compat/string.c
+++ b/jni/pjproject-android/pjlib/src/pj/compat/string.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: string.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/compat/string_compat.c b/jni/pjproject-android/pjlib/src/pj/compat/string_compat.c
index 64e917a..e2370ac 100644
--- a/jni/pjproject-android/pjlib/src/pj/compat/string_compat.c
+++ b/jni/pjproject-android/pjlib/src/pj/compat/string_compat.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: string_compat.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/config.c b/jni/pjproject-android/pjlib/src/pj/config.c
index 83ba55d..709af53 100644
--- a/jni/pjproject-android/pjlib/src/pj/config.c
+++ b/jni/pjproject-android/pjlib/src/pj/config.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: config.c 4112 2012-04-27 09:47:20Z bennylp $ */
 /* 
  * 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/pjlib/src/pj/ctype.c b/jni/pjproject-android/pjlib/src/pj/ctype.c
index d000659..bb04342 100644
--- a/jni/pjproject-android/pjlib/src/pj/ctype.c
+++ b/jni/pjproject-android/pjlib/src/pj/ctype.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ctype.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/errno.c b/jni/pjproject-android/pjlib/src/pj/errno.c
index ebfeb9e..91c9afa 100644
--- a/jni/pjproject-android/pjlib/src/pj/errno.c
+++ b/jni/pjproject-android/pjlib/src/pj/errno.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: errno.c 4613 2013-10-08 09:08:13Z bennylp $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -91,6 +91,8 @@
  */
 static int pjlib_error(pj_status_t code, char *buf, pj_size_t size)
 {
+    int len;
+
 #if defined(PJ_HAS_ERROR_STRING) && PJ_HAS_ERROR_STRING!=0
     unsigned i;
 
@@ -105,7 +107,10 @@
     }
 #endif
 
-    return pj_ansi_snprintf( buf, size, "Unknown pjlib error %d", code);
+    len = pj_ansi_snprintf( buf, size, "Unknown pjlib error %d", code);
+    if (len < 1 || len >= (int)size)
+	len = size - 1;
+    return len;
 }
 
 #define IN_RANGE(val,start,end)	    ((val)>=(start) && (val)<(end))
@@ -199,9 +204,9 @@
 	len = pj_ansi_snprintf( buf, bufsize, "Unknown error %d", statcode);
     }
 
-    if (len < 1) {
-        *buf = '\0';
-        len = 0;
+    if (len < 1 || len >= (int)bufsize) {
+	len = bufsize - 1;
+	buf[len] = '\0';
     }
 
     errstr.ptr = buf;
diff --git a/jni/pjproject-android/pjlib/src/pj/except.c b/jni/pjproject-android/pjlib/src/pj/except.c
index abe1ce6..e3984df 100644
--- a/jni/pjproject-android/pjlib/src/pj/except.c
+++ b/jni/pjproject-android/pjlib/src/pj/except.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: except.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/exception_symbian.cpp b/jni/pjproject-android/pjlib/src/pj/exception_symbian.cpp
index 4b5da40..f2dae4c 100644
--- a/jni/pjproject-android/pjlib/src/pj/exception_symbian.cpp
+++ b/jni/pjproject-android/pjlib/src/pj/exception_symbian.cpp
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: exception_symbian.cpp 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/extra-exports.c b/jni/pjproject-android/pjlib/src/pj/extra-exports.c
index 23a37bd..dcd5e5e 100644
--- a/jni/pjproject-android/pjlib/src/pj/extra-exports.c
+++ b/jni/pjproject-android/pjlib/src/pj/extra-exports.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: extra-exports.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/fifobuf.c b/jni/pjproject-android/pjlib/src/pj/fifobuf.c
index 565a993..62f66cc 100644
--- a/jni/pjproject-android/pjlib/src/pj/fifobuf.c
+++ b/jni/pjproject-android/pjlib/src/pj/fifobuf.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: fifobuf.c 4537 2013-06-19 06:47:43Z riza $ */
 /* 
  * 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/pjlib/src/pj/file_access_unistd.c b/jni/pjproject-android/pjlib/src/pj/file_access_unistd.c
index b257ff4..b48a3bc 100644
--- a/jni/pjproject-android/pjlib/src/pj/file_access_unistd.c
+++ b/jni/pjproject-android/pjlib/src/pj/file_access_unistd.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: file_access_unistd.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/file_access_win32.c b/jni/pjproject-android/pjlib/src/pj/file_access_win32.c
index 5cae386..e737fff 100644
--- a/jni/pjproject-android/pjlib/src/pj/file_access_win32.c
+++ b/jni/pjproject-android/pjlib/src/pj/file_access_win32.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: file_access_win32.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/file_io_ansi.c b/jni/pjproject-android/pjlib/src/pj/file_io_ansi.c
index d7a68cd..487d496 100644
--- a/jni/pjproject-android/pjlib/src/pj/file_io_ansi.c
+++ b/jni/pjproject-android/pjlib/src/pj/file_io_ansi.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: file_io_ansi.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/file_io_win32.c b/jni/pjproject-android/pjlib/src/pj/file_io_win32.c
index b43c3ab..cf72e4d 100644
--- a/jni/pjproject-android/pjlib/src/pj/file_io_win32.c
+++ b/jni/pjproject-android/pjlib/src/pj/file_io_win32.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: file_io_win32.c 4537 2013-06-19 06:47:43Z riza $ */
 /* 
  * 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/pjlib/src/pj/guid.c b/jni/pjproject-android/pjlib/src/pj/guid.c
index c16a7ce..88b6c37 100644
--- a/jni/pjproject-android/pjlib/src/pj/guid.c
+++ b/jni/pjproject-android/pjlib/src/pj/guid.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: guid.c 4208 2012-07-18 07:52:33Z ming $ */
 /* 
  * 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/pjlib/src/pj/guid_simple.c b/jni/pjproject-android/pjlib/src/pj/guid_simple.c
index 029ee8d..8bf8ae9 100644
--- a/jni/pjproject-android/pjlib/src/pj/guid_simple.c
+++ b/jni/pjproject-android/pjlib/src/pj/guid_simple.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: guid_simple.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/guid_uuid.c b/jni/pjproject-android/pjlib/src/pj/guid_uuid.c
index 98c52fa..b850bed 100644
--- a/jni/pjproject-android/pjlib/src/pj/guid_uuid.c
+++ b/jni/pjproject-android/pjlib/src/pj/guid_uuid.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: guid_uuid.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/guid_win32.c b/jni/pjproject-android/pjlib/src/pj/guid_win32.c
index de944f1..c40fcad 100644
--- a/jni/pjproject-android/pjlib/src/pj/guid_win32.c
+++ b/jni/pjproject-android/pjlib/src/pj/guid_win32.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: guid_win32.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/hash.c b/jni/pjproject-android/pjlib/src/pj/hash.c
index 226d680..ab58fb4 100644
--- a/jni/pjproject-android/pjlib/src/pj/hash.c
+++ b/jni/pjproject-android/pjlib/src/pj/hash.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: hash.c 4537 2013-06-19 06:47:43Z riza $ */
 /* 
  * 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/pjlib/src/pj/ioqueue_common_abs.c b/jni/pjproject-android/pjlib/src/pj/ioqueue_common_abs.c
index 5ccdd3f..d80f442 100644
--- a/jni/pjproject-android/pjlib/src/pj/ioqueue_common_abs.c
+++ b/jni/pjproject-android/pjlib/src/pj/ioqueue_common_abs.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ioqueue_common_abs.c 4601 2013-09-25 04:20:01Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -1016,7 +1016,6 @@
 
                 return status;
             }
-	    status = status;
         }
     }
 
diff --git a/jni/pjproject-android/pjlib/src/pj/ioqueue_dummy.c b/jni/pjproject-android/pjlib/src/pj/ioqueue_dummy.c
index 43dd162..6ea5bb7 100644
--- a/jni/pjproject-android/pjlib/src/pj/ioqueue_dummy.c
+++ b/jni/pjproject-android/pjlib/src/pj/ioqueue_dummy.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ioqueue_dummy.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/ioqueue_epoll.c b/jni/pjproject-android/pjlib/src/pj/ioqueue_epoll.c
index adc2c31..eea57a9 100644
--- a/jni/pjproject-android/pjlib/src/pj/ioqueue_epoll.c
+++ b/jni/pjproject-android/pjlib/src/pj/ioqueue_epoll.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ioqueue_epoll.c 4528 2013-05-30 07:01:11Z ming $ */
 /* 
  * 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/pjlib/src/pj/ioqueue_linux_kernel.c b/jni/pjproject-android/pjlib/src/pj/ioqueue_linux_kernel.c
index ca2bd13..706da06 100644
--- a/jni/pjproject-android/pjlib/src/pj/ioqueue_linux_kernel.c
+++ b/jni/pjproject-android/pjlib/src/pj/ioqueue_linux_kernel.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ioqueue_linux_kernel.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/ioqueue_select.c b/jni/pjproject-android/pjlib/src/pj/ioqueue_select.c
index 6be66ae..d2e4491 100644
--- a/jni/pjproject-android/pjlib/src/pj/ioqueue_select.c
+++ b/jni/pjproject-android/pjlib/src/pj/ioqueue_select.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ioqueue_select.c 4537 2013-06-19 06:47:43Z riza $ */
 /* 
  * 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/pjlib/src/pj/ioqueue_symbian.cpp b/jni/pjproject-android/pjlib/src/pj/ioqueue_symbian.cpp
index 1264621..0b310d1 100644
--- a/jni/pjproject-android/pjlib/src/pj/ioqueue_symbian.cpp
+++ b/jni/pjproject-android/pjlib/src/pj/ioqueue_symbian.cpp
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ioqueue_symbian.cpp 4374 2013-02-27 07:15:57Z riza $ */
 /* 
  * 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/pjlib/src/pj/ioqueue_winnt.c b/jni/pjproject-android/pjlib/src/pj/ioqueue_winnt.c
index 948727c..fbe8ab8 100644
--- a/jni/pjproject-android/pjlib/src/pj/ioqueue_winnt.c
+++ b/jni/pjproject-android/pjlib/src/pj/ioqueue_winnt.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ioqueue_winnt.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/ip_helper_generic.c b/jni/pjproject-android/pjlib/src/pj/ip_helper_generic.c
index b85e336..94d5a1f 100644
--- a/jni/pjproject-android/pjlib/src/pj/ip_helper_generic.c
+++ b/jni/pjproject-android/pjlib/src/pj/ip_helper_generic.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ip_helper_generic.c 4355 2013-02-19 16:27:37Z bennylp $ */
 /* 
  * 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/pjlib/src/pj/ip_helper_symbian.cpp b/jni/pjproject-android/pjlib/src/pj/ip_helper_symbian.cpp
index f980045..fb751ad 100644
--- a/jni/pjproject-android/pjlib/src/pj/ip_helper_symbian.cpp
+++ b/jni/pjproject-android/pjlib/src/pj/ip_helper_symbian.cpp
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ip_helper_symbian.cpp 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/ip_helper_win32.c b/jni/pjproject-android/pjlib/src/pj/ip_helper_win32.c
index 4a4b53a..a924606 100644
--- a/jni/pjproject-android/pjlib/src/pj/ip_helper_win32.c
+++ b/jni/pjproject-android/pjlib/src/pj/ip_helper_win32.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ip_helper_win32.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/list.c b/jni/pjproject-android/pjlib/src/pj/list.c
index 2d7a3b0..6ff8d20 100644
--- a/jni/pjproject-android/pjlib/src/pj/list.c
+++ b/jni/pjproject-android/pjlib/src/pj/list.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: list.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/lock.c b/jni/pjproject-android/pjlib/src/pj/lock.c
index a521fd4..efc0787 100644
--- a/jni/pjproject-android/pjlib/src/pj/lock.c
+++ b/jni/pjproject-android/pjlib/src/pj/lock.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: lock.c 4613 2013-10-08 09:08:13Z bennylp $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -683,7 +683,7 @@
 	int len;
 
 	len = pj_ansi_snprintf(start, max_len, "%s:%d ", ref->file, ref->line);
-	if (len < 1 || len > max_len) {
+	if (len < 1 || len >= max_len) {
 	    len = strlen(ref->file);
 	    if (len > max_len - 1)
 		len = max_len - 1;
diff --git a/jni/pjproject-android/pjlib/src/pj/log.c b/jni/pjproject-android/pjlib/src/pj/log.c
index 47b6b0f..fef4317 100644
--- a/jni/pjproject-android/pjlib/src/pj/log.c
+++ b/jni/pjproject-android/pjlib/src/pj/log.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: log.c 4624 2013-10-21 06:37:30Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -107,7 +107,7 @@
     pj_thread_local_set(thread_indent_tls_id, (void*)(pj_ssize_t)indent);
 }
 
-static int log_get_raw_indent()
+static int log_get_raw_indent(void)
 {
     return (long)(pj_ssize_t)pj_thread_local_get(thread_indent_tls_id);
 }
@@ -119,13 +119,13 @@
     if (log_indent < 0) log_indent = 0;
 }
 
-static int log_get_raw_indent()
+static int log_get_raw_indent(void)
 {
     return log_indent;
 }
 #endif	/* PJ_LOG_ENABLE_INDENT && PJ_HAS_THREADS */
 
-static int log_get_indent()
+static int log_get_indent(void)
 {
     int indent = log_get_raw_indent();
     return indent > LOG_MAX_INDENT ? LOG_MAX_INDENT : indent;
@@ -445,6 +445,9 @@
 	print_len = pj_ansi_snprintf(pre, sizeof(log_buffer)-len, 
 				     "<logging error: msg too long>");
     }
+    if (print_len < 1 || print_len >= (int)(sizeof(log_buffer)-len)) {
+	print_len = sizeof(log_buffer) - len - 1;
+    }
     len = len + print_len;
     if (len > 0 && len < (int)sizeof(log_buffer)-2) {
 	if (log_decor & PJ_LOG_HAS_CR) {
diff --git a/jni/pjproject-android/pjlib/src/pj/log_writer_printk.c b/jni/pjproject-android/pjlib/src/pj/log_writer_printk.c
index 51ab669..c75fb67 100644
--- a/jni/pjproject-android/pjlib/src/pj/log_writer_printk.c
+++ b/jni/pjproject-android/pjlib/src/pj/log_writer_printk.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: log_writer_printk.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/log_writer_stdout.c b/jni/pjproject-android/pjlib/src/pj/log_writer_stdout.c
index ede1505..b1e5482 100644
--- a/jni/pjproject-android/pjlib/src/pj/log_writer_stdout.c
+++ b/jni/pjproject-android/pjlib/src/pj/log_writer_stdout.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: log_writer_stdout.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/log_writer_symbian_console.cpp b/jni/pjproject-android/pjlib/src/pj/log_writer_symbian_console.cpp
index 0ecb826..525394e 100644
--- a/jni/pjproject-android/pjlib/src/pj/log_writer_symbian_console.cpp
+++ b/jni/pjproject-android/pjlib/src/pj/log_writer_symbian_console.cpp
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: log_writer_symbian_console.cpp 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/os_core_darwin.m b/jni/pjproject-android/pjlib/src/pj/os_core_darwin.m
index 7b21f87..f93f425 100644
--- a/jni/pjproject-android/pjlib/src/pj/os_core_darwin.m
+++ b/jni/pjproject-android/pjlib/src/pj/os_core_darwin.m
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os_core_darwin.m 3670 2011-07-20 03:00:48Z ming $ */
 /* 
  * Copyright (C) 2011-2011 Teluu Inc. (http://www.teluu.com)
  *
diff --git a/jni/pjproject-android/pjlib/src/pj/os_core_linux_kernel.c b/jni/pjproject-android/pjlib/src/pj/os_core_linux_kernel.c
index c1c5ca2..c1865ef 100644
--- a/jni/pjproject-android/pjlib/src/pj/os_core_linux_kernel.c
+++ b/jni/pjproject-android/pjlib/src/pj/os_core_linux_kernel.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os_core_linux_kernel.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/os_core_symbian.cpp b/jni/pjproject-android/pjlib/src/pj/os_core_symbian.cpp
index d6a1df2..f9f5d7d 100644
--- a/jni/pjproject-android/pjlib/src/pj/os_core_symbian.cpp
+++ b/jni/pjproject-android/pjlib/src/pj/os_core_symbian.cpp
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os_core_symbian.cpp 3999 2012-03-30 07:10:13Z bennylp $ */
 /* 
  * 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/pjlib/src/pj/os_core_unix.c b/jni/pjproject-android/pjlib/src/pj/os_core_unix.c
index 252f7fc..ff8ba68 100644
--- a/jni/pjproject-android/pjlib/src/pj/os_core_unix.c
+++ b/jni/pjproject-android/pjlib/src/pj/os_core_unix.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os_core_unix.c 4359 2013-02-21 11:18:36Z bennylp $ */
 /* 
  * 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/pjlib/src/pj/os_core_win32.c b/jni/pjproject-android/pjlib/src/pj/os_core_win32.c
index 531be6b..927d789 100644
--- a/jni/pjproject-android/pjlib/src/pj/os_core_win32.c
+++ b/jni/pjproject-android/pjlib/src/pj/os_core_win32.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os_core_win32.c 4537 2013-06-19 06:47:43Z riza $ */
 /* 
  * 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/pjlib/src/pj/os_error_linux_kernel.c b/jni/pjproject-android/pjlib/src/pj/os_error_linux_kernel.c
index 7cf28e6..bd2ac90 100644
--- a/jni/pjproject-android/pjlib/src/pj/os_error_linux_kernel.c
+++ b/jni/pjproject-android/pjlib/src/pj/os_error_linux_kernel.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os_error_linux_kernel.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/os_error_symbian.cpp b/jni/pjproject-android/pjlib/src/pj/os_error_symbian.cpp
index 4af9b30..7d0569e 100644
--- a/jni/pjproject-android/pjlib/src/pj/os_error_symbian.cpp
+++ b/jni/pjproject-android/pjlib/src/pj/os_error_symbian.cpp
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os_error_symbian.cpp 4613 2013-10-08 09:08:13Z bennylp $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -162,7 +162,7 @@
     }
 
     if (!len) {
-	len = pj_ansi_snprintf( buf, bufsize, "Symbian native error %d", 
+	len = pj_ansi_snprintf( buf, bufsize-1, "Symbian native error %d",
 				os_errcode);
 	buf[len] = '\0';
     }
diff --git a/jni/pjproject-android/pjlib/src/pj/os_error_unix.c b/jni/pjproject-android/pjlib/src/pj/os_error_unix.c
index 523f585..95c27b5 100644
--- a/jni/pjproject-android/pjlib/src/pj/os_error_unix.c
+++ b/jni/pjproject-android/pjlib/src/pj/os_error_unix.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os_error_unix.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/os_error_win32.c b/jni/pjproject-android/pjlib/src/pj/os_error_win32.c
index 369f5f2..79df4f3 100644
--- a/jni/pjproject-android/pjlib/src/pj/os_error_win32.c
+++ b/jni/pjproject-android/pjlib/src/pj/os_error_win32.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os_error_win32.c 4537 2013-06-19 06:47:43Z riza $ */
 /* 
  * 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/pjlib/src/pj/os_info.c b/jni/pjproject-android/pjlib/src/pj/os_info.c
index dfa486c..eb942c8 100644
--- a/jni/pjproject-android/pjlib/src/pj/os_info.c
+++ b/jni/pjproject-android/pjlib/src/pj/os_info.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os_info.c 4610 2013-10-03 10:26:14Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -57,6 +57,8 @@
 
 
 #if defined(PJ_DARWINOS) && PJ_DARWINOS != 0 && TARGET_OS_IPHONE
+#   include <sys/types.h>
+#   include <sys/sysctl.h>
     void pj_iphone_os_get_sys_info(pj_sys_info *si, pj_str_t *si_buffer);
 #endif
     
@@ -151,16 +153,20 @@
 	(!defined TARGET_IPHONE_SIMULATOR || TARGET_IPHONE_SIMULATOR == 0)
     {
 	pj_str_t buf = {si_buffer + PJ_SYS_INFO_BUFFER_SIZE - left, left};
-	pj_str_t machine = {"arm", 3};
+	pj_str_t machine = {"arm-", 4};
 	pj_str_t sdk_name = {"iOS-SDK", 7};
+        size_t size = PJ_SYS_INFO_BUFFER_SIZE - machine.slen;
 	char tmp[PJ_SYS_INFO_BUFFER_SIZE];
-	
+        int name[] = {CTL_HW,HW_MACHINE};
+
 	pj_iphone_os_get_sys_info(&si, &buf);
 	left -= si.os_name.slen + 1;
 
 	si.os_ver = parse_version(si.machine.ptr);
-	
-	si.machine = machine;
+
+	pj_memcpy(tmp, machine.ptr, machine.slen);
+        sysctl(name, 2, tmp+machine.slen, &size, NULL, 0);
+        ALLOC_CP_STR(tmp, machine);
 	si.sdk_name = sdk_name;
 
 	#ifdef PJ_SDK_NAME
diff --git a/jni/pjproject-android/pjlib/src/pj/os_info_iphone.m b/jni/pjproject-android/pjlib/src/pj/os_info_iphone.m
index ef20f92..b7315c1 100644
--- a/jni/pjproject-android/pjlib/src/pj/os_info_iphone.m
+++ b/jni/pjproject-android/pjlib/src/pj/os_info_iphone.m
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os_info_iphone.m 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/os_info_symbian.cpp b/jni/pjproject-android/pjlib/src/pj/os_info_symbian.cpp
index 4c2e86b..9389f04 100644
--- a/jni/pjproject-android/pjlib/src/pj/os_info_symbian.cpp
+++ b/jni/pjproject-android/pjlib/src/pj/os_info_symbian.cpp
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os_info_symbian.cpp 3437 2011-03-08 06:30:34Z nanang $ */
 /* 
  * Copyright (C) 2011 Teluu Inc. (http://www.teluu.com)
  *
diff --git a/jni/pjproject-android/pjlib/src/pj/os_rwmutex.c b/jni/pjproject-android/pjlib/src/pj/os_rwmutex.c
index 4a87afe..d392353 100644
--- a/jni/pjproject-android/pjlib/src/pj/os_rwmutex.c
+++ b/jni/pjproject-android/pjlib/src/pj/os_rwmutex.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os_rwmutex.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/os_symbian.h b/jni/pjproject-android/pjlib/src/pj/os_symbian.h
index c40c223..9b3511b 100644
--- a/jni/pjproject-android/pjlib/src/pj/os_symbian.h
+++ b/jni/pjproject-android/pjlib/src/pj/os_symbian.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os_symbian.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/os_time_bsd.c b/jni/pjproject-android/pjlib/src/pj/os_time_bsd.c
index 3adba23..5240c9e 100644
--- a/jni/pjproject-android/pjlib/src/pj/os_time_bsd.c
+++ b/jni/pjproject-android/pjlib/src/pj/os_time_bsd.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os_time_bsd.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/os_time_common.c b/jni/pjproject-android/pjlib/src/pj/os_time_common.c
index c3c2a9c..cada701 100644
--- a/jni/pjproject-android/pjlib/src/pj/os_time_common.c
+++ b/jni/pjproject-android/pjlib/src/pj/os_time_common.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os_time_common.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/os_time_linux_kernel.c b/jni/pjproject-android/pjlib/src/pj/os_time_linux_kernel.c
index 4d835b7..4c772a0 100644
--- a/jni/pjproject-android/pjlib/src/pj/os_time_linux_kernel.c
+++ b/jni/pjproject-android/pjlib/src/pj/os_time_linux_kernel.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os_time_linux_kernel.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/os_time_unix.c b/jni/pjproject-android/pjlib/src/pj/os_time_unix.c
index 70c8c1f..4f3139b 100644
--- a/jni/pjproject-android/pjlib/src/pj/os_time_unix.c
+++ b/jni/pjproject-android/pjlib/src/pj/os_time_unix.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os_time_unix.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/os_time_win32.c b/jni/pjproject-android/pjlib/src/pj/os_time_win32.c
index fbd2972..2143e2e 100644
--- a/jni/pjproject-android/pjlib/src/pj/os_time_win32.c
+++ b/jni/pjproject-android/pjlib/src/pj/os_time_win32.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os_time_win32.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/os_timestamp_common.c b/jni/pjproject-android/pjlib/src/pj/os_timestamp_common.c
index 9e6ff74..af5e493 100644
--- a/jni/pjproject-android/pjlib/src/pj/os_timestamp_common.c
+++ b/jni/pjproject-android/pjlib/src/pj/os_timestamp_common.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os_timestamp_common.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/os_timestamp_linux_kernel.c b/jni/pjproject-android/pjlib/src/pj/os_timestamp_linux_kernel.c
index 425d503..14609ea 100644
--- a/jni/pjproject-android/pjlib/src/pj/os_timestamp_linux_kernel.c
+++ b/jni/pjproject-android/pjlib/src/pj/os_timestamp_linux_kernel.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os_timestamp_linux_kernel.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/os_timestamp_posix.c b/jni/pjproject-android/pjlib/src/pj/os_timestamp_posix.c
index eec6ed1..215589c 100644
--- a/jni/pjproject-android/pjlib/src/pj/os_timestamp_posix.c
+++ b/jni/pjproject-android/pjlib/src/pj/os_timestamp_posix.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os_timestamp_posix.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/os_timestamp_win32.c b/jni/pjproject-android/pjlib/src/pj/os_timestamp_win32.c
index e77b14a..7042ab1 100644
--- a/jni/pjproject-android/pjlib/src/pj/os_timestamp_win32.c
+++ b/jni/pjproject-android/pjlib/src/pj/os_timestamp_win32.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os_timestamp_win32.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/pool.c b/jni/pjproject-android/pjlib/src/pj/pool.c
index 3e2e268..d324223 100644
--- a/jni/pjproject-android/pjlib/src/pj/pool.c
+++ b/jni/pjproject-android/pjlib/src/pj/pool.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: pool.c 4537 2013-06-19 06:47:43Z riza $ */
 /* 
  * 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/pjlib/src/pj/pool_buf.c b/jni/pjproject-android/pjlib/src/pj/pool_buf.c
index 13940d4..b79106e 100644
--- a/jni/pjproject-android/pjlib/src/pj/pool_buf.c
+++ b/jni/pjproject-android/pjlib/src/pj/pool_buf.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: pool_buf.c 4624 2013-10-21 06:37:30Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -43,7 +43,7 @@
 	is_initialized = 0;
 }
 
-static pj_status_t pool_buf_initialize()
+static pj_status_t pool_buf_initialize(void)
 {
     pj_atexit(&pool_buf_cleanup);
 
diff --git a/jni/pjproject-android/pjlib/src/pj/pool_caching.c b/jni/pjproject-android/pjlib/src/pj/pool_caching.c
index 3a96923..14780e1 100644
--- a/jni/pjproject-android/pjlib/src/pj/pool_caching.c
+++ b/jni/pjproject-android/pjlib/src/pj/pool_caching.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: pool_caching.c 4537 2013-06-19 06:47:43Z riza $ */
 /* 
  * 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/pjlib/src/pj/pool_dbg.c b/jni/pjproject-android/pjlib/src/pj/pool_dbg.c
index 9ea40c9..21bd36e 100644
--- a/jni/pjproject-android/pjlib/src/pj/pool_dbg.c
+++ b/jni/pjproject-android/pjlib/src/pj/pool_dbg.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: pool_dbg.c 4537 2013-06-19 06:47:43Z riza $ */
 /* 
  * 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/pjlib/src/pj/pool_policy_kmalloc.c b/jni/pjproject-android/pjlib/src/pj/pool_policy_kmalloc.c
index 3f7ca4f..2b5ec70 100644
--- a/jni/pjproject-android/pjlib/src/pj/pool_policy_kmalloc.c
+++ b/jni/pjproject-android/pjlib/src/pj/pool_policy_kmalloc.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: pool_policy_kmalloc.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/pool_policy_malloc.c b/jni/pjproject-android/pjlib/src/pj/pool_policy_malloc.c
index b2a9157..6bba91d 100644
--- a/jni/pjproject-android/pjlib/src/pj/pool_policy_malloc.c
+++ b/jni/pjproject-android/pjlib/src/pj/pool_policy_malloc.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: pool_policy_malloc.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/pool_policy_new.cpp b/jni/pjproject-android/pjlib/src/pj/pool_policy_new.cpp
index 66375cd..909eb9f 100644
--- a/jni/pjproject-android/pjlib/src/pj/pool_policy_new.cpp
+++ b/jni/pjproject-android/pjlib/src/pj/pool_policy_new.cpp
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: pool_policy_new.cpp 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/pool_signature.h b/jni/pjproject-android/pjlib/src/pj/pool_signature.h
index e51f292..6d0d432 100644
--- a/jni/pjproject-android/pjlib/src/pj/pool_signature.h
+++ b/jni/pjproject-android/pjlib/src/pj/pool_signature.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: pool_signature.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/rand.c b/jni/pjproject-android/pjlib/src/pj/rand.c
index 4f788bb..59bad5f 100644
--- a/jni/pjproject-android/pjlib/src/pj/rand.c
+++ b/jni/pjproject-android/pjlib/src/pj/rand.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: rand.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/rbtree.c b/jni/pjproject-android/pjlib/src/pj/rbtree.c
index b640087..37c977e 100644
--- a/jni/pjproject-android/pjlib/src/pj/rbtree.c
+++ b/jni/pjproject-android/pjlib/src/pj/rbtree.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: rbtree.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/sock_bsd.c b/jni/pjproject-android/pjlib/src/pj/sock_bsd.c
index 107f524..2dd7d38 100644
--- a/jni/pjproject-android/pjlib/src/pj/sock_bsd.c
+++ b/jni/pjproject-android/pjlib/src/pj/sock_bsd.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: sock_bsd.c 4537 2013-06-19 06:47:43Z riza $ */
 /* 
  * 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/pjlib/src/pj/sock_common.c b/jni/pjproject-android/pjlib/src/pj/sock_common.c
index 94fa52e..d37d312 100644
--- a/jni/pjproject-android/pjlib/src/pj/sock_common.c
+++ b/jni/pjproject-android/pjlib/src/pj/sock_common.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: sock_common.c 4538 2013-06-19 09:06:55Z nanang $ */
 /* 
  * 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/pjlib/src/pj/sock_linux_kernel.c b/jni/pjproject-android/pjlib/src/pj/sock_linux_kernel.c
index 89c2f0e..a1a7c7c 100644
--- a/jni/pjproject-android/pjlib/src/pj/sock_linux_kernel.c
+++ b/jni/pjproject-android/pjlib/src/pj/sock_linux_kernel.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: sock_linux_kernel.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/sock_qos_bsd.c b/jni/pjproject-android/pjlib/src/pj/sock_qos_bsd.c
index c4c54ba..ca28653 100644
--- a/jni/pjproject-android/pjlib/src/pj/sock_qos_bsd.c
+++ b/jni/pjproject-android/pjlib/src/pj/sock_qos_bsd.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: sock_qos_bsd.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  *
diff --git a/jni/pjproject-android/pjlib/src/pj/sock_qos_common.c b/jni/pjproject-android/pjlib/src/pj/sock_qos_common.c
index b12d097..643f0ea 100644
--- a/jni/pjproject-android/pjlib/src/pj/sock_qos_common.c
+++ b/jni/pjproject-android/pjlib/src/pj/sock_qos_common.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: sock_qos_common.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  *
diff --git a/jni/pjproject-android/pjlib/src/pj/sock_qos_dummy.c b/jni/pjproject-android/pjlib/src/pj/sock_qos_dummy.c
index ad0dab3..fbbb56f 100644
--- a/jni/pjproject-android/pjlib/src/pj/sock_qos_dummy.c
+++ b/jni/pjproject-android/pjlib/src/pj/sock_qos_dummy.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: sock_qos_dummy.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2009-2011 Teluu Inc. (http://www.teluu.com)
  *
diff --git a/jni/pjproject-android/pjlib/src/pj/sock_qos_symbian.cpp b/jni/pjproject-android/pjlib/src/pj/sock_qos_symbian.cpp
index 7d350ed..35779b8 100644
--- a/jni/pjproject-android/pjlib/src/pj/sock_qos_symbian.cpp
+++ b/jni/pjproject-android/pjlib/src/pj/sock_qos_symbian.cpp
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: sock_qos_symbian.cpp 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2009-2011 Teluu Inc. (http://www.teluu.com)
  *
diff --git a/jni/pjproject-android/pjlib/src/pj/sock_qos_wm.c b/jni/pjproject-android/pjlib/src/pj/sock_qos_wm.c
index 46eb3e2..e607d96 100644
--- a/jni/pjproject-android/pjlib/src/pj/sock_qos_wm.c
+++ b/jni/pjproject-android/pjlib/src/pj/sock_qos_wm.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: sock_qos_wm.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2009-2011 Teluu Inc. (http://www.teluu.com)
  *
diff --git a/jni/pjproject-android/pjlib/src/pj/sock_select.c b/jni/pjproject-android/pjlib/src/pj/sock_select.c
index 7d8297a..2b930a3 100644
--- a/jni/pjproject-android/pjlib/src/pj/sock_select.c
+++ b/jni/pjproject-android/pjlib/src/pj/sock_select.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: sock_select.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/sock_select_symbian.cpp b/jni/pjproject-android/pjlib/src/pj/sock_select_symbian.cpp
index 8ac6948..aeaa2bc 100644
--- a/jni/pjproject-android/pjlib/src/pj/sock_select_symbian.cpp
+++ b/jni/pjproject-android/pjlib/src/pj/sock_select_symbian.cpp
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: sock_select_symbian.cpp 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/sock_symbian.cpp b/jni/pjproject-android/pjlib/src/pj/sock_symbian.cpp
index 09239b0..35db1ea 100644
--- a/jni/pjproject-android/pjlib/src/pj/sock_symbian.cpp
+++ b/jni/pjproject-android/pjlib/src/pj/sock_symbian.cpp
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: sock_symbian.cpp 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/ssl_sock_common.c b/jni/pjproject-android/pjlib/src/pj/ssl_sock_common.c
index 67a8d63..768a640 100644
--- a/jni/pjproject-android/pjlib/src/pj/ssl_sock_common.c
+++ b/jni/pjproject-android/pjlib/src/pj/ssl_sock_common.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ssl_sock_common.c 3999 2012-03-30 07:10:13Z bennylp $ */
 /* 
  * Copyright (C) 2009-2011 Teluu Inc. (http://www.teluu.com)
  *
diff --git a/jni/pjproject-android/pjlib/src/pj/ssl_sock_dump.c b/jni/pjproject-android/pjlib/src/pj/ssl_sock_dump.c
index 307431f..118992e 100644
--- a/jni/pjproject-android/pjlib/src/pj/ssl_sock_dump.c
+++ b/jni/pjproject-android/pjlib/src/pj/ssl_sock_dump.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ssl_sock_dump.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2009-2011 Teluu Inc. (http://www.teluu.com)
  *
diff --git a/jni/pjproject-android/pjlib/src/pj/ssl_sock_ossl.c b/jni/pjproject-android/pjlib/src/pj/ssl_sock_ossl.c
index 281e6f8..ba4ae0b 100644
--- a/jni/pjproject-android/pjlib/src/pj/ssl_sock_ossl.c
+++ b/jni/pjproject-android/pjlib/src/pj/ssl_sock_ossl.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ssl_sock_ossl.c 4624 2013-10-21 06:37:30Z ming $ */
 /* 
  * Copyright (C) 2009-2011 Teluu Inc. (http://www.teluu.com)
  *
@@ -272,7 +272,8 @@
     errstr.slen = pj_ansi_snprintf(buf, bufsize, 
 				   "Unknown OpenSSL error %lu",
 				   ssl_err);
-
+    if (errstr.slen < 1 || errstr.slen >= (int)bufsize)
+	errstr.slen = bufsize - 1;
     return errstr;
 }
 
@@ -609,8 +610,8 @@
     /* Setup SSL BIOs */
     ssock->ossl_rbio = BIO_new(BIO_s_mem());
     ssock->ossl_wbio = BIO_new(BIO_s_mem());
-    BIO_set_close(ssock->ossl_rbio, BIO_CLOSE);
-    BIO_set_close(ssock->ossl_wbio, BIO_CLOSE);
+    (void)BIO_set_close(ssock->ossl_rbio, BIO_CLOSE);
+    (void)BIO_set_close(ssock->ossl_wbio, BIO_CLOSE);
     SSL_set_bio(ssock->ossl_ssl, ssock->ossl_rbio, ssock->ossl_wbio);
 
     return PJ_SUCCESS;
@@ -1272,7 +1273,7 @@
     pj_memcpy(&wdata->data, data, len);
 
     /* Reset write BIO */
-    BIO_reset(ssock->ossl_wbio);
+    (void)BIO_reset(ssock->ossl_wbio);
 
     /* Ticket #1573: Don't hold mutex while calling PJLIB socket send(). */
     pj_lock_release(ssock->write_mutex);
diff --git a/jni/pjproject-android/pjlib/src/pj/ssl_sock_symbian.cpp b/jni/pjproject-android/pjlib/src/pj/ssl_sock_symbian.cpp
index 47288fa..6b9b311 100644
--- a/jni/pjproject-android/pjlib/src/pj/ssl_sock_symbian.cpp
+++ b/jni/pjproject-android/pjlib/src/pj/ssl_sock_symbian.cpp
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ssl_sock_symbian.cpp 3999 2012-03-30 07:10:13Z bennylp $ */
 /* 
  * Copyright (C) 2009-2011 Teluu Inc. (http://www.teluu.com)
  *
diff --git a/jni/pjproject-android/pjlib/src/pj/string.c b/jni/pjproject-android/pjlib/src/pj/string.c
index 5610c90..22c3fde 100644
--- a/jni/pjproject-android/pjlib/src/pj/string.c
+++ b/jni/pjproject-android/pjlib/src/pj/string.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: string.c 4537 2013-06-19 06:47:43Z riza $ */
 /* 
  * 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/pjlib/src/pj/symbols.c b/jni/pjproject-android/pjlib/src/pj/symbols.c
index ab83af9..61e9526 100644
--- a/jni/pjproject-android/pjlib/src/pj/symbols.c
+++ b/jni/pjproject-android/pjlib/src/pj/symbols.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: symbols.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/timer.c b/jni/pjproject-android/pjlib/src/pj/timer.c
index 931a57f..beb4cd1 100644
--- a/jni/pjproject-android/pjlib/src/pj/timer.c
+++ b/jni/pjproject-android/pjlib/src/pj/timer.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: timer.c 4567 2013-07-19 06:31:28Z bennylp $ */
 /* 
  * The PJLIB's timer heap is based (or more correctly, copied and modied)
  * from ACE library by Douglas C. Schmidt. ACE is an excellent OO framework
diff --git a/jni/pjproject-android/pjlib/src/pj/timer_symbian.cpp b/jni/pjproject-android/pjlib/src/pj/timer_symbian.cpp
index 4b1d61b..8b18525 100644
--- a/jni/pjproject-android/pjlib/src/pj/timer_symbian.cpp
+++ b/jni/pjproject-android/pjlib/src/pj/timer_symbian.cpp
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: timer_symbian.cpp 4374 2013-02-27 07:15:57Z riza $ */
 /* 
  * 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/pjlib/src/pj/types.c b/jni/pjproject-android/pjlib/src/pj/types.c
index 89cb36e..212afcf 100644
--- a/jni/pjproject-android/pjlib/src/pj/types.c
+++ b/jni/pjproject-android/pjlib/src/pj/types.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: types.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/unicode_symbian.cpp b/jni/pjproject-android/pjlib/src/pj/unicode_symbian.cpp
index f4b598f..be109e7 100644
--- a/jni/pjproject-android/pjlib/src/pj/unicode_symbian.cpp
+++ b/jni/pjproject-android/pjlib/src/pj/unicode_symbian.cpp
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: unicode_symbian.cpp 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pj/unicode_win32.c b/jni/pjproject-android/pjlib/src/pj/unicode_win32.c
index 7718f65..dda63be 100644
--- a/jni/pjproject-android/pjlib/src/pj/unicode_win32.c
+++ b/jni/pjproject-android/pjlib/src/pj/unicode_win32.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: unicode_win32.c 4537 2013-06-19 06:47:43Z riza $ */
 /* 
  * 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/pjlib/src/pjlib-samples/except.c b/jni/pjproject-android/pjlib/src/pjlib-samples/except.c
index ffc0d8e..2e7aa33 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-samples/except.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-samples/except.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: except.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pjlib-samples/list.c b/jni/pjproject-android/pjlib/src/pjlib-samples/list.c
index ec55405..dece342 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-samples/list.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-samples/list.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: list.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pjlib-samples/log.c b/jni/pjproject-android/pjlib/src/pjlib-samples/log.c
index cefec10..c571ec5 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-samples/log.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-samples/log.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: log.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pjlib-test/activesock.c b/jni/pjproject-android/pjlib/src/pjlib-test/activesock.c
index 560f0c6..7a6dcca 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/activesock.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/activesock.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: activesock.c 4487 2013-04-23 05:37:41Z bennylp $ */
 /* 
  * 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/pjlib/src/pjlib-test/atomic.c b/jni/pjproject-android/pjlib/src/pjlib-test/atomic.c
index d94f590..f9cddf4 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/atomic.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/atomic.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: atomic.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pjlib-test/echo_clt.c b/jni/pjproject-android/pjlib/src/pjlib-test/echo_clt.c
index 12c4e03..0ce27dc 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/echo_clt.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/echo_clt.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: echo_clt.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pjlib-test/errno.c b/jni/pjproject-android/pjlib/src/pjlib-test/errno.c
index e6d901f..d8f1fc2 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/errno.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/errno.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: errno.c 4537 2013-06-19 06:47:43Z riza $ */
 /* 
  * 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/pjlib/src/pjlib-test/exception.c b/jni/pjproject-android/pjlib/src/pjlib-test/exception.c
index ea9155a..4d4b1cd 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/exception.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/exception.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: exception.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pjlib-test/exception_wrap.cpp b/jni/pjproject-android/pjlib/src/pjlib-test/exception_wrap.cpp
index 2107ac0..9c5b31b 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/exception_wrap.cpp
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/exception_wrap.cpp
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: exception_wrap.cpp 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2009-2011 Teluu Inc. (http://www.teluu.com)
  *
diff --git a/jni/pjproject-android/pjlib/src/pjlib-test/fifobuf.c b/jni/pjproject-android/pjlib/src/pjlib-test/fifobuf.c
index cd59b04..89c3ee2 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/fifobuf.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/fifobuf.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: fifobuf.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pjlib-test/file.c b/jni/pjproject-android/pjlib/src/pjlib-test/file.c
index 51bd1bd..df086e5 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/file.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/file.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: file.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pjlib-test/hash_test.c b/jni/pjproject-android/pjlib/src/pjlib-test/hash_test.c
index c1ce4ad..088107d 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/hash_test.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/hash_test.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: hash_test.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pjlib-test/ioq_perf.c b/jni/pjproject-android/pjlib/src/pjlib-test/ioq_perf.c
index 2dd9444..117748f 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/ioq_perf.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/ioq_perf.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ioq_perf.c 4537 2013-06-19 06:47:43Z riza $ */
 /* 
  * 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/pjlib/src/pjlib-test/ioq_tcp.c b/jni/pjproject-android/pjlib/src/pjlib-test/ioq_tcp.c
index 57a468c..aa9e1ef 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/ioq_tcp.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/ioq_tcp.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ioq_tcp.c 4550 2013-07-02 11:45:57Z riza $ */
 /* 
  * 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/pjlib/src/pjlib-test/ioq_udp.c b/jni/pjproject-android/pjlib/src/pjlib-test/ioq_udp.c
index 86a01c7..93656ff 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/ioq_udp.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/ioq_udp.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ioq_udp.c 4537 2013-06-19 06:47:43Z riza $ */
 /* 
  * 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/pjlib/src/pjlib-test/ioq_unreg.c b/jni/pjproject-android/pjlib/src/pjlib-test/ioq_unreg.c
index d40c171..c142ef9 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/ioq_unreg.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/ioq_unreg.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ioq_unreg.c 4537 2013-06-19 06:47:43Z riza $ */
 /* 
  * 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/pjlib/src/pjlib-test/list.c b/jni/pjproject-android/pjlib/src/pjlib-test/list.c
index a265481..a354d35 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/list.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/list.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: list.c 4537 2013-06-19 06:47:43Z riza $ */
 /* 
  * 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/pjlib/src/pjlib-test/main.c b/jni/pjproject-android/pjlib/src/pjlib-test/main.c
index 082a2b8..e0241b6 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/main.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/main.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: main.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pjlib-test/main_mod.c b/jni/pjproject-android/pjlib/src/pjlib-test/main_mod.c
index e82b1bc..bb52a6f 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/main_mod.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/main_mod.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: main_mod.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pjlib-test/main_rtems.c b/jni/pjproject-android/pjlib/src/pjlib-test/main_rtems.c
index 934a22a..b2c8d9b 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/main_rtems.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/main_rtems.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: main_rtems.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pjlib-test/main_win32.c b/jni/pjproject-android/pjlib/src/pjlib-test/main_win32.c
index fa79968..fd107c3 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/main_win32.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/main_win32.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: main_win32.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pjlib-test/mutex.c b/jni/pjproject-android/pjlib/src/pjlib-test/mutex.c
index e9905f3..0c5fa07 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/mutex.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/mutex.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: mutex.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pjlib-test/os.c b/jni/pjproject-android/pjlib/src/pjlib-test/os.c
index d5b1879..87270ff 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/os.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/os.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os.c 3841 2011-10-24 09:28:13Z ming $ */
 /* 
  * 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/pjlib/src/pjlib-test/pool.c b/jni/pjproject-android/pjlib/src/pjlib-test/pool.c
index e3fbb55..37fbe0a 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/pool.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/pool.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: pool.c 4537 2013-06-19 06:47:43Z riza $ */
 /* 
  * 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/pjlib/src/pjlib-test/pool_perf.c b/jni/pjproject-android/pjlib/src/pjlib-test/pool_perf.c
index 5847f4d..d5985cb 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/pool_perf.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/pool_perf.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: pool_perf.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pjlib-test/pool_wrap.cpp b/jni/pjproject-android/pjlib/src/pjlib-test/pool_wrap.cpp
index c95561f..f435ae8 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/pool_wrap.cpp
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/pool_wrap.cpp
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: pool_wrap.cpp 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2009-2011 Teluu Inc. (http://www.teluu.com)
  *
diff --git a/jni/pjproject-android/pjlib/src/pjlib-test/rand.c b/jni/pjproject-android/pjlib/src/pjlib-test/rand.c
index a5d766e..3c442d2 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/rand.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/rand.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: rand.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pjlib-test/rbtree.c b/jni/pjproject-android/pjlib/src/pjlib-test/rbtree.c
index b4f0e55..601a163 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/rbtree.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/rbtree.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: rbtree.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pjlib-test/rtems_network_config.h b/jni/pjproject-android/pjlib/src/pjlib-test/rtems_network_config.h
index 48f354d..b2d5652 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/rtems_network_config.h
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/rtems_network_config.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: rtems_network_config.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pjlib-test/select.c b/jni/pjproject-android/pjlib/src/pjlib-test/select.c
index 94d6132..d7d891a 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/select.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/select.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: select.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pjlib-test/sleep.c b/jni/pjproject-android/pjlib/src/pjlib-test/sleep.c
index 72dfba7..03bef7d 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/sleep.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/sleep.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: sleep.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pjlib-test/sock.c b/jni/pjproject-android/pjlib/src/pjlib-test/sock.c
index 35669dc..330fb97 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/sock.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/sock.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: sock.c 3841 2011-10-24 09:28:13Z ming $ */
 /* 
  * 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/pjlib/src/pjlib-test/sock_perf.c b/jni/pjproject-android/pjlib/src/pjlib-test/sock_perf.c
index 4a998b1..796d9f1 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/sock_perf.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/sock_perf.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: sock_perf.c 4537 2013-06-19 06:47:43Z riza $ */
 /* 
  * 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/pjlib/src/pjlib-test/ssl_sock.c b/jni/pjproject-android/pjlib/src/pjlib-test/ssl_sock.c
index 4ebf997..0bf89b7 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/ssl_sock.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/ssl_sock.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ssl_sock.c 4537 2013-06-19 06:47:43Z riza $ */
 /* 
  * 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/pjlib/src/pjlib-test/string.c b/jni/pjproject-android/pjlib/src/pjlib-test/string.c
index 5a5c394..b7f73b9 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/string.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/string.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: string.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pjlib-test/test.c b/jni/pjproject-android/pjlib/src/pjlib-test/test.c
index c6a0299..5c6f57d 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/test.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/test.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: test.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pjlib-test/test.h b/jni/pjproject-android/pjlib/src/pjlib-test/test.h
index d86866d..de69ea4 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/test.h
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/test.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: test.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pjlib-test/test_wrap.cpp b/jni/pjproject-android/pjlib/src/pjlib-test/test_wrap.cpp
index c5baab7..7341204 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/test_wrap.cpp
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/test_wrap.cpp
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: test_wrap.cpp 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2009-2011 Teluu Inc. (http://www.teluu.com)
  *
diff --git a/jni/pjproject-android/pjlib/src/pjlib-test/thread.c b/jni/pjproject-android/pjlib/src/pjlib-test/thread.c
index 0c62b85..976317f 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/thread.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/thread.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: thread.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pjlib-test/timer.c b/jni/pjproject-android/pjlib/src/pjlib-test/timer.c
index 9521aa9..9dd09b7 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/timer.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/timer.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: timer.c 4537 2013-06-19 06:47:43Z riza $ */
 /* 
  * 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/pjlib/src/pjlib-test/timestamp.c b/jni/pjproject-android/pjlib/src/pjlib-test/timestamp.c
index ac0ee83..3b04000 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/timestamp.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/timestamp.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: timestamp.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * 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/pjlib/src/pjlib-test/udp_echo_srv_sync.c b/jni/pjproject-android/pjlib/src/pjlib-test/udp_echo_srv_sync.c
index 5e9fdf6..bb6337a 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/udp_echo_srv_sync.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/udp_echo_srv_sync.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: udp_echo_srv_sync.c 4537 2013-06-19 06:47:43Z riza $ */
 /* 
  * 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/pjlib/src/pjlib-test/util.c b/jni/pjproject-android/pjlib/src/pjlib-test/util.c
index a08a937..32aa938 100644
--- a/jni/pjproject-android/pjlib/src/pjlib-test/util.c
+++ b/jni/pjproject-android/pjlib/src/pjlib-test/util.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: util.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>