diff options
author | Guy Harris <guy@alum.mit.edu> | 2015-09-17 14:56:44 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2015-09-17 14:56:44 -0700 |
commit | 11f73ad248fa22461ca040baa8dc94b864509efa (patch) | |
tree | 5a0e2679a78a1dfbe2388b4bf2d55490a38ef989 /print-aodv.c | |
parent | 2a85a1bba4c2e63094a259c5d0ed397f234ba5f3 (diff) | |
download | tcpdump-11f73ad248fa22461ca040baa8dc94b864509efa.tar.gz |
Don't require IPv6 library support in order to support IPv6 addresses.
Have our own routines to convert between IPv4/IPv6 addresses and
strings; that helps if, for example, we want to build binary versions of
tcpdump for Windows that can run both on NT 5 (W2K/WXP), which doesn't
have inet_ntop() or inet_pton(), and NT 6 (Vista/7/8/10), which do. It
also means that we don't require IPv6 library support on UN*X to print
addresses (if somebody wants to build tcpdump for older UN*Xes lacking
IPv6 support in the system library or in add-on libraries).
Get rid of files in the missing directory that we don't need, and
various no-longer-necessary autoconf tests.
Diffstat (limited to 'print-aodv.c')
-rw-r--r-- | print-aodv.c | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/print-aodv.c b/print-aodv.c index c0c2a6b1..db293bb6 100644 --- a/print-aodv.c +++ b/print-aodv.c @@ -52,7 +52,6 @@ struct aodv_rreq { uint32_t rreq_oa; /* originator IPv4 address */ uint32_t rreq_os; /* originator sequence number */ }; -#ifdef INET6 struct aodv_rreq6 { uint8_t rreq_type; /* AODV message type (1) */ uint8_t rreq_flags; /* various flags */ @@ -75,7 +74,6 @@ struct aodv_rreq6_draft_01 { struct in6_addr rreq_da; /* destination IPv6 address */ struct in6_addr rreq_oa; /* originator IPv6 address */ }; -#endif #define RREQ_JOIN 0x80 /* join (reserved for multicast */ #define RREQ_REPAIR 0x40 /* repair (reserved for multicast */ @@ -94,7 +92,6 @@ struct aodv_rrep { uint32_t rrep_oa; /* originator IPv4 address */ uint32_t rrep_life; /* lifetime of this route */ }; -#ifdef INET6 struct aodv_rrep6 { uint8_t rrep_type; /* AODV message type (2) */ uint8_t rrep_flags; /* various flags */ @@ -115,7 +112,6 @@ struct aodv_rrep6_draft_01 { struct in6_addr rrep_oa; /* originator IPv6 address */ uint32_t rrep_life; /* lifetime of this route */ }; -#endif #define RREP_REPAIR 0x80 /* repair (reserved for multicast */ #define RREP_ACK 0x40 /* acknowledgement required */ @@ -126,7 +122,6 @@ struct rerr_unreach { uint32_t u_da; /* IPv4 address */ uint32_t u_ds; /* sequence number */ }; -#ifdef INET6 struct rerr_unreach6 { struct in6_addr u_da; /* IPv6 address */ uint32_t u_ds; /* sequence number */ @@ -135,7 +130,6 @@ struct rerr_unreach6_draft_01 { struct in6_addr u_da; /* IPv6 address */ uint32_t u_ds; /* sequence number */ }; -#endif struct aodv_rerr { uint8_t rerr_type; /* AODV message type (3 or 18) */ @@ -292,13 +286,8 @@ trunc: } static void -#ifdef INET6 aodv_v6_rreq(netdissect_options *ndo, const u_char *dat, u_int length) -#else -aodv_v6_rreq(netdissect_options *ndo, const u_char *dat _U_, u_int length) -#endif { -#ifdef INET6 u_int i; const struct aodv_rreq6 *ap = (const struct aodv_rreq6 *)dat; @@ -325,19 +314,11 @@ aodv_v6_rreq(netdissect_options *ndo, const u_char *dat _U_, u_int length) trunc: ND_PRINT((ndo, " [|rreq")); -#else - ND_PRINT((ndo, " v6 rreq %u", length)); -#endif } static void -#ifdef INET6 aodv_v6_rrep(netdissect_options *ndo, const u_char *dat, u_int length) -#else -aodv_v6_rrep(netdissect_options *ndo, const u_char *dat _U_, u_int length) -#endif { -#ifdef INET6 u_int i; const struct aodv_rrep6 *ap = (const struct aodv_rrep6 *)dat; @@ -361,19 +342,11 @@ aodv_v6_rrep(netdissect_options *ndo, const u_char *dat _U_, u_int length) trunc: ND_PRINT((ndo, " [|rreq")); -#else - ND_PRINT((ndo, " rrep %u", length)); -#endif } static void -#ifdef INET6 aodv_v6_rerr(netdissect_options *ndo, const u_char *dat, u_int length) -#else -aodv_v6_rerr(netdissect_options *ndo, const u_char *dat _U_, u_int length) -#endif { -#ifdef INET6 u_int i, dc; const struct aodv_rerr *ap = (const struct aodv_rerr *)dat; const struct rerr_unreach6 *dp6; @@ -399,19 +372,11 @@ aodv_v6_rerr(netdissect_options *ndo, const u_char *dat _U_, u_int length) trunc: ND_PRINT((ndo, "[|rerr]")); -#else - ND_PRINT((ndo, " rerr %u", length)); -#endif } static void -#ifdef INET6 aodv_v6_draft_01_rreq(netdissect_options *ndo, const u_char *dat, u_int length) -#else -aodv_v6_draft_01_rreq(netdissect_options *ndo, const u_char *dat _U_, u_int length) -#endif { -#ifdef INET6 u_int i; const struct aodv_rreq6_draft_01 *ap = (const struct aodv_rreq6_draft_01 *)dat; @@ -438,19 +403,11 @@ aodv_v6_draft_01_rreq(netdissect_options *ndo, const u_char *dat _U_, u_int leng trunc: ND_PRINT((ndo, " [|rreq")); -#else - ND_PRINT((ndo, " rreq %u", length)); -#endif } static void -#ifdef INET6 aodv_v6_draft_01_rrep(netdissect_options *ndo, const u_char *dat, u_int length) -#else -aodv_v6_draft_01_rrep(netdissect_options *ndo, const u_char *dat _U_, u_int length) -#endif { -#ifdef INET6 u_int i; const struct aodv_rrep6_draft_01 *ap = (const struct aodv_rrep6_draft_01 *)dat; @@ -474,19 +431,11 @@ aodv_v6_draft_01_rrep(netdissect_options *ndo, const u_char *dat _U_, u_int leng trunc: ND_PRINT((ndo, " [|rreq")); -#else - ND_PRINT((ndo, " rrep %u", length)); -#endif } static void -#ifdef INET6 aodv_v6_draft_01_rerr(netdissect_options *ndo, const u_char *dat, u_int length) -#else -aodv_v6_draft_01_rerr(netdissect_options *ndo, const u_char *dat _U_, u_int length) -#endif { -#ifdef INET6 u_int i, dc; const struct aodv_rerr *ap = (const struct aodv_rerr *)dat; const struct rerr_unreach6_draft_01 *dp6; @@ -512,9 +461,6 @@ aodv_v6_draft_01_rerr(netdissect_options *ndo, const u_char *dat _U_, u_int leng trunc: ND_PRINT((ndo, "[|rerr]")); -#else - ND_PRINT((ndo, " rerr %u", length)); -#endif } void |