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

Timestamp:

Apr 14, 2010 6:57:35 AM (14 years ago)

Author:

nanang

Message:

Ticket #1056:

• Added functions to set/unset transport state notification callback on specific transport.
• Updated transaction to immediately terminate the transactions when their transport gets disconnected.
• Minor update: renamed function pjsip_tpmgr_set/get_status_cb() to pjsip_tpmgr_set/get_state_cb().

File:

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

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

@@ -181 +181 @@
 static void        tsx_timer_callback( pj_timer_heap_t *theap, 
                                        pj_timer_entry *entry);
+static void        tsx_tp_state_callback(
+                                       pjsip_transport *tp,
+                                       pjsip_transport_state state,
+                                       const pjsip_transport_state_info *info);
 static pj_status_t tsx_create( pjsip_module *tsx_user,
                                pjsip_transaction **p_tsx);
@@ -188 +192 @@
 static int         tsx_send_msg( pjsip_transaction *tsx, 
                                  pjsip_tx_data *tdata);
+static void        tsx_update_transport( pjsip_transaction *tsx, 
+                                         pjsip_transport *tp);
 
 
@@ -986 +992 @@
     struct tsx_lock_data *lck;
 
-    /* Decrement transport reference counter. */
-    if (tsx->transport) {
-        pjsip_transport_dec_ref( tsx->transport );
-        tsx->transport = NULL;
-    }
+    /* Release the transport */
+    tsx_update_transport(tsx, NULL);
+
     /* Decrement reference counter in transport selector */
     pjsip_tpselector_dec_ref(&tsx->tp_sel);
@@ -1405 +1409 @@
      */
     if (tsx->res_addr.transport) {
-        tsx->transport = tsx->res_addr.transport;
-        pjsip_transport_add_ref(tsx->transport);
+        tsx_update_transport(tsx, tsx->res_addr.transport);
         pj_memcpy(&tsx->addr, &tsx->res_addr.addr, tsx->res_addr.addr_len);
         tsx->addr_len = tsx->res_addr.addr_len;
@@ -1676 +1679 @@
         if (tsx->transport != send_state->cur_transport) {
             /* Update transport. */
-            if (tsx->transport) {
-                pjsip_transport_dec_ref(tsx->transport);
-                tsx->transport = NULL;
-            }
-            tsx->transport = send_state->cur_transport;
-            pjsip_transport_add_ref(tsx->transport);
+            tsx_update_transport(tsx, send_state->cur_transport);
 
             /* Update remote address. */
@@ -1730 +1728 @@
          * release the transport.
          */
-        if (send_state->cur_transport==tsx->transport &&
-            tsx->transport != NULL)
-        {
-            pjsip_transport_dec_ref(tsx->transport);
-            tsx->transport = NULL;
-        }
+        if (send_state->cur_transport==tsx->transport)
+            tsx_update_transport(tsx, NULL);
 
         /* Also stop processing if transaction has been flagged with
@@ -1837 +1831 @@
         lock_tsx(tsx, &lck);
 
-        /* Dereference transport. */
-        pjsip_transport_dec_ref(tsx->transport);
-        tsx->transport = NULL;
+        /* Release transport. */
+        tsx_update_transport(tsx, NULL);
 
         /* Terminate transaction. */
@@ -1849 +1842 @@
    }
 }
+
+
+/*
+ * Callback when transport state changes.
+ */
+static void tsx_tp_state_callback( pjsip_transport *tp,
+                                   pjsip_transport_state state,
+                                   const pjsip_transport_state_info *info)
+{
+    if (state == PJSIP_TP_STATE_DISCONNECTED) {
+        pjsip_transaction *tsx;
+        struct tsx_lock_data lck;
+
+        pj_assert(tp && info && info->user_data);
+
+        tsx = (pjsip_transaction*)info->user_data;
+
+        lock_tsx(tsx, &lck);
+
+        /* Terminate transaction when transport disconnected */
+        if (tsx->state < PJSIP_TSX_STATE_TERMINATED) {
+            pj_str_t err;
+            char errmsg[PJ_ERR_MSG_SIZE];
+
+            err = pj_strerror(info->status, errmsg, sizeof(errmsg));
+            tsx_set_status_code(tsx, PJSIP_SC_TSX_TRANSPORT_ERROR, &err);
+            tsx_set_state( tsx, PJSIP_TSX_STATE_TERMINATED, 
+                           PJSIP_EVENT_TRANSPORT_ERROR, NULL);
+        }
+
+        unlock_tsx(tsx, &lck);
+    }
+}
+
 
 /*
@@ -1887 +1914 @@
              * resolution procedure.
              */
-            if (tsx->transport) {
-                pjsip_transport_dec_ref(tsx->transport);
-                tsx->transport = NULL;
-            }
+            tsx_update_transport(tsx, NULL);
+
             tsx->addr_len = 0;
             tsx->res_addr.transport = NULL;
@@ -2096 +2121 @@
 
     return PJ_SUCCESS;
+}
+
+static void tsx_update_transport( pjsip_transaction *tsx, 
+                                  pjsip_transport *tp)
+{
+    pj_assert(tsx);
+
+    if (tsx->transport) {
+        pjsip_transport_remove_state_listener(tsx->transport, 
+                                               tsx->tp_st_key, tsx);
+        pjsip_transport_dec_ref( tsx->transport );
+        tsx->transport = NULL;
+    }
+
+    if (tp) {
+        tsx->transport = tp;
+        pjsip_transport_add_ref(tp);
+        pjsip_transport_add_state_listener(tp, &tsx_tp_state_callback, tsx,
+                                            &tsx->tp_st_key);
+    }
 }