Changeset 870e501

Timestamp:

12/24/06 17:14:50 (14 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:

e2d49d5

Parents:

4bd8a5b

Message:

Fix warnings
Add command line parsing

Location:

tools/tracereport

Files:

• dir_report.c (modified) (1 diff)
• tracereport.c (modified) (3 diffs)

tools/tracereport/dir_report.c

@@ -12 +12 @@
 void dir_per_packet(struct libtrace_packet_t *packet)
 {
-        if (trace_get_direction(packet)==-1)
+        if (trace_get_direction(packet)==~0U)
                 return;
         dir_bytes[trace_get_direction(packet)]+=trace_get_wire_length(packet);

tools/tracereport/tracereport.c

@@ -105 +105 @@
         fprintf(stderr,"Usage:\n"
         "%s flags traceuri [traceuri...]\n"
-        "-f --filter=bpf        Apply BPF filter. Can be specified multiple times\n"
+        "-f --filter            Apply BPF filter. Can be specified multiple times\n"
         "-H --libtrace-help     Print libtrace runtime documentation\n"
         ,argv0);
@@ -113 +113 @@
 int main(int argc, char *argv[]) {
 
-        int i;
+        libtrace_filter_t *filter = NULL;
 
-        /*char *filterstring="host 130.197.127.210"; */
+        if (argc<2)
+                usage(argv[0]);
 
-        libtrace_filter_t *filter = NULL;/*trace_bpf_setfilter(filterstring); */
+        while(1) {
+                int option_index;
+                struct option long_options[] = {
+                                { "filter",             1, 0, 'f' },
+                                { "libtrace-help",      0, 0, 'H' },
+                                {NULL,                  0, 0, 0   },
+                        };
+                int c = getopt_long(argc, argv, "f:H",
+                                long_options, &option_index);
+                if (c == -1)
+                        break;
+                switch(c) {
+                        case 'f':
+                                if (filter != NULL) {
+                                        fprintf(stderr,"You can only have one filter\n");
+                                        usage(argv[0]);
+                                }
+                                filter=trace_create_filter(optarg);
+                                break;
+                        case 'H':
+                                trace_help();
+                                exit(1);
+                                break;
+                        default:
+                                printf("Unknown option: %c\n", c);
+                                usage(argv[0]);
+                }
+        }
 
-        for(i=1;i<argc;++i) {
-                run_trace(argv[i],filter,(1<<30));
+        while(optind < argc) {
+                run_trace(argv[optind++],filter,(1<<30));
         }
 
@@ -131 +159 @@
         dir_report();
 
-
         return 0;
 }