Changeset 2724 for pjproject/trunk/pjsip/src/pjsip/sip_util.c

Timestamp:

May 29, 2009 1:04:03 PM (14 years ago)

Author:

bennylp

Message:

Integration of Sipit24 branch, many tickets involved:

• #793: AMR encoder should regard 'mode-set' param specified by remote decoder.
• #831: Automatically switch to TCP transport when sending large request
• #832: Support for outbound proxy setting without using Route header
• #849: Modify conference audio switch behavior in connecting ports.
• #850: Remove 'Require=replaces' param in 'Refer-To' header (in call transfer with replaces).
• #851: Support for regular nomination in ICE
• #852: --ip-addr support for IPv6 for media transport in pjsua
• #854: Adding SOFTWARE attribute in all outgoing requests may cause compatibility problem with older STUN server (thanks Alexei Kuznetsov for the report)
• #855: Bug in digit map frequencies for DTMF digits (thanks FCCH for the report)
• #856: Put back the ICE candidate priority values according to the default values in the draft-mmusic-ice
• #857: Support for ICE keep-alive with Binding indication
• #858: Do not authenticate STUN 438 response
• #859: AMR-WB format param in the SDP is not negotiated correctly.
• #867: Return error instead of asserting when PJSUA-LIB fails to open log file

File:

• pjproject/trunk/pjsip/src/pjsip/sip_util.c (modified) (2 diffs)

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

@@ -1136 +1136 @@
         via->rport_param = 0;
 
+        pjsip_tx_data_invalidate_msg(tdata);
+
         /* Send message using this transport. */
         status = pjsip_transport_send( stateless_data->cur_transport,
@@ -1181 +1183 @@
     /* Copy server addresses */
     pj_memcpy( &stateless_data->addr, addr, sizeof(pjsip_server_addresses));
+
+    /* RFC 3261 section 18.1.1:
+     * If a request is within 200 bytes of the path MTU, or if it is larger
+     * than 1300 bytes and the path MTU is unknown, the request MUST be sent
+     * using an RFC 2914 [43] congestion controlled transport protocol, such
+     * as TCP.
+     */
+    if (stateless_data->tdata->msg->type == PJSIP_REQUEST_MSG &&
+        addr->count > 0 && 
+        addr->entry[0].type == PJSIP_TRANSPORT_UDP)
+    {
+        int len;
+
+        /* Encode the request */
+        status = pjsip_tx_data_encode(stateless_data->tdata);
+        if (status != PJ_SUCCESS) {
+            if (stateless_data->app_cb) {
+                pj_bool_t cont = PJ_FALSE;
+                (*stateless_data->app_cb)(stateless_data, -status, &cont);
+            }
+            pjsip_tx_data_dec_ref(stateless_data->tdata);
+            return;
+        }
+
+        /* Check if request message is larger than 1300 bytes. */
+        len = stateless_data->tdata->buf.cur - 
+                stateless_data->tdata->buf.start;
+        if (len >= PJSIP_UDP_SIZE_THRESHOLD) {
+            int i;
+            int count = stateless_data->addr.count;
+
+            /* Insert "TCP version" of resolved UDP addresses at the
+             * beginning.
+             */
+            if (count * 2 > PJSIP_MAX_RESOLVED_ADDRESSES)
+                count = PJSIP_MAX_RESOLVED_ADDRESSES / 2;
+            for (i = 0; i < count; ++i) {
+                pj_memcpy(&stateless_data->addr.entry[i+count],
+                          &stateless_data->addr.entry[i],
+                          sizeof(stateless_data->addr.entry[0]));
+                stateless_data->addr.entry[i].type = PJSIP_TRANSPORT_TCP;
+            }
+            stateless_data->addr.count = count * 2;
+        }
+    }
 
     /* Process the addresses. */