Changeset 030aa3f for lib

Timestamp:

04/25/06 16:37:02 (16 years ago)

Author:

Perry Lorier <perry@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

bf66333

Parents:

cee9e34

Message:

Fix support for writing on interfaces

Location:

lib

Files:

• format_linux.c (modified) (1 diff)
• format_pcapfile.c (modified) (2 diffs)

lib/format_linux.c

@@ -243 +243 @@
         hdr.sll_family = AF_PACKET;
         hdr.sll_protocol = 0;
-        hdr.sll_ifindex = if_nametoindex(packet->trace->uridata);
+        hdr.sll_ifindex = if_nametoindex(trace->uridata);
         hdr.sll_hatype = 0;
         hdr.sll_pkttype = 0;

lib/format_pcapfile.c

@@ -67 +67 @@
 static uint16_t swaps(libtrace_t *libtrace, uint16_t num)
 {
+        /* to deal with open_dead traces that might try and use this
+         * if we don't have any per trace data, assume host byte order
+         */
+        if (!DATA(libtrace))
+                return num;
         if (DATA(libtrace)->header.magic_number == 0xd4c3b2a1)
                 return ((num<<8)&0xFF00)|((num>>8)&0x00FF);
@@ -74 +79 @@
 static uint32_t swapl(libtrace_t *libtrace, uint32_t num)
 {
+        /* to deal with open_dead traces that might try and use this
+         * if we don't have any per trace data, assume host byte order
+         */
+        if (!DATA(libtrace))
+                return num;
         if (DATA(libtrace)->header.magic_number == 0xd4c3b2a1)
                 return