Changeset 3bfeb7d for tools/tracereport

Timestamp:

02/26/07 13:48:28 (14 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:

634089d

Parents:

051618c

Message:

Some tweaks and changes to the SYN option counters and output
Fixed tracesummary which I had broken by adding a line of comments!

File:

• tools/tracereport/synopt_report.c (modified) (10 diffs)

tools/tracereport/synopt_report.c

@@ -13 +13 @@
         bool ts;
         bool ttcp;
+        bool other;
 };
 
@@ -22 +23 @@
         uint64_t mw;
         uint64_t msw;
+        uint64_t mt;
         uint64_t all_four;
         uint64_t ts_and_another;
         uint64_t ttcp;
+        uint64_t other;
 };
 
-struct opt_counter counts = {0,0,0,0,0,0,0,0,0};
+struct opt_counter counts = {0,0,0,0,0,0,0,0,0,0,0};
 uint64_t total_syns = 0;
 
 void classify_packet(struct tcp_opts opts) {
-        if (!opts.mss && !opts.sack && !opts.winscale && !opts.ts && !opts.ttcp)
+        if (!opts.mss && !opts.sack && !opts.winscale && !opts.ts && !opts.ttcp && !opts.other)
         {
                 counts.no_options ++;
@@ -37 +40 @@
         }
 
-        if (opts.mss && !opts.sack && !opts.winscale && !opts.ts && !opts.ttcp)
+        if (opts.mss && !opts.sack && !opts.winscale && !opts.ts && !opts.ttcp && !opts.other)
         {
                 counts.mss_only ++;
@@ -43 +46 @@
         }
 
-        if (!opts.mss && !opts.sack && !opts.winscale && opts.ts && !opts.ttcp)
+        if (!opts.mss && !opts.sack && !opts.winscale && opts.ts && !opts.ttcp && !opts.other)
         {
                 counts.ts_only ++;
@@ -58 +61 @@
                 counts.msw ++;
         
+        if (opts.mss && opts.ts && !opts.winscale && !opts.sack)
+                counts.mt ++;
         if (opts.mss && opts.sack && opts.winscale && opts.ts) {
                 counts.all_four ++;
@@ -68 +73 @@
         if (opts.ttcp)
                 counts.ttcp ++;
-        
+        if (opts.other)
+                counts.other ++;        
 }
 
@@ -78 +84 @@
         int tcp_payload, len;
         unsigned char type, optlen, *data;
-        struct tcp_opts opts_seen = {false, false, false, false, false};
+        struct tcp_opts opts_seen = {false, false, false, false, false, false};
         
         if(!tcp)
@@ -109 +115 @@
                                 opts_seen.winscale = true;
                                 break;
+                        case 4:
+                                opts_seen.sack = true;
+                                break;
                         case 5:
                                 opts_seen.sack = true;
@@ -120 +129 @@
                                 opts_seen.ttcp = true;
                                 break;
+                        default:
+                                opts_seen.other = true;
                 }
         }
@@ -156 +167 @@
                         (double)(counts.msw) / total_syns * 100.0);
         fprintf(out, "%-20s\t%.2f%%\n",
+                        "M, T",
+                        (double)(counts.mt) / total_syns * 100.0);
+        fprintf(out, "%-20s\t%.2f%%\n",
                         "M, S, W and T",
                         (double)(counts.all_four) / total_syns * 100.0);
-        fprintf(out, "%-20s\t%.2f%%\n",
-                        "T and (M or S or W)",
-                        (double)(counts.ts_and_another) / total_syns * 100.0);
+        //fprintf(out, "%-20s\t%.2f%%\n",
+        //              "T and (M or S or W)",
+        //              (double)(counts.ts_and_another) / total_syns * 100.0);
         fprintf(out, "%-20s\t%.2f%%\n",
                         "T/TCP",
                         (double)(counts.ttcp) / total_syns * 100.0);
+        fprintf(out, "%-20s\t%.2f%%\n",
+                        "Other options",
+                        (double)(counts.other) / total_syns * 100.0);