Changeset cde85f8 for tools

Timestamp:

12/02/09 11:46:57 (13 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:

5c866be

Parents:

c7062df

Message:

Reorganise to support switching off source/dest ip/ports properly

File:

• tools/tracetop/tracetop.cc (modified) (7 diffs)

tools/tracetop/tracetop.cc

@@ -103 +103 @@
 }
 
+static void set_port_for_sockaddr(struct sockaddr *sa,uint16_t port)
+{
+        switch (sa->sa_family) {
+                case AF_INET:
+                        ((struct sockaddr_in *)sa)->sin_port = htons(port);
+                        break;
+                case AF_INET6:
+                        ((struct sockaddr_in6 *)sa)->sin6_port = htons(port);
+                        break;
+        }
+}
+
+static void clear_addr_for_sockaddr(struct sockaddr *sa)
+{
+        switch (sa->sa_family) {
+                case AF_INET:
+                        ((struct sockaddr_in *)sa)->sin_addr.s_addr = 0;
+                        break;
+                case AF_INET6:
+                        memset((void*)&((struct sockaddr_in6 *)sa)->sin6_addr,0,sizeof(((struct sockaddr_in6 *)sa)->sin6_addr));
+                        break;
+        }
+}
+
+static uint16_t get_port_from_sockaddr(struct sockaddr *sa)
+{
+        switch (sa->sa_family) {
+                case AF_INET:
+                        return ntohs(((struct sockaddr_in *)sa)->sin_port);
+                        break;
+                case AF_INET6:
+                        return ntohs(((struct sockaddr_in6 *)sa)->sin6_port);
+                        break;
+        }
+}
+
 struct flowkey_t {
         struct sockaddr_storage sip;
@@ -121 +157 @@
                         if (c != 0) return c<0;
                 }
-
-                if (use_sport && sport != b.sport) return sport < b.sport;
-                if (use_dport && dport != b.dport) return dport < b.dport;
 
                 return protocol < b.protocol;
@@ -161 +194 @@
         flows_t::iterator it;
 
-        if (use_sip && trace_get_source_address(packet,(struct sockaddr*)&flowkey.sip)==NULL)
+        if (trace_get_source_address(packet,(struct sockaddr*)&flowkey.sip)==NULL)
                 flowkey.sip.ss_family = AF_UNSPEC;
-        if (use_dip && trace_get_destination_address(packet,(struct sockaddr*)&flowkey.dip)==NULL)
+
+        if (trace_get_destination_address(packet,(struct sockaddr*)&flowkey.dip)==NULL)
                 flowkey.dip.ss_family = AF_UNSPEC;
+
+        if (!use_sip)
+                clear_addr_for_sockaddr((struct sockaddr *)&flowkey.sip);
+
+        if (!use_dip)
+                clear_addr_for_sockaddr((struct sockaddr *)&flowkey.dip);
+
+        if (!use_sport)
+                set_port_for_sockaddr((struct sockaddr *)&flowkey.sip,0);
+
+        if (!use_dport) 
+                set_port_for_sockaddr((struct sockaddr *)&flowkey.dip,0);
+
         if (use_protocol && trace_get_transport(packet,&flowkey.protocol, NULL) == NULL)
                 flowkey.protocol = 255;
-        if (use_sport) flowkey.sport = trace_get_source_port(packet);
-        if (use_dport) flowkey.dport = trace_get_destination_port(packet);
+
 
         it = flows.find(flowkey);
@@ -191 +237 @@
         struct sockaddr_storage sip;
         struct sockaddr_storage dip;
-        uint16_t sport;
-        uint16_t dport;
         uint8_t protocol;
 
@@ -212 +256 @@
                 data.sip = it->first.sip;
                 data.dip = it->first.dip;
-                data.sport = it->first.sport;
-                data.dport = it->first.dport;
                 data.protocol = it->first.protocol;
                 pq.push(data);
@@ -272 +314 @@
                 }
                 if (use_sport)
-                        printw("%-5d\t", pq.top().sport);
+                        printw("%-5d\t", get_port_from_sockaddr((struct sockaddr*)&pq.top().sip));
                 if (use_dip) {
                         printw("%20s",
@@ -284 +326 @@
                 }
                 if (use_dport)
-                        printw("%-5d\t", pq.top().dport);
+                        printw("%-5d\t", get_port_from_sockaddr((struct sockaddr*)&pq.top().dip));
                 if (use_protocol) {
                         struct protoent *proto = getprotobynumber(pq.top().protocol);