Changeset 54 for pjproject/trunk/pjsip/src/pjsip/sip_misc.c

Timestamp:

Nov 18, 2005 10:43:42 PM (17 years ago)

Author:

bennylp

Message:

The BIG transport modifications

File:

• pjproject/trunk/pjsip/src/pjsip/sip_misc.c (modified) (7 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_misc.c

@@ -430 +430 @@
 
     /* rdata must be a request message. */
-    req_msg = rdata->msg;
+    req_msg = rdata->msg_info.msg;
     pj_assert(req_msg->type == PJSIP_REQUEST_MSG);
 
@@ -450 +450 @@
 
     /* Set TX data attributes. */
-    tdata->rx_timestamp = rdata->timestamp;
+    tdata->rx_timestamp = rdata->pkt_info.timestamp;
 
     /* Copy all the via headers, in order. */
-    via = rdata->via;
+    via = rdata->msg_info.via;
     while (via) {
         pjsip_msg_add_hdr( msg, pjsip_hdr_clone(tdata->pool, via));
@@ -479 +479 @@
 
     /* Copy From header. */
-    hdr = pjsip_hdr_clone(tdata->pool, rdata->from);
+    hdr = pjsip_hdr_clone(tdata->pool, rdata->msg_info.from);
     pjsip_msg_add_hdr( msg, hdr);
 
     /* Copy To header. */
-    hdr = pjsip_hdr_clone(tdata->pool, rdata->to);
+    hdr = pjsip_hdr_clone(tdata->pool, rdata->msg_info.to);
     pjsip_msg_add_hdr( msg, hdr);
 
     /* Copy CSeq header. */
-    hdr = pjsip_hdr_clone(tdata->pool, rdata->cseq);
+    hdr = pjsip_hdr_clone(tdata->pool, rdata->msg_info.cseq);
     pjsip_msg_add_hdr( msg, hdr);
 
@@ -515 +515 @@
 
     /* rdata must be a final response. */
-    pj_assert(rdata->msg->type==PJSIP_RESPONSE_MSG &&
-              rdata->msg->line.status.code >= 300);
+    pj_assert(rdata->msg_info.msg->type==PJSIP_RESPONSE_MSG &&
+              rdata->msg_info.msg->line.status.code >= 300);
 
     /* Log this action. */
@@ -543 +543 @@
     to = (pjsip_to_hdr*)pjsip_msg_find_remove_hdr( invite_msg, 
                                                    PJSIP_H_TO, NULL);
-    pj_strdup(tdata->pool, &to->tag, &rdata->to->tag);
+    pj_strdup(tdata->pool, &to->tag, &rdata->msg_info.to->tag);
     pjsip_msg_add_hdr( ack_msg, (pjsip_hdr*)to );
 
@@ -675 +675 @@
  */
 PJ_DEF(pj_status_t) pjsip_get_response_addr(pj_pool_t *pool,
-                                            const pjsip_transport_t *req_transport,
+                                            const pjsip_transport *req_transport,
                                             const pjsip_via_hdr *via,
                                             pjsip_host_port *send_addr)
@@ -688 +688 @@
      * - otherwise send to the address in sent-by.
      */
-    send_addr->flag = pjsip_transport_get_flag(req_transport);
-    send_addr->type = pjsip_transport_get_type(req_transport);
+    send_addr->flag = req_transport->flag;
+    send_addr->type = req_transport->type;
 
     if (PJSIP_TRANSPORT_IS_RELIABLE(req_transport)) {
         const pj_sockaddr_in *remote_addr;
-        remote_addr = pjsip_transport_get_remote_addr(req_transport);
+        remote_addr = &req_transport->rem_addr;
         pj_strdup2(pool, &send_addr->host, 
                    pj_inet_ntoa(remote_addr->sin_addr));