Changeset 1537 for pjproject/trunk

Timestamp:

Oct 31, 2007 3:52:09 PM (17 years ago)

Author:

bennylp

Message:

Ticket #408: Route set shouldn't be updated once it has been set (thanks Anshuman S. Rawat)

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_dialog.h (modified) (1 diff)
• src/pjsip/sip_dialog.c (modified) (7 diffs)

pjproject/trunk/pjsip/include/pjsip/sip_dialog.h

@@ -131 +131 @@
     pjsip_cid_hdr      *call_id;    /**< Call-ID header.                    */
     pjsip_route_hdr     route_set;  /**< Route set.                         */
+    pj_bool_t           route_set_frozen; /**< Route set has been set.      */
     pjsip_auth_clt_sess auth_sess;  /**< Client authentication session.     */
 

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

@@ -473 +473 @@
                                                    PJSIP_H_RECORD_ROUTE, rr);
     }
+    dlg->route_set_frozen = PJ_TRUE;
 
     /* Init client authentication session. */
@@ -642 +643 @@
         r = r->next;
     }
+    dlg->route_set_frozen = PJ_TRUE;
 
     /* Clone client authentication session. */
@@ -1541 +1543 @@
     const pjsip_hdr *hdr, *end_hdr;
 
+    /* Ignore if route set has been set */
+    if (dlg->route_set_frozen)
+        return;
+
     pj_list_init(&dlg->route_set);
 
@@ -1552 +1558 @@
         }
     }
+    dlg->route_set_frozen = PJ_TRUE;
 }
 
@@ -1560 +1567 @@
 {
     unsigned i;
-    pj_bool_t routeset_updated = PJ_FALSE;
     int res_code;
 
@@ -1614 +1620 @@
          */
         dlg_update_routeset(dlg, rdata->msg_info.msg);
-        routeset_updated = PJ_TRUE;
 
         /* The remote target MUST be set to the URI from the Contact header 
@@ -1674 +1679 @@
         }
 
-        if (!routeset_updated) {
-            dlg_update_routeset(dlg, rdata->msg_info.msg);
-            routeset_updated = PJ_TRUE;
-        }
+        dlg_update_routeset(dlg, rdata->msg_info.msg);
     }