diff options
| author | Renato Botelho <renato@netgate.com> | 2017-02-23 06:37:07 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-02-23 06:37:07 -0300 |
| commit | 4ef888db25896b2295f521c736ef04aa2e5e64ec (patch) | |
| tree | 3fcc00dda536bd32ae85bc09f21be4081d32bad5 /contrib/tcpdump/addrtoname.h | |
| parent | 272ffd7c3e4e5e27910eb918e2e36556f2a8ec3a (diff) | |
| parent | af015c5bcac0e333adeec07eff0698bad3b91e95 (diff) | |
| download | FreeBSD-src-4ef888db25896b2295f521c736ef04aa2e5e64ec.zip FreeBSD-src-4ef888db25896b2295f521c736ef04aa2e5e64ec.tar.gz | |
Merge remote-tracking branch 'origin/stable/11' into devel-11
Diffstat (limited to 'contrib/tcpdump/addrtoname.h')
| -rw-r--r-- | contrib/tcpdump/addrtoname.h | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/contrib/tcpdump/addrtoname.h b/contrib/tcpdump/addrtoname.h index b07d8b2..72e5ef1 100644 --- a/contrib/tcpdump/addrtoname.h +++ b/contrib/tcpdump/addrtoname.h @@ -19,6 +19,14 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +/* + * Definitions to let us compile most of the IPv6 code even on systems + * without IPv6 support. + */ +#ifndef INET6_ADDRSTRLEN +#define INET6_ADDRSTRLEN 46 +#endif + /* Name to address translation routines. */ enum { @@ -32,28 +40,22 @@ enum { extern const char *linkaddr_string(netdissect_options *, const u_char *, const unsigned int, const unsigned int); extern const char *etheraddr_string(netdissect_options *, const u_char *); -extern const char *le64addr_string(const u_char *); -extern const char *etherproto_string(u_short); -extern const char *tcpport_string(u_short); -extern const char *udpport_string(u_short); -extern const char *isonsap_string(const u_char *, register u_int); +extern const char *le64addr_string(netdissect_options *, const u_char *); +extern const char *etherproto_string(netdissect_options *, u_short); +extern const char *tcpport_string(netdissect_options *, u_short); +extern const char *udpport_string(netdissect_options *, u_short); +extern const char *isonsap_string(netdissect_options *, const u_char *, register u_int); extern const char *dnaddr_string(netdissect_options *, u_short); -extern const char *protoid_string(const u_char *); -extern const char *ipxsap_string(u_short); +extern const char *protoid_string(netdissect_options *, const u_char *); +extern const char *ipxsap_string(netdissect_options *, u_short); extern const char *getname(netdissect_options *, const u_char *); -#ifdef INET6 extern const char *getname6(netdissect_options *, const u_char *); -#endif extern const char *intoa(uint32_t); extern void init_addrtoname(netdissect_options *, uint32_t, uint32_t); -extern struct hnamemem *newhnamemem(void); -#ifdef INET6 -extern struct h6namemem *newh6namemem(void); -#endif +extern struct hnamemem *newhnamemem(netdissect_options *); +extern struct h6namemem *newh6namemem(netdissect_options *); extern const char * ieee8021q_tci_string(const uint16_t); #define ipaddr_string(ndo, p) getname(ndo, (const u_char *)(p)) -#ifdef INET6 #define ip6addr_string(ndo, p) getname6(ndo, (const u_char *)(p)) -#endif |
