Changeset 2216d25

Timestamp:

03/11/13 11:12:36 (9 years ago)

Author:

Shane Alcock <salcock@…>

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:

524ebb5

Parents:

6e6577d

Message:

• Make tracetop display addresses properly on FreeBSD

File:

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

tools/tracetop/tracetop.cc

@@ -17 +17 @@
 #include <netpacket/packet.h>
 #include <net/ethernet.h>
+#else
+#include <net/if_dl.h>
 #endif
 
@@ -90 +92 @@
         size_t mybufflen = buffer ? bufflen : sizeof(intbuffer);
         int err;
+
+        /* Some systems (FreeBSD and Solaris, I'm looking at you) have a bug
+         * where they can't deal with the idea of a sockaddr_storage being
+         * passed into getnameinfo. Linux just deals by looking
+         * at sa_family and figuring out what sockaddr it is really.
+         *
+         * Anyway, the fix appears to be to manually hax the sockaddr length
+         * to be the right value for the underlying family.
+         */
         switch (a->sa_family) {
                 case AF_INET:
-                case AF_INET6:
+                        salen = sizeof(struct sockaddr_in);
                         if ((err=getnameinfo(a, salen, mybuf, mybufflen, NULL, 0, NI_NUMERICHOST))!=0) {
                                 strncpy(mybuf,gai_strerror(err),mybufflen);
                         }
                         break;
+                case AF_INET6:
+                        salen = sizeof(struct sockaddr_in6);
+                        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;
+#else
+                case AF_LINK:
+                        trace_ether_ntoa((uint8_t *)((struct sockaddr_dl *)a)->sdl_data, mybuf);
                         break;
 #endif