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

Timestamp:

Jun 28, 2006 4:46:49 PM (17 years ago)

Author:

bennylp

Message:

Major improvements in PJSIP to support TCP. The changes fall into these categories: (1) the TCP transport implementation itself (*.[hc]), (2) bug-fix in SIP transaction when using reliable transports, (3) support for TCP transport in PJSUA-LIB/PJSUA, and (4) changes in PJSIP-TEST to support TCP testing.

File:

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

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

@@ -37 +37 @@
 #define THIS_FILE    "sip_transport.c"
 
+#if 0
+#   define TRACE_(x)    PJ_LOG(5,x)
+#else
+#   define TRACE_(x)
+#endif
+
 /* Prototype. */
 static pj_status_t mod_on_tx_msg(pjsip_tx_data *tdata);
@@ -602 +608 @@
     pj_lock_release(mgr->lock);
 
+    TRACE_((THIS_FILE,"Transport %s registered: type=%s, remote=%s:%d",
+                       tp->obj_name,
+                       pjsip_transport_get_type_name(tp->key.type),
+                       pj_inet_ntoa(((pj_sockaddr_in*)&tp->key.rem_addr)->sin_addr),
+                       pj_ntohs(((pj_sockaddr_in*)&tp->key.rem_addr)->sin_port)));
+
     return PJ_SUCCESS;
 }
@@ -610 +622 @@
 {
     int key_len;
+
+    TRACE_((THIS_FILE, "Transport %s is being destroyed", tp->obj_name));
 
     pj_lock_acquire(tp->lock);
@@ -627 +641 @@
      */
     key_len = sizeof(tp->key.type) + tp->addr_len;
+    pj_assert(pj_hash_get(mgr->table, &tp->key, key_len, NULL) != NULL);
     pj_hash_set(tp->pool, mgr->table, &tp->key, key_len, 0, NULL);
 
@@ -643 +658 @@
     pjsip_tpmgr *mgr;
     pj_status_t status;
+
+    TRACE_((THIS_FILE, "Transport %s shutting down", tp->obj_name));
 
     pj_lock_acquire(tp->lock);
@@ -808 +825 @@
     pj_hash_iterator_t itr_val;
     pj_hash_iterator_t *itr;
+    pjsip_tpfactory *factory;
     pjsip_endpoint *endpt = mgr->endpt;
     
@@ -814 +832 @@
     pj_lock_acquire(mgr->lock);
 
+    /*
+     * Destroy all transports.
+     */
     itr = pj_hash_first(mgr->table, &itr_val);
     while (itr != NULL) {
@@ -828 +849 @@
     }
 
+    /*
+     * Destroy all factories/listeners.
+     */
+    factory = mgr->factory_list.next;
+    while (factory != &mgr->factory_list) {
+        pjsip_tpfactory *next = factory->next;
+        
+        factory->destroy(factory);
+
+        factory = next;
+    }
+
     pj_lock_release(mgr->lock);
     pj_lock_destroy(mgr->lock);
@@ -843 +876 @@
     //pj_assert(pj_atomic_get(mgr->tdata_counter) == 0);
     if (pj_atomic_get(mgr->tdata_counter) != 0) {
-        PJ_LOG(4,(THIS_FILE, "Warning: %d transmit buffers are not freed!",
+        PJ_LOG(3,(THIS_FILE, "Warning: %d transmit buffer(s) not freed!",
                   pj_atomic_get(mgr->tdata_counter)));
     }
@@ -880 +913 @@
 
     /* Process all message fragments. */
-    while (total_processed < remaining_len) {
+    while (remaining_len > 0) {
 
         pjsip_msg *msg;
-        pj_size_t msg_fragment_size = 0;
+        pj_size_t msg_fragment_size;
 
         /* Initialize default fragment size. */
@@ -1039 +1072 @@
     pj_status_t status;
 
+    TRACE_((THIS_FILE,"Acquiring transport type=%s, remote=%s:%d",
+                       pjsip_transport_get_type_name(type),
+                       pj_inet_ntoa(((pj_sockaddr_in*)remote)->sin_addr),
+                       pj_ntohs(((pj_sockaddr_in*)remote)->sin_port)));
+
     pj_lock_acquire(mgr->lock);
 
@@ -1084 +1122 @@
         pj_lock_release(mgr->lock);
         *tp = transport;
+
+        TRACE_((THIS_FILE, "Transport %s acquired", transport->obj_name));
         return PJ_SUCCESS;
     }
@@ -1101 +1141 @@
         /* No factory can create the transport! */
         pj_lock_release(mgr->lock);
+        TRACE_((THIS_FILE, "No suitable factory was found either"));
         return PJSIP_EUNSUPTRANSPORT;
     }
+
+    TRACE_((THIS_FILE, "%s, creating new one from factory",
+           (transport?"Transport is shutdown":"No transport found")));
 
     /* Request factory to create transport. */