From 1cde6435df23876fb88998e38739def0dc7dca47 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Fri, 4 Apr 2014 00:43:46 -0700 Subject: Netdissectify the to-name resolution routines. Have them take a netdissect_options * argument, and get the "no name resolution" flag from it. Move the declaration of dnaddr_string to addrtoname.h, along with the other XXX-to-string routines. --- addrtoname.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'addrtoname.h') diff --git a/addrtoname.h b/addrtoname.h index 533a7864..bdbcf369 100644 --- a/addrtoname.h +++ b/addrtoname.h @@ -30,28 +30,29 @@ enum { #define BUFSIZE 128 -extern const char *linkaddr_string(const u_char *, const unsigned int, const unsigned int); -extern const char *etheraddr_string(const u_char *); +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 *dnaddr_string(netdissect_options *, u_short); extern const char *protoid_string(const u_char *); extern const char *ipxsap_string(u_short); -extern const char *getname(const u_char *); +extern const char *getname(netdissect_options *, const u_char *); #ifdef INET6 -extern const char *getname6(const u_char *); +extern const char *getname6(netdissect_options *, const u_char *); #endif extern const char *intoa(u_int32_t); -extern void init_addrtoname(u_int32_t, u_int32_t); +extern void init_addrtoname(netdissect_options *, u_int32_t, u_int32_t); extern struct hnamemem *newhnamemem(void); #ifdef INET6 extern struct h6namemem *newh6namemem(void); #endif -#define ipaddr_string(p) getname((const u_char *)(p)) +#define ipaddr_string(ndo, p) getname(ndo, (const u_char *)(p)) #ifdef INET6 -#define ip6addr_string(p) getname6((const u_char *)(p)) +#define ip6addr_string(ndo, p) getname6(ndo, (const u_char *)(p)) #endif -- cgit v1.2.1