Changeset a8a9355 for lib/trace.c

Timestamp:

10/27/05 14:54:51 (17 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:

779d445

Parents:

953c53f

Message:

Add assert()'s to catch if you call functions after the end of file

File:

• lib/trace.c (modified) (12 diffs)

lib/trace.c

@@ -508 +508 @@
 
         if (libtrace->format->read_packet) {
-                return libtrace->format->read_packet(libtrace,packet);
-        }
+                return (packet->size=libtrace->format->read_packet(libtrace,packet));
+        }
+        packet->size=-1;
         return -1;
 }
@@ -524 +525 @@
         assert(libtrace);
         assert(packet); 
+        /* Verify the packet is valid */
+        assert(packet->size<65536);
+        assert(packet->size>0);
 
         if (libtrace->format->write_packet) {
@@ -540 +544 @@
 void *trace_get_link(const struct libtrace_packet_t *packet) {
         const void *ethptr = 0;
+
+        assert(packet->size>0 && packet->size<65536);
         
         if (packet->trace->format->get_link) {
@@ -774 +780 @@
         struct libtrace_udp *udpptr = 0;
 
-        if ((ip->ip_p == 6) && ((ip->ip_off & SW_IP_OFFMASK) == 0))  {
+        if ((ip->ip_p == 17) && ((ip->ip_off & SW_IP_OFFMASK) == 0))  {
                 udpptr = (struct libtrace_udp *)((ptrdiff_t)ip+ (ip->ip_hl * 4));
         }
@@ -884 +890 @@
         struct timeval ts;
 
+        assert(packet->size>0 && packet->size<65536);
+
         if (packet->trace->format->get_erf_timestamp) {
                 // timestamp -> timestamp
@@ -912 +920 @@
         uint64_t ts = 0;
         double seconds = 0.0;
+        assert(packet->size>0 && packet->size<65536);
         if (packet->trace->format->get_timeval) {
                 // timeval -> timeval
@@ -951 +960 @@
         uint64_t ts = 0;
         struct timeval tv;
+
+        assert(packet->size>0 && packet->size<65536);
         
         if (packet->trace->format->get_seconds) {
@@ -984 +995 @@
 int trace_get_capture_length(const struct libtrace_packet_t *packet) {
 
+        assert(packet->size>0 && packet->size<65536);
+
         if (packet->trace->format->get_capture_length) {
                 return packet->trace->format->get_capture_length(packet);
@@ -1000 +1013 @@
  */ 
 int trace_get_wire_length(const struct libtrace_packet_t *packet){
+        assert(packet->size>0 && packet->size<65536);
+
         if (packet->trace->format->get_wire_length) {
                 return packet->trace->format->get_wire_length(packet);
@@ -1204 +1219 @@
 int8_t trace_set_direction(struct libtrace_packet_t *packet, int8_t direction) {
         assert(packet);
+        assert(packet->size>0 && packet->size<65536);
         if (packet->trace->format->set_direction) {
                 return packet->trace->format->set_direction(packet,direction);
@@ -1221 +1237 @@
 int8_t trace_get_direction(const struct libtrace_packet_t *packet) {
         assert(packet);
+        assert(packet->size>0 && packet->size<65536);
         if (packet->trace->format->get_direction) {
                 return packet->trace->format->get_direction(packet);
@@ -1394 +1411 @@
 size_t trace_set_capture_length(struct libtrace_packet_t *packet, size_t size) {
         assert(packet);
+        assert(packet->size>0 && packet->size<65536);
 
         if (packet->trace->format->set_capture_length) {