Changeset 65 for pjproject

Timestamp:

Nov 21, 2005 1:55:47 AM (19 years ago)

Author:

bennylp

Message:

Set svn:eol-style property

Location:

pjproject/trunk

Files:

• build/cc-gcc.mak (modified) (1 prop)
• build/cc-vc.mak (modified) (1 prop)
• build/common.mak (modified) (1 prop)
• build/host-mingw.mak (modified) (1 prop)
• build/host-unix.mak (modified) (1 prop)
• build/host-win32.mak (modified) (1 prop)
• build/m-alpha.mak (modified) (1 prop)
• build/m-i386.mak (modified) (1 prop)
• build/m-m68k.mak (modified) (1 prop)
• build/m-sparc.mak (modified) (1 prop)
• build/os-linux-kernel.mak (modified) (1 prop)
• build/os-linux.mak (modified) (1 prop)
• build/os-palmos.mak (modified) (1 prop)
• build/os-sunos.mak (modified) (1 prop)
• build/os-win32.mak (modified) (1 prop)
• build/pjproject.dsw (modified) (1 prop)
• build/pjproject.sln (modified) (1 prop)
• build/rules.mak (modified) (1 prop)
• pjlib-util/build/Makefile (modified) (1 prop)
• pjlib-util/build/pjlib_util.dsp (modified) (1 prop)
• pjlib-util/build/pjlib_util.dsw (modified) (1 prop)
• pjlib-util/build/pjlib_util_test.dsp (modified) (1 prop)
• pjlib-util/include/pjlib-util/md5.h (modified) (1 prop)
• pjlib-util/include/pjlib-util/scanner.h (modified) (1 prop)
• pjlib-util/include/pjlib-util/string.h (modified) (2 diffs, 1 prop)
• pjlib-util/include/pjlib-util/stun.h (modified) (1 prop)
• pjlib-util/include/pjlib-util/xml.h (modified) (1 prop)
• pjlib-util/src/pjlib-util-test/main.c (modified) (1 prop)
• pjlib-util/src/pjlib-util-test/test.c (modified) (1 prop)
• pjlib-util/src/pjlib-util-test/test.h (modified) (1 prop)
• pjlib-util/src/pjlib-util-test/xml.c (modified) (1 prop)
• pjlib-util/src/pjlib-util/md5.c (modified) (1 prop)
• pjlib-util/src/pjlib-util/scanner.c (modified) (1 prop)
• pjlib-util/src/pjlib-util/string.c (modified) (3 diffs, 1 prop)
• pjlib-util/src/pjlib-util/stun.c (modified) (1 prop)
• pjlib-util/src/pjlib-util/stun_client.c (modified) (1 prop)
• pjlib-util/src/pjlib-util/symbols.c (modified) (1 prop)
• pjlib-util/src/pjlib-util/xml.c (modified) (1 prop)
• pjlib/build/Makefile (modified) (1 prop)
• pjlib/build/os-linux-kernel.mak (modified) (1 prop)
• pjlib/build/os-linux.mak (modified) (1 prop)
• pjlib/build/os-sunos.mak (modified) (1 prop)
• pjlib/build/os-win32.mak (modified) (1 prop)
• pjlib/build/pjlib++-test.dsp (modified) (1 prop)
• pjlib/build/pjlib++.dsp (modified) (1 prop)
• pjlib/build/pjlib++.vcproj (modified) (1 prop)
• pjlib/build/pjlib.dsp (modified) (1 prop)
• pjlib/build/pjlib.dsw (modified) (1 prop)
• pjlib/build/pjlib.sln (modified) (1 prop)
• pjlib/build/pjlib.vcproj (modified) (1 prop)
• pjlib/build/pjlib_samples.dsp (modified) (1 prop)
• pjlib/build/pjlib_samples.vcproj (modified) (1 prop)
• pjlib/build/pjlib_test.dsp (modified) (1 prop)
• pjlib/build/pjlib_test.vcproj (modified) (1 prop)
• pjlib/include/pj++/file.hpp (modified) (1 prop)
• pjlib/include/pj++/hash.hpp (modified) (1 prop)
• pjlib/include/pj++/list.hpp (modified) (1 prop)
• pjlib/include/pj++/lock.hpp (modified) (1 prop)
• pjlib/include/pj++/os.hpp (modified) (1 prop)
• pjlib/include/pj++/pool.hpp (modified) (1 prop)
• pjlib/include/pj++/proactor.hpp (modified) (1 prop)
• pjlib/include/pj++/scanner.hpp (modified) (1 prop)
• pjlib/include/pj++/sock.hpp (modified) (1 prop)
• pjlib/include/pj++/string.hpp (modified) (1 prop)
• pjlib/include/pj++/timer.hpp (modified) (1 prop)
• pjlib/include/pj++/tree.hpp (modified) (1 prop)
• pjlib/include/pj++/types.hpp (modified) (1 prop)
• pjlib/include/pj/addr_resolv.h (modified) (1 prop)
• pjlib/include/pj/array.h (modified) (1 prop)
• pjlib/include/pj/assert.h (modified) (1 prop)
• pjlib/include/pj/compat/assert.h (modified) (1 prop)
• pjlib/include/pj/compat/cc_gcc.h (modified) (1 prop)
• pjlib/include/pj/compat/cc_msvc.h (modified) (1 prop)
• pjlib/include/pj/compat/ctype.h (modified) (1 prop)
• pjlib/include/pj/compat/errno.h (modified) (1 prop)
• pjlib/include/pj/compat/high_precision.h (modified) (1 prop)
• pjlib/include/pj/compat/m_alpha.h (modified) (1 prop)
• pjlib/include/pj/compat/m_i386.h (modified) (1 prop)
• pjlib/include/pj/compat/m_m68k.h (modified) (1 prop)
• pjlib/include/pj/compat/m_sparc.h (modified) (1 prop)
• pjlib/include/pj/compat/malloc.h (modified) (1 prop)
• pjlib/include/pj/compat/os_linux.h (modified) (1 prop)
• pjlib/include/pj/compat/os_linux_kernel.h (modified) (1 prop)
• pjlib/include/pj/compat/os_palmos.h (modified) (1 prop)
• pjlib/include/pj/compat/os_sunos.h (modified) (1 prop)
• pjlib/include/pj/compat/os_win32.h (modified) (1 prop)
• pjlib/include/pj/compat/rand.h (modified) (1 prop)
• pjlib/include/pj/compat/setjmp.h (modified) (1 prop)
• pjlib/include/pj/compat/size_t.h (modified) (1 prop)
• pjlib/include/pj/compat/socket.h (modified) (1 prop)
• pjlib/include/pj/compat/sprintf.h (modified) (1 prop)
• pjlib/include/pj/compat/stdarg.h (modified) (1 prop)
• pjlib/include/pj/compat/stdfileio.h (modified) (1 prop)
• pjlib/include/pj/compat/string.h (modified) (1 prop)
• pjlib/include/pj/compat/time.h (modified) (1 prop)
• pjlib/include/pj/compat/vsprintf.h (modified) (1 prop)
• pjlib/include/pj/os.h (modified) (1 diff)
• pjlib/include/pj/string.h (modified) (1 diff)
• pjlib/src/pj/addr_resolv_linux_kernel.c (modified) (1 prop)
• pjlib/src/pj/addr_resolv_sock.c (modified) (1 prop)
• pjlib/src/pj/array.c (modified) (1 prop)
• pjlib/src/pj/compat/longjmp_i386.S (modified) (1 prop)
• pjlib/src/pj/compat/setjmp_i386.S (modified) (1 prop)
• pjlib/src/pj/compat/sigjmp.c (modified) (1 prop)
• pjlib/src/pj/compat/string.c (modified) (1 prop)
• pjlib/src/pjlib++-test/main.cpp (modified) (1 prop)
• pjlib/src/pjlib-samples/except.c (modified) (1 prop)
• pjlib/src/pjlib-samples/list.c (modified) (1 prop)
• pjlib/src/pjlib-samples/log.c (modified) (1 prop)
• pjlib/src/pjlib-test/atomic.c (modified) (1 prop)
• pjlib/src/pjlib-test/echo_clt.c (modified) (1 prop)
• pjlib/src/pjlib-test/errno.c (modified) (1 prop)
• pjlib/src/pjlib-test/exception.c (modified) (1 prop)
• pjlib/src/pjlib-test/fifobuf.c (modified) (1 prop)
• pjlib/src/pjlib-test/file.c (modified) (1 prop)
• pjlib/src/pjlib-test/ioq_perf.c (modified) (1 prop)
• pjlib/src/pjlib-test/ioq_tcp.c (modified) (1 prop)
• pjlib/src/pjlib-test/ioq_udp.c (modified) (1 prop)
• pjlib/src/pjlib-test/list.c (modified) (1 prop)
• pjlib/src/pjlib-test/main.c (modified) (1 prop)
• pjlib/src/pjlib-test/main_mod.c (modified) (1 prop)
• pjlib/src/pjlib-test/mutex.c (modified) (1 prop)
• pjlib/src/pjlib-test/os.c (modified) (1 prop)
• pjlib/src/pjlib-test/pool.c (modified) (1 prop)
• pjlib/src/pjlib-test/pool_perf.c (modified) (1 prop)
• pjlib/src/pjlib-test/rand.c (modified) (1 prop)
• pjlib/src/pjlib-test/rbtree.c (modified) (1 prop)
• pjlib/src/pjlib-test/select.c (modified) (1 prop)
• pjlib/src/pjlib-test/sleep.c (modified) (1 prop)
• pjlib/src/pjlib-test/sock.c (modified) (1 prop)
• pjlib/src/pjlib-test/sock_perf.c (modified) (1 prop)
• pjlib/src/pjlib-test/string.c (modified) (1 prop)
• pjlib/src/pjlib-test/test.c (modified) (1 prop)
• pjlib/src/pjlib-test/test.h (modified) (1 prop)
• pjlib/src/pjlib-test/thread.c (modified) (1 prop)
• pjlib/src/pjlib-test/timer.c (modified) (1 prop)
• pjlib/src/pjlib-test/timestamp.c (modified) (1 prop)
• pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c (modified) (1 prop)
• pjlib/src/pjlib-test/udp_echo_srv_sync.c (modified) (1 prop)
• pjlib/src/pjlib-test/util.c (modified) (1 prop)
• pjmedia/build/Jbtest.dat (modified) (1 prop)
• pjmedia/build/Makefile (modified) (1 prop)
• pjmedia/build/make-linux-i386.inc (modified) (1 prop)
• pjmedia/build/make-mingw.inc (modified) (1 prop)
• pjmedia/build/make-rules (modified) (1 prop)
• pjmedia/build/pjmedia.dsp (modified) (1 prop)
• pjmedia/build/pjmedia.dsw (modified) (1 prop)
• pjmedia/build/pjmedia.sln (modified) (1 prop)
• pjmedia/build/pjmedia.vcproj (modified) (1 prop)
• pjmedia/build/pjmedia_audio_tool.dsp (modified) (1 prop)
• pjmedia/build/pjmedia_audio_tool.vcproj (modified) (1 prop)
• pjmedia/build/pjmedia_test.dsp (modified) (1 prop)
• pjmedia/build/pjmedia_test.vcproj (modified) (1 prop)
• pjmedia/src/pjmedia/codec.c (modified) (1 prop)
• pjmedia/src/pjmedia/codec.h (modified) (1 prop)
• pjmedia/src/pjmedia/config.h (modified) (1 prop)
• pjmedia/src/pjmedia/dsound.c (modified) (1 prop)
• pjmedia/src/pjmedia/g711.c (modified) (1 prop)
• pjmedia/src/pjmedia/jbuf.c (modified) (1 prop)
• pjmedia/src/pjmedia/jbuf.h (modified) (1 prop)
• pjmedia/src/pjmedia/mediamgr.c (modified) (1 prop)
• pjmedia/src/pjmedia/mediamgr.h (modified) (1 prop)
• pjmedia/src/pjmedia/nullsound.c (modified) (1 prop)
• pjmedia/src/pjmedia/pasound.c (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/LICENSE.txt (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/README.txt (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/V19-devel-readme.txt (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/dsound_wrapper.c (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/dsound_wrapper.h (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/pa_allocation.c (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/pa_allocation.h (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/pa_converters.c (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/pa_converters.h (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/pa_cpuload.c (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/pa_cpuload.h (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/pa_dither.c (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/pa_dither.h (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/pa_endianness.h (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/pa_front.c (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/pa_hostapi.h (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/pa_linux_alsa.c (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/pa_linux_alsa.h (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/pa_process.c (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/pa_process.h (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/pa_skeleton.c (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/pa_stream.c (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/pa_stream.h (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/pa_trace.c (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/pa_trace.h (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/pa_types.h (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/pa_unix_hostapis.c (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/pa_unix_oss.c (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/pa_unix_util.c (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/pa_unix_util.h (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/pa_util.h (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/pa_win_ds.c (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/pa_win_hostapis.c (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/pa_win_util.c (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/pa_win_wmme.c (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/pa_win_wmme.h (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/pa_x86_plain_converters.c (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/pa_x86_plain_converters.h (modified) (1 prop)
• pjmedia/src/pjmedia/portaudio/portaudio.h (modified) (1 prop)
• pjmedia/src/test/audio_tool.c (modified) (1 prop)
• pjmedia/src/test/jbuf_test.c (modified) (1 prop)
• pjmedia/src/test/main.c (modified) (1 prop)
• pjmedia/src/test/rtp_test.c (modified) (1 prop)
• pjmedia/src/test/sdptest.c (modified) (1 prop)
• pjmedia/src/test/session_test.c (modified) (1 prop)
• pjsip/build/Makefile (modified) (1 prop)
• pjsip/build/make-linux-i386.inc (modified) (1 prop)
• pjsip/build/make-mingw.inc (modified) (1 prop)
• pjsip/build/make-optimize.inc (modified) (1 prop)
• pjsip/build/make-rules (modified) (1 prop)
• pjsip/build/pjsip.dsw (modified) (1 prop)
• pjsip/build/pjsip.sln (modified) (1 prop)
• pjsip/build/pjsip_auth_lib.dsp (modified) (1 prop)
• pjsip/build/pjsip_core.dsp (modified) (1 prop)
• pjsip/build/pjsip_simple.dsp (modified) (1 prop)
• pjsip/build/pjsip_ua.dsp (modified) (1 prop)
• pjsip/build/pjsua.dsp (modified) (1 prop)
• pjsip/build/test_pjsip.dsp (modified) (1 prop)
• pjsip/include/pjsip-simple/event_notify.h (modified) (1 prop)
• pjsip/include/pjsip-simple/event_notify_msg.h (modified) (1 prop)
• pjsip/include/pjsip-simple/messaging.h (modified) (1 prop)
• pjsip/include/pjsip-simple/pidf.h (modified) (1 prop)
• pjsip/include/pjsip-simple/presence.h (modified) (1 prop)
• pjsip/include/pjsip-simple/xpidf.h (modified) (1 prop)
• pjsip/include/pjsip-ua/sip_dialog.h (modified) (1 prop)
• pjsip/include/pjsip-ua/sip_regc.h (modified) (1 prop)
• pjsip/include/pjsip-ua/sip_ua.h (modified) (1 prop)
• pjsip/include/pjsip/print_util.h (modified) (1 prop)
• pjsip/include/pjsip/sip_auth.h (modified) (1 prop)
• pjsip/include/pjsip/sip_auth_msg.h (modified) (8 diffs, 1 prop)
• pjsip/include/pjsip/sip_auth_parser.h (modified) (1 prop)
• pjsip/include/pjsip/sip_config.h (modified) (1 prop)
• pjsip/include/pjsip/sip_endpoint.h (modified) (1 prop)
• pjsip/include/pjsip/sip_errno.h (modified) (1 prop)
• pjsip/include/pjsip/sip_event.h (modified) (1 prop)
• pjsip/include/pjsip/sip_module.h (modified) (1 prop)
• pjsip/include/pjsip/sip_msg.h (modified) (4 diffs, 1 prop)
• pjsip/include/pjsip/sip_msg_i.h (modified) (1 prop)
• pjsip/include/pjsip/sip_parser.h (modified) (1 diff, 1 prop)
• pjsip/include/pjsip/sip_private.h (modified) (1 prop)
• pjsip/include/pjsip/sip_resolve.h (modified) (1 prop)
• pjsip/include/pjsip/sip_transaction.h (modified) (1 prop)
• pjsip/include/pjsip/sip_transport.h (modified) (1 prop)
• pjsip/include/pjsip/sip_transport_udp.h (modified) (1 prop)
• pjsip/include/pjsip/sip_types.h (modified) (1 prop)
• pjsip/include/pjsip/sip_uri.h (modified) (1 diff, 1 prop)
• pjsip/include/pjsip/sip_util.h (modified) (1 prop)
• pjsip/src/pjsip-simple/event_notify.c (modified) (1 prop)
• pjsip/src/pjsip-simple/event_notify_msg.c (modified) (1 prop)
• pjsip/src/pjsip-simple/messaging.c (modified) (1 prop)
• pjsip/src/pjsip-simple/pidf.c (modified) (1 prop)
• pjsip/src/pjsip-simple/presence.c (modified) (1 prop)
• pjsip/src/pjsip-simple/xpidf.c (modified) (1 prop)
• pjsip/src/pjsip-ua/sip_dialog.c (modified) (1 prop)
• pjsip/src/pjsip-ua/sip_reg.c (modified) (1 prop)
• pjsip/src/pjsip-ua/sip_ua.c (modified) (1 prop)
• pjsip/src/pjsip-ua/sip_ua_private.h (modified) (1 prop)
• pjsip/src/pjsip/sip_auth.c (modified) (1 prop)
• pjsip/src/pjsip/sip_auth_msg.c (modified) (10 diffs, 1 prop)
• pjsip/src/pjsip/sip_auth_parser.c (modified) (5 diffs, 1 prop)
• pjsip/src/pjsip/sip_endpoint.c (modified) (1 prop)
• pjsip/src/pjsip/sip_errno.c (modified) (1 prop)
• pjsip/src/pjsip/sip_msg.c (modified) (19 diffs, 1 prop)
• pjsip/src/pjsip/sip_parser.c (modified) (24 diffs, 1 prop)
• pjsip/src/pjsip/sip_resolve.c (modified) (1 prop)
• pjsip/src/pjsip/sip_transaction.c (modified) (1 prop)
• pjsip/src/pjsip/sip_transport.c (modified) (1 prop)
• pjsip/src/pjsip/sip_transport_udp.c (modified) (1 prop)
• pjsip/src/pjsip/sip_uri.c (modified) (3 diffs, 1 prop)
• pjsip/src/pjsip/sip_util.c (modified) (1 prop)
• pjsip/src/pjsua/getopt.c (modified) (1 prop)
• pjsip/src/pjsua/getopt.h (modified) (1 prop)
• pjsip/src/pjsua/main.c (modified) (1 prop)
• pjsip/src/pjsua/misc.c (modified) (1 prop)
• pjsip/src/test-pjsip/main.c (modified) (1 prop)
• pjsip/src/test-pjsip/msg.c (modified) (1 prop)
• pjsip/src/test-pjsip/test.c (modified) (1 prop)
• pjsip/src/test-pjsip/test.h (modified) (1 prop)
• pjsip/src/test-pjsip/uri.c (modified) (41 diffs, 1 prop)

pjproject/trunk/pjlib-util/include/pjlib-util/string.h

@@ -1 @@
-/* $Id: $ */
+/* $Id$ */
 /* 
  * Copyright (C)2003-2006 Benny Prijono <benny@prijono.org>
@@ -31 +31 @@
 
 /**
- * Unescape string.
+ * Unescape string. If source string does not contain any escaped
+ * characters, the function would simply return the original string.
+ * Otherwise a new string will be allocated.
  *
- * @param str       The string to unescape.
+ * @param pool      Pool to allocate the string.
+ * @param src       Source string to unescape.
+ *
+ * @return          String with no escaped characters.
  */
-PJ_DECL(void) pj_str_unescape(pj_str_t *str);
+PJ_DECL(pj_str_t) pj_str_unescape( pj_pool_t *pool, const pj_str_t *src);
 
 /**

pjproject/trunk/pjlib-util/src/pjlib-util/string.c

@@ -1 @@
-/* $Id: $ */
+/* $Id$ */
 /* 
  * Copyright (C)2003-2006 Benny Prijono <benny@prijono.org>
@@ -19 +19 @@
 #include <pjlib-util/string.h>
 #include <pj/ctype.h>
+#include <pj/string.h>
+#include <pj/pool.h>
 
-PJ_DEF(void) pj_str_unescape(pj_str_t *str)
+PJ_DEF(pj_str_t) pj_str_unescape( pj_pool_t *pool, const pj_str_t *src_str)
 {
-    char *src = str->ptr;
-    char *dst = str->ptr;
-    char *end = src + str->slen;
+    char *src = src_str->ptr;
+    char *end = src + src_str->slen;
+    pj_str_t dst_str;
+    char *dst;
     
+    if (pj_strchr(src_str, '%')==NULL)
+        return *src_str;
+
+    dst = dst_str.ptr = pj_pool_alloc(pool, src_str->slen);
+
     while (src != end) {
         if (*src == '%' && src < end-2) {
@@ -33 +41 @@
             src += 3;
         } else {
-            ++src;
-            ++dst;
+            *dst++ = *src++;
         }
     }
-    str->slen = dst - str->ptr;
+    dst_str.slen = dst - dst_str.ptr;
+    return dst_str;
 }
 

pjproject/trunk/pjlib/include/pj/os.h

@@ -867 +867 @@
 
 /**
+ * Add timestamp t2 to t1.
+ * @param t1        t1.
+ * @param t2        t2.
+ */
+PJ_INLINE(void) pj_add_timestamp(pj_timestamp *t1, const pj_timestamp *t2)
+{
+#if PJ_HAS_INT64
+    t1->u64 += t2->u64;
+#else
+    pj_uint32_t old = t1->u32.lo;
+    t1->u32.hi += t2->u32.hi;
+    t1->u32.lo += t2->u32.lo;
+    if (t1->u32.lo < old)
+        ++t1->u32.hi;
+#endif
+}
+
+/**
+ * Substract timestamp t2 from t1.
+ * @param t1        t1.
+ * @param t2        t2.
+ */
+PJ_INLINE(void) pj_sub_timestamp(pj_timestamp *t1, const pj_timestamp *t2)
+{
+#if PJ_HAS_INT64
+    t1->u64 -= t2->u64;
+#else
+    t1->u32.hi -= t2->u32.hi;
+    if (t1->u32.lo >= t2->u32.lo)
+        t1->u32.lo -= t2->u32.lo;
+    else {
+        t1->u32.lo -= t2->u32.lo;
+        --t1->u32.hi;
+    }
+#endif
+}
+
+/**
  * Calculate the elapsed time, and store it in pj_time_val.
  * This function calculates the elapsed time using highest precision

pjproject/trunk/pjlib/include/pj/string.h

@@ -399 +399 @@
  * @return the pointer to first character found, or NULL.
  */
-PJ_INLINE(char*) pj_strchr( pj_str_t *str, int chr)
+PJ_INLINE(char*) pj_strchr( const pj_str_t *str, int chr)
 {
     return (char*) memchr(str->ptr, chr, str->slen);

pjproject/trunk/pjsip/include/pjsip/sip_auth_msg.h

@@ -37 +37 @@
 {
     pj_str_t    realm;
+    pjsip_param other_param;
 };
 
@@ -49 +50 @@
 {
     pj_str_t    realm;
+    pjsip_param other_param;
     pj_str_t    username;
     pj_str_t    nonce;
@@ -58 +60 @@
     pj_str_t    qop;
     pj_str_t    nc;
-    pj_str_t    other_param;
 };
 
@@ -70 +71 @@
 {
     pj_str_t    realm;
+    pjsip_param other_param;
     pj_str_t    version;
     pj_str_t    signature;
@@ -130 +132 @@
 {
     pj_str_t    realm;
+    pjsip_param other_param;
 };
 
@@ -141 +144 @@
 {
     pj_str_t    realm;
+    pjsip_param other_param;
     pj_str_t    domain;
     pj_str_t    nonce;
@@ -147 +151 @@
     pj_str_t    algorithm;
     pj_str_t    qop;
-    pj_str_t    other_param;
 };
 
@@ -159 +162 @@
 {
     pj_str_t    realm;
+    pjsip_param other_param;
     pj_str_t    version;
     pj_str_t    micalgorithm;

pjproject/trunk/pjsip/include/pjsip/sip_msg.h

@@ -995 +995 @@
     PJSIP_DECL_HDR_MEMBER(struct pjsip_contact_hdr);
     int             star;           /**< The contact contains only a '*' character */
-    pjsip_uri *uri;         /**< URI in the contact. */
+    pjsip_uri      *uri;            /**< URI in the contact. */
     int             q1000;          /**< The "q" value times 1000 (to avoid float) */
     pj_int32_t      expires;        /**< Expires parameter, otherwise -1 if not present. */
-    pj_str_t        other_param;    /**< Other parameters, concatenated in a single string. */
+    pjsip_param     other_param;    /**< Other parameters, concatenated in a single string. */
 } pjsip_contact_hdr;
 
@@ -1078 +1078 @@
 {
     PJSIP_DECL_HDR_MEMBER(struct pjsip_fromto_hdr);
-    pjsip_uri  *uri;        /**< URI in From/To header. */
+    pjsip_uri       *uri;           /**< URI in From/To header. */
     pj_str_t         tag;           /**< Header "tag" parameter. */
-    pj_str_t         other_param;   /**< Other params, concatenated as a single string. */
+    pjsip_param      other_param;   /**< Other params, concatenated as a single string. */
 } pjsip_fromto_hdr;
 
@@ -1188 +1188 @@
     PJSIP_DECL_HDR_MEMBER(struct pjsip_routing_hdr);  /**< Generic header fields. */
     pjsip_name_addr  name_addr;   /**< The URL in the Route/Record-Route header. */
-    pj_str_t         other_param; /** Other parameter. */
+    pjsip_param      other_param; /** Other parameter. */
 } pjsip_routing_hdr;
 
@@ -1352 +1352 @@
     pj_str_t         recvd_param;   /**< "received" parameter. */
     pj_str_t         branch_param;  /**< "branch" parameter. */
-    pj_str_t         other_param;   /**< Other parameters, concatenated as single string. */
+    pjsip_param      other_param;   /**< Other parameters, concatenated as single string. */
     pj_str_t         comment;       /**< Comment. */
 } pjsip_via_hdr;

pjproject/trunk/pjsip/include/pjsip/sip_parser.h

@@ -337 +337 @@
 };
 
-void pjsip_parse_param_imp(  pj_scanner *scanner,
+void pjsip_parse_param_imp(  pj_scanner *scanner, pj_pool_t *pool,
                              pj_str_t *pname, pj_str_t *pvalue,
                              unsigned opt);

pjproject/trunk/pjsip/include/pjsip/sip_uri.h

@@ -85 +85 @@
 PJ_DECL(void) pjsip_param_clone(pj_pool_t *pool, pjsip_param *dst_list,
                                 const pjsip_param *src_list);
+
+/**
+ * Duplicate the parameters.
+ *
+ * @param pool          Pool to allocate memory from.
+ * @param dst_list      Destination list.
+ * @param src_list      Source list.
+ */
+PJ_DECL(void) pjsip_param_shallow_clone(pj_pool_t *pool, 
+                                        pjsip_param *dst_list,
+                                        const pjsip_param *src_list);
+
+/**
+ * Print parameters.
+ *
+ * @param param_list    The parameter list.
+ * @param buf           Buffer.
+ * @param size          Size of buffer.
+ * @param sep           Separator character (either ';' or ',').
+ *
+ * @return              The number of bytes printed, or -1 on errr.
+ */
+PJ_DECL(pj_ssize_t) pjsip_param_print_on(const pjsip_param *param_list,
+                                         char *buf, pj_size_t size,
+                                         int sep);
 
 /**

pjproject/trunk/pjsip/src/pjsip/sip_auth_msg.c

@@ -48 +48 @@
     pjsip_authorization_hdr *hdr = pj_pool_calloc(pool, 1, sizeof(*hdr));
     init_hdr(hdr, PJSIP_H_AUTHORIZATION, &authorization_hdr_vptr);
+    pj_list_init(&hdr->credential.common.other_param);
     return hdr;
 }
@@ -55 +56 @@
     pjsip_proxy_authorization_hdr *hdr = pj_pool_calloc(pool, 1, sizeof(*hdr));
     init_hdr(hdr, PJSIP_H_PROXY_AUTHORIZATION, &authorization_hdr_vptr);
+    pj_list_init(&hdr->credential.common.other_param);
     return hdr;
 }
@@ -77 +79 @@
     copy_advance_pair(buf, ", qop=", 6, cred->qop);
     copy_advance_pair(buf, ", nc=", 5, cred->nc);
-    copy_advance(buf, cred->other_param);
+    
+    printed = pjsip_param_print_on(&cred->other_param, buf, endbuf-buf, ',');
+    if (printed < 0)
+        return -1;
+    buf += printed;
 
     return (int) (buf-startbuf);
@@ -148 +154 @@
         pj_strdup(pool, &hdr->credential.digest.qop, &rhs->credential.digest.qop);
         pj_strdup(pool, &hdr->credential.digest.nc, &rhs->credential.digest.nc);
-        pj_strdup(pool, &hdr->credential.digest.other_param, &rhs->credential.digest.other_param);
+        pjsip_param_clone(pool, &hdr->credential.digest.other_param, &rhs->credential.digest.other_param);
     } else if (pj_stricmp2(&hdr->scheme, "pgp") == 0) {
         pj_assert(0);
@@ -166 +172 @@
     pjsip_authorization_hdr *hdr = pj_pool_alloc(pool, sizeof(*hdr));
     pj_memcpy(hdr, rhs, sizeof(*hdr));
+    pjsip_param_shallow_clone(pool, &hdr->credential.common.other_param, 
+                              &rhs->credential.common.other_param);
     return hdr;
 }
@@ -193 +201 @@
     pjsip_www_authenticate_hdr *hdr = pj_pool_calloc(pool, 1, sizeof(*hdr));
     init_hdr(hdr, PJSIP_H_WWW_AUTHENTICATE, &www_authenticate_hdr_vptr);
+    pj_list_init(&hdr->challenge.common.other_param);
     return hdr;
 }
@@ -201 +210 @@
     pjsip_proxy_authenticate_hdr *hdr = pj_pool_calloc(pool, 1, sizeof(*hdr));
     init_hdr(hdr, PJSIP_H_PROXY_AUTHENTICATE, &www_authenticate_hdr_vptr);
+    pj_list_init(&hdr->challenge.common.other_param);
     return hdr;
 }
@@ -221 +231 @@
     copy_advance_pair(buf, ",algorithm=", 11, chal->algorithm);
     copy_advance_pair_quote_cond(buf, ",qop=", 5, chal->qop, '"', '"');
-    copy_advance(buf, chal->other_param);
+    
+    printed = pjsip_param_print_on(&chal->other_param, buf, endbuf-buf, ',');
+    if (printed < 0)
+        return -1;
+    buf += printed;
 
     return (int)(buf-startbuf);
@@ -286 +300 @@
         pj_strdup(pool, &hdr->challenge.digest.algorithm, &rhs->challenge.digest.algorithm);
         pj_strdup(pool, &hdr->challenge.digest.qop, &rhs->challenge.digest.qop);
-        pj_strdup(pool, &hdr->challenge.digest.other_param, &rhs->challenge.digest.other_param);
+        pjsip_param_clone(pool, &hdr->challenge.digest.other_param, 
+                          &rhs->challenge.digest.other_param);
     } else if (pj_stricmp2(&hdr->scheme, "pgp") == 0) {
         pj_assert(0);
@@ -305 +320 @@
     pjsip_www_authenticate_hdr *hdr = pj_pool_alloc(pool, sizeof(*hdr));
     pj_memcpy(hdr, rhs, sizeof(*hdr));
-    return hdr;
-}
-
-
+    pjsip_param_shallow_clone(pool, &hdr->challenge.common.other_param, 
+                              &rhs->challenge.common.other_param);
+    return hdr;
+}
+
+

pjproject/trunk/pjsip/src/pjsip/sip_auth_parser.c

@@ -23 +23 @@
 #include <pj/string.h>
 #include <pj/except.h>
+#include <pj/pool.h>
 
 static pjsip_hdr* parse_hdr_authorization       ( pjsip_parse_ctx *ctx );
@@ -67 +68 @@
                                      pjsip_digest_credential *cred)
 {
+    pj_list_init(&cred->other_param);
+
     for (;;) {
         pj_str_t name, value;
 
-        pjsip_parse_param_imp(scanner, &name, &value,PJSIP_PARSE_REMOVE_QUOTE);
+        pjsip_parse_param_imp(scanner, pool, &name, &value,
+                              PJSIP_PARSE_REMOVE_QUOTE);
 
         if (!pj_stricmp(&name, &pjsip_USERNAME_STR)) {
@@ -103 +107 @@
 
         } else {
-            pjsip_concat_param_imp(&cred->other_param,pool,&name,&value, ',');
+            pjsip_param *p = pj_pool_alloc(pool, sizeof(pjsip_param));
+            p->name = name;
+            p->value = value;
+            pj_list_insert_before(&cred->other_param, p);
         }
 
@@ -127 +134 @@
                                     pjsip_digest_challenge *chal)
 {
+    pj_list_init(&chal->other_param);
+
     for (;;) {
         pj_str_t name, value;
 
-        pjsip_parse_param_imp(scanner, &name, &value,PJSIP_PARSE_REMOVE_QUOTE);
+        pjsip_parse_param_imp(scanner, pool, &name, &value,
+                              PJSIP_PARSE_REMOVE_QUOTE);
 
         if (!pj_stricmp(&name, &pjsip_REALM_STR)) {
@@ -159 +169 @@
 
         } else {
-            pjsip_concat_param_imp(&chal->other_param, pool, 
-                                   &name, &value, ',');
+            pjsip_param *p = pj_pool_alloc(pool, sizeof(pjsip_param));
+            p->name = name;
+            p->value = value;
+            pj_list_insert_before(&chal->other_param, p);
         }
 

pjproject/trunk/pjsip/src/pjsip/sip_msg.c

@@ -869 +869 @@
     init_hdr(hdr, PJSIP_H_CONTACT, &contact_hdr_vptr);
     hdr->expires = -1;
+    pj_list_init(&hdr->other_param);
     return hdr;
 }
@@ -884 +885 @@
         *p++ = ' ';
         *p++ = '*';
-        *p = '\0';
         return p - buf;
 
@@ -928 +928 @@
         }
 
-        if (hdr->other_param.slen) {
-            copy_advance(buf, hdr->other_param);
-        }
-
-        *buf = '\0';
+        printed = pjsip_param_print_on(&hdr->other_param, buf, endbuf-buf,';');
+        if (printed < 0)
+            return printed;
+        buf += printed;
+
         return buf-startbuf;
     }
 }
 
-static pjsip_contact_hdr* pjsip_contact_hdr_clone( pj_pool_t *pool, 
-                                                   const pjsip_contact_hdr *rhs)
+static pjsip_contact_hdr* pjsip_contact_hdr_clone(pj_pool_t *pool, 
+                                                  const pjsip_contact_hdr *rhs)
 {
     pjsip_contact_hdr *hdr = pjsip_contact_hdr_create(pool);
@@ -949 +949 @@
     hdr->q1000 = rhs->q1000;
     hdr->expires = rhs->expires;
-    pj_strdup(pool, &hdr->other_param, &rhs->other_param);
-    return hdr;
-}
-
-static pjsip_contact_hdr* pjsip_contact_hdr_shallow_clone( pj_pool_t *pool,
-                                                           const pjsip_contact_hdr *rhs)
+    pjsip_param_clone(pool, &hdr->other_param, &rhs->other_param);
+    return hdr;
+}
+
+static pjsip_contact_hdr* 
+pjsip_contact_hdr_shallow_clone( pj_pool_t *pool,
+                                 const pjsip_contact_hdr *rhs)
 {
     pjsip_contact_hdr *hdr = pj_pool_alloc(pool, sizeof(*hdr));
     pj_memcpy(hdr, rhs, sizeof(*hdr));
+    pjsip_param_shallow_clone(pool, &hdr->other_param, &rhs->other_param);
     return hdr;
 }
@@ -965 +967 @@
  * Content-Type header..
  */
-static int pjsip_ctype_hdr_print( pjsip_ctype_hdr *hdr, char *buf, pj_size_t size);
-static pjsip_ctype_hdr* pjsip_ctype_hdr_clone( pj_pool_t *pool, const pjsip_ctype_hdr *hdr);
+static int pjsip_ctype_hdr_print( pjsip_ctype_hdr *hdr, char *buf, 
+                                  pj_size_t size);
+static pjsip_ctype_hdr* pjsip_ctype_hdr_clone(pj_pool_t *pool, 
+                                              const pjsip_ctype_hdr *hdr);
 #define pjsip_ctype_hdr_shallow_clone pjsip_ctype_hdr_clone
 
@@ -1071 +1075 @@
     pjsip_from_hdr *hdr = pj_pool_calloc(pool, 1, sizeof(*hdr));
     init_hdr(hdr, PJSIP_H_FROM, &fromto_hdr_vptr);
+    pj_list_init(&hdr->other_param);
     return hdr;
 }
@@ -1078 +1083 @@
     pjsip_to_hdr *hdr = pj_pool_calloc(pool, 1, sizeof(*hdr));
     init_hdr(hdr, PJSIP_H_TO, &fromto_hdr_vptr);
+    pj_list_init(&hdr->other_param);
     return hdr;
 }
@@ -1106 +1112 @@
     *buf++ = ' ';
 
-    printed = pjsip_uri_print(PJSIP_URI_IN_FROMTO_HDR, hdr->uri, buf, endbuf-buf);
+    printed = pjsip_uri_print(PJSIP_URI_IN_FROMTO_HDR, hdr->uri, 
+                              buf, endbuf-buf);
     if (printed < 1)
         return -1;
@@ -1113 +1120 @@
 
     copy_advance_pair(buf, ";tag=", 5, hdr->tag);
-    if (hdr->other_param.slen)
-        copy_advance(buf, hdr->other_param);
+
+    printed = pjsip_param_print_on(&hdr->other_param, buf, endbuf-buf, ';');
+    if (printed < 0)
+        return -1;
+    buf += printed;
 
     return buf-startbuf;
@@ -1129 +1139 @@
     hdr->uri = pjsip_uri_clone(pool, rhs->uri);
     pj_strdup( pool, &hdr->tag, &rhs->tag);
-    pj_strdup( pool, &hdr->other_param, &rhs->other_param);
-
-    return hdr;
-}
-
-static pjsip_fromto_hdr* pjsip_fromto_hdr_shallow_clone( pj_pool_t *pool,
-                                                         const pjsip_fromto_hdr *rhs)
+    pjsip_param_clone( pool, &hdr->other_param, &rhs->other_param);
+
+    return hdr;
+}
+
+static pjsip_fromto_hdr* 
+pjsip_fromto_hdr_shallow_clone( pj_pool_t *pool,
+                                const pjsip_fromto_hdr *rhs)
 {
     pjsip_fromto_hdr *hdr = pj_pool_alloc(pool, sizeof(*hdr));
     pj_memcpy(hdr, rhs, sizeof(*hdr));
+    pjsip_param_shallow_clone( pool, &hdr->other_param, &rhs->other_param);
     return hdr;
 }
@@ -1188 +1200 @@
     init_hdr(hdr, PJSIP_H_RECORD_ROUTE, &routing_hdr_vptr);
     pjsip_name_addr_init(&hdr->name_addr);
-    pj_memset(&hdr->other_param, 0, sizeof(hdr->other_param));
+    pj_list_init(&hdr->other_param);
     return hdr;
 }
@@ -1197 +1209 @@
     init_hdr(hdr, PJSIP_H_ROUTE, &routing_hdr_vptr);
     pjsip_name_addr_init(&hdr->name_addr);
-    pj_memset(&hdr->other_param, 0, sizeof(hdr->other_param));
+    pj_list_init(&hdr->other_param);
     return hdr;
 }
@@ -1226 +1238 @@
     *buf++ = ' ';
 
-    printed = pjsip_uri_print(PJSIP_URI_IN_ROUTING_HDR, &hdr->name_addr, buf, endbuf-buf);
+    printed = pjsip_uri_print(PJSIP_URI_IN_ROUTING_HDR, &hdr->name_addr, buf, 
+                              endbuf-buf);
     if (printed < 1)
         return -1;
     buf += printed;
 
-    if (hdr->other_param.slen) {
-        copy_advance(buf, hdr->other_param);
-    }
+    printed = pjsip_param_print_on(&hdr->other_param, buf, endbuf-buf, ';');
+    if (printed < 0)
+        return -1;
+    buf += printed;
 
     return buf-startbuf;
@@ -1246 +1260 @@
     pjsip_name_addr_init(&hdr->name_addr);
     pjsip_name_addr_assign(pool, &hdr->name_addr, &rhs->name_addr);
-    pj_strdup( pool, &hdr->other_param, &rhs->other_param);
+    pjsip_param_clone( pool, &hdr->other_param, &rhs->other_param);
     return hdr;
 }
@@ -1255 +1269 @@
     pjsip_routing_hdr *hdr = pj_pool_alloc(pool, sizeof(*hdr));
     pj_memcpy(hdr, rhs, sizeof(*hdr));
+    pjsip_param_shallow_clone( pool, &hdr->other_param, &rhs->other_param);
     return hdr;
 }
@@ -1331 +1346 @@
     hdr->ttl_param = -1;
     hdr->rport_param = -1;
+    pj_list_init(&hdr->other_param);
     return hdr;
 }
@@ -1390 +1406 @@
     copy_advance_pair(buf, ";received=", 10, hdr->recvd_param);
     copy_advance_pair(buf, ";branch=", 8, hdr->branch_param);
-    copy_advance(buf, hdr->other_param);
     
-    *buf = '\0';
+    printed = pjsip_param_print_on(&hdr->other_param, buf, endbuf-buf, ';');
+    if (printed < 0)
+        return -1;
+    buf += printed;
+    
     return buf-startbuf;
 }
@@ -1408 +1427 @@
     pj_strdup(pool, &hdr->recvd_param, &rhs->recvd_param);
     pj_strdup(pool, &hdr->branch_param, &rhs->branch_param);
-    pj_strdup(pool, &hdr->other_param, &rhs->other_param);
+    pjsip_param_clone(pool, &hdr->other_param, &rhs->other_param);
     return hdr;
 }
@@ -1417 +1436 @@
     pjsip_via_hdr *hdr = pj_pool_alloc(pool, sizeof(*hdr));
     pj_memcpy(hdr, rhs, sizeof(*hdr));
+    pjsip_param_shallow_clone(pool, &hdr->other_param, &rhs->other_param);
     return hdr;
 }

pjproject/trunk/pjsip/src/pjsip/sip_parser.c

@@ -114 +114 @@
                                    pjsip_parser_err_report *err_list);
 static void         int_parse_param( pj_scanner *scanner, 
+                                     pj_pool_t *pool,
                                      pj_str_t *pname, 
                                      pj_str_t *pvalue);
 static void         int_parse_hparam( pj_scanner *scanner,
+                                      pj_pool_t *pool,
                                       pj_str_t *hname,
                                       pj_str_t *hvalue );
@@ -126 +128 @@
                                            pjsip_status_line *line);
 static void         int_parse_user_pass( pj_scanner *scanner, 
+                                         pj_pool_t *pool,
                                          pj_str_t *user, 
                                          pj_str_t *pass);
@@ -287 +290 @@
     status = pj_cis_dup(&pjsip_USER_SPEC, &pjsip_ALNUM_SPEC);
     PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
-    pj_cis_add_str( &pjsip_USER_SPEC, ESCAPED USER_UNRESERVED );
+    pj_cis_add_str( &pjsip_USER_SPEC, UNRESERVED ESCAPED USER_UNRESERVED );
 
     status = pj_cis_dup(&pjsip_PASSWD_SPEC, &pjsip_ALNUM_SPEC);
     PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
-    pj_cis_add_str( &pjsip_PASSWD_SPEC, MARK ESCAPED PASS);
+    pj_cis_add_str( &pjsip_PASSWD_SPEC, UNRESERVED ESCAPED PASS);
 
     status = pj_cis_init(&cis_buf, &pjsip_PROBE_USER_HOST_SPEC);
@@ -866 +869 @@
 
 /* Parse parameter (pname ["=" pvalue]). */
-void pjsip_parse_param_imp(  pj_scanner *scanner,
+void pjsip_parse_param_imp(  pj_scanner *scanner, pj_pool_t *pool,
                              pj_str_t *pname, pj_str_t *pvalue,
                              unsigned option)
@@ -872 +875 @@
     /* pname */
     pj_scan_get(scanner, &pjsip_PARAM_CHAR_SPEC, pname);
-    pj_str_unescape(pname);
+    *pname = pj_str_unescape(pool, pname);
 
     /* pvalue, if any */
@@ -886 +889 @@
         } else {
             pj_scan_get(scanner, &pjsip_PARAM_CHAR_SPEC, pvalue);
-            pj_str_unescape(pvalue);
+            *pvalue = pj_str_unescape(pool, pvalue);
         }
     } else {
@@ -895 +898 @@
 
 /* Parse parameter (";" pname ["=" pvalue]). */
-static void int_parse_param( pj_scanner *scanner,
+static void int_parse_param( pj_scanner *scanner, pj_pool_t *pool,
                              pj_str_t *pname, pj_str_t *pvalue)
 {
@@ -902 +905 @@
 
     /* Get pname and optionally pvalue */
-    pjsip_parse_param_imp(scanner, pname, pvalue, 0);
+    pjsip_parse_param_imp(scanner, pool, pname, pvalue, 
+                          PJSIP_PARSE_REMOVE_QUOTE);
 }
 
 /* Parse header parameter. */
-static void int_parse_hparam( pj_scanner *scanner,
+static void int_parse_hparam( pj_scanner *scanner, pj_pool_t *pool,
                               pj_str_t *hname, pj_str_t *hvalue )
 {
@@ -914 +918 @@
     /* hname */
     pj_scan_get(scanner, &pjsip_HDR_CHAR_SPEC, hname);
-    pj_str_unescape(hname);
+    *hname = pj_str_unescape(pool, hname);
 
     /* pvalue, if any */
@@ -920 +924 @@
         pj_scan_get_char(scanner);
         pj_scan_get(scanner, &pjsip_HDR_CHAR_SPEC, hvalue);
-        pj_str_unescape(hvalue);
+        *hvalue = pj_str_unescape(pool, hvalue);
     } else {
         hvalue->ptr = NULL;
@@ -937 +941 @@
         pj_scan_get_char(scanner);
         pj_scan_get(scanner, &pjsip_DIGIT_SPEC, &port);
-        pj_str_unescape(&port);
         *p_port = pj_strtoul(&port);
     } else {
@@ -962 +965 @@
 
 /* Parse user:pass tokens in an URI. */
-static void int_parse_user_pass( pj_scanner *scanner, 
+static void int_parse_user_pass( pj_scanner *scanner, pj_pool_t *pool,
                                  pj_str_t *user, pj_str_t *pass)
 {
     pj_scan_get( scanner, &pjsip_USER_SPEC, user);
-    pj_str_unescape(user);
+    *user = pj_str_unescape(pool, user);
 
     if ( *scanner->curptr == ':') {
         pj_scan_get_char( scanner );
         pj_scan_get( scanner, &pjsip_PASSWD_SPEC, pass);
-        pj_str_unescape(pass);
+        *pass = pj_str_unescape(pool, pass);
     } else {
         pass->ptr = NULL;
@@ -1105 +1108 @@
 
     if (int_is_next_user(scanner)) {
-        int_parse_user_pass(scanner, &url->user, &url->passwd);
+        int_parse_user_pass(scanner, pool, &url->user, &url->passwd);
     }
 
@@ -1115 +1118 @@
         pj_str_t pname, pvalue;
 
-        int_parse_param( scanner, &pname, &pvalue);
+        int_parse_param( scanner, pool, &pname, &pvalue);
 
         if (!parser_stricmp(pname, pjsip_USER_STR) && pvalue.slen) {
@@ -1147 +1150 @@
         pjsip_param *param;
         param = pj_pool_alloc(pool, sizeof(pjsip_param));
-        int_parse_hparam(scanner, &param->name, &param->value);
+        int_parse_hparam(scanner, pool, &param->name, &param->value);
         pj_list_insert_before(&url->header_param, param);
         hsep = '&';
@@ -1168 +1171 @@
     if (*scanner->curptr == '"') {
         pj_scan_get_quote( scanner, '"', '"', &name_addr->display);
+        /* Trim the leading and ending quote */
+        name_addr->display.ptr++;
+        name_addr->display.slen -= 2;
 
     } else if (*scanner->curptr != '<') {
@@ -1324 +1330 @@
         pj_str_t pname, pvalue;
 
-        int_parse_param( scanner, &pname, &pvalue);
+        int_parse_param( scanner, pool, &pname, &pvalue);
         if (!parser_stricmp(pname, pjsip_Q_STR) && pvalue.slen) {
             char *dot_pos = memchr(pvalue.ptr, '.', pvalue.slen);
@@ -1338 +1344 @@
 
         } else {
-            concat_param(&hdr->other_param, pool, &pname, &pvalue);
+            pjsip_param *p = pj_pool_alloc(pool, sizeof(pjsip_param));
+            p->name = pname;
+            p->value = pvalue;
+            pj_list_insert_before(&hdr->other_param, p);
         }
     }
@@ -1413 +1422 @@
     while (*scanner->curptr == ';') {
         pj_str_t pname, pvalue;
-        int_parse_param(scanner, &pname, &pvalue);
+        int_parse_param(scanner, ctx->pool, &pname, &pvalue);
         concat_param(&hdr->media.param, ctx->pool, &pname, &pvalue);
     }
@@ -1466 +1475 @@
         pj_str_t pname, pvalue;
 
-        int_parse_param( scanner, &pname, &pvalue);
+        int_parse_param( scanner, pool, &pname, &pvalue);
 
         if (!parser_stricmp(pname, pjsip_TAG_STR)) {
@@ -1472 +1481 @@
             
         } else {
-            concat_param(&hdr->other_param, pool, &pname, &pvalue);
+            pjsip_param *p = pj_pool_alloc(pool, sizeof(pjsip_param));
+            p->name = pname;
+            p->value = pvalue;
+            pj_list_insert_before(&hdr->other_param, p);
         }
     }
@@ -1547 +1559 @@
         pj_str_t pname, pvalue;
 
-        int_parse_param( scanner, &pname, &pvalue);
+        int_parse_param( scanner, pool, &pname, &pvalue);
 
         if (!parser_stricmp(pname, pjsip_BRANCH_STR) && pvalue.slen) {
@@ -1567 +1579 @@
                 hdr->rport_param = 0;
         } else {
-            concat_param( &hdr->other_param, pool, &pname, &pvalue);
-        }
-    }
-
+            pjsip_param *p = pj_pool_alloc(pool, sizeof(pjsip_param));
+            p->name = pname;
+            p->value = pvalue;
+            pj_list_insert_before(&hdr->other_param, p);
+        }
+    }
 }
 
@@ -1603 +1617 @@
 
     pj_memcpy(&hdr->name_addr, temp, sizeof(*temp));
-    if (*scanner->curptr == ';') {
-        pj_scan_get_until(scanner, &pjsip_NEWLINE_OR_EOF_SPEC, 
-                          &hdr->other_param);
+
+    while (*scanner->curptr == ';') {
+        pjsip_param *p = pj_pool_alloc(pool, sizeof(pjsip_param));
+        int_parse_param(scanner, pool, &p->name, &p->value);
+        pj_list_insert_before(&hdr->other_param, p);
     }
 }

pjproject/trunk/pjsip/src/pjsip/sip_uri.c

@@ -69 +69 @@
 }
 
+
+PJ_DEF(void) pjsip_param_shallow_clone( pj_pool_t *pool, 
+                                        pjsip_param *dst_list,
+                                        const pjsip_param *src_list)
+{
+    const pjsip_param *p = src_list->next;
+
+    pj_list_init(dst_list);
+    while (p != src_list) {
+        pjsip_param *new_param = pj_pool_alloc(pool, sizeof(pjsip_param));
+        new_param->name = p->name;
+        new_param->value = p->value;
+        pj_list_insert_before(dst_list, new_param);
+        p = p->next;
+    }
+}
+
+PJ_DEF(pj_ssize_t) pjsip_param_print_on( const pjsip_param *param_list,
+                                         char *buf, pj_size_t size,
+                                         int sep)
+{
+    const pjsip_param *p = param_list->next;
+    char *startbuf = buf;
+    char *endbuf = buf + size;
+
+    while (p != param_list) {
+        *buf++ = (char)sep;
+        copy_advance_escape(buf, p->name, pjsip_PARAM_CHAR_SPEC);
+        if (p->value.slen) {
+            *buf++ = '=';
+            copy_advance_escape(buf, p->value, pjsip_PARAM_CHAR_SPEC);
+        }
+        p = p->next;
+    }
+    return buf-startbuf;
+}
+
+
 /*
  * URI stuffs
@@ -255 +293 @@
 
     /* Other param. */
-    param = url->other_param.next;
-    while (param != &url->other_param) {
-        *buf++ = ';';
-        copy_advance_escape(buf, param->name, pjsip_PARAM_CHAR_SPEC);
-        if (param->value.slen) {
-            *buf++ = '=';
-            copy_advance_escape(buf, param->value, pjsip_PARAM_CHAR_SPEC);
-        }
-        param = param->next;
-    }
+    printed = pjsip_param_print_on(&url->other_param, buf, endbuf-buf, ';');
+    if (printed < 0)
+        return -1;
+    buf += printed;
 
     /* Header param. */
@@ -473 +505 @@
 
     if (context != PJSIP_URI_IN_REQ_URI) {
-        copy_advance(buf, name->display);
         if (name->display.slen) {
+            if (endbuf-buf < 8) return -1;
+            *buf++ = '"';
+            copy_advance(buf, name->display);
+            *buf++ = '"';
             *buf++ = ' ';
         }

pjproject/trunk/pjsip/src/test-pjsip/uri.c

@@ -26 +26 @@
                     "0123456789"
 #define MARK        "-_.!~*'()"
-#define USER        "&=+$,;?/%"
-#define PASS        "&=+$,%"
-#define PARAM_CHAR  "[]/:&+$" MARK "%"
-
-#define POOL_SIZE       4096
-
-static pj_uint32_t parse_len, parse_time, print_time;
+#define USER_CHAR   ALPHANUM MARK "&=+$,;?/"
+#define PASS_CHAR   ALPHANUM MARK "&=+$,"
+#define PARAM_CHAR  ALPHANUM MARK "[]/:&+$"
+
+#define POOL_SIZE       4000
+#define LOOP_COUNT      1000
+#define AVERAGE_URL_LEN 80
+#define THREAD_COUNT    4
+
+static pj_uint32_t parse_len;
+static pj_timestamp parse_time, print_time;
 
 
 /* URI creator functions. */
+static pjsip_uri *create_uri0( pj_pool_t *pool );
 static pjsip_uri *create_uri1( pj_pool_t *pool );
 static pjsip_uri *create_uri2( pj_pool_t *pool );
@@ -53 +58 @@
 static pjsip_uri *create_uri16( pj_pool_t *pool );
 static pjsip_uri *create_uri17( pj_pool_t *pool );
-static pjsip_uri *create_uri18( pj_pool_t *pool );
-static pjsip_uri *create_uri19( pj_pool_t *pool );
 static pjsip_uri *create_dummy( pj_pool_t *pool );
 
@@ -71 +74 @@
         PJ_SUCCESS,
         "sip:localhost",
+        &create_uri0
+    },
+    {
+        PJ_SUCCESS,
+        "sip:user@localhost",
         &create_uri1
     },
     {
         PJ_SUCCESS,
-        "sip:user@localhost",
-        &create_uri2
-    },
-    {
-        PJ_SUCCESS,
         "sip:user:password@localhost:5060",
-        &create_uri3,
+        &create_uri2,
     },
     {
@@ -87 +90 @@
         ERR_NOT_EQUAL,
         "sip:localhost:5060",
+        &create_uri3
+    },
+    {
+        /* All recognized parameters. */
+        PJ_SUCCESS,
+        "sip:localhost;transport=tcp;user=ip;ttl=255;lr;maddr=127.0.0.1;method=ACK",
         &create_uri4
-    },
-    {
-        /* All recognized parameters. */
-        PJ_SUCCESS,
-        "sip:localhost;transport=tcp;user=ip;ttl=255;lr;maddr=127.0.0.1;method=ACK",
-        &create_uri5
     },
     {
@@ -100 +103 @@
         "sip:localhost;pickup=hurry;user=phone;message=I%20am%20sorry"
         "?Subject=Hello%20There&Server=SIP%20Server",
-        &create_uri6
+        &create_uri5
     },
     {
@@ -106 +109 @@
         PJ_SUCCESS,
         "sips:localhost",
-        &create_uri7,
+        &create_uri6,
     },
     {
@@ -112 +115 @@
         PJ_SUCCESS,
         "<sip:localhost>",
-        &create_uri8
+        &create_uri7
     },
     {
@@ -120 +123 @@
         PJ_SUCCESS,
         "  Power Administrator  <sips:localhost>",
+        &create_uri8
+    },
+    {
+        /* Name address. */
+        PJ_SUCCESS,
+        " \"User\" <sip:user@localhost:5071>",
         &create_uri9
     },
     {
-        /* Name address. */
-        PJ_SUCCESS,
-        " \"User\" <sip:user@localhost:5071>",
-        &create_uri10
-    },
-    {
         /* Escaped sequence in display name (display=Strange User\"\\\"). */
         PJ_SUCCESS,
         " \"Strange User\\\"\\\\\\\"\" <sip:localhost>",
+        &create_uri10,
+    },
+    {
+        /* Errorneous escaping in display name. */
+        ERR_SYNTAX_ERR,
+        " \"Rogue User\\\" <sip:localhost>",
         &create_uri11,
     },
     {
-        /* Errorneous escaping in display name. */
-        ERR_SYNTAX_ERR,
-        " \"Rogue User\\\" <sip:localhost>",
+        /* Dangling quote in display name, but that should be OK. */
+        PJ_SUCCESS,
+        "Strange User\" <sip:localhost>",
         &create_uri12,
     },
     {
-        /* Dangling quote in display name, but that should be OK. */
-        PJ_SUCCESS,
-        "Strange User\" <sip:localhost>",
+        /* Special characters in parameter value must be quoted. */
+        PJ_SUCCESS,
+        "sip:localhost;pvalue=\"hello world\"",
         &create_uri13,
-    },
-    {
-        /* Special characters in parameter value must be quoted. */
-        PJ_SUCCESS,
-        "sip:localhost;pvalue=\"hello world\"",
-        &create_uri14,
     },
     {
@@ -157 +160 @@
          */
         PJ_SUCCESS,
-        "This is -. !% *_+`'~ me <sip:a19A&=+$,;?/%2c:%09a&Zz=+$,@"
+        "This is -. !% *_+`'~ me <sip:a19A&=+$,;?/%2c:%40a&Zz=+$,@"
         "my_proxy09.MY-domain.com:9801>",
+        &create_uri14,
+    },
+    {
+        /* Another excercise to the allowed character sets to the hostname. */
+        PJ_SUCCESS,
+        "sip:" ALPHANUM "-_.com",
         &create_uri15,
-    },
-    {
-        /* Another excercise to the allowed character sets to the hostname. */
-        PJ_SUCCESS,
-        "sip:" ALPHANUM "-_.com",
-        &create_uri16,
     },
     {
@@ -172 +175 @@
          */
         PJ_SUCCESS,
-        "sip:" ALPHANUM USER ":" ALPHANUM PASS "@host",
-        &create_uri17,
+        "sip:" USER_CHAR ":" PASS_CHAR "@host",
+        &create_uri16,
     },
     {
@@ -180 +183 @@
          */
         PJ_SUCCESS,
-        "sip:host;user=ip;" ALPHANUM PARAM_CHAR "=" ALPHANUM PARAM_CHAR 
+        "sip:host;user=ip;" PARAM_CHAR "%21=" PARAM_CHAR "%21"
         ";lr;other=1;transport=sctp;other2",
-        &create_uri18,
-    },
-    {
-        /* This should trigger syntax error. */
+        &create_uri17,
+    },
+    {
+        /* 18: This should trigger syntax error. */
         ERR_SYNTAX_ERR,
         "sip:",
@@ -191 +194 @@
     },
     {
-        /* Syntax error: whitespace after scheme. */
+        /* 19: Syntax error: whitespace after scheme. */
         ERR_SYNTAX_ERR,
         "sip :host",
@@ -197 +200 @@
     },
     {
-        /* Syntax error: whitespace before hostname. */
+        /* 20: Syntax error: whitespace before hostname. */
         ERR_SYNTAX_ERR,
         "sip: host",
@@ -203 +206 @@
     },
     {
-        /* Syntax error: invalid port. */
+        /* 21: Syntax error: invalid port. */
         ERR_SYNTAX_ERR,
         "sip:user:password",
@@ -209 +212 @@
     },
     {
-        /* Syntax error: no host. */
+        /* 22: Syntax error: no host. */
         ERR_SYNTAX_ERR,
         "sip:user@",
@@ -215 +218 @@
     },
     {
-        /* Syntax error: no user/host. */
+        /* 23: Syntax error: no user/host. */
         ERR_SYNTAX_ERR,
         "sip:@",
@@ -221 +224 @@
     },
     {
-        /* Syntax error: empty string. */
+        /* 24: Syntax error: empty string. */
         ERR_SYNTAX_ERR,
         "",
@@ -228 +231 @@
 };
 
-static pjsip_uri *create_uri1(pj_pool_t *pool)
+static pjsip_uri *create_uri0(pj_pool_t *pool)
 {
     /* "sip:localhost" */
@@ -237 +240 @@
 }
 
-static pjsip_uri *create_uri2(pj_pool_t *pool)
+static pjsip_uri *create_uri1(pj_pool_t *pool)
 {
     /* "sip:user@localhost" */
@@ -248 +251 @@
 }
 
-static pjsip_uri *create_uri3(pj_pool_t *pool)
+static pjsip_uri *create_uri2(pj_pool_t *pool)
 {
     /* "sip:user:password@localhost:5060" */
@@ -261 +264 @@
 }
 
-static pjsip_uri *create_uri4(pj_pool_t *pool)
+static pjsip_uri *create_uri3(pj_pool_t *pool)
 {
     /* Like: "sip:localhost:5060", but without the port. */
@@ -270 +273 @@
 }
 
-static pjsip_uri *create_uri5(pj_pool_t *pool)
+static pjsip_uri *create_uri4(pj_pool_t *pool)
 {
     /* "sip:localhost;transport=tcp;user=ip;ttl=255;lr;maddr=127.0.0.1;method=ACK" */
@@ -286 +289 @@
 }
 
-static pjsip_uri *create_uri6(pj_pool_t *pool)
+#define param_add(list,pname,pvalue)  \
+        do { \
+            pjsip_param *param; \
+            param=pj_pool_alloc(pool, sizeof(pjsip_param)); \
+            param->name = pj_str(pname); \
+            param->value = pj_str(pvalue); \
+            pj_list_insert_before(&list, param); \
+        } while (0)
+
+static pjsip_uri *create_uri5(pj_pool_t *pool)
 {
     /* "sip:localhost;pickup=hurry;user=phone;message=I%20am%20sorry"
@@ -295 +307 @@
     pj_strdup2(pool, &url->host, "localhost");
     pj_strdup2(pool, &url->user_param, "phone");
-    pj_strdup2(pool, &url->other_param, ";pickup=hurry;message=I%20am%20sorry");
-    pj_strdup2(pool, &url->header_param, "?Subject=Hello%20There&Server=SIP%20Server");
-    return (pjsip_uri*)url;
-
-}
-
-static pjsip_uri *create_uri7(pj_pool_t *pool)
+
+    //pj_strdup2(pool, &url->other_param, ";pickup=hurry;message=I%20am%20sorry");
+    param_add(url->other_param, "pickup", "hurry");
+    param_add(url->other_param, "message", "I am sorry");
+
+    //pj_strdup2(pool, &url->header_param, "?Subject=Hello%20There&Server=SIP%20Server");
+    param_add(url->header_param, "Subject", "Hello There");
+    param_add(url->header_param, "Server", "SIP Server");
+    return (pjsip_uri*)url;
+
+}
+
+static pjsip_uri *create_uri6(pj_pool_t *pool)
 {
     /* "sips:localhost" */
@@ -310 +328 @@
 }
 
-static pjsip_uri *create_uri8(pj_pool_t *pool)
+static pjsip_uri *create_uri7(pj_pool_t *pool)
 {
     /* "<sip:localhost>" */
@@ -323 +341 @@
 }
 
-static pjsip_uri *create_uri9(pj_pool_t *pool)
+static pjsip_uri *create_uri8(pj_pool_t *pool)
 {
     /* "  Power Administrator <sips:localhost>" */
@@ -337 +355 @@
 }
 
-static pjsip_uri *create_uri10(pj_pool_t *pool)
+static pjsip_uri *create_uri9(pj_pool_t *pool)
 {
     /* " \"User\" <sip:user@localhost:5071>" */
@@ -346 +364 @@
     name_addr->uri = (pjsip_uri*) url;
 
-    pj_strdup2(pool, &name_addr->display, "\"User\"");
+    pj_strdup2(pool, &name_addr->display, "User");
     pj_strdup2(pool, &url->user, "user");
     pj_strdup2(pool, &url->host, "localhost");
@@ -353 +371 @@
 }
 
-static pjsip_uri *create_uri11(pj_pool_t *pool)
+static pjsip_uri *create_uri10(pj_pool_t *pool)
 {
     /* " \"Strange User\\\"\\\\\\\"\" <sip:localhost>" */
@@ -362 +380 @@
     name_addr->uri = (pjsip_uri*) url;
 
-    pj_strdup2(pool, &name_addr->display, "\"Strange User\\\"\\\\\\\"\"");
+    pj_strdup2(pool, &name_addr->display, "Strange User\\\"\\\\\\\"");
     pj_strdup2(pool, &url->host, "localhost");
     return (pjsip_uri*)name_addr;
 }
 
-static pjsip_uri *create_uri12(pj_pool_t *pool)
+static pjsip_uri *create_uri11(pj_pool_t *pool)
 {
     /* " \"Rogue User\\\" <sip:localhost>" */
@@ -376 +394 @@
     name_addr->uri = (pjsip_uri*) url;
 
-    pj_strdup2(pool, &name_addr->display, "\"Rogue User\\\"");
+    pj_strdup2(pool, &name_addr->display, "Rogue User\\");
     pj_strdup2(pool, &url->host, "localhost");
     return (pjsip_uri*)name_addr;
 }
 
-static pjsip_uri *create_uri13(pj_pool_t *pool)
+static pjsip_uri *create_uri12(pj_pool_t *pool)
 {
     /* "Strange User\" <sip:localhost>" */
@@ -395 +413 @@
 }
 
+static pjsip_uri *create_uri13(pj_pool_t *pool)
+{
+    /* "sip:localhost;pvalue=\"hello world\"" */
+    pjsip_url *url;
+    url = pjsip_url_create(pool, 0);
+    pj_strdup2(pool, &url->host, "localhost");
+    //pj_strdup2(pool, &url->other_param, ";pvalue=\"hello world\"");
+    param_add(url->other_param, "pvalue", "hello world");
+    return (pjsip_uri*)url;
+}
+
 static pjsip_uri *create_uri14(pj_pool_t *pool)
 {
-    /* "sip:localhost;pvalue=\"hello world\"" */
-    pjsip_url *url;
-    url = pjsip_url_create(pool, 0);
-    pj_strdup2(pool, &url->host, "localhost");
-    pj_strdup2(pool, &url->other_param, ";pvalue=\"hello world\"");
-    return (pjsip_uri*)url;
-}
-
-static pjsip_uri *create_uri15(pj_pool_t *pool)
-{
-    /* "This is -. !% *_+`'~ me <sip:a19A&=+$,;?/%2c:%09a&Zz=+$,@my_proxy09.my-domain.com:9801>" */
+    /* "This is -. !% *_+`'~ me <sip:a19A&=+$,;?/%2c:%40a&Zz=+$,@my_proxy09.my-domain.com:9801>" */
     pjsip_name_addr *name_addr = pjsip_name_addr_create(pool);
     pjsip_url *url;
@@ -415 +434 @@
 
     pj_strdup2(pool, &name_addr->display, "This is -. !% *_+`'~ me");
-    pj_strdup2(pool, &url->user, "a19A&=+$,;?/%2c");
-    pj_strdup2(pool, &url->passwd, "%09a&Zz=+$,");
+    pj_strdup2(pool, &url->user, "a19A&=+$,;?/,");
+    pj_strdup2(pool, &url->passwd, "@a&Zz=+$,");
     pj_strdup2(pool, &url->host, "my_proxy09.MY-domain.com");
     url->port = 9801;
@@ -422 +441 @@
 }
 
+static pjsip_uri *create_uri15(pj_pool_t *pool)
+{
+    /* "sip:abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.com" */
+    pjsip_url *url;
+    url = pjsip_url_create(pool, 0);
+    pj_strdup2(pool, &url->host, ALPHANUM "-_.com");
+    return (pjsip_uri*)url;
+}
+
 static pjsip_uri *create_uri16(pj_pool_t *pool)
 {
-    /* "sip:abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.com" */
-    pjsip_url *url;
-    url = pjsip_url_create(pool, 0);
-    pj_strdup2(pool, &url->host, ALPHANUM "-_.com");
+    /* "sip:" USER_CHAR ":" PASS_CHAR "@host" */
+    pjsip_url *url;
+    url = pjsip_url_create(pool, 0);
+    pj_strdup2(pool, &url->user, USER_CHAR);
+    pj_strdup2(pool, &url->passwd, PASS_CHAR);
+    pj_strdup2(pool, &url->host, "host");
     return (pjsip_uri*)url;
 }
@@ -433 +463 @@
 static pjsip_uri *create_uri17(pj_pool_t *pool)
 {
-    /* "sip:" ALPHANUM USER ":" ALPHANUM PASS "@host" */
-    pjsip_url *url;
-    url = pjsip_url_create(pool, 0);
-    pj_strdup2(pool, &url->user, ALPHANUM USER);
-    pj_strdup2(pool, &url->passwd, ALPHANUM PASS);
-    pj_strdup2(pool, &url->host, "host");
-    return (pjsip_uri*)url;
-}
-
-static pjsip_uri *create_uri18(pj_pool_t *pool)
-{
-    /* "sip:host;user=ip;" ALPHANUM PARAM_CHAR "=" ALPHANUM PARAM_CHAR ";lr;other=1;transport=sctp;other2" */
+    /* "sip:host;user=ip;" PARAM_CHAR "%21=" PARAM_CHAR "%21;lr;other=1;transport=sctp;other2" */
     pjsip_url *url;
     url = pjsip_url_create(pool, 0);
@@ -450 +469 @@
     pj_strdup2(pool, &url->user_param, "ip");
     pj_strdup2(pool, &url->transport_param, "sctp");
-    pj_strdup2(pool, &url->other_param, ";" ALPHANUM PARAM_CHAR "=" ALPHANUM PARAM_CHAR ";other=1;other2");    
+    param_add(url->other_param, PARAM_CHAR "!", PARAM_CHAR "!");
+    param_add(url->other_param, "other", "1");
+    param_add(url->other_param, "other2", "");
     url->lr_param = 1;
     return (pjsip_uri*)url;
@@ -485 +506 @@
          */
         status = entry->status==ERR_SYNTAX_ERR ? PJ_SUCCESS : -10;
+        if (status != 0) {
+            PJ_LOG(3,("", "   uri parse error!\n"
+                          "   uri='%s'\n",
+                          entry->str));
+        }
         goto on_return;
     }
     pj_get_timestamp(&t2);
-    parse_time += t2.u32.lo - t1.u32.lo;
+    pj_sub_timestamp(&t2, &t1);
+    pj_add_timestamp(&parse_time, &t2);
 
     /* Create the reference URI. */
@@ -503 +530 @@
         goto on_return;
     }
+    s1.ptr[len] = '\0';
     s1.slen = len;
+
+    pj_get_timestamp(&t2);
+    pj_sub_timestamp(&t2, &t1);
+    pj_add_timestamp(&print_time, &t2);
 
     len = pjsip_uri_print( PJSIP_URI_IN_OTHER, ref_uri, s2.ptr, PJSIP_MAX_URL_SIZE);
@@ -510 +542 @@
         goto on_return;
     }
+    s2.ptr[len] = '\0';
     s2.slen = len;
-    pj_get_timestamp(&t2);
-    print_time += t2.u32.lo - t1.u32.lo;
 
     /* Full comparison of parsed URI with reference URI. */
-    if (pjsip_uri_cmp(PJSIP_URI_IN_OTHER, parsed_uri, ref_uri) != 0) {
+    status = pjsip_uri_cmp(PJSIP_URI_IN_OTHER, parsed_uri, ref_uri);
+    if (status != 0) {
         /* Not equal. See if this is the expected status. */
         status = entry->status==ERR_NOT_EQUAL ? PJ_SUCCESS : -40;
+        if (status != 0) {
+            PJ_LOG(3,("", "   uri comparison mismatch, status=%d:\n"
+                          "    uri1='%s'\n"
+                          "    uri2='%s'",
+                          status, s1.ptr, s2.ptr));
+        }
         goto on_return;
 
@@ -540 +578 @@
 pj_status_t uri_test()
 {
-    unsigned i;
+    unsigned i, loop;
     pj_pool_t *pool;
     pj_status_t status;
-
-    pool = pjsip_endpt_create_pool(endpt, "", 4000, 4000);
-
+    pj_timestamp zero;
+    pj_highprec_t avg_parse, avg_print;
+
+    zero.u32.hi = zero.u32.lo = 0;
+
+    PJ_LOG(3,("", "  simple test"));
+    pool = pjsip_endpt_create_pool(endpt, "", POOL_SIZE, POOL_SIZE);
     for (i=0; i<PJ_ARRAY_SIZE(uri_test_array); ++i) {
         status = do_uri_test(pool, &uri_test_array[i]);
@@ -551 +593 @@
             PJ_LOG(3,("uri_test", "  error %d when testing entry %d",
                       status, i));
-            break;
+            goto on_return;
         }
     }
-
+    pjsip_endpt_destroy_pool(endpt, pool);
+
+    PJ_LOG(3,("", "  benchmarking..."));
+    parse_len = 0;
+    parse_time.u32.hi = parse_time.u32.lo = 0;
+    print_time.u32.hi = print_time.u32.lo = 0;
+    pool = pjsip_endpt_create_pool(endpt, "", POOL_SIZE, POOL_SIZE);
+    for (loop=0; loop<LOOP_COUNT; ++loop) {
+        for (i=0; i<PJ_ARRAY_SIZE(uri_test_array); ++i) {
+            status = do_uri_test(pool, &uri_test_array[i]);
+            if (status != PJ_SUCCESS) {
+                PJ_LOG(3,("uri_test", "  error %d when testing entry %d",
+                          status, i));
+                goto on_return;
+            }
+        }
+    }
+
+    avg_parse = pj_elapsed_usec(&zero, &parse_time);
+    pj_highprec_mul(avg_parse, AVERAGE_URL_LEN);
+    pj_highprec_div(avg_parse, parse_len);
+    avg_parse = 1000000 / avg_parse;
+
+    avg_print = pj_elapsed_usec(&zero, &print_time);
+    pj_highprec_mul(avg_print, AVERAGE_URL_LEN);
+    pj_highprec_div(avg_print, parse_len);
+    avg_print = 1000000 / avg_print;
+
+    PJ_LOG(3,("", "   done. Average parse=%d url/sec, print=%d url/sec",
+                  (unsigned)avg_parse, (unsigned)avg_print));
+
+    PJ_LOG(3,("", "  multithreaded test"));
+
+
+on_return:
     pjsip_endpt_destroy_pool(endpt, pool);
     return status;