Changeset 566e404

Timestamp:

04/14/06 17:36:52 (15 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:

671566a

Parents:

97e39a7

Message:

Fix bugs with forward porting of format_linux:

• Fix the buffer management
• Fill out uninitialised packet->type

Location:

lib

Files:

• format_linux.c (modified) (5 diffs)
• rt_protocol.h (modified) (1 diff)

lib/format_linux.c

@@ -68 +68 @@
         if (FORMAT(libtrace->format_data)->fd==-1) {
                 free(libtrace->format_data);
-                return 0;
+                return -1;
         }
         addr.sll_family = AF_PACKET;
@@ -77 +77 @@
                         close(FORMAT(libtrace->format_data)->fd);
                         free(libtrace->format_data);
-                        return 0;
+                        return -1;
                 }
         }
@@ -87 +87 @@
                                 sizeof(addr))==-1) {
                 free(libtrace->format_data);
-                return 0;
+                return -1;
         }
         /* enable promisc mode when listening on an interface */
@@ -102 +102 @@
         }
 
-        return 1;
+        return 0;
 }
 
@@ -112 +112 @@
 
 static int linuxnative_read_packet(struct libtrace_t *libtrace, struct libtrace_packet_t *packet) {
-        struct libtrace_linuxnative_header *hdr=(void*)packet->buffer;
+        struct libtrace_linuxnative_header *hdr;
+        if (!packet->buffer || packet->buf_control == TRACE_CTRL_EXTERNAL) {
+                packet->buffer = malloc(LIBTRACE_PACKET_BUFSIZE);
+                packet->buf_control = TRACE_CTRL_PACKET;
+        }
+
+        packet->header = packet->buffer;
+        packet->type = RT_DATA_LINUX_NATIVE;
+        packet->payload = packet->buffer+sizeof(*hdr);
+
+        hdr=(void*)packet->buffer;
         socklen_t socklen=sizeof(hdr->hdr);
         hdr->wirelen = recvfrom(FORMAT(libtrace->format_data)->fd,
-                        (void*)packet->buffer+sizeof(*hdr),
-                        sizeof(packet->buffer)-sizeof(*hdr),
+                        (void*)packet->payload,
+                        LIBTRACE_PACKET_BUFSIZE-sizeof(*hdr),
                         MSG_TRUNC,
                         (void *)&hdr->hdr,

lib/rt_protocol.h

@@ -60 +60 @@
  RT_DATA_LEGACY_POS     =RT_DATA_SIMPLE + TRACE_FORMAT_LEGACY_POS, 
  RT_DATA_LEGACY_ETH     =RT_DATA_SIMPLE + TRACE_FORMAT_LEGACY_ETH, 
+ RT_DATA_LINUX_NATIVE   =RT_DATA_SIMPLE + TRACE_FORMAT_LINUX_NATIVE,
 
 #ifdef HAVE_PCAP