Changeset 2532 for pjproject/branches/1.0

Timestamp:

Mar 23, 2009 1:06:24 PM (15 years ago)

Author:

bennylp

Message:

Ticket #714: backported changes from ticket #713

Location:

pjproject/branches/1.0

Files:

• . (modified) (1 prop)
• pjsip/src/pjsip/sip_util.c (modified) (1 diff)

pjproject/branches/1.0/pjsip/src/pjsip/sip_util.c

@@ -855 +855 @@
     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!
+    /* If the request contains strict route, check that the strict route
+     * has been restored to its original values before processing the
+     * route set. The strict route is restored to the original values
+     * with pjsip_restore_strict_route_set(). If caller did not restore
+     * the strict route before calling this function, we need to call it
+     * here, or otherwise the strict-route and Request-URI will be swapped
+     * twice!
      */
+    if (tdata->saved_strict_route != NULL) {
+        pjsip_restore_strict_route_set(tdata);
+    }
     PJ_ASSERT_RETURN(tdata->saved_strict_route==NULL, PJ_EBUG);