Changeset 1345 for pjproject/trunk

Timestamp:

Jun 7, 2007 12:51:40 PM (17 years ago)

Author:

bennylp

Message:

Ticket #324: Allow '#' character in the user part of URI of incoming message (thanks Esbjörn Dominique)

File:

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

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

@@ -125 +125 @@
             pjsip_USER_SPEC,            /* User */
             pjsip_USER_SPEC_ESC,        /* Variant without escaped char */
+            pjsip_USER_SPEC_LENIENT,    /* User, with additional '#' char */
+            pjsip_USER_SPEC_LENIENT_ESC,
             pjsip_NOT_COMMA_OR_NEWLINE, /* Array separator. */
             pjsip_NOT_NEWLINE,          /* For eating up header.*/
@@ -362 +364 @@
     pj_cis_del_str( &pjsip_USER_SPEC_ESC, ESCAPED);
 
+    status = pj_cis_dup(&pjsip_USER_SPEC_LENIENT, &pjsip_USER_SPEC);
+    PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
+    pj_cis_add_str(&pjsip_USER_SPEC_LENIENT, "#");
+
+    status = pj_cis_dup(&pjsip_USER_SPEC_LENIENT_ESC, &pjsip_USER_SPEC_ESC);
+    PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
+    pj_cis_add_str(&pjsip_USER_SPEC_LENIENT_ESC, "#");
+
     status = pj_cis_dup(&pjsip_PASSWD_SPEC, &pjsip_ALNUM_SPEC);
     PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
@@ -1209 +1219 @@
                                  pj_str_t *user, pj_str_t *pass)
 {
-    parser_get_and_unescape(scanner, pool, &pjsip_USER_SPEC, 
-                            &pjsip_USER_SPEC_ESC, user);
+    parser_get_and_unescape(scanner, pool, &pjsip_USER_SPEC_LENIENT, 
+                            &pjsip_USER_SPEC_LENIENT_ESC, user);
 
     if ( *scanner->curptr == ':') {