Changeset 1816

Timestamp:

Feb 22, 2008 8:36:06 AM (16 years ago)

Author:

bennylp

Message:

Ticket #492: Bug in strict route processing when challenged with 401/407 response

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_transport.h (modified) (1 diff)
• include/pjsip/sip_util.h (modified) (1 diff)
• src/pjsip/sip_auth_client.c (modified) (1 diff)
• src/pjsip/sip_util.c (modified) (3 diffs)

pjproject/trunk/pjsip/include/pjsip/sip_transport.h

@@ -496 +496 @@
     /** The message in this buffer. */
     pjsip_msg           *msg;
+
+    /** Strict route header saved by #pjsip_process_route_set(), to be
+     *  restored by #pjsip_restore_strict_route_set().
+     */
+    pjsip_route_hdr     *saved_strict_route;
 
     /** Buffer to the printed text representation of the message. When the

pjproject/trunk/pjsip/include/pjsip/sip_util.h

@@ -220 +220 @@
 PJ_DECL(pj_status_t) pjsip_process_route_set(pjsip_tx_data *tdata,
                                              pjsip_host_info *dest_info );
+
+
+/**
+ * Swap the request URI and strict route back to the original position
+ * before #pjsip_process_route_set() function is called. If no strict
+ * route URI was found by #pjsip_process_route_set(), this function will
+ * do nothing.
+ *
+ * This function should only used internally by PJSIP client authentication
+ * module.
+ *
+ * @param tdata     Transmit data containing request message.
+ */
+PJ_DECL(void) pjsip_restore_strict_route_set(pjsip_tx_data *tdata);
+
 
 /**

pjproject/trunk/pjsip/src/pjsip/sip_auth_client.c

@@ -1099 +1099 @@
     via->branch_param.slen = 0;
 
+    /* Restore strict route set.
+     * See http://trac.pjsip.org/repos/ticket/492
+     */
+    pjsip_restore_strict_route_set(tdata);
+
     /* Must invalidate the message! */
     pjsip_tx_data_invalidate_msg(tdata);

pjproject/trunk/pjsip/src/pjsip/sip_util.c

@@ -721 +721 @@
     PJ_ASSERT_RETURN(dest_info != NULL, PJ_EINVAL);
 
+    /* Assert if the request contains strict route and strict
+     * route processing has been applied before. We need to
+     * restore the strict route with pjsip_restore_strict_route_set()
+     * before we can call this function again, otherwise strict
+     * route will be swapped twice!
+     */
+    PJ_ASSERT_RETURN(tdata->saved_strict_route==NULL, PJ_EBUG);
+
     /* Find the first and last "Route" headers from the message. */
     last_route_hdr = first_route_hdr = (pjsip_route_hdr*)
@@ -776 +784 @@
                               pjsip_uri_get_uri((pjsip_uri*)topmost_route_uri);
             pj_list_erase(first_route_hdr);
+            tdata->saved_strict_route = first_route_hdr;
             if (first_route_hdr == last_route_hdr)
-                last_route_hdr = NULL;
+                first_route_hdr = last_route_hdr = NULL;
         }
 
@@ -807 +816 @@
     /* Success. */
     return PJ_SUCCESS;  
+}
+
+
+/*
+ * Swap the request URI and strict route back to the original position
+ * before #pjsip_process_route_set() function is called. This function
+ * should only used internally by PJSIP client authentication module.
+ */
+PJ_DEF(void) pjsip_restore_strict_route_set(pjsip_tx_data *tdata)
+{
+    pjsip_route_hdr *first_route_hdr, *last_route_hdr;
+
+    /* Check if we have found strict route before */
+    if (tdata->saved_strict_route == NULL) {
+        /* This request doesn't contain strict route */
+        return;
+    }
+
+    /* Find the first "Route" headers from the message. */
+    first_route_hdr = (pjsip_route_hdr*)
+                      pjsip_msg_find_hdr(tdata->msg, PJSIP_H_ROUTE, NULL);
+
+    if (first_route_hdr == NULL) {
+        /* User has modified message route? We don't expect this! */
+        pj_assert(!"Message route was modified?");
+        tdata->saved_strict_route = NULL;
+        return;
+    }
+
+    /* Find last Route header */
+    last_route_hdr = first_route_hdr;
+    while (last_route_hdr->next != (void*)&tdata->msg->hdr) {
+        pjsip_route_hdr *hdr;
+        hdr = (pjsip_route_hdr*)
+              pjsip_msg_find_hdr(tdata->msg, PJSIP_H_ROUTE, 
+                                 last_route_hdr->next);
+        if (!hdr)
+            break;
+        last_route_hdr = hdr;
+    }
+
+    /* Put the last Route header as request URI, delete last Route
+     * header, and insert the saved strict route as the first Route.
+     */
+    tdata->msg->line.req.uri = last_route_hdr->name_addr.uri;
+    pj_list_insert_before(first_route_hdr, tdata->saved_strict_route);
+    pj_list_erase(last_route_hdr);
+
+    /* Reset */
+    tdata->saved_strict_route = NULL;
 }