Changeset 59751a5

Timestamp:

03/23/09 17:01:09 (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:

5dd06d6

Parents:

d4242e4

Message:

have trace_get_source_address() / trace_get_destination_address() return link layer addresses
where possible.

Files:

• lib/protocols_l3.c (modified) (6 diffs)
• tools/tracetop/tracetop.cc (modified) (6 diffs)

lib/protocols_l3.c

@@ -4 +4 @@
 #include <assert.h>
 #include <stdlib.h>
+#include "config.h"
+
+#ifdef HAVE_NETPACKET_PACKET_H
+#include <sys/socket.h>
+#include <netpacket/packet.h>
+#include <net/ethernet.h>
+#include <net/if_arp.h>
+#include <string.h>
+#endif
 
 libtrace_ip_t *trace_get_ip(libtrace_packet_t *packet) 
@@ -248 +257 @@
 }
 
+/* Extract the source mac address from a frame and bundle it up into a sockaddr */
+static struct sockaddr *get_source_ethernet_address(
+        libtrace_ether_t *ethernet, struct sockaddr *addr)
+{
+#ifdef HAVE_NETPACKET_PACKET_H
+/* Use linux's sockaddr_ll structure */
+        static struct sockaddr_storage dummy;
+        struct sockaddr_ll *l2addr;
+
+        if (addr)
+                l2addr = (struct sockaddr_ll*)addr;
+        else
+                l2addr = (struct sockaddr_ll*)&dummy;
+        
+        l2addr->sll_family = AF_PACKET;
+        l2addr->sll_protocol = ethernet->ether_type;
+        l2addr->sll_ifindex = 0; /* Irrelevant */
+        l2addr->sll_hatype = ARPHRD_ETHER; 
+        l2addr->sll_pkttype = PACKET_OTHERHOST;
+        l2addr->sll_halen = 6;
+        memcpy(l2addr->sll_addr,ethernet->ether_shost, 6);
+
+        return (struct sockaddr*)l2addr;
+#else
+/* TODO: implement BSD's sockaddr_dl structure, sigh. */
+        return NULL;
+#endif
+}
+
+static struct sockaddr *get_source_l2_address(
+        const libtrace_packet_t *packet, struct sockaddr *addr)
+{
+        static struct sockaddr_storage dummy;
+        void *l2;
+        libtrace_linktype_t linktype;
+        uint32_t remaining;
+
+        if (!addr)
+                addr =(struct sockaddr*)&dummy;
+
+        l2=trace_get_layer2(packet, &linktype, &remaining);
+        if (!l2) {
+                return NULL;
+        }
+
+        switch (linktype) {
+                case TRACE_TYPE_ETH:
+                        return get_source_ethernet_address((libtrace_ether_t*)l2, addr);
+                default:
+                        return NULL;
+        }
+}
+
 DLLEXPORT struct sockaddr *trace_get_source_address(
                 const libtrace_packet_t *packet, struct sockaddr *addr)
@@ -263 +325 @@
 
         if (!l3)
-                return NULL;
+                return get_source_l2_address(packet,addr);
 
         switch (ethertype) {
@@ -296 +358 @@
                 }
                 default:
+                        return get_source_l2_address(packet, addr);
+        }
+}
+
+
+static struct sockaddr *get_destination_ethernet_address(
+        libtrace_ether_t *ethernet, struct sockaddr *addr)
+{
+#ifdef HAVE_NETPACKET_PACKET_H
+/* Use linux's sockaddr_ll structure */
+        static struct sockaddr_storage dummy;
+        struct sockaddr_ll *l2addr;
+        if (addr)
+                l2addr = (struct sockaddr_ll*)addr;
+        else
+                l2addr = (struct sockaddr_ll*)&dummy;
+        
+        l2addr->sll_family = AF_PACKET;
+        l2addr->sll_protocol = ethernet->ether_type;
+        l2addr->sll_ifindex = 0; /* Irrelevant */
+        l2addr->sll_hatype = ARPHRD_ETHER; 
+        l2addr->sll_pkttype = PACKET_OTHERHOST;
+        l2addr->sll_halen = 6;
+        memcpy(l2addr->sll_addr,ethernet->ether_dhost, 6);
+
+        return (struct sockaddr*)l2addr;
+#else
+/* TODO: implement BSD's sockaddr_dl structure, sigh. */
+        return NULL;
+#endif
+}
+
+static struct sockaddr *get_destination_l2_address(
+        const libtrace_packet_t *packet, struct sockaddr *addr)
+{
+        static struct sockaddr_storage dummy;
+        void *l2;
+        libtrace_linktype_t linktype;
+        uint32_t remaining;
+        if (!addr)
+                addr =(struct sockaddr*)&dummy;
+        l2=trace_get_layer2(packet, &linktype, &remaining);
+        if (!l2)
+                return NULL;
+
+        switch (linktype) {
+                case TRACE_TYPE_ETH:
+                        return get_destination_ethernet_address((libtrace_ether_t*)l2, addr);
+                default:
                         return NULL;
         }
@@ -315 +426 @@
 
         if (!l3)
-                return NULL;
+                return get_destination_l2_address(packet,addr);
 
         switch (ethertype) {
@@ -348 +459 @@
                 }
                 default:
-                        return NULL;
-        }
-}
-
-
+                        return get_destination_l2_address(packet, addr);
+        }
+}
+
+

tools/tracetop/tracetop.cc

@@ -13 +13 @@
 #include <sys/socket.h>
 #include <netdb.h>
+#include "config.h"
+#ifdef HAVE_NETPACKET_PACKET_H
+#include <sys/socket.h>
+#include <netpacket/packet.h>
+#include <net/ethernet.h>
+#endif
+
+typedef enum { BITS_PER_SEC, BYTES } display_t;
+display_t display_as = BYTES;
 
 int cmp_sockaddr_in6(const struct sockaddr_in6 *a, const struct sockaddr_in6 *b)
@@ -27 +36 @@
         return a->sin_addr.s_addr - b->sin_addr.s_addr;
 }
+
+#ifdef HAVE_NETPACKET_PACKET_H
+int cmp_sockaddr_ll(const struct sockaddr_ll *a, const struct sockaddr_ll *b)
+{
+        return memcmp(a->sll_addr, b->sll_addr, b->sll_halen);
+}
+#endif
 
 int cmp_sockaddr(const struct sockaddr *a, const struct sockaddr *b)
@@ -38 +54 @@
                 case AF_INET6:
                         return cmp_sockaddr_in6((struct sockaddr_in6 *)a,(struct sockaddr_in6*)b);
+#ifdef HAVE_NETPACKET_PACKET_H
+                case AF_PACKET:
+                        return cmp_sockaddr_ll((struct sockaddr_ll *)a,(struct sockaddr_ll*)b);
+#endif
                 case AF_UNSPEC:
                         return 0; /* Can't compare UNSPEC's! */
@@ -52 +72 @@
         size_t mybufflen = buffer ? bufflen : sizeof(intbuffer);
         int err;
-        if ((err=getnameinfo(a, salen, mybuf, mybufflen, NULL, 0, NI_NUMERICHOST))!=0) {
-                strncpy(mybuf,gai_strerror(err),mybufflen);
+        switch (a->sa_family) {
+                case AF_INET:
+                case AF_INET6:
+                        if ((err=getnameinfo(a, salen, mybuf, mybufflen, NULL, 0, NI_NUMERICHOST))!=0) {
+                                strncpy(mybuf,gai_strerror(err),mybufflen);
+                        }
+                        break;
+#ifdef HAVE_NETPACKET_PACKET_H
+                case AF_PACKET:
+                        trace_ether_ntoa(((struct sockaddr_ll*)a)->sll_addr, mybuf);
+                        break;
+#endif
+                default:
+                        snprintf(mybuf,mybufflen,"Unknown family %d",a->sa_family);
         }
         return mybuf;
@@ -94 +126 @@
         flows_t::iterator it;
 
-        if (trace_get_source_address(packet,(struct sockaddr*)&flowkey.sip)==0)
+        if (trace_get_source_address(packet,(struct sockaddr*)&flowkey.sip)==NULL)
                 flowkey.sip.ss_family = AF_UNSPEC;
-        if (trace_get_destination_address(packet,(struct sockaddr*)&flowkey.dip)==0)
+        if (trace_get_destination_address(packet,(struct sockaddr*)&flowkey.dip)==NULL)
                 flowkey.dip.ss_family = AF_UNSPEC;
         trace_get_transport(packet,&flowkey.protocol, NULL);
@@ -112 +144 @@
         ++it->second.packets;
         it->second.bytes+=trace_get_capture_length(packet);
+
 }