Changeset 2756 for pjproject

Timestamp:

Jun 8, 2009 3:30:38 PM (15 years ago)

Author:

nanang

Message:

Ticket #831: Added compile-time option to disable/prevent transport switching to TCP.

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_config.h (modified) (1 diff)
• src/pjsip/sip_util.c (modified) (2 diffs)

pjproject/trunk/pjsip/include/pjsip/sip_config.h

@@ -234 +234 @@
  * as TCP.
  *
+ * Disable the behavior of automatic switching to TCP whenever UDP packet
+ * size exceeds the threshold defined in PJSIP_UDP_SIZE_THRESHOLD.
+ *
+ * Default is 0 (no).
+ */
+#ifndef PJSIP_DONT_SWITCH_TO_TCP
+#   define PJSIP_DONT_SWITCH_TO_TCP     0
+#endif
+
+
+/**
  * This setting controls the threshold of the UDP packet, which if it's
- * larger than this value the request will be sent with TCP. Default is
- * 1300 bytes.
+ * larger than this value the request will be sent with TCP. This setting
+ * is useful only when PJSIP_DONT_SWITCH_TO_TCP is set to 0.
+ *
+ * Default is 1300 bytes.
  */
 #ifndef PJSIP_UDP_SIZE_THRESHOLD
 #   define PJSIP_UDP_SIZE_THRESHOLD     1300
 #endif
+
 
 /**

pjproject/trunk/pjsip/src/pjsip/sip_util.c

@@ -1191 +1191 @@
     pj_memcpy( &stateless_data->addr, addr, sizeof(pjsip_server_addresses));
 
+#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
@@ -1235 +1236 @@
         }
     }
+#endif /* !PJSIP_DONT_SWITCH_TO_TCP */
 
     /* Process the addresses. */