Deleted Added
full compact
22a23,24
> *
> * $FreeBSD: head/contrib/libpcap/nametoaddr.c 56891 2000-01-30 00:43:38Z fenner $
27c29
< "@(#) $Header: nametoaddr.c,v 1.48 98/07/12 13:15:36 leres Exp $ (LBL)";
---
> "@(#) $Header: /tcpdump/master/libpcap/nametoaddr.c,v 1.51 1999/11/25 08:25:35 itojun Exp $ (LBL)";
43a46,49
> #ifdef INET6
> #include <netdb.h>
> #include <sys/socket.h>
> #endif /*INET6*/
72a79
> #ifndef INET6
95a103,108
> #else
> struct addrinfo *
> pcap_nametoaddr(const char *name)
> {
> struct addrinfo hints, *res;
> int error;
96a110,120
> memset(&hints, 0, sizeof(hints));
> hints.ai_family = PF_UNSPEC;
> hints.ai_socktype = SOCK_STREAM; /*not really*/
> error = getaddrinfo(name, NULL, &hints, &res);
> if (error)
> return NULL;
> else
> return res;
> }
> #endif /*INET6*/
>
184a209,216
> #if 0
> /* The FreeBSD elf linker generates a request to copy this array
> * (including its size) when you link with -lpcap. In order to
> * not bump the major version number of this libpcap.so, we need
> * to ensure that the array stays the same size. Since PUP is
> * likely never seen in real life any more, it's the first to
> * be sacrificed (in favor of ip6).
> */
185a218
> #endif
187a221,223
> #ifdef INET6
> { "ip6", ETHERTYPE_IPV6 },
> #endif
333c369
< #ifndef sgi
---
> #if !defined(sgi) && !defined(__NetBSD__)