Changeset 606 for pjproject/trunk/pjsip/include/pjsip/sip_parser.h

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/include/pjsip/sip_parser.h (modified) (2 diffs)

pjproject/trunk/pjsip/include/pjsip/sip_parser.h

@@ -315 +315 @@
     pjsip_HEX_SPEC,             /**< Hexadecimal digits. */
     pjsip_PARAM_CHAR_SPEC,      /**< For scanning pname (or pvalue when it's 
-                                     not quoted.) */
+                                     not quoted.) in URI */
     pjsip_PARAM_CHAR_SPEC_ESC,  /**< Variant without the escape ('%') char */
     pjsip_HDR_CHAR_SPEC,        /**< Chars in hname/havalue in URL. */
@@ -357 +357 @@
 };
 
+/* Parse parameter in header (matching the character as token) */
 void pjsip_parse_param_imp(  pj_scanner *scanner, pj_pool_t *pool,
                              pj_str_t *pname, pj_str_t *pvalue,
                              unsigned opt);
+/* Parse parameter in URL (matching the character as paramchar) */
+void pjsip_parse_uri_param_imp(  pj_scanner *scanner, pj_pool_t *pool,
+                                 pj_str_t *pname, pj_str_t *pvalue,
+                                 unsigned opt);
 void pjsip_concat_param_imp( pj_str_t *param, pj_pool_t *pool, 
-                         const pj_str_t *pname, const pj_str_t *pvalue, int sepchar);
+                             const pj_str_t *pname, const pj_str_t *pvalue, 
+                             int sepchar);
 void pjsip_parse_end_hdr_imp ( pj_scanner *scanner );