From: Francois-Xavier Le Bail Date: Sun, 4 Oct 2015 15:20:21 +0000 (+0200) Subject: LISP: We always support IPv6 addresses now X-Git-Tag: tcpdump-4.8.0~104 X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/eea2b6d5dd579b0fbfa3b4dc3b5a19e18473376e LISP: We always support IPv6 addresses now INET6 is no more used. --- diff --git a/print-lisp.c b/print-lisp.c index 327e99e2..ddddc2e9 100644 --- a/print-lisp.c +++ b/print-lisp.c @@ -104,9 +104,7 @@ #include #include "ip.h" -#ifdef INET6 #include "ip6.h" -#endif #include "extract.h" #include "interface.h" @@ -313,12 +311,8 @@ void lisp_print(netdissect_options *ndo, const u_char *bp, u_int length) break; case IPv6_AFI: ND_TCHECK2(*(packet_iterator + packet_offset), 16); - #ifdef INET6 ND_PRINT((ndo, " EID %s/%u,", getname6(ndo, packet_iterator + packet_offset), mask_len)); - #else - ND_PRINT((ndo, " IPv6 EID,")); - #endif packet_offset += 16; break; default: @@ -349,11 +343,7 @@ void lisp_print(netdissect_options *ndo, const u_char *bp, u_int length) break; case IPv6_AFI: ND_TCHECK2(*(packet_iterator + packet_offset), 16); - #ifdef INET6 ND_PRINT((ndo, " LOC %s", getname6(ndo, loc_ip_pointer))); - #else - ND_PRINT((ndo, " LOC IPv6")); - #endif packet_offset += 16; break; default: diff --git a/tests/lisp_ipv6.out b/tests/lisp_ipv6.out index e33844ca..39e84c3e 100644 --- a/tests/lisp_ipv6.out +++ b/tests/lisp_ipv6.out @@ -3,10 +3,10 @@ IP (tos 0x0, ttl 64, id 1, offset 0, flags [none], proto UDP (17), length 168) 2 record(s), Authentication SHA1, Authentication-Data: 0x0000: 4bbb 9614 a67a 8604 0407 7995 4537 1906 Authentication-Data: 0x0010: 836c d1d6 - Record TTL 1440, Authoritative, No-Action, Map Version: 0, IPv6 EID, 1 locator(s) + Record TTL 1440, Authoritative, No-Action, Map Version: 0, EID 2001:db8:85a3::8a2e:370:7334/80, 1 locator(s) LOC 20.20.8.253 Priority/Weight 1/100, Multicast Priority/Weight 1/100, flags [none], - Record TTL 1440, Authoritative, No-Action, Map Version: 0, IPv6 EID, 1 locator(s) + Record TTL 1440, Authoritative, No-Action, Map Version: 0, EID 2001:db8:95a3::8a2e:370:7334/80, 1 locator(s) LOC 20.20.8.251 Priority/Weight 1/100, Multicast Priority/Weight 1/100, flags [none], xTR-ID: 0x0000: 9787 ad75 3caf 58a7 13fa 6920 e6d2 7a8f @@ -16,9 +16,9 @@ IP (tos 0x0, ttl 64, id 1, offset 0, flags [none], proto UDP (17), length 144) 2 record(s), Authentication SHA1, Authentication-Data: 0x0000: 4bbb 9614 a67a 8604 0407 7995 4537 1906 Authentication-Data: 0x0010: 836c d1d6 - Record TTL 1440, Authoritative, No-Action, Map Version: 0, IPv6 EID, 1 locator(s) + Record TTL 1440, Authoritative, No-Action, Map Version: 0, EID 2001:db8:85a3::8a2e:370:7334/80, 1 locator(s) LOC 20.20.8.253 Priority/Weight 1/100, Multicast Priority/Weight 1/100, flags [none], - Record TTL 1440, Authoritative, No-Action, Map Version: 0, IPv6 EID, 1 locator(s) + Record TTL 1440, Authoritative, No-Action, Map Version: 0, EID 2001:db8:95a3::8a2e:370:7334/80, 1 locator(s) LOC 20.20.8.251 Priority/Weight 1/100, Multicast Priority/Weight 1/100, flags [none],