Changeset 1800 for pjproject/trunk/pjsip/src/pjsip/sip_transport.c

Timestamp:

Feb 15, 2008 5:26:47 PM (16 years ago)

Author:

bennylp

Message:

Ticket #482: TCP keep-alive packets are corrupting SIP message (thanks Helmut Wolf)

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transport.c (modified) (3 diffs)

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

@@ -1271 +1271 @@
     if (rdata->pkt_info.len <= 0)
         return -1;
-    
+
     current_pkt = rdata->pkt_info.packet;
     remaining_len = rdata->pkt_info.len;
@@ -1284 +1284 @@
 
         pjsip_msg *msg;
+        char *p, *end;
+        char saved;
         pj_size_t msg_fragment_size;
+
+        /* Skip leading newlines as pjsip_find_msg() currently can't
+         * handle leading newlines.
+         */
+        for (p=current_pkt, end=p+remaining_len; p!=end; ++p) {
+            if (*p != '\r' && *p != '\n')
+                break;
+        }
+        if (p!=current_pkt) {
+            remaining_len -= (p - current_pkt);
+            total_processed += (p - current_pkt);
+            current_pkt = p;
+            if (remaining_len == 0) {
+                return total_processed;
+            }
+        }
 
         /* Initialize default fragment size. */
         msg_fragment_size = remaining_len;
-
-        /* Null terminate packet. */
 
         /* Clear and init msg_info in rdata. 
@@ -1320 +1336 @@
         rdata->msg_info.len = msg_fragment_size;
 
+        /* Null terminate packet */
+        saved = current_pkt[msg_fragment_size];
+        current_pkt[msg_fragment_size] = '\0';
+
         /* Parse the message. */
         rdata->msg_info.msg = msg = 
             pjsip_parse_rdata( current_pkt, msg_fragment_size, rdata);
+
+        /* Restore null termination */
+        current_pkt[msg_fragment_size] = saved;
 
         /* Check for parsing syntax error */