Changeset 3952 for pjproject/branches/1.x/pjsip/src/pjsip/sip_util.c

Timestamp:

Feb 16, 2012 5:35:25 AM (12 years ago)

Author:

bennylp

Message:

Allow run-time control of automatic switching to TCP when request is larger than 1300 (the PJSIP_DONT_SWITCH_TO_TCP compile time setting) via pjsip_cfg()->endpt.disable_tcp_switch setting. Thanks Johan Lantz for the suggestion.

File:

• pjproject/branches/1.x/pjsip/src/pjsip/sip_util.c (modified) (3 diffs)

pjproject/branches/1.x/pjsip/src/pjsip/sip_util.c

@@ -1249 +1249 @@
     pj_assert(tdata->dest_info.addr.count != 0);
 
-#if !defined(PJSIP_DONT_SWITCH_TO_TCP) || PJSIP_DONT_SWITCH_TO_TCP==0
     /* RFC 3261 section 18.1.1:
      * If a request is within 200 bytes of the path MTU, or if it is larger
@@ -1256 +1255 @@
      * as TCP.
      */
-    if (tdata->msg->type == PJSIP_REQUEST_MSG &&
+    if (pjsip_cfg()->endpt.disable_tcp_switch==0 &&
+        tdata->msg->type == PJSIP_REQUEST_MSG &&
         tdata->dest_info.addr.count > 0 && 
         tdata->dest_info.addr.entry[0].type == PJSIP_TRANSPORT_UDP)
@@ -1298 +1298 @@
         }
     }
-#endif /* !PJSIP_DONT_SWITCH_TO_TCP */
 
     /* Process the addresses. */