Changeset 606 for pjproject/trunk/pjsip/src/pjsip/sip_tel_uri.c

Timestamp:

Jul 17, 2006 10:04:12 AM (18 years ago)

Author:

bennylp

Message:

Fixed bugs with the parsing (re: allowable chars): (1) Parameters in URI and header should have different spec. URI should use paramchar spec while header should use token spec (thanks Jeroen van Bemmel) (2) The same rule applies when escaping the parameters during printing process (3) While we're on it, also fixed the tel-URI parser to automatically unescape the parameter values.

File:

• pjproject/trunk/pjsip/src/pjsip/sip_tel_uri.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_tel_uri.c

@@ -56 +56 @@
 static pj_cis_t pjsip_TEL_PNAME_SPEC;
 static pj_cis_t pjsip_TEL_PVALUE_SPEC;
+static pj_cis_t pjsip_TEL_PVALUE_SPEC_ESC;
 static pj_cis_t pjsip_TEL_PARSING_PVALUE_SPEC;
+static pj_cis_t pjsip_TEL_PARSING_PVALUE_SPEC_ESC;
 
 static pj_str_t pjsip_ISUB_STR = { "isub", 4 };
@@ -153 +155 @@
     pj_cis_add_str(&pjsip_TEL_PVALUE_SPEC, PARAM_CHAR);
 
+    status = pj_cis_dup(&pjsip_TEL_PVALUE_SPEC_ESC, &pjsip_TEL_PVALUE_SPEC);
+    pj_cis_del_str(&pjsip_TEL_PVALUE_SPEC_ESC, "%");
+
     status = pj_cis_dup(&pjsip_TEL_PARSING_PVALUE_SPEC, &pjsip_TEL_URIC_SPEC);
     PJ_ASSERT_RETURN(status==PJ_SUCCESS, status);
     pj_cis_add_cis(&pjsip_TEL_PARSING_PVALUE_SPEC, &pjsip_TEL_PVALUE_SPEC);
     pj_cis_add_str(&pjsip_TEL_PARSING_PVALUE_SPEC, "=");
+
+    status = pj_cis_dup(&pjsip_TEL_PARSING_PVALUE_SPEC_ESC, 
+                        &pjsip_TEL_PARSING_PVALUE_SPEC);
+    pj_cis_del_str(&pjsip_TEL_PVALUE_SPEC_ESC, "%");
 
     status = pjsip_register_uri_parser("tel", &tel_uri_parse);
@@ -394 +403 @@
             if (*scanner->curptr == '=') {
                 pj_scan_get_char(scanner);
-                pj_scan_get(scanner, &pjsip_TEL_PARSING_PVALUE_SPEC, &pvalue);
+
+#               if defined(PJSIP_UNESCAPE_IN_PLACE) && PJSIP_UNESCAPE_IN_PLACE!=0
+                    pj_scan_get_unescape( scanner, 
+                                          &pjsip_TEL_PARSING_PVALUE_SPEC_ESC,
+                                          &pvalue);
+#               else
+                    pj_scan_get(scanner, &pjsip_TEL_PARSING_PVALUE_SPEC, 
+                                &pvalue);
+                    *token = pj_str_unescape(pool, &pvalue);
+#               endif
+
             } else {
                 pvalue.slen = 0;