Changeset 5495 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

Timestamp:

Dec 7, 2016 3:33:35 AM (8 years ago)

Author:

ming

Message:

Fixed #1985: Escape '@' character in the Replaces parameter of REFER request

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

@@ -2870 +2870 @@
     pj_str_t str_dest;
     int len;
+    char call_id_dest_buf[PJSIP_MAX_URL_SIZE * 2];
+    int call_id_len;
     pjsip_uri *uri;
     pj_status_t status;
+    const pjsip_parser_const_t *pconst;
 
 
@@ -2916 +2919 @@
 
     str_dest.slen += len;
-
+        
+    /* This uses the the same scanner definition used for SIP parsing 
+     * to escape the call-id in the refer.
+     *
+     * A common pattern for call-ids is: name@domain. The '@' character, 
+     * when used in a URL parameter, throws off many SIP parsers. 
+     * URL escape it based off of the allowed characters for header values.
+    */
+    pconst = pjsip_parser_const();      
+    call_id_len = pj_strncpy2_escape(call_id_dest_buf, &dest_dlg->call_id->id,
+                                     PJ_ARRAY_SIZE(call_id_dest_buf),
+                                     &pconst->pjsip_HDR_CHAR_SPEC);
+    if (call_id_len < 0) {
+        status = PJSIP_EURITOOLONG;
+        goto on_error;
+    }
 
     /* Build the URI */
@@ -2927 +2945 @@
                            ((options&PJSUA_XFER_NO_REQUIRE_REPLACES) ?
                             "" : "Require=replaces&"),
-                           (int)dest_dlg->call_id->id.slen,
-                           dest_dlg->call_id->id.ptr,
+                           call_id_len,
+                           call_id_dest_buf,
                            (int)dest_dlg->remote.info->tag.slen,
                            dest_dlg->remote.info->tag.ptr,