Changeset cdcaef6 for lib

Timestamp:

04/09/08 11:07:00 (14 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:

0bfd4a0

Parents:

de3d203

Message:

• Add an error for an invalid snaplen
• Use packet->buffer, not packet->payload when reading from a linux native interface

Location:

lib

Files:

• format_linux.c (modified) (4 diffs)
• trace.c (modified) (1 diff)

lib/format_linux.c

@@ -87 +87 @@
         FORMAT(libtrace->format_data)->fd = -1;
         FORMAT(libtrace->format_data)->promisc = -1;
-        FORMAT(libtrace->format_data)->snaplen = 65536;
+        FORMAT(libtrace->format_data)->snaplen = LIBTRACE_PACKET_BUFSIZE;
         FORMAT(libtrace->format_data)->filter = NULL;
         FORMAT(libtrace->format_data)->stats_valid = 0;
@@ -155 +155 @@
                 mreq.mr_ifindex = addr.sll_ifindex;
                 mreq.mr_type = PACKET_MR_PROMISC;
-                setsockopt(FORMAT(libtrace->format_data)->fd,
+                if (setsockopt(FORMAT(libtrace->format_data)->fd,
                                 SOL_PACKET,
                                 PACKET_ADD_MEMBERSHIP,
                                 &mreq,
-                                socklen);
+                                socklen)==-1) {
+                        perror("setsockopt(PROMISC)");
+                }
         }
 
@@ -377 +379 @@
         if (!packet->buffer || packet->buf_control == TRACE_CTRL_EXTERNAL) {
                 packet->buffer = malloc((size_t)LIBTRACE_PACKET_BUFSIZE);
+                if (!packet->buffer) {
+                        perror("Cannot allocate buffer");
+                }
         }
 
@@ -399 +404 @@
         msghdr.msg_flags = 0;
 
-        iovec.iov_base = (void*)packet->payload;
+        iovec.iov_base = (void*)packet->buffer;
         iovec.iov_len = snaplen;
 

lib/trace.c

@@ -547 +547 @@
                         if (trace_is_err(libtrace)) {
                                 err = trace_get_err(libtrace);
+                        }
+                        if (*(int*)value<0 
+                                || *(int*)value>LIBTRACE_PACKET_BUFSIZE) {
+                                trace_set_err(libtrace,TRACE_ERR_BAD_STATE,
+                                        "Invalid snap length");
                         }
                         libtrace->snaplen=*(int*)value;