Changeset 54 for pjproject/trunk/pjsip/src/pjsip/sip_transaction.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_transaction.c (modified) (18 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

@@ -193 +193 @@
 
     PJ_ASSERT_RETURN(pool && str && method && rdata, PJ_EINVAL);
-    PJ_ASSERT_RETURN(rdata->msg, PJ_EINVAL);
-    PJ_ASSERT_RETURN(rdata->via, PJSIP_EMISSINGHDR);
-    PJ_ASSERT_RETURN(rdata->cseq, PJSIP_EMISSINGHDR);
-    PJ_ASSERT_RETURN(rdata->from, PJSIP_EMISSINGHDR);
-
-    host = &rdata->via->sent_by.host;
-    req_uri = (pjsip_uri*)rdata->msg->line.req.uri;
+    PJ_ASSERT_RETURN(rdata->msg_info.msg, PJ_EINVAL);
+    PJ_ASSERT_RETURN(rdata->msg_info.via, PJSIP_EMISSINGHDR);
+    PJ_ASSERT_RETURN(rdata->msg_info.cseq, PJSIP_EMISSINGHDR);
+    PJ_ASSERT_RETURN(rdata->msg_info.from, PJSIP_EMISSINGHDR);
+
+    host = &rdata->msg_info.via->sent_by.host;
+    req_uri = (pjsip_uri*)rdata->msg_info.msg->line.req.uri;
 
     /* Calculate length required. */
     len_required = 9 +                      /* CSeq number */
-                   rdata->from->tag.slen +   /* From tag. */
-                   rdata->call_id.slen +    /* Call-ID */
+                   rdata->msg_info.from->tag.slen +   /* From tag. */
+                   rdata->msg_info.call_id.slen +    /* Call-ID */
                    host->slen +             /* Via host. */
                    9 +                      /* Via port. */
@@ -232 +232 @@
 
     /* Add CSeq (only the number). */
-    len = pj_utoa(rdata->cseq->cseq, p);
+    len = pj_utoa(rdata->msg_info.cseq->cseq, p);
     p += len;
     *p++ = SEPARATOR;
 
     /* Add From tag. */
-    len = rdata->from->tag.slen;
-    pj_memcpy( p, rdata->from->tag.ptr, len);
+    len = rdata->msg_info.from->tag.slen;
+    pj_memcpy( p, rdata->msg_info.from->tag.ptr, len);
     p += len;
     *p++ = SEPARATOR;
 
     /* Add Call-ID. */
-    len = rdata->call_id.slen;
-    pj_memcpy( p, rdata->call_id.ptr, len );
+    len = rdata->msg_info.call_id.slen;
+    pj_memcpy( p, rdata->msg_info.call_id.ptr, len );
     p += len;
     *p++ = SEPARATOR;
@@ -258 +258 @@
     *p++ = ':';
 
-    len = pj_utoa(rdata->via->sent_by.port, p);
+    len = pj_utoa(rdata->msg_info.via->sent_by.port, p);
     p += len;
     *p++ = SEPARATOR;
@@ -325 +325 @@
      * handled as RFC2543.
      */
-    const pj_str_t *branch = &rdata->via->branch_param;
+    const pj_str_t *branch = &rdata->msg_info.via->branch_param;
 
     if (pj_strncmp(branch,&rfc3261_branch,PJSIP_RFC3261_BRANCH_LEN)==0) {
@@ -643 +643 @@
  * has completed, with or without error.
  */
-static void tsx_transport_callback(pjsip_transport_t *tr, 
+static void tsx_transport_callback(pjsip_transport *tr, 
                                    void *token, 
                                    pj_status_t status)
@@ -657 +657 @@
     if (status == PJ_SUCCESS) {
         PJ_LOG(4, (tsx->obj_name, "%s connected to %s:%d",
-                                  pjsip_transport_get_type_name(tr),
+                                  tr->type_name,
                                   addr, tsx->dest_name.port));
     } else {
         PJ_LOG(4, (tsx->obj_name, "%s unable to connect to %s:%d, status=%d", 
-                                  pjsip_transport_get_type_name(tr),
+                                  tr->type_name,
                                   addr, tsx->dest_name.port, status));
     }
@@ -878 +878 @@
                                         pjsip_rx_data *rdata)
 {
-    pjsip_msg *msg = rdata->msg;
+    pjsip_msg *msg = rdata->msg_info.msg;
     pj_str_t *branch;
     pjsip_cseq_hdr *cseq;
@@ -890 +890 @@
 
     /* Keep shortcut to message */
-    msg = rdata->msg;
+    msg = rdata->msg_info.msg;
 
     /* Role is UAS */
@@ -909 +909 @@
 
     /* Duplicate branch parameter for transaction. */
-    branch = &rdata->via->branch_param;
+    branch = &rdata->msg_info.via->branch_param;
     pj_strdup(tsx->pool, &tsx->branch, branch);
 
@@ -916 +916 @@
 
     /* Save CSeq */
-    cseq = rdata->cseq;
+    cseq = rdata->msg_info.cseq;
     tsx->cseq = cseq->cseq;
 
@@ -932 +932 @@
      * then return the response using the same transport.
      */
-    if (PJSIP_TRANSPORT_IS_RELIABLE(rdata->transport) || 
-        rdata->via->rport_param >= 0) 
+    if (PJSIP_TRANSPORT_IS_RELIABLE(rdata->tp_info.transport) || 
+        rdata->msg_info.via->rport_param >= 0) 
     {
-        tsx->transport = rdata->transport;
+        tsx->transport = rdata->tp_info.transport;
         pjsip_transport_add_ref(tsx->transport);
         tsx->transport_state = PJSIP_TSX_TRANSPORT_STATE_FINAL;
@@ -944 +944 @@
                 pjsip_transport_get_type(tsx->transport);
         pj_memcpy(&tsx->remote_addr.entry[0].addr, 
-                  &rdata->addr, rdata->addr_len);
+                  &rdata->pkt_info.addr, rdata->pkt_info.addr_len);
         
     } else {
         pj_status_t status;
 
-        status = pjsip_get_response_addr(tsx->pool, rdata->transport,
-                                         rdata->via, &tsx->dest_name);
+        status = pjsip_get_response_addr(tsx->pool, rdata->tp_info.transport,
+                                         rdata->msg_info.via, &tsx->dest_name);
         if (status != PJ_SUCCESS) {
             tsx->transport_state = PJSIP_TSX_TRANSPORT_STATE_FINAL;
@@ -1213 +1213 @@
             /* Don't update Via sent-by on retransmission. */
             if (via->sent_by.host.slen == 0) {
-                addr_name = pjsip_transport_get_addr_name(tsx->transport);
+                addr_name = &tsx->transport->public_addr;
                 pj_strdup2(tdata->pool, &via->transport, 
-                        pjsip_transport_get_type_name(tsx->transport));
+                           tsx->transport->type_name);
                 pj_strdup2(tdata->pool, &via->sent_by.host, 
                            pj_inet_ntoa(addr_name->sin_addr));
@@ -1397 +1397 @@
          */
         /* Keep last_tx for authorization. */
-        code = event->body.rx_msg.rdata->msg->line.status.code;
+        code = event->body.rx_msg.rdata->msg_info.msg->line.status.code;
         if (tsx->method.id != PJSIP_INVITE_METHOD && code!=401 && code!=407) {
             pjsip_tx_data_dec_ref(tsx->last_tx);
@@ -1666 +1666 @@
         }
 
-        tsx->status_code = event->body.rx_msg.rdata->msg->line.status.code;
+        tsx->status_code = event->body.rx_msg.rdata->msg_info.msg->line.status.code;
     } else {
         tsx->status_code = PJSIP_SC_TSX_TIMEOUT;
@@ -1763 +1763 @@
 
     if (event->type == PJSIP_EVENT_RX_MSG) {
-        pjsip_msg *msg = event->body.rx_msg.rdata->msg;
+        pjsip_msg *msg = event->body.rx_msg.rdata->msg_info.msg;
         pjsip_cseq_hdr *cseq = pjsip_msg_find_hdr( msg, PJSIP_H_CSEQ, NULL );
 
@@ -1856 +1856 @@
              * TU doesn't need to be informed.
              */
-            pjsip_msg *msg = event->body.rx_msg.rdata->msg;
+            pjsip_msg *msg = event->body.rx_msg.rdata->msg_info.msg;
             pj_assert(msg->type == PJSIP_RESPONSE_MSG);
             if (msg->type==PJSIP_RESPONSE_MSG &&
@@ -1922 +1922 @@
 
         pjsip_method_e method_id = 
-            event->body.rx_msg.rdata->msg->line.req.method.id;
+            event->body.rx_msg.rdata->msg_info.msg->line.req.method.id;
 
         /* Must be a request message. */
-        pj_assert(event->body.rx_msg.rdata->msg->type == PJSIP_REQUEST_MSG);
+        pj_assert(event->body.rx_msg.rdata->msg_info.msg->type == PJSIP_REQUEST_MSG);
 
         /* Must be an ACK request or a late INVITE retransmission. */