Changeset 1957

Timestamp:

May 15, 2008 10:07:36 AM (16 years ago)

Author:

bennylp

Message:

More ticket #533: fixed bug in Retry-After parser (thanks Samuel Vinson)

Location:

pjproject/trunk/pjsip/src

Files:

• pjsip/sip_parser.c (modified) (1 diff)
• test-pjsip/msg_test.c (modified) (3 diffs)

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

@@ -1835 +1835 @@
 
     while (!pj_scan_is_eof(scanner) && *scanner->curptr!='\r' &&
-           *scanner->curptr=='\n')
+           *scanner->curptr!='\n')
     {
         if (*scanner->curptr=='(') {
             pj_scan_get_quote(scanner, '(', ')', &hdr->comment);
+            /* Trim the leading and ending parens */
+            hdr->comment.ptr++;
+            hdr->comment.slen -= 2;
         } else if (*scanner->curptr==';') {
             pjsip_param *prm = PJ_POOL_ALLOC_T(ctx->pool, pjsip_param);

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

@@ -801 +801 @@
 static int hdr_test_via_ipv6_2(pjsip_hdr *h);
 static int hdr_test_via_ipv6_3(pjsip_hdr *h);
+static int hdr_test_retry_after1(pjsip_hdr *h);
 
 
@@ -973 +974 @@
         "SIP/2.0/UDP [::1];rport=5061;received=::2",
         &hdr_test_via_ipv6_3
+    },
+
+    {
+        /* Retry-After header with comment */
+        "Retry-After", NULL,
+        "10(Already Pending Register)",
+        &hdr_test_retry_after1
     }
 };
@@ -1523 +1531 @@
     if (hdr->rport_param != 5061)
         return -2850;
+
+    return 0;
+}
+
+/* "10(Already Pending Register)" */
+static int hdr_test_retry_after1(pjsip_hdr *h)
+{
+    pjsip_retry_after_hdr *hdr = (pjsip_retry_after_hdr*)h;
+
+    if (h->type != PJSIP_H_RETRY_AFTER)
+        return -2910;
+
+    if (hdr->ivalue != 10)
+        return -2920;
+    
+    if (pj_strcmp2(&hdr->comment, "Already Pending Register"))
+        return -2930;
 
     return 0;