Changeset 3588 for pjproject/branches/1.x/pjlib-util/src/pjlib-util/pcap.c

Timestamp:

Jun 20, 2011 3:54:49 AM (13 years ago)

Author:

nanang

Message:

Re #1308:

• Updated pcap parser component to skip trailer bytes that may exist in some network layers (was raising assertion).
• Updated pcaputil app to allow dynamic payload type codecs.
• Updated pcaputil app to be able to play decoded frames directly to audio device, instead of writing to WAV file.

File:

• pjproject/branches/1.x/pjlib-util/src/pjlib-util/pcap.c (modified) (1 diff)

pjproject/branches/1.x/pjlib-util/src/pjlib-util/pcap.c

@@ -369 +369 @@
         *udp_payload_size = sz;
 
+        // Some layers may have trailer, e.g: link eth2.
         /* Check that we've read all the packets */
-        PJ_ASSERT_RETURN(sz_read == rec_incl, PJ_EBUG);
+        //PJ_ASSERT_RETURN(sz_read == rec_incl, PJ_EBUG);
+
+        /* Skip trailer */
+        while (sz_read < rec_incl) {
+            sz = rec_incl - sz_read;
+            status = read_file(file, &tmp.eth, &sz);
+            if (status != PJ_SUCCESS) {
+                TRACE_((file->obj_name, "Error reading trailer: %d", status));
+                return status;
+            }
+            sz_read += sz;
+        }
 
         return PJ_SUCCESS;