Changeset 2194 for pjproject/trunk

Timestamp:

Aug 5, 2008 8:14:39 PM (16 years ago)

Author:

bennylp

Message:

Ticket #585: Handle non-SIP URI in Contact header of incoming INVITE and SUBSCRIBE requests

Location:

pjproject/trunk

Files:

• pjsip-apps/src/test-pjsua/scripts-sendto/360_non_sip_uri.py (added)
• pjsip-apps/src/test-pjsua/scripts-sendto/361_non_sip_uri.py (added)
• pjsip-apps/src/test-pjsua/scripts-sendto/362_non_sip_uri.py (added)
• pjsip-apps/src/test-pjsua/scripts-sendto/363_non_sip_uri_subscribe.py (added)
• pjsip-apps/src/test-pjsua/scripts-sendto/364_non_sip_uri_subscribe.py (added)
• pjsip/src/pjsip/sip_dialog.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_acc.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_pres.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_dialog.c

@@ -308 +308 @@
 {
     pj_status_t status;
-    pjsip_hdr *contact_hdr;
+    pjsip_hdr *pos = NULL;
+    pjsip_contact_hdr *contact_hdr;
     pjsip_rr_hdr *rr;
     pjsip_transaction *tsx = NULL;
@@ -417 +418 @@
 
 
-    /* Init remote's contact from Contact header. */
-    contact_hdr = (pjsip_hdr*)
-                  pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_CONTACT, 
-                                     NULL);
+    /* Init remote's contact from Contact header. 
+     * Iterate the Contact URI until we find sip: or sips: scheme.
+     */
+    do {
+        contact_hdr = (pjsip_contact_hdr*)
+                      pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_CONTACT,
+                                         pos);
+        if (contact_hdr) {
+            if (!PJSIP_URI_SCHEME_IS_SIP(contact_hdr->uri) && 
+                !PJSIP_URI_SCHEME_IS_SIPS(contact_hdr->uri))
+            {
+                pos = (pjsip_hdr*)contact_hdr->next;
+                if (pos == &rdata->msg_info.msg->hdr)
+                    contact_hdr = NULL;
+            } else {
+                break;
+            }
+        }
+    } while (contact_hdr);
+
     if (!contact_hdr) {
         status = PJSIP_ERRNO_FROM_SIP_STATUS(PJSIP_SC_BAD_REQUEST);
         goto on_error;
     }
+
     dlg->remote.contact = (pjsip_contact_hdr*) 
-                          pjsip_hdr_clone(dlg->pool, contact_hdr);
+                          pjsip_hdr_clone(dlg->pool, (pjsip_hdr*)contact_hdr);
 
     /* Init remote's CSeq from CSeq header */

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

@@ -1675 +1675 @@
                 pjsip_uri_get_uri(rdata->msg_info.record_route->name_addr.uri);
     } else {
+        pjsip_hdr *pos = NULL;
         pjsip_contact_hdr *h_contact;
         pjsip_uri *uri = NULL;
 
-        /* Otherwise URI is Contact URI */
-        h_contact = (pjsip_contact_hdr*)
-                    pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_CONTACT,
-                                       NULL);
-        if (h_contact)
-            uri = (pjsip_uri*) pjsip_uri_get_uri(h_contact->uri);
+        /* Otherwise URI is Contact URI.
+         * Iterate the Contact URI until we find sip: or sips: scheme.
+         */
+        do {
+            h_contact = (pjsip_contact_hdr*)
+                        pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_CONTACT,
+                                           pos);
+            if (h_contact) {
+                uri = (pjsip_uri*) pjsip_uri_get_uri(h_contact->uri);
+                if (!PJSIP_URI_SCHEME_IS_SIP(uri) && 
+                    !PJSIP_URI_SCHEME_IS_SIPS(uri))
+                {
+                    pos = (pjsip_hdr*)h_contact->next;
+                    if (pos == &rdata->msg_info.msg->hdr)
+                        h_contact = NULL;
+                } else {
+                    break;
+                }
+            }
+        } while (h_contact);
         
 

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

@@ -689 +689 @@
                          status);
             PJSUA_UNLOCK();
+            pjsip_endpt_respond_stateless(pjsua_var.endpt, rdata, 400, NULL,
+                                          NULL, NULL);
             return PJ_TRUE;
         }
@@ -701 +703 @@
                      status);
         PJSUA_UNLOCK();
+        pjsip_endpt_respond_stateless(pjsua_var.endpt, rdata, 400, NULL,
+                                      NULL, NULL);
         return PJ_TRUE;
     }