Changeset b25f4b0

Timestamp:

04/26/07 14:00:46 (15 years ago)

Author:

Shane Alcock <salcock@…>

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:

1dc58e0

Parents:

0a65ed8

Message:

Added a new report type to tracereport which can be used to provide stats as to how much traffic is national / international based on the IP addresses involved. This report does require the user to provide a list of "local" IP ranges.
Replaced the "remove" call in traceflow which should make it run a lot faster.

Location:

tools

Files:

• traceflow/traceflow.cc (modified) (1 diff)
• tracereport/Makefile.am (modified) (1 diff)
• tracereport/locality_report.c (added)
• tracereport/tracereport.c (modified) (6 diffs)
• tracereport/tracereport.h (modified) (1 diff)

tools/traceflow/traceflow.cc

@@ -104 +104 @@
         
         flow->expiry_ts = ts + timeout;
-        flow->flow_list->remove(flow);
+        flow->flow_list->erase(active_flows[flow->id]);
         flow->flow_list = lru;
         lru->push_front(flow);

tools/tracereport/Makefile.am

@@ -26 +26 @@
         ecn_report.c\
         tcpsegment_report.c\
+        locality_report.c\
         contain.h\
         report.h\

tools/tracereport/tracereport.c

@@ -110 +110 @@
                 if (reports_required & REPORT_TYPE_TCPSEG)
                         tcpseg_per_packet(packet);
+                if (reports_required & REPORT_TYPE_LOCALITY)
+                        locality_per_packet(packet);
         }
         trace_destroy(trace);
@@ -132 +134 @@
         "-C --ecn               Report TCP ECN information\n"
         "-s --tcpsegment        \tReport TCP segment size\n"
+        "-l --locality=input    \tReport traffic locality using <input> to describe local IP addresses\n"
         "-H --help              Print libtrace runtime documentation\n"
         ,argv0);
@@ -163 +166 @@
                         { "ecn",                0, 0, 'C' },
                         { "tcpsegment",         0, 0, 's' },
+                        { "locality",           1, 0, 'l' },
                         { NULL,                 0, 0, 0 }
                 };
-                opt = getopt_long(argc, argv, "f:HeFmPpTtOondCs", long_options,
-                                &option_index);
+                opt = getopt_long(argc, argv, "f:HemFPpTtOondCsl:", 
+                                long_options, &option_index);
                 if (opt == -1)
                         break;
@@ -189 +193 @@
                                 usage(argv[0]);
                                 break;
+                        case 'l':
+                                if (locality_init(optarg) > 0)
+                                        reports_required |= REPORT_TYPE_LOCALITY;
+                        case 'm':
+                                reports_required |= REPORT_TYPE_MISC;
+                                break;
                         case 'n':
                                 reports_required |= REPORT_TYPE_NLP;
@@ -197 +207 @@
                         case 'o':
                                 reports_required |= REPORT_TYPE_SYNOPT;
-                                break;
-                        case 'm':
-                                reports_required |= REPORT_TYPE_MISC;
                                 break;
                         case 'P':
@@ -267 +274 @@
         if (reports_required & REPORT_TYPE_TCPSEG)
                 tcpseg_report();
+        if (reports_required & REPORT_TYPE_LOCALITY)
+                locality_report();
         return 0;
 }

tools/tracereport/tracereport.h

@@ -20 +20 @@
         REPORT_TYPE_TCPSEG = 1 << 10,
         REPORT_TYPE_SYNOPT = 1 << 11,
-        REPORT_TYPE_MISC = 1 << 12
+        REPORT_TYPE_LOCALITY = 1 << 12
+        REPORT_TYPE_MISC = 1 << 13
 } report_type_t;