Changeset 4c5bbfc

Timestamp:

12/06/18 09:36:29 (2 years ago)

Author:

Jacob Van Walraven <jcv9@…>

Branches:

develop

Children:

d97dee9

Parents:

de8566f

git-author:

Jacob Van Walraven <jcv9@…> (11/30/18 14:50:34)

git-committer:

Jacob Van Walraven <jcv9@…> (12/06/18 09:36:29)

Message:

Reusing the original packet should prevent issue #60

File:

• tools/tracesplit/tracesplit.c (modified) (1 diff)

tools/tracesplit/tracesplit.c

@@ -326 +326 @@
         if (jump) {
             /* Skip headers */
-            void *newpacket = perform_jump(*packet, jump);
+            struct libtrace_packet_t *newpacket = perform_jump(*packet, jump);
             if (newpacket) {
-                trace_destroy_packet(*packet);
-                *packet = newpacket;
+                /* If an IP header was found on the nth layer down
+                 * write out the packet  */
+                if (trace_write_packet(output, newpacket)==-1) {
+                    trace_perror_output(output,"write_packet");
+                    return -1;
+                }
+                /* Then destroy the packet */
+                trace_destroy_packet(newpacket);
             }
-            else /* Skip packet */
+            else /* Skip packet - Payload ran out before getting to nth layer */
                 return 1;
-        }
-
-        if (trace_write_packet(output, *packet)==-1) {
+        } else {
+
+            if (trace_write_packet(output, *packet)==-1) {
                 trace_perror_output(output,"write_packet");
                 return -1;
+            }
         }