From 1e173590ef999f110f90112573f5c590088165b0 Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Wed, 28 Mar 2018 10:38:06 +0200 Subject: proto: permit icmp-in-ipv6 and icmpv6-in-ipv4 Jozsef points out that meta l4proto icmp icmp type destination-unreachable is hard to read. So, lets just add icmp/icmpv6 to ip/ip6 protocol base so users can just go with icmp type destination-unreachable and let nft fill in needed dependency. After this patch, the recent patch to not remove the dependency can be reverted again. Suggested-by: Pablo Neira Ayuso Signed-off-by: Florian Westphal --- src/proto.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/proto.c') diff --git a/src/proto.c b/src/proto.c index a54090a3..8cf29d20 100644 --- a/src/proto.c +++ b/src/proto.c @@ -591,6 +591,7 @@ const struct proto_desc proto_ip = { .checksum_key = IPHDR_CHECKSUM, .protocols = { PROTO_LINK(IPPROTO_ICMP, &proto_icmp), + PROTO_LINK(IPPROTO_ICMPV6, &proto_icmp6), PROTO_LINK(IPPROTO_ESP, &proto_esp), PROTO_LINK(IPPROTO_AH, &proto_ah), PROTO_LINK(IPPROTO_COMP, &proto_comp), @@ -718,6 +719,7 @@ const struct proto_desc proto_ip6 = { PROTO_LINK(IPPROTO_TCP, &proto_tcp), PROTO_LINK(IPPROTO_DCCP, &proto_dccp), PROTO_LINK(IPPROTO_SCTP, &proto_sctp), + PROTO_LINK(IPPROTO_ICMP, &proto_icmp), PROTO_LINK(IPPROTO_ICMPV6, &proto_icmp6), }, .templates = { -- cgit v1.2.3