Changeset 5556 for pjproject

Timestamp:

Feb 20, 2017 1:16:58 AM (8 years ago)

Author:

ming

Message:

Closed #1995: Add API pjsip_transport_shutdown2() to immediately disconnect a transport

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_transport.h (modified) (1 diff)
• src/pjsip/sip_transport.c (modified) (3 diffs)

pjproject/trunk/pjsip/include/pjsip/sip_transport.h

@@ -904 +904 @@
 
 /**
+ * Start shutdown procedure for this transport. If \a force is false,
+ * the API is the same as #pjsip_transport_shutdown(), while
+ * if \a force is true, existing transport users will immediately
+ * receive PJSIP_TP_STATE_DISCONNECTED notification and should not
+ * use the transport anymore. In either case, transport will
+ * only be destroyed after all objects release their references.
+ *
+ * @param tp                The transport.
+ * @param force             Force transport to immediately send
+ *                          disconnection state notification.
+ *
+ * @return                  PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjsip_transport_shutdown2(pjsip_transport *tp,
+                                               pj_bool_t force);
+
+/**
  * Destroy a transport when there is no object currently uses the transport.
  * This function is normally called internally by transport manager or the

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

@@ -1164 +1164 @@
 PJ_DEF(pj_status_t) pjsip_transport_shutdown(pjsip_transport *tp)
 {
+    return pjsip_transport_shutdown2(tp, PJ_FALSE);
+}
+
+
+/*
+ * Start shutdown procedure for this transport. 
+ */
+PJ_DEF(pj_status_t) pjsip_transport_shutdown2(pjsip_transport *tp,
+                                              pj_bool_t force)
+{
     pjsip_tpmgr *mgr;
     pj_status_t status;
     pjsip_tp_state_callback state_cb;
 
-    TRACE_((THIS_FILE, "Transport %s shutting down", tp->obj_name));
+    PJ_LOG(4, (THIS_FILE, "Transport %s shutting down, force=%d",
+                          tp->obj_name, force));
 
     pj_lock_acquire(tp->lock);
@@ -1188 +1199 @@
         status = tp->do_shutdown(tp);
 
+    if (status == PJ_SUCCESS)
+        tp->is_shutdown = PJ_TRUE;
+
     /* Notify application of transport shutdown */
     state_cb = pjsip_tpmgr_get_state_cb(tp->tpmgr);
@@ -1194 +1208 @@
 
         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;
+        state_info.status = PJ_ECANCELLED;
+        (*state_cb)(tp, (force? PJSIP_TP_STATE_DISCONNECTED:
+                    PJSIP_TP_STATE_SHUTDOWN), &state_info);
+    }
 
     /* If transport reference count is zero, start timer count-down */