Changeset 1610 for pjproject/trunk/pjsip/src/test-pjsip/msg_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/msg_test.c (modified) (8 diffs)

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

@@ -701 +701 @@
 
 
+#if INCLUDE_BENCHMARKS
 static int msg_benchmark(unsigned *p_detect, unsigned *p_parse, 
                          unsigned *p_print)
@@ -776 +777 @@
     return status;
 }
+#endif  /* INCLUDE_BENCHMARKS */
 
 /*****************************************************************************/
@@ -796 +798 @@
 static int hdr_test_to(pjsip_hdr *h);
 static int hdr_test_via(pjsip_hdr *h);
-
+static int hdr_test_via_ipv6_1(pjsip_hdr *h);
+static int hdr_test_via_ipv6_2(pjsip_hdr *h);
+static int hdr_test_via_ipv6_3(pjsip_hdr *h);
 
 
 #define GENERIC_PARAM        "p0=a;p1=\"ab:;cd\";p2=ab%3acd;p3"
 #define GENERIC_PARAM_PARSED "p0=a;p1=\"ab:;cd\";p2=ab:cd;p3"
-#define PARAM_CHAR           "[]/:&+$"
+#define PARAM_CHAR           "][/:&+$"
 #define SIMPLE_ADDR_SPEC     "sip:host"
 #define ADDR_SPEC            SIMPLE_ADDR_SPEC ";"PARAM_CHAR"="PARAM_CHAR ";p1=\";\""
@@ -948 +952 @@
         "SIP/2.0/XYZ host" ";" GENERIC_PARAM,
         &hdr_test_via
+    },
+
+    {
+        /* Via with IPv6 */
+        "Via", "v",
+        "SIP/2.0/UDP [::1]",
+        &hdr_test_via_ipv6_1
+    },
+
+    {
+        /* Via with IPv6 */
+        "Via", "v",
+        "SIP/2.0/UDP [::1]:5061",
+        &hdr_test_via_ipv6_2
+    },
+
+    {
+        /* Via with IPv6 */
+        "Via", "v",
+        "SIP/2.0/UDP [::1];rport=5061;received=::2",
+        &hdr_test_via_ipv6_3
     }
 };
@@ -1112 +1137 @@
 
 /* 
-#define PARAM_CHAR          "[]/:&+$"
+#define PARAM_CHAR          "][/:&+$"
 #define SIMPLE_ADDR_SPEC    "sip:host"
 #define ADDR_SPEC            SIMPLE_ADDR_SPEC ";"PARAM_CHAR"="PARAM_CHAR ";p1=\";\""
@@ -1433 +1458 @@
 }
 
+
+/*
+    "SIP/2.0/UDP [::1]"
+ */
+static int hdr_test_via_ipv6_1(pjsip_hdr *h)
+{
+    pjsip_via_hdr *hdr = (pjsip_via_hdr*)h;
+
+    if (h->type != PJSIP_H_VIA)
+        return -2610;
+
+    if (pj_strcmp2(&hdr->transport, "UDP"))
+        return -2615;
+
+    if (pj_strcmp2(&hdr->sent_by.host, "::1"))
+        return -2620;
+
+    if (hdr->sent_by.port != 0)
+        return -2630;
+
+    return 0;
+}
+
+/* "SIP/2.0/UDP [::1]:5061" */
+static int hdr_test_via_ipv6_2(pjsip_hdr *h)
+{
+    pjsip_via_hdr *hdr = (pjsip_via_hdr*)h;
+
+    if (h->type != PJSIP_H_VIA)
+        return -2710;
+
+    if (pj_strcmp2(&hdr->transport, "UDP"))
+        return -2715;
+
+    if (pj_strcmp2(&hdr->sent_by.host, "::1"))
+        return -2720;
+
+    if (hdr->sent_by.port != 5061)
+        return -2730;
+
+    return 0;
+}
+
+/* "SIP/2.0/UDP [::1];rport=5061;received=::2" */
+static int hdr_test_via_ipv6_3(pjsip_hdr *h)
+{
+    pjsip_via_hdr *hdr = (pjsip_via_hdr*)h;
+
+    if (h->type != PJSIP_H_VIA)
+        return -2810;
+
+    if (pj_strcmp2(&hdr->transport, "UDP"))
+        return -2815;
+
+    if (pj_strcmp2(&hdr->sent_by.host, "::1"))
+        return -2820;
+
+    if (hdr->sent_by.port != 0)
+        return -2830;
+
+    if (pj_strcmp2(&hdr->recvd_param, "::2"))
+        return -2840;
+
+    if (hdr->rport_param != 5061)
+        return -2850;
+
+    return 0;
+}
 
 static int hdr_test(void)
@@ -1534 +1627 @@
     pj_status_t status;
 
+    status = hdr_test();
+    if (status != 0)
+        return status;
+
     status = simple_test();
     if (status != PJ_SUCCESS)
         return status;
 
-    status = hdr_test();
-    if (status != 0)
-        return status;
-
+#if INCLUDE_BENCHMARKS
     for (i=0; i<COUNT; ++i) {
         PJ_LOG(3,(THIS_FILE, "  benchmarking (%d of %d)..", i+1, COUNT));
@@ -1609 +1703 @@
                 "The value is derived from msg-print-per-sec above.");
 
+#endif  /* INCLUDE_BENCHMARKS */
 
     return PJ_SUCCESS;