Changeset 58 for pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

Timestamp:

Nov 19, 2005 8:28:08 PM (17 years ago)

Author:

bennylp

Message:

Changed transaction to refrect new transport changes

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transaction.c (modified) (6 diffs)

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

@@ -718 +718 @@
     pjsip_transaction *tsx = token;
     struct tsx_lock_data lck;
+    pjsip_transport *tp;
 
     PJ_LOG(4, (tsx->obj_name, "resolver job complete, status=%d", status));
@@ -742 +743 @@
 
     tsx->transport_state = PJSIP_TSX_TRANSPORT_STATE_CONNECTING;
-    pjsip_endpt_get_transport(tsx->endpt, tsx->pool,
-                              addr->entry[0].type, &addr->entry[0].addr,
-                              tsx,
-                              &tsx_transport_callback);
+    status = pjsip_endpt_alloc_transport( tsx->endpt, addr->entry[0].type,
+                                          &addr->entry[0].addr,
+                                          &tp);
+    tsx_transport_callback(tp, tsx, status);
 
     /* Unlock transaction */
@@ -941 +942 @@
         tsx->current_addr = 0;
         tsx->remote_addr.count = 1;
-        tsx->remote_addr.entry[0].type = 
-                pjsip_transport_get_type(tsx->transport);
+        tsx->remote_addr.entry[0].type = tsx->transport->type;
         pj_memcpy(&tsx->remote_addr.entry[0].addr, 
                   &rdata->pkt_info.addr, rdata->pkt_info.addr_len);
@@ -1182 +1182 @@
 
 /*
+ * Transport send completion callback.
+ */
+static void tsx_on_send_complete(void *token, pjsip_tx_data *tdata,
+                                 pj_ssize_t bytes_sent)
+{
+    PJ_UNUSED_ARG(token);
+    PJ_UNUSED_ARG(tdata);
+
+    if (bytes_sent <= 0) {
+        PJ_TODO(HANDLE_TRANSPORT_ERROR);
+    }
+}
+
+/*
  * Send message to the transport.
  * If transport is not yet available, then do nothing. The message will be
@@ -1194 +1208 @@
 
     if (tsx->transport_state == PJSIP_TSX_TRANSPORT_STATE_FINAL) {
-        pj_ssize_t sent;
         pjsip_event before_tx_event;
 
@@ -1228 +1241 @@
 
         tsx->has_unsent_msg = 0;
-        status = pjsip_transport_send_msg(
-                        tsx->transport, tdata,
-                        &tsx->remote_addr.entry[tsx->current_addr].addr,
-                        &sent);
-        if (status != PJ_SUCCESS) {
+        status = pjsip_transport_send(tsx->transport, tdata,
+                        &tsx->remote_addr.entry[tsx->current_addr].addr,
+                        tsx, &tsx_on_send_complete);
+        if (status != PJ_SUCCESS && status != PJ_EPENDING) {
+            PJ_TODO(HANDLE_TRANSPORT_ERROR);
             goto on_error;
         }