diff options
| author | mlaier <mlaier@FreeBSD.org> | 2007-10-16 02:31:48 +0000 |
|---|---|---|
| committer | mlaier <mlaier@FreeBSD.org> | 2007-10-16 02:31:48 +0000 |
| commit | 7407d685ab0d1977958bae143bdcc3b53dacea31 (patch) | |
| tree | 8c8221dcf086879544da49d1342bacd303933fa6 /contrib/tcpdump/addrtoname.c | |
| parent | f0e5d335e38c264eb2fca7e15e417b70c8908f54 (diff) | |
| download | FreeBSD-src-7407d685ab0d1977958bae143bdcc3b53dacea31.zip FreeBSD-src-7407d685ab0d1977958bae143bdcc3b53dacea31.tar.gz | |
Resolve merge conflicts
Approved by: re (kensmith)
Obtained from: tcpdump.org
Diffstat (limited to 'contrib/tcpdump/addrtoname.c')
| -rw-r--r-- | contrib/tcpdump/addrtoname.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/contrib/tcpdump/addrtoname.c b/contrib/tcpdump/addrtoname.c index d2e7b48..db9a93c 100644 --- a/contrib/tcpdump/addrtoname.c +++ b/contrib/tcpdump/addrtoname.c @@ -25,7 +25,7 @@ */ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/addrtoname.c,v 1.108.2.7 2005/09/29 07:46:45 hannes Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/addrtoname.c,v 1.108.2.9 2007/09/14 00:26:18 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -70,6 +70,10 @@ extern int ether_ntohost(char *, const struct ether_addr *); #include "extract.h" #include "oui.h" +#ifndef ETHER_ADDR_LEN +#define ETHER_ADDR_LEN 6 +#endif + /* * hash tables for whatever-to-name translations * @@ -513,7 +517,7 @@ linkaddr_string(const u_char *ep, const unsigned int len) register char *cp; register struct enamemem *tp; - if (len == 6) /* XXX not totally correct... */ + if (len == ETHER_ADDR_LEN) /* XXX not totally correct... */ return etheraddr_string(ep); tp = lookup_bytestring(ep, len); |
