Changeset 4eec8dc for tools/tracereport/nlp_report.c

Timestamp:

02/22/07 13:48:08 (14 years ago)

Author:

Josef Vodanovich <jjv4@…>

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:

b5dc60d

Parents:

013d3692

Message:

Updated NLP and ECN reports with Shanes file output format and tidied up a bit of code so its readable, also added -t ttl to usage report.

File:

• tools/tracereport/nlp_report.c (modified) (2 diffs)

tools/tracereport/nlp_report.c

@@ -6 +6 @@
 #include "tracereport.h"
 
-static stat_t nlp_stat[4][65536] = {{{0,0}}} ;
-static bool suppress[4] = {true,true,true,true};
+static stat_t nlp_stat[3][65536] = {{{0,0}}} ;
 
 void nlp_per_packet(struct libtrace_packet_t *packet)
 {
-        unsigned char *p=trace_get_link(packet);
-        uint16_t a;
+        char *link=(char *)trace_get_link(packet);
+        uint16_t type = htons(*(uint16_t*)(link+12));
+        libtrace_direction_t dir = trace_get_direction(packet);
+
+        if (dir != TRACE_DIR_INCOMING && dir != TRACE_DIR_OUTGOING)
+                dir = TRACE_DIR_OTHER;
         
-        p += 12;
-        a = *p;
-        a *= 256;
-        a += p[1];
-        int dir = trace_get_direction(packet);
-        if(dir < 0 || dir > 1)
-                dir = 2;
-        
-        nlp_stat[dir][a].count++;
-        nlp_stat[dir][a].bytes+=trace_get_wire_length(packet);
-        suppress[dir] = false;
-}
-
-void nlp_suppress()
-{
-        int i;
-        printf("%-20s","Direction:");
-        //printf("%20s", " ");
-        for(i=0;i<4;i++){
-                if(!suppress[i]){
-                        switch(i){
-                                case 0:
-                                        printf("\t%24s", "Outbound   ");
-                                        break;
-                                case 1:
-                                        printf("\t%24s", "Inbound   ");
-                                        break;
-                                case 2:
-                                        printf("\t%24s", "Undefined   ");
-                                        break;
-                                default:
-                                        break;
-                        }
-                }
-        }
-        printf("\n");
-        printf("%-20s","NLP");
-        for(i=0;i<4;i++){
-                if(!suppress[i]){
-                        printf("\t%12s\t%12s", "bytes","packets");
-                }
-        }
-        printf("\n");
+        nlp_stat[dir][type].count++;
+        nlp_stat[dir][type].bytes+=trace_get_wire_length(packet);
 }
 
 void nlp_report(void){
-        printf("# Network Layer Protocol breakdown:\n");
-        nlp_suppress();
         int i,j;
         
+        FILE *out = fopen("nlp.out", "w");
+        if (!out) {
+                perror("fopen");
+                return;
+        }
+        
+        /* Put some headings up for human-readability */
+        fprintf(out, "%-12s\t%8s\t%12s\t%12s\n",
+                        "NETWORK LAYER",
+                        "DIRECTION",
+                        "BYTES",
+                        "PACKETS");
         for(i = 0; i < 65536; i++){
                 if (nlp_stat[0][i].count==0 && 
@@ -70 +42 @@
                 switch(i){
                         case 0x0800: 
-                                printf("%20s", "IPv4");
+                                fprintf(out, "%12s", "IPv4 |");
                                 break;
                         case 0x0806: 
-                                printf("%20s", "ARP");
+                                fprintf(out, "%12s", "ARP |");
                                 break;
-                        case 0x8137:    
-                                printf("%20s", "IPX");
+                        case 0x8137:
+                                fprintf(out, "%12s", "IPX |");
                                 break;
                         case 0x814C:
-                                printf("%20s", "SNMP");
+                                fprintf(out, "%12s", "SNMP |");
                                 break;
                         case 0x86DD:
-                                printf("%20s", "IPv6");
+                                fprintf(out, "%12s", "IPv6 |");
                                 break;
                         case 0x880B:
-                                printf("%20s", "PPP");
+                                fprintf(out, "%12s", "PPP |");
                                 break;
                         default:
-                                printf("%20i:",i);
+                                fprintf(out, "%10i |",i);
                 }
-                for(j=0;j<4;j++){
-                        if (nlp_stat[j][i].count==0){
-                                if(!suppress[j])
-                                        printf("\t%24s"," ");
-                                continue;
+                for(j=0;j<3;j++){
+                        if (j != 0) {
+                                fprintf(out, "%12s", " |");
                         }
-                        printf("\t%12" PRIu64 "\t%12" PRIu64,
+
+                        switch (j) {
+                                case 0:
+                                        fprintf(out, "\t%8s", "Outbound");
+                                        break;
+                                case 1:
+                                        fprintf(out, "\t%8s", "Inbound");
+                                        break;
+                                case 2:
+                                        fprintf(out, "\t%8s", "Unknown");
+                                        break;
+                        }
+                        
+                        fprintf(out, "\t%12llu %12llu\n",
                                 nlp_stat[j][i].bytes,
                                 nlp_stat[j][i].count);
                 }
-                printf("\n");
         }
+        fclose(out);
 }