Changeset 1347

Timestamp:

09/04/08 11:07:00 (9 months ago)

Author:

perry

Message:

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

interface

Files:

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

trunk/lib/format_linux.c

@@ -87 +87 @@
-        FORMAT(libtrace->format_data)->fd = -1;
-        FORMAT(libtrace->format_data)->promisc = -1;
-65536
+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;
-
+if (
-                                SOL_PACKET,
-                                PACKET_ADD_MEMBERSHIP,
-                                &mreq,
-
+
+
+
-        }
-
@@ -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;
-
-payload
+buffer
-        iovec.iov_len = snaplen;
-

trunk/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;