Deleted Added
full compact
pcap-namedb.h (56891) pcap-namedb.h (75110)
1/*
2 * Copyright (c) 1994, 1996
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 16 unchanged lines hidden (view full) ---

25 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
1/*
2 * Copyright (c) 1994, 1996
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 16 unchanged lines hidden (view full) ---

25 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * $FreeBSD: head/contrib/libpcap/pcap-namedb.h 56891 2000-01-30 00:43:38Z fenner $
34 * @(#) $Header: /tcpdump/master/libpcap/pcap-namedb.h,v 1.6 1999/10/19 15:18:31 itojun Exp $ (LBL)
33 * $FreeBSD: head/contrib/libpcap/pcap-namedb.h 75110 2001-04-03 04:32:48Z fenner $
34 * @(#) $Header: /tcpdump/master/libpcap/pcap-namedb.h,v 1.8 2000/07/29 07:36:43 guy Exp $ (LBL)
35 */
36
37#ifndef lib_pcap_ethers_h
38#define lib_pcap_ethers_h
39
40#ifdef __cplusplus
41extern "C" {
42#endif
35 */
36
37#ifndef lib_pcap_ethers_h
38#define lib_pcap_ethers_h
39
40#ifdef __cplusplus
41extern "C" {
42#endif
43
44
45/*
46 * As returned by the pcap_next_etherent()
47 * XXX this stuff doesn't belong in this interface, but this
48 * library already must do name to address translation, so
49 * on systems that don't have support for /etc/ethers, we
50 * export these hooks since they'll
51 */
52struct pcap_etherent {
53 u_char addr[6];
54 char name[122];
55};
56#ifndef PCAP_ETHERS_FILE
57#define PCAP_ETHERS_FILE "/etc/ethers"
58#endif
59struct pcap_etherent *pcap_next_etherent(FILE *);
60u_char *pcap_ether_hostton(const char*);
61u_char *pcap_ether_aton(const char *);
62
43
44/*
45 * As returned by the pcap_next_etherent()
46 * XXX this stuff doesn't belong in this interface, but this
47 * library already must do name to address translation, so
48 * on systems that don't have support for /etc/ethers, we
49 * export these hooks since they'll
50 */
51struct pcap_etherent {
52 u_char addr[6];
53 char name[122];
54};
55#ifndef PCAP_ETHERS_FILE
56#define PCAP_ETHERS_FILE "/etc/ethers"
57#endif
58struct pcap_etherent *pcap_next_etherent(FILE *);
59u_char *pcap_ether_hostton(const char*);
60u_char *pcap_ether_aton(const char *);
61
63#ifndef INET6
64bpf_u_int32 **pcap_nametoaddr(const char *);
62bpf_u_int32 **pcap_nametoaddr(const char *);
65#else
66struct addrinfo *pcap_nametoaddr(const char *);
63#ifdef INET6
64struct addrinfo *pcap_nametoaddrinfo(const char *);
67#endif
68bpf_u_int32 pcap_nametonetaddr(const char *);
69
70int pcap_nametoport(const char *, int *, int *);
71int pcap_nametoproto(const char *);
72int pcap_nametoeproto(const char *);
73/*
74 * If a protocol is unknown, PROTO_UNDEF is returned.

--- 6 unchanged lines hidden (view full) ---

81/* XXX move these to pcap-int.h? */
82int __pcap_atodn(const char *, bpf_u_int32 *);
83int __pcap_atoin(const char *, bpf_u_int32 *);
84u_short __pcap_nametodnaddr(const char *);
85
86#ifdef __cplusplus
87}
88#endif
65#endif
66bpf_u_int32 pcap_nametonetaddr(const char *);
67
68int pcap_nametoport(const char *, int *, int *);
69int pcap_nametoproto(const char *);
70int pcap_nametoeproto(const char *);
71/*
72 * If a protocol is unknown, PROTO_UNDEF is returned.

--- 6 unchanged lines hidden (view full) ---

79/* XXX move these to pcap-int.h? */
80int __pcap_atodn(const char *, bpf_u_int32 *);
81int __pcap_atoin(const char *, bpf_u_int32 *);
82u_short __pcap_nametodnaddr(const char *);
83
84#ifdef __cplusplus
85}
86#endif
89
90
91#endif
87
88#endif