Changeset 1077 for pjproject/branches/pjproject-0.5-stable/pjsip/include/pjsip/sip_util.h

Timestamp:

Mar 17, 2007 10:21:58 PM (17 years ago)

Author:

bennylp

Message:

Fixed ticket #186: Major bug with destination address calculation for strict route set (thanks Hoi-Ho Chan)

File:

• pjproject/branches/pjproject-0.5-stable/pjsip/include/pjsip/sip_util.h (modified) (2 diffs)

pjproject/branches/pjproject-0.5-stable/pjsip/include/pjsip/sip_util.h

@@ -173 +173 @@
  * chapter 8.1.2.
  *
- * This function may modify the message (request line and Route headers),
- * if the Route information specifies strict routing and the request
- * URI in the message is different than the calculated target URI. In that
- * case, the target URI will be put as the request URI of the request and
- * current request URI will be put as the last entry of the Route headers.
+ * Note there was a change in the behavior of this function since version
+ * 0.5.10.2. Previously this function may modify the request when strict
+ * route is present (to update request URI and route-set). This is no
+ * longer the case now, and this process is done in separate function
+ * (see #pjsip_process_route_set()).
  *
  * @param tdata     The transmit data containing the request message.
@@ -187 +187 @@
  *
  * @return          PJ_SUCCESS, or the appropriate error code.
- */
-PJ_DECL(pj_status_t) pjsip_get_request_addr( pjsip_tx_data *tdata,
+ *
+ * @see pjsip_process_route_set
+ */
+PJ_DECL(pj_status_t) pjsip_get_request_dest(const pjsip_tx_data *tdata,
+                                            pjsip_host_info *dest_info );
+
+
+/**
+ * Process route-set found in the request and calculate destination to be
+ * used to send the request message, based on the request URI and Route 
+ * headers in the message. The procedure used here follows the guidelines
+ * on sending the request in RFC 3261 chapter 8.1.2.
+ *
+ * This function may modify the message (request line and Route headers),
+ * if the Route information specifies strict routing and the request
+ * URI in the message is different than the calculated target URI. In that
+ * case, the target URI will be put as the request URI of the request and
+ * current request URI will be put as the last entry of the Route headers.
+ *
+ * @param tdata     The transmit data containing the request message.
+ * @param dest_info On return, it contains information about destination
+ *                  host to contact, along with the preferable transport
+ *                  type, if any. Caller will then normally proceed with
+ *                  resolving this host with server resolution procedure
+ *                  described in RFC 3263.
+ *
+ * @return          PJ_SUCCESS, or the appropriate error code.
+ *
+ * @see pjsip_get_request_addr
+ */
+PJ_DECL(pj_status_t) pjsip_process_route_set(pjsip_tx_data *tdata,
                                              pjsip_host_info *dest_info );