Changeset 1610 for pjproject/trunk/pjsip/src/test-pjsip/uri_test.c

Timestamp:

Dec 2, 2007 3:40:52 PM (16 years ago)

Author:

bennylp

Message:

More ticket #421: fixed SIP messaging components to support IPv6 format

File:

• pjproject/trunk/pjsip/src/test-pjsip/uri_test.c (modified) (7 diffs)

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

@@ -77 +77 @@
 static pjsip_uri *create_uri33( pj_pool_t *pool );
 static pjsip_uri *create_uri34( pj_pool_t *pool );
-//static pjsip_uri *create_uri35( pj_pool_t *pool );
+static pjsip_uri *create_uri35( pj_pool_t *pool );
+static pjsip_uri *create_uri36( pj_pool_t *pool );
 static pjsip_uri *create_dummy( pj_pool_t *pool );
 
@@ -319 +320 @@
         "tel:911;p1=p1;p2=p2"
     },
-    
+    {
+        /* 35: IPv6 in host and maddr parameter */
+        PJ_SUCCESS,
+        "sip:user@[::1];maddr=[::01]",
+        &create_uri35,
+        "sip:user@[::1];maddr=[::01]"
+    },
+    {
+        /* 36: IPv6 in host and maddr, without username */
+        PJ_SUCCESS,
+        "sip:[::1];maddr=[::01]",
+        &create_uri36,
+        "sip:[::1];maddr=[::01]"
+    }
+
 };
 
@@ -670 +685 @@
 }
 
+/* "sip:user@[::1];maddr=[::01]" */
+static pjsip_uri *create_uri35( pj_pool_t *pool )
+{
+    pjsip_sip_uri *url;
+    url = pjsip_sip_uri_create(pool, 0);
+    url->user = pj_str("user");
+    url->host = pj_str("::1");
+    url->maddr_param = pj_str("::01");
+    return (pjsip_uri*)url;
+}
+
+/* "sip:[::1];maddr=[::01]" */
+static pjsip_uri *create_uri36( pj_pool_t *pool )
+{
+    pjsip_sip_uri *url;
+    url = pjsip_sip_uri_create(pool, 0);
+    url->host = pj_str("::1");
+    url->maddr_param = pj_str("::01");
+    return (pjsip_uri*)url;
+
+}
 
 static pjsip_uri *create_dummy(pj_pool_t *pool)
@@ -825 +861 @@
 }
 
+#if INCLUDE_BENCHMARKS
 static int uri_benchmark(unsigned *p_parse, unsigned *p_print, unsigned *p_cmp)
 {
@@ -910 +947 @@
     return status;
 }
-
+#endif  /* INCLUDE_BENCHMARKS */
 
 /*****************************************************************************/
@@ -930 +967 @@
         return status;
 
+#if INCLUDE_BENCHMARKS
     for (i=0; i<COUNT; ++i) {
         PJ_LOG(3,(THIS_FILE, "  benchmarking (%d of %d)...", i+1, COUNT));
@@ -994 +1032 @@
     report_ival("uri-cmp-per-sec", max, "URI/sec", desc);
 
+#endif  /* INCLUDE_BENCHMARKS */
+
     return PJ_SUCCESS;
 }