Changeset 91c9552 for lib/trace.c

Timestamp:

02/23/06 11:21:19 (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:

aa62105

Parents:

c2d5f23

Message:

Documentation fixes
Make bpf return valid errors
Add trace_copy_packet()

File:

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

lib/trace.c

@@ -523 +523 @@
 }
 
+libtrace_packet_t *trace_copy_packet(const libtrace_packet_t *packet) {
+        libtrace_packet_t *dest = malloc(sizeof(libtrace_packet_t));
+        dest->trace=packet->trace;
+        dest->buffer=malloc(
+                        trace_get_framing_length(packet)
+                        +trace_get_capture_length(packet));
+        dest->header=dest->buffer;
+        dest->payload=(void*)
+                ((char*)dest->buffer+trace_get_framing_length(packet));
+        dest->size=packet->size;
+        dest->type=packet->type;
+        dest->buf_control=TRACE_CTRL_PACKET;
+        memcpy(dest->header,packet->header,trace_get_framing_length(packet));
+        memcpy(dest->payload,packet->payload,trace_get_capture_length(packet));
+}
+
 /** Destroy a packet object
  *
@@ -528 +544 @@
  */
 void trace_destroy_packet(struct libtrace_packet_t **packet) {
-        if ((*packet)->buf_control) {
+        if ((*packet)->buf_control == TRACE_CTRL_PACKET) {
                 free((*packet)->buffer);
         }
@@ -1289 +1305 @@
         linkptr = trace_get_link(packet);
         if (!linkptr) {
+                trace_set_err(TRACE_ERR_BAD_PACKET,"Packet has no payload");
                 return -1;
         }
@@ -1301 +1318 @@
                                         1, 0)) {
                         pcap_close(pcap);
+                        trace_set_err(TRACE_ERR_BAD_PACKET,
+                                        "Packet has no payload");
                         return -1;
                 }
@@ -1312 +1331 @@
 }
 
-/* apply a BPF filter
- * @param filter the filter opaque pointer
- * @param packet the packet opaque pointer
- * @returns 0 if the filter fails, 1 if it succeeds
- * @author Daniel Lawson
- */
 int trace_bpf_filter(struct libtrace_filter_t *filter,
                         const struct libtrace_packet_t *packet) {
@@ -1333 +1346 @@
          * link type was
          */
-        trace_bpf_compile(filter,packet);
+        if (trace_bpf_compile(filter,packet)==-1)
+                return -1;
         
         clen = trace_get_capture_length(packet);