Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ICMPv6: Recognise ND option 14 (Nonce) #1108

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ICMPv6: Recognise ND option 14 (Nonce) #1108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions print-icmp6.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,7 @@ struct nd_opt_hdr { /* Neighbor discovery option header */
#define ND_OPT_MTU 5
#define ND_OPT_ADVINTERVAL 7
#define ND_OPT_HOMEAGENT_INFO 8
#define ND_OPT_NONCE 14
#define ND_OPT_ROUTE_INFO 24 /* RFC4191 */
#define ND_OPT_RDNSS 25
#define ND_OPT_DNSSL 31
Expand Down Expand Up @@ -712,6 +713,7 @@ static const struct tok icmp6_opt_values[] = {
{ ND_OPT_DNSSL, "dnssl"},
{ ND_OPT_ADVINTERVAL, "advertisement interval"},
{ ND_OPT_HOMEAGENT_INFO, "homeagent information"},
{ ND_OPT_NONCE, "nonce"},
{ ND_OPT_ROUTE_INFO, "route info"},
{ 0, NULL }
};
Expand Down Expand Up @@ -753,6 +755,18 @@ get_lifetime(uint32_t v)
}
}

static void
print_opaque_data(netdissect_options *ndo, const uint8_t *p, size_t l)
{
if (l > 0)
ND_PRINT("0x");
while (l > 0) {
ND_PRINT("%02x", GET_U_1(p));
p++;
l--;
}
}

static void
print_lladdr(netdissect_options *ndo, const uint8_t *p, size_t l)
{
Expand Down Expand Up @@ -1473,6 +1487,10 @@ icmp6_opt_print(netdissect_options *ndo, const u_char *bp, int resid)
GET_BE_U_2(oph->nd_opt_hai_preference),
GET_BE_U_2(oph->nd_opt_hai_lifetime));
break;
case ND_OPT_NONCE:
l = (opt_len << 3) - 2;
print_opaque_data(ndo, cp + 2, l);
break;
case ND_OPT_ROUTE_INFO:
opri = (const struct nd_opt_route_info *)op;
ND_TCHECK_4(opri->nd_opt_rti_lifetime);
Expand Down
3 changes: 3 additions & 0 deletions tests/TESTLIST
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,9 @@ icmpv6-rfc7112 icmpv6-rfc7112.pcap icmpv6-rfc7112.out
icmpv6-RFC2894-RR icmpv6-RFC2894-RR.pcap icmpv6-RFC2894-RR.out
icmpv6-RFC2894-RR-v icmpv6-RFC2894-RR.pcap icmpv6-RFC2894-RR-v.out -v
icmpv6-ni-flags icmpv6-ni-flags.pcap icmpv6-ni-flags.out
icmpv6-ns-nonce-v0 icmpv6-ns-nonce.pcap icmpv6-ns-nonce-v0.out
icmpv6-ns-nonce-v1 icmpv6-ns-nonce.pcap icmpv6-ns-nonce-v1.out -v
icmpv6-ns-nonce-v2 icmpv6-ns-nonce.pcap icmpv6-ns-nonce-v2.out -vv

# SPB tests
spb spb.pcap spb.out
Expand Down
1 change: 1 addition & 0 deletions tests/icmpv6-ns-nonce-v0.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1 11:07:31.663323 IP6 :: > ff02::1:ffe1:f: ICMP6, neighbor solicitation, who has fe80::546f:f7ff:fee1:f, length 32
2 changes: 2 additions & 0 deletions tests/icmpv6-ns-nonce-v1.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
1 11:07:31.663323 IP6 (hlim 255, next-header ICMPv6 (58) payload length: 32) :: > ff02::1:ffe1:f: [icmp6 sum ok] ICMP6, neighbor solicitation, length 32, who has fe80::546f:f7ff:fee1:f
nonce option (14), length 8 (1): 0x6069604c0aaa
3 changes: 3 additions & 0 deletions tests/icmpv6-ns-nonce-v2.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
1 11:07:31.663323 IP6 (hlim 255, next-header ICMPv6 (58) payload length: 32) :: > ff02::1:ffe1:f: [icmp6 sum ok] ICMP6, neighbor solicitation, length 32, who has fe80::546f:f7ff:fee1:f
nonce option (14), length 8 (1): 0x6069604c0aaa
0x0000: 6069 604c 0aaa
Binary file added tests/icmpv6-ns-nonce.pcap
View file
Open in desktop
Binary file not shown.