Changeset 5884

Timestamp:

Sep 14, 2018 1:27:32 AM (6 years ago)

Author:

ming

Message:

Fixed #2149: Add option to disable transport connection reuse via the setting pjsip_tpselector.disable_connection_reuse

Thanks to Joshua Colp for the patch.

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_transport.h (modified) (2 diffs)
• src/pjsip/sip_transport.c (modified) (4 diffs)

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

@@ -222 +222 @@
  * should be used to send request. This structure is used when calling
  * pjsip_tsx_set_transport() and pjsip_dlg_set_transport().
+ *
+ * If application disables connection reuse and wants to force creating
+ * a new transport, it needs to consider the following couple of things:
+ * - If it still wants to reuse an existing transport (if any), it
+ *   needs to keep a reference to that transport and specifically set
+ *   the transport to be used for sending requests.
+ * - Delete those existing transports manually when no longer needed.
  */
 typedef struct pjsip_tpselector
@@ -227 +234 @@
     /** The type of data in the union */
     pjsip_tpselector_type   type;
+
+    /**
+     * Whether to disable reuse of an existing connection.
+     * This setting will be ignored if (type == PJSIP_TPSELECTOR_TRANSPORT)
+     * and transport in the union below is set.
+     */
+    pj_bool_t disable_connection_reuse;
 
     /** Union representing the transport/listener criteria to be used. */

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

@@ -2120 +2120 @@
         pjsip_transport_key key;
         int key_len;
-        pjsip_transport *transport;
+        pjsip_transport *transport = NULL;
 
         /* If listener is specified, verify that the listener type matches
@@ -2133 +2133 @@
         }
 
-        pj_bzero(&key, sizeof(key));
-        key_len = sizeof(key.type) + addr_len;
-
-        /* First try to get exact destination. */
-        key.type = type;
-        pj_memcpy(&key.rem_addr, remote, addr_len);
-
-        transport = (pjsip_transport*)
-                    pj_hash_get(mgr->table, &key, key_len, NULL);
-
-        if (transport == NULL) {
+        if (!sel || sel->disable_connection_reuse == PJ_FALSE) {
+            pj_bzero(&key, sizeof(key));
+            key_len = sizeof(key.type) + addr_len;
+
+            /* First try to get exact destination. */
+            key.type = type;
+            pj_memcpy(&key.rem_addr, remote, addr_len);
+
+            transport = (pjsip_transport*)
+                        pj_hash_get(mgr->table, &key, key_len, NULL);
+        }
+
+        if (transport == NULL &&
+            (!sel || sel->disable_connection_reuse == PJ_FALSE))
+        {
             unsigned flag = pjsip_transport_get_flag_from_type(type);
             const pj_sockaddr *remote_addr = (const pj_sockaddr*)remote;
@@ -2181 +2185 @@
             /* This will cause a new transport to be created which will be a
              * 'duplicate' of the existing transport (same type & remote addr,
-             * but different factory). Any future hash lookup will return
-             * the new one, and eventually the old one will still be freed
-             * (by application or #1774).
+             * but different factory).
              */
         }
@@ -2201 +2203 @@
 
         /*
-         * Transport not found!
-         * So we need to create one, find factory that can create
-         * such transport.
+         * Either transport not found, or we don't want to use the existing
+         * transport (such as in the case of different factory or
+         * if connection reuse is disabled). So we need to create one,
+         * find factory that can create such transport.
+         *
+         * If there's an existing transport, its place in the hash table
+         * will be replaced by this new one. And eventually the existing
+         * transport will still be freed (by application or #1774).
          */
         if (sel && sel->type == PJSIP_TPSELECTOR_LISTENER && sel->u.listener)