Changeset 3840760 for tools/tracemerge/tracemerge.c

Timestamp:

11/28/05 10:15:22 (17 years ago)

Author:

Daniel Lawson <dlawson@…>

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:

08594b8

Parents:

14d8a63

Message:

updated the examples/ and tools/ directories to correctly use trace_packet_create() now.

fixed a typo in format_wag (shouldn't use pcap_get_framing_length for wag!)

File:

• tools/tracemerge/tracemerge.c (modified) (5 diffs)

tools/tracemerge/tracemerge.c

@@ -19 +19 @@
         struct libtrace_out_t *output;
         struct libtrace_t **input;
-        struct libtrace_packet_t *packet;
+        struct libtrace_packet_t **packet;
         bool *live;
         bool set_interface=false;
@@ -57 +57 @@
 
         input=calloc((argc-optind),sizeof(struct libtrace_t *));
-        packet=calloc((argc-optind),sizeof(struct libtrace_packet_t));
+        packet=calloc((argc-optind),sizeof(struct libtrace_packet_t *));
         live=calloc((argc-optind),sizeof(bool));
         for(i=0;i<argc-optind;++i) {
                 struct libtrace_t *f;
-                struct libtrace_packet_t p;
+                struct libtrace_packet_t *p;
                 f=trace_create(argv[i+optind]);
+                p=trace_packet_create();
                 input[i]=f;
+                packet[i]=p;
                 if (!input[i]) {
                         fprintf(stderr,"Could not read %s\n",argv[i+optind]);
                         return 1;
                 }
-                trace_read_packet(f,&p);
+                trace_read_packet(f,p);
         }
 
@@ -76 +78 @@
                 for(i=0;i<argc-2;++i) {
                         if (!live[i] && input[i]) {
-                                int ret=trace_read_packet(input[i],&packet[i]);
+                                int ret=trace_read_packet(input[i],packet[i]);
                                 if (ret<0) {
                                         /* Error */
@@ -93 +95 @@
                         if (live[i] && 
                                 (oldest==-1 || 
-                                 oldest_ts<trace_get_erf_timestamp(&packet[i]))) {
+                                 oldest_ts<trace_get_erf_timestamp(packet[i]))) {
                                 oldest=i;
-                                oldest_ts=trace_get_erf_timestamp(&packet[i]);
+                                oldest_ts=trace_get_erf_timestamp(packet[i]);
                         }
                 }
@@ -104 +106 @@
 
                 if (set_interface)
-                        trace_set_direction(&packet[oldest],oldest);
-                trace_write_packet(output,&packet[oldest]);
+                        trace_set_direction(packet[oldest],oldest);
+                trace_write_packet(output,packet[oldest]);
                 live[oldest]=false;