Changeset 735 for pjproject/trunk

Timestamp:

Sep 22, 2006 6:42:09 PM (18 years ago)

Author:

bennylp

Message:

Handle incoming empty packets sent by some user agents (to refresh NAT)

Location:

pjproject/trunk/pjsip/src/pjsip

Files:

• sip_parser.c (modified) (1 diff)
• sip_transport.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_parser.c

@@ -909 +909 @@
         }
 
+        /* Check if we still have valid packet.
+         * Sometimes endpoints just send blank (CRLF) packets just to keep
+         * NAT bindings open.
+         */
+        if (pj_scan_is_eof(scanner))
+            return NULL;
+
         /* Parse request or status line */
         if (pj_scan_stricmp_alnum( scanner, PJSIP_VERSION, 7) == 0) {

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

@@ -1084 +1084 @@
                 int len;
                 len = pj_ansi_snprintf(tmp.ptr+tmp.slen, sizeof(buf)-tmp.slen,
-                                       ": %s exception when parsing %.*s "
+                                       ": %s exception when parsing '%.*s' "
                                        "header on line %d col %d",
                                        pj_exception_id_name(err->except_code),
@@ -1095 +1095 @@
             }
 
-            PJ_LOG(1, (THIS_FILE, 
-                      "Error processing %d bytes packet from %s:%d %.*s:\n"
+            /* Only print error message if there's error.
+             * Sometimes we receive blank packets (packets with only CRLF)
+             * which were sent to keep NAT bindings.
+             */
+            if (tmp.slen) {
+                PJ_LOG(1, (THIS_FILE, 
+                      "Error processing %d bytes packet from %s %s:%d %.*s:\n"
                       "%.*s\n"
                       "-- end of packet.",
                       msg_fragment_size,
+                      rdata->tp_info.transport->type_name,
                       rdata->pkt_info.src_name, 
                       rdata->pkt_info.src_port,
@@ -1105 +1111 @@
                       (int)msg_fragment_size,
                       rdata->msg_info.msg_buf));
+            }
 
             goto finish_process_fragment;