Changeset 2193 for pjproject/trunk/pjsip/src/pjsip/sip_parser.c

Timestamp:

Aug 5, 2008 7:28:17 PM (16 years ago)

Author:

bennylp

Message:

Implement ticket #551: Generic URI scheme handler (thanks Juri Glaß for the patch)

File:

• pjproject/trunk/pjsip/src/pjsip/sip_parser.c (modified) (5 diffs)

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

@@ -48 +48 @@
 #define HNV_UNRESERVED      "[]/?:+$"
 #define HDR_CHAR            HNV_UNRESERVED UNRESERVED ESCAPED
+
+/* A generic URI can consist of (For a complete BNF see RFC 2396):
+     #?;:@&=+-_.!~*'()%$,/
+ */
+#define GENERIC_URI_CHARS   "#?;:@&=+-_.!~*'()%$,/" "%"
 
 #define PJSIP_VERSION           "SIP/2.0"
@@ -153 +158 @@
                     int_parse_name_addr( pj_scanner *scanner, 
                                          pj_pool_t *pool );
+static void*        int_parse_other_uri(pj_scanner *scanner, 
+                                        pj_pool_t *pool,
+                                        pj_bool_t parse_params);
 static void         parse_hdr_end( pj_scanner *scanner );
 
@@ -377 +385 @@
     pj_cis_invert(&pconst.pjsip_DISPLAY_SPEC);
 
+    status = pj_cis_dup(&pconst.pjsip_OTHER_URI_CONTENT, &pconst.pjsip_ALNUM_SPEC);
+    PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
+    pj_cis_add_str( &pconst.pjsip_OTHER_URI_CONTENT, GENERIC_URI_CHARS);
+
     /*
      * Register URI parsers.
@@ -691 +703 @@
             return uri_handler[i].parse;
     }
-    return NULL;
+    return &int_parse_other_uri;
 }
 
@@ -1464 +1476 @@
 
 
+/* Parse other URI */
+static void* int_parse_other_uri(pj_scanner *scanner, 
+                                 pj_pool_t *pool,
+                                 pj_bool_t parse_params)
+{
+    pjsip_other_uri *uri = 0;
+    const pjsip_parser_const_t *pc = pjsip_parser_const();
+    int skip_ws = scanner->skip_ws;
+
+    PJ_UNUSED_ARG(parse_params);
+
+    scanner->skip_ws = 0;
+    
+    uri = pjsip_other_uri_create(pool); 
+    
+    pj_scan_get(scanner, &pc->pjsip_TOKEN_SPEC, &uri->scheme);
+    if (pj_scan_get_char(scanner) != ':') {
+        PJ_THROW(PJSIP_SYN_ERR_EXCEPTION);
+    }
+    
+    pj_scan_get(scanner, &pc->pjsip_OTHER_URI_CONTENT, &uri->content);
+    scanner->skip_ws = skip_ws;
+    
+    return uri;
+}
+
+
 /* Parse SIP request line. */
 static void int_parse_req_line( pj_scanner *scanner, pj_pool_t *pool,