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

Timestamp:

Jun 23, 2006 3:04:54 PM (18 years ago)

Author:

bennylp

Message:

Renamed pjsip_transport_unregister() to pjsip_transport_destroy(), also initial implementation of TCP transport

File:

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

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

@@ -517 +517 @@
 
     entry->id = PJ_FALSE;
-    pjsip_transport_unregister(tp->tpmgr, tp);
+    pjsip_transport_destroy(tp);
 }
 
@@ -555 +555 @@
         /* Verify again. */
         if (pj_atomic_get(tp->ref_cnt) == 0) {
-            pj_time_val delay = { PJSIP_TRANSPORT_IDLE_TIME, 0 };
+            pj_time_val delay;
+            
+            /* If transport is in graceful shutdown, then this is the
+             * last user who uses the transport. Schedule to destroy the
+             * transport immediately. Otherwise schedule idle timer.
+             */
+            if (tp->is_shutdown) {
+                delay.sec = delay.msec = 0;
+            } else {
+                delay.sec = PJSIP_TRANSPORT_IDLE_TIME;
+                delay.msec = 0;
+            }
 
             pj_assert(tp->idle_timer.id == 0);
@@ -624 +635 @@
 }
 
+
+/*
+ * Start graceful shutdown procedure for this transport. 
+ */
+PJ_DEF(pj_status_t) pjsip_transport_shutdown(pjsip_transport *tp)
+{
+    pjsip_tpmgr *mgr;
+    pj_status_t status;
+
+    pj_lock_acquire(tp->lock);
+
+    mgr = tp->tpmgr;
+    pj_lock_acquire(mgr->lock);
+
+    /* Do nothing if transport is being shutdown already */
+    if (tp->is_shutdown) {
+        pj_lock_release(tp->lock);
+        pj_lock_release(mgr->lock);
+        return PJ_SUCCESS;
+    }
+
+    status = PJ_SUCCESS;
+
+    /* Instruct transport to shutdown itself */
+    if (tp->do_shutdown)
+        status = tp->do_shutdown(tp);
+    
+    if (status == PJ_SUCCESS)
+        tp->is_shutdown = PJ_TRUE;
+
+    pj_lock_release(tp->lock);
+    pj_lock_release(mgr->lock);
+
+    return status;
+}
+
+
 /**
  * Unregister transport.
  */
-PJ_DEF(pj_status_t) pjsip_transport_unregister( pjsip_tpmgr *mgr,
-                                                pjsip_transport *tp)
+PJ_DEF(pj_status_t) pjsip_transport_destroy( pjsip_transport *tp)
 {
     /* Must have no user. */
@@ -634 +681 @@
 
     /* Destroy. */
-    return destroy_transport(mgr, tp);
+    return destroy_transport(tp->tpmgr, tp);
 }
 
@@ -1030 +1077 @@
     }
     
-    if (transport != NULL) {
+    if (transport!=NULL && !transport->is_shutdown) {
         /*
          * Transport found!