Changeset d3fd4d3 for lib

Timestamp:

06/23/06 12:01:36 (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:

45dfddc

Parents:

c5ebbaa

Message:

Move pcapfile_pkt_hdr_t to be a global libtrace internal structure
Change the way detecting trace types works

File:

• lib/format_pcapfile.c (modified) (13 diffs)

lib/format_pcapfile.c

@@ -44 +44 @@
 #define DATA(x) ((struct pcapfile_format_data_t*)((x)->format_data))
 
-struct pcapfile_format_data_t {
-        libtrace_io_t *file;
-        struct pcapfile_header_t {
+typedef struct pcapfile_header_t {
                 uint32_t magic_number;   /* magic number */
                 uint16_t version_major;  /* major version number */
@@ -54 +52 @@
                 uint32_t snaplen;        /* aka "wirelen" */
                 uint32_t network;        /* data link type */
-        } header;
+} pcapfile_header_t; 
+
+struct pcapfile_format_data_t {
+        libtrace_io_t *file;
+        pcapfile_header_t header;
+};
+
+struct pcapfile_format_data_out_t {
+        libtrace_io_t *file;
+
 };
 
@@ -147 +154 @@
 }
 
-struct pcapfile_pkt_hdr_t {
-        uint32_t ts_sec;
-        uint32_t ts_usec;
-        uint32_t caplen;
-        uint32_t wirelen;
-};
-
 static int pcapfile_read_packet(libtrace_t *libtrace, libtrace_packet_t *packet) {
         int err;
@@ -169 +169 @@
         err=libtrace_io_read(DATA(libtrace)->file,
                         packet->buffer,
-                        sizeof(struct pcapfile_pkt_hdr_t));
+                        sizeof(libtrace_pcapfile_pkt_hdr_t));
 
         if (err<0) {
@@ -184 +184 @@
 
         err=libtrace_io_read(DATA(libtrace)->file,
-                        (char*)packet->buffer+sizeof(struct pcapfile_pkt_hdr_t),
-                        swapl(libtrace,((struct pcapfile_pkt_hdr_t*)packet->buffer)->caplen)
+                        (char*)packet->buffer+sizeof(libtrace_pcapfile_pkt_hdr_t),
+                        swapl(libtrace,((libtrace_pcapfile_pkt_hdr_t*)packet->buffer)->caplen)
                         );
 
@@ -198 +198 @@
 
         packet->payload = (char*)packet->buffer 
-                + sizeof(struct pcapfile_pkt_hdr_t);
+                + sizeof(libtrace_pcapfile_pkt_hdr_t);
         
-        return sizeof(struct pcapfile_pkt_hdr_t)
-                +swapl(libtrace,((struct pcapfile_pkt_hdr_t*)packet->buffer)->caplen);
-}
+        return sizeof(libtrace_pcapfile_pkt_hdr_t)
+                +swapl(libtrace,((libtrace_pcapfile_pkt_hdr_t*)packet->buffer)->caplen);
+}
+
+#if 0
+static void pcapfile_write_packet(libtrace_out_t *out,
+                const libtrace_packet_t *packet)
+{
+        struct pcapfile_pkt_hdr_t hdr;
+
+        tv = trace_get_timeval(packet);
+        hdr.ts_sec = tv.tv_sec;
+        hdr.ts_usec = tv.tv_usec;
+        hdr.caplen = trace_get_capture_length(packet);
+        hdr.wirelen = trace_get_wire_length(packet);
+
+        write(fd,&hdr,sizeof(hdr));
+        write(fd,packet->payload,hdr.caplen);
+        
+}
+#endif
 
 
@@ -208 +226 @@
                 const libtrace_packet_t *packet) 
 {
-
+#if 0
         return pcap_dlt_to_libtrace(
                         swapl(packet->trace,
@@ -214 +232 @@
                              )
                         );
+#endif
+        return pcap_dlt_to_libtrace(rt_to_pcap_dlt(packet->type));
 }
 
@@ -279 +299 @@
                 const libtrace_packet_t *packet) 
 {
-        struct pcapfile_pkt_hdr_t *hdr =
-                (struct pcapfile_pkt_hdr_t*)packet->header;
+        libtrace_pcapfile_pkt_hdr_t *hdr =
+                (libtrace_pcapfile_pkt_hdr_t*)packet->header;
         struct timeval ts;
         ts.tv_sec = swapl(packet->trace,hdr->ts_sec);
@@ -289 +309 @@
 
 static int pcapfile_get_capture_length(const libtrace_packet_t *packet) {
-        struct pcapfile_pkt_hdr_t *pcapptr 
-                = (struct pcapfile_pkt_hdr_t *)packet->header;
+        libtrace_pcapfile_pkt_hdr_t *pcapptr 
+                = (libtrace_pcapfile_pkt_hdr_t *)packet->header;
 
         return swapl(packet->trace,pcapptr->caplen);
@@ -296 +316 @@
 
 static int pcapfile_get_wire_length(const libtrace_packet_t *packet) {
-        struct pcapfile_pkt_hdr_t *pcapptr 
-                = (struct pcapfile_pkt_hdr_t *)packet->header;
+        libtrace_pcapfile_pkt_hdr_t *pcapptr 
+                = (libtrace_pcapfile_pkt_hdr_t *)packet->header;
         if (packet->type==pcap_dlt_to_rt(TRACE_DLT_EN10MB))
                 /* Include the missing FCS */
@@ -306 +326 @@
 
 static int pcapfile_get_framing_length(const libtrace_packet_t *packet UNUSED) {
-        return sizeof(struct pcapfile_pkt_hdr_t);
+        return sizeof(libtrace_pcapfile_pkt_hdr_t);
 }
 
 static size_t pcapfile_set_capture_length(libtrace_packet_t *packet,size_t size) {
-        struct pcapfile_pkt_hdr_t *pcapptr = 0;
+        libtrace_pcapfile_pkt_hdr_t *pcapptr = 0;
         assert(packet);
         if (size > trace_get_capture_length(packet)) {
@@ -316 +336 @@
                 return trace_get_capture_length(packet);
         }
-        pcapptr = (struct pcapfile_pkt_hdr_t *)packet->header;
+        pcapptr = (libtrace_pcapfile_pkt_hdr_t *)packet->header;
         pcapptr->caplen = swapl(packet->trace,size);
         return trace_get_capture_length(packet);