Changeset 4773 for pjproject/trunk/pjsip/src/pjsip/sip_transport.c

Timestamp:

Feb 28, 2014 5:42:24 AM (9 years ago)

Author:

ming

Message:

Fixed #1699: Transport state callback to report transport shutdown events (Thanks to Johan Lantz for the discussion and preliminary patch).

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transport.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transport.c

@@ -1092 +1092 @@
     pjsip_tpmgr *mgr;
     pj_status_t status;
+    pjsip_tp_state_callback state_cb;
 
     TRACE_((THIS_FILE, "Transport %s shutting down", tp->obj_name));
@@ -1112 +1113 @@
     if (tp->do_shutdown)
         status = tp->do_shutdown(tp);
-    
+
+    /* Notify application of transport shutdown */
+    state_cb = pjsip_tpmgr_get_state_cb(tp->tpmgr);
+    if (state_cb) {
+        pjsip_transport_state_info state_info;
+
+        pj_bzero(&state_info, sizeof(state_info));
+        state_info.status = status;
+        (*state_cb)(tp, PJSIP_TP_STATE_SHUTDOWN, &state_info);
+    }
+
     if (status == PJ_SUCCESS)
         tp->is_shutdown = PJ_TRUE;
@@ -1134 +1145 @@
 PJ_DEF(pj_status_t) pjsip_transport_destroy( pjsip_transport *tp)
 {
+    pjsip_tp_state_callback state_cb;
+
     /* Must have no user. */
     PJ_ASSERT_RETURN(pj_atomic_get(tp->ref_cnt) == 0, PJSIP_EBUSY);
+
+    /* Notify application of transport destroy */
+    state_cb = pjsip_tpmgr_get_state_cb(tp->tpmgr);
+    if (state_cb) {
+        pjsip_transport_state_info state_info;
+
+        pj_bzero(&state_info, sizeof(state_info));
+        (*state_cb)(tp, PJSIP_TP_STATE_DESTROY, &state_info);
+    }
 
     /* Destroy. */