Changeset 59751a5 for lib

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.

File:

• lib/protocols_l3.c (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);
+        }
+}
+
+