Changeset 1150

Timestamp:

02/22/07 15:45:46 (6 years ago)

Author:

jjv4

Message:

Lots of minor changes to the reports to make it look a bit nicer and tcp ss should be working.

Location:

trunk/tools/tracereport

Files:

• ecn_report.c (modified) (2 diffs)
• nlp_report.c (modified) (2 diffs)
• port_report.c (modified) (7 diffs)
• protocol_report.c (modified) (5 diffs)
• tcpsegment_report.c (modified) (4 diffs)
• tos_report.c (modified) (4 diffs)
• tracereport.c (modified) (2 diffs)
• ttl_report.c (modified) (4 diffs)

trunk/tools/tracereport/ecn_report.c

@@ -36 +36 @@
 
         /* Put some headings up for human-readability */
-        fprintf(out, "%-12s\t%8s\t%12s\t%12s\n",
+        fprintf(out, "%-12s\t%10s\t%16s %16s\n",
                         "ECN",
                         "DIRECTION",
@@ -67 +67 @@
                         switch (j) {
                                 case 0:
-                                        fprintf(out, "\t%8s", "Outbound");
+                                        fprintf(out, "\t%10s", "Outbound");
                                         break;
                                 case 1:
-                                        fprintf(out, "\t%8s", "Inbound");
+                                        fprintf(out, "\t%10s", "Inbound");
                                         break;
                                 case 2:
-                                        fprintf(out, "\t%8s", "Unknown");
+                                        fprintf(out, "\t%10s", "Unknown");
                                         break;
                         }
-                        fprintf(out, "\t%12llu %12llu\n",
+                        fprintf(out, "\t%16llu %16llu\n",
                                 ecn_stat[j][i].bytes,
                                 ecn_stat[j][i].count);

trunk/tools/tracereport/nlp_report.c

@@ -31 +31 @@
         
         /* Put some headings up for human-readability */
-        fprintf(out, "%-12s\t%8s\t%12s\t%12s\n",
+        fprintf(out, "%-12s\t%10s\t%16s %16s\n",
                         "NETWORK LAYER",
                         "DIRECTION",
@@ -69 +69 @@
                         switch (j) {
                                 case 0:
-                                        fprintf(out, "\t%8s", "Outbound");
+                                        fprintf(out, "\t%10s", "Outbound");
                                         break;
                                 case 1:
-                                        fprintf(out, "\t%8s", "Inbound");
+                                        fprintf(out, "\t%10s", "Inbound");
                                         break;
                                 case 2:
-                                        fprintf(out, "\t%8s", "Unknown");
+                                        fprintf(out, "\t%10s", "Unknown");
                                         break;
                         }
                         
-                        fprintf(out, "\t%12llu %12llu\n",
+                        fprintf(out, "\t%16llu %16llu\n",
                                 nlp_stat[j][i].bytes,
                                 nlp_stat[j][i].count);

trunk/tools/tracereport/port_report.c

@@ -9 +9 @@
 #include "contain.h"
 
-stat_t ports[4][256][65536]={{{{0,0}}}};
+stat_t ports[3][256][65536]={{{{0,0}}}};
 char protn[256]={0};
-static bool suppress[4] = {true,true,true,true};
+static bool suppress[3] = {true,true,true};
 
 void port_per_packet(struct libtrace_packet_t *packet)
@@ -17 +17 @@
         uint8_t proto;
         int port;
-        int dir = trace_get_direction(packet);
-        if(dir < 0 || dir > 1)
-                dir = 2;
+        libtrace_direction_t dir = trace_get_direction(packet);
+
         if(trace_get_transport(packet,&proto,NULL)==NULL) 
                 return;
 
+        if (dir != TRACE_DIR_INCOMING && dir != TRACE_DIR_OUTGOING)
+                dir = TRACE_DIR_OTHER;
+        
         port = trace_get_server_port(proto,
                         trace_get_source_port(packet),
@@ -39 +41 @@
         int i;
         printf("%-20s","Direction:");
-        for(i=0;i<4;i++){
+        for(i=0;i<3;i++){
                 if(!suppress[i]){
                         switch(i){
@@ -58 +60 @@
         printf("\n");
         printf("%-20s","Port");
-        for(i=0;i<4;i++){
+        for(i=0;i<3;i++){
                 if(!suppress[i]){
                         printf("\t%12s\t%12s", "bytes","packets");
@@ -73 +75 @@
         if(ent){
                 printf("%20s:",ent->s_name);
-                for(k=0;k<4;k++){
+                for(k=0;k<3;k++){
                         if (ports[k][i][j].count==0){
                                 if(!suppress[k])
@@ -87 +89 @@
         else{
                 printf("%20i:",j);
-                for(k=0;k<4;k++){
+                for(k=0;k<3;k++){
                         if (ports[k][i][j].count==0){
                                 if(!suppress[k])
@@ -109 +111 @@
                         ent?"(":"",ent?ent->p_name:"",ent?")":"");
         for(j=0;j<65536;++j) {
-                for(k=0;k<4;k++){
+                for(k=0;k<3;k++){
                         if (ports[k][i][j].count) {
                                 port_port(i,ent?ent->p_name:"",j);

trunk/tools/tracereport/protocol_report.c

@@ -7 +7 @@
 #include "report.h"
 
-static stat_t prot_stat[4][256] = {{{0,0}}} ;
-static bool suppress[4] = {true,true,true,true};
+static stat_t prot_stat[3][256] = {{{0,0}}} ;
+static bool suppress[3] = {true,true,true};
 
 void protocol_per_packet(struct libtrace_packet_t *packet)
 {
         uint8_t proto;
-        int dir = trace_get_direction(packet);
-        if(dir < 0 || dir > 1)
-                dir = 2;
+        libtrace_direction_t dir = trace_get_direction(packet);
+        
         if (trace_get_transport(packet,&proto,NULL)==NULL)
                 return;
                 
+        if (dir != TRACE_DIR_INCOMING && dir != TRACE_DIR_OUTGOING)
+                dir = TRACE_DIR_OTHER;
+        
         prot_stat[dir][proto].count++;
         prot_stat[dir][proto].bytes+=trace_get_wire_length(packet);
@@ -28 +30 @@
         int i;
         printf("%-20s","Direction:");
-        for(i=0;i<4;i++){
+        for(i=0;i<3;i++){
                 if(!suppress[i]){
                         switch(i){
@@ -47 +49 @@
         printf("\n");
         printf("%-20s","Protocol");
-        for(i=0;i<4;i++){
+        for(i=0;i<3;i++){
                 if(!suppress[i]){
                         printf("\t%12s\t%12s", "bytes","packets");
@@ -69 +71 @@
                 if (prot) {
                         printf("%20s",prot->p_name);
-                        for(j=0;j<4;j++){
+                        for(j=0;j<3;j++){
                                 if (prot_stat[j][i].count==0){
                                         if(!suppress[j])
@@ -82 +84 @@
                 else {
                         printf("%20i:",i);
-                        for(j=0;j<4;j++){
+                        for(j=0;j<3;j++){
                                 if (prot_stat[j][i].count==0){
                                         if(!suppress[j])

trunk/tools/tracereport/tcpsegment_report.c

@@ -6 +6 @@
 #include "tracereport.h"
 
-static stat_t tcpseg_stat[4][2048] = {{{0,0}}} ;
-static bool suppress[4] = {true,true,true,true};
+static stat_t tcpseg_stat[3][2048] = {{{0,0}}} ;
+static bool suppress[3] = {true,true,true};
 
 void tcpseg_per_packet(struct libtrace_packet_t *packet)
 {
         struct libtrace_tcp *tcp = trace_get_tcp(packet);
+        libtrace_direction_t dir = trace_get_direction(packet);
+        int payload, tcplen, ss;
+        
         if (!tcp)
                 return;
-        int dir = trace_get_direction(packet);
-        if(dir < 0 || dir > 1)
-                dir = 2;
+
+        if (dir != TRACE_DIR_INCOMING && dir != TRACE_DIR_OUTGOING)
+                dir = TRACE_DIR_OTHER;
         
-        int a = trace_get_wire_length(packet);
-        a -= 34;
+        payload = trace_get_wire_length(packet) - trace_get_capture_length(packet);
+        tcplen = tcp->doff * 4;
+        ss = payload + tcplen;
 
-        tcpseg_stat[dir][a].count++;
-        tcpseg_stat[dir][a].bytes+=trace_get_wire_length(packet);
+        tcpseg_stat[dir][ss].count++;
+        tcpseg_stat[dir][ss].bytes+=trace_get_wire_length(packet);
         suppress[dir] = false;
 }
@@ -30 +34 @@
         int i;
         printf("%-20s","Direction:");
-        for(i=0;i<4;i++){
+        for(i=0;i<3;i++){
                 if(!suppress[i]){
                         switch(i){
@@ -49 +53 @@
         printf("\n");
         printf("%-20s","TCP SS");
-        for(i=0;i<4;i++){
+        for(i=0;i<3;i++){
                 if(!suppress[i]){
                         printf("\t%12s\t%12s", "bytes","packets");
@@ -67 +71 @@
                         continue;
                 printf("%20i:",i);
-                for(j=0;j<4;j++){
+                for(j=0;j<3;j++){
                         if (tcpseg_stat[j][i].count==0){
                                 if(!suppress[j])

trunk/tools/tracereport/tos_report.c

@@ -6 +6 @@
 #include "tracereport.h"
 
-static stat_t tos_stat[4][256] = {{{0,0}}} ;
-static bool suppress[4] = {true,true,true,true};
+static stat_t tos_stat[3][256] = {{{0,0}}} ;
+static bool suppress[3] = {true,true,true};
 
 void tos_per_packet(struct libtrace_packet_t *packet)
 {
         struct libtrace_ip *ip = trace_get_ip(packet);
+        libtrace_direction_t dir = trace_get_direction(packet);
+        
         if (!ip)
                 return;
-        int dir = trace_get_direction(packet);
-        if(dir < 0 || dir > 1)
-                dir = 2;
+        
+        if (dir != TRACE_DIR_INCOMING && dir != TRACE_DIR_OUTGOING)
+                dir = TRACE_DIR_OTHER;
+        
         tos_stat[dir][ip->ip_tos].count++;
         tos_stat[dir][ip->ip_tos].bytes+=trace_get_wire_length(packet);
@@ -26 +29 @@
         int i;
         printf("%-20s","Direction:");
-        for(i=0;i<4;i++){
+        for(i=0;i<3;i++){
                 if(!suppress[i]){
                         switch(i){
@@ -45 +48 @@
         printf("\n");
         printf("%-20s","ToS");
-        for(i=0;i<4;i++){
+        for(i=0;i<3;i++){
                 if(!suppress[i]){
                         printf("\t%12s\t%12s", "bytes","packets");
@@ -63 +66 @@
                         continue;
                 printf("%20i:",i);
-                for(j=0;j<4;j++){
+                for(j=0;j<3;j++){
                         if (tos_stat[j][i].count==0){
                                 if(!suppress[j])

trunk/tools/tracereport/tracereport.c

@@ -104 +104 @@
                 if (reports_required & REPORT_TYPE_ECN)
                         ecn_per_packet(packet);
-                /*
-                if (reports_required & REPORT_TYPE_TCPSEQ)
+                if (reports_required & REPORT_TYPE_TCPSEG)
                         tcpseg_per_packet(packet);
-                */
         }
         trace_destroy(trace);
@@ -242 +240 @@
         if (reports_required & REPORT_TYPE_ECN)
                 ecn_report();
-        /*
         if (reports_required & REPORT_TYPE_TCPSEG)
                 tcpseg_report();
-        */
         return 0;
 }

trunk/tools/tracereport/ttl_report.c

@@ -6 +6 @@
 #include "tracereport.h"
 
-static stat_t ttl_stat[4][256] = {{{0,0}}} ;
-static bool suppress[4] = {true,true,true,true};
+static stat_t ttl_stat[3][256] = {{{0,0}}} ;
+static bool suppress[3] = {true,true,true};
 
 void ttl_per_packet(struct libtrace_packet_t *packet)
 {
         struct libtrace_ip *ip = trace_get_ip(packet);
+        libtrace_direction_t dir = trace_get_direction(packet);
+        
         if (!ip)
                 return;
-        int dir = trace_get_direction(packet);
-        if(dir < 0 || dir > 1)
-                dir = 2;
+        
+        if (dir != TRACE_DIR_INCOMING && dir != TRACE_DIR_OUTGOING)
+                dir = TRACE_DIR_OTHER;
+        
         ttl_stat[dir][ip->ip_ttl].count++;
         ttl_stat[dir][ip->ip_ttl].bytes+=trace_get_wire_length(packet);
@@ -26 +29 @@
         int i;
         printf("%-20s","Direction:");
-        for(i=0;i<4;i++){
+        for(i=0;i<3;i++){
                 if(!suppress[i]){
                         switch(i){
@@ -45 +48 @@
         printf("\n");
         printf("%-20s","TTL");
-        for(i=0;i<4;i++){
+        for(i=0;i<3;i++){
                 if(!suppress[i]){
                         printf("\t%12s\t%12s", "bytes","packets");
@@ -63 +66 @@
                         continue;
                 printf("%20i:",i);
-                for(j=0;j<4;j++){
+                for(j=0;j<3;j++){
                         if (ttl_stat[j][i].count==0){
                                 if(!suppress[j])