Changeset 2710 for pjproject/branches/projects/sipit24/pjsip/src/pjsip/sip_util.c

Timestamp:

May 18, 2009 11:18:38 AM (14 years ago)

Author:

bennylp

Message:

More ticket #831:

• fixed Via address unchanged when switching transport
• reset transaction retransmit count and timeout timer when retrying
• handle case when TCP transport is not available
• added macro PJSIP_UDP_SIZE_THRESHOLD
• added API to encode transmit data (to avoid using stack when checking message size)

File:

• pjproject/branches/projects/sipit24/pjsip/src/pjsip/sip_util.c (modified) (2 diffs)

pjproject/branches/projects/sipit24/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,
@@ -1192 +1194 @@
         addr->entry[0].type == PJSIP_TRANSPORT_UDP)
     {
-        char buf[1500];
         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 = pjsip_msg_print(stateless_data->tdata->msg, buf, 1300);
-        if (len < 0) {
+        len = stateless_data->tdata->buf.end - 
+                stateless_data->tdata->buf.start;
+        if (len >= PJSIP_UDP_SIZE_THRESHOLD) {
             int i;
             int count = stateless_data->addr.count;