src: disentangle ICMP code types
Pablo Neira Ayuso
maintainerPATCH 1/1 src: disentangle ICMP code types
Currently, ICMP{v4,v6,inet} code datatypes only describe those that are supported by the reject statement, but they can also be used for icmp code matching. Moreover, ICMP code types go hand-to-hand with ICMP types, that is, ICMP code symbols depend on the ICMP type.
Thus, the output of:
nft describe icmp_code
look confusing because that only displays the values that are supported by the reject statement.
Disentangle this by adding internal datatypes for the reject statement to handle the ICMP code symbol conversion to value as well as ruleset listing.
The existing icmp_code, icmpv6_code and icmpx_code remain in place. For backward compatibility, a parser function is defined in case an existing ruleset relies on these symbols.
As for the manpage, move existing ICMP code tables from the DATA TYPES section to the REJECT STATEMENT section, where this really belongs to. But the icmp_code and icmpv6_code table stubs remain in the DATA TYPES section because that describe that this is an 8-bit integer field.
After this patch:
# nft describe icmp_code datatype icmp_code (icmp code) (basetype integer), 8 bits # nft describe icmpv6_code datatype icmpv6_code (icmpv6 code) (basetype integer), 8 bits # nft describe icmpx_code datatype icmpx_code (icmpx code) (basetype integer), 8 bits
do not display the symbol table of the reject statement anymore.
icmpx_code_type is not used anymore, but keep it in place for backward compatibility reasons.
--- doc/data-types.txt | 68 ----------------------------------- doc/statements.txt | 74 ++++++++++++++++++++++++++++++--------- include/datatype.h | 5 +++ src/datatype.c | 71 +++++++++++++++++++++++++++++++++---- src/netlink_delinearize.c | 10 +++--- src/parser_bison.y | 12 +++---- src/parser_json.c | 6 ++-- tests/py/ip/icmp.t | 6 ++-- tests/py/ip6/icmpv6.t | 8 ++--- 9 files changed, 147 insertions(+), 113 deletions(-)
doc/data-types.txt +0 -68
@@ -242,28 +242,6 @@ integer The ICMP Code type is used to conveniently specify the ICMP header's code field. -.Keywords may be used when specifying the ICMP code -[options="header"] -|================== -|Keyword | Value -|net-unreachable | -0 -|host-unreachable | -1 -|prot-unreachable| -2 -|port-unreachable| -3 -|frag-needed| -4 -|net-prohibited| -9 -|host-prohibited| -10 -|admin-prohibited| -13 -|=================== - ICMPV6 TYPE TYPE ~~~~~~~~~~~~~~~~ [options="header"]
@@ -340,52 +318,6 @@ integer The ICMPv6 Code type is used to conveniently specify the ICMPv6 header's code field. -.keywords may be used when specifying the ICMPv6 code -[options="header"] -|================== -|Keyword |Value -|no-route| -0 -|admin-prohibited| -1 -|addr-unreachable| -3 -|port-unreachable| -4 -|policy-fail| -5 -|reject-route| -6 -|================== - -ICMPVX CODE TYPE -~~~~~~~~~~~~~~~~ -[options="header"] -|================== -|Name | Keyword | Size | Base type -|ICMPvX Code | -icmpx_code | -8 bit | -integer -|=================== - -The ICMPvX Code type abstraction is a set of values which overlap between ICMP -and ICMPv6 Code types to be used from the inet family. - -.keywords may be used when specifying the ICMPvX code -[options="header"] -|================== -|Keyword |Value -|no-route| -0 -|port-unreachable| -1 -|host-unreachable| -2 -|admin-prohibited| -3 -|================= - CONNTRACK TYPES ~~~~~~~~~~~~~~~
doc/statements.txt +57 -17
90 lines not on this page · raw message
include/datatype.h +5 -0
@@ -283,6 +283,11 @@ extern const struct datatype priority_type;extern const struct datatype policy_type;extern const struct datatype cgroupv2_type; +/* private datatypes for reject statement. */ +extern const struct datatype reject_icmp_code_type; +extern const struct datatype reject_icmpv6_code_type; +extern const struct datatype reject_icmpx_code_type; +void inet_service_type_print (const struct expr *expr,struct output_ctx *octx);extern const struct datatype *concat_type_alloc (uint32_t type);
src/datatype.c +64 -7
115 lines not on this page · raw message
src/netlink_delinearize.c +5 -5
@@ -2948,7 +2948,7 @@ static void stmt_reject_postprocess(struct rule_pp_ctx *rctx)switch (dl->pctx.family) {case NFPROTO_IPV4 : stmt->reject.family = dl->pctx.family; -datatype_set (stmt->reject.expr, &icmp_code_type); +datatype_set (stmt->reject.expr, &reject_icmp_code_type);if (stmt->reject.type ==NFT_REJECT_TCP_RST &&payload_dependency_exists (&dl->pdctx,PROTO_BASE_TRANSPORT_HDR ))
@@ -2957,7 +2957,7 @@ static void stmt_reject_postprocess(struct rule_pp_ctx *rctx)break ;case NFPROTO_IPV6 : stmt->reject.family = dl->pctx.family; -datatype_set (stmt->reject.expr, &icmpv6_code_type); +datatype_set (stmt->reject.expr, &reject_icmpv6_code_type);if (stmt->reject.type ==NFT_REJECT_TCP_RST &&payload_dependency_exists (&dl->pdctx,PROTO_BASE_TRANSPORT_HDR ))
@@ -2968,7 +2968,7 @@ static void stmt_reject_postprocess(struct rule_pp_ctx *rctx)case NFPROTO_BRIDGE :case NFPROTO_NETDEV :if (stmt->reject.type ==NFT_REJECT_ICMPX_UNREACH ) { -datatype_set (stmt->reject.expr, &icmpx_code_type); +datatype_set (stmt->reject.expr, &reject_icmpx_code_type);break ; }
@@ -2984,12 +2984,12 @@ static void stmt_reject_postprocess(struct rule_pp_ctx *rctx)case NFPROTO_IPV4 :/* INET */ case __constant_htons (ETH_P_IP ):/* BRIDGE, NETDEV */ stmt->reject.family =NFPROTO_IPV4 ; -datatype_set (stmt->reject.expr, &icmp_code_type); +datatype_set (stmt->reject.expr, &reject_icmp_code_type);break ;case NFPROTO_IPV6 :/* INET */ case __constant_htons (ETH_P_IPV6 ):/* BRIDGE, NETDEV */ stmt->reject.family =NFPROTO_IPV6 ; -datatype_set (stmt->reject.expr, &icmpv6_code_type); +datatype_set (stmt->reject.expr, &reject_icmpv6_code_type);break ;default :break ;
src/parser_bison.y +6 -6
@@ -3740,40 +3740,40 @@ reject_opts : /* empty */ $<stmt>0->reject.family = NFPROTO_IPV4; $<stmt>0->reject.type = NFT_REJECT_ICMP_UNREACH; $<stmt>0->reject.expr = $4; - datatype_set($<stmt>0->reject.expr, &icmp_code_type); + datatype_set($<stmt>0->reject.expr, &reject_icmp_code_type); } | WITH ICMP reject_with_expr { $<stmt>0->reject.family = NFPROTO_IPV4; $<stmt>0->reject.type = NFT_REJECT_ICMP_UNREACH; $<stmt>0->reject.expr = $3; - datatype_set($<stmt>0->reject.expr, &icmp_code_type); + datatype_set($<stmt>0->reject.expr, &reject_icmp_code_type); } | WITH ICMP6 TYPE reject_with_expr close_scope_type close_scope_icmp { $<stmt>0->reject.family = NFPROTO_IPV6; $<stmt>0->reject.type = NFT_REJECT_ICMP_UNREACH; $<stmt>0->reject.expr = $4; - datatype_set($<stmt>0->reject.expr, &icmpv6_code_type); + datatype_set($<stmt>0->reject.expr, &reject_icmpv6_code_type); } | WITH ICMP6 reject_with_expr { $<stmt>0->reject.family = NFPROTO_IPV6; $<stmt>0->reject.type = NFT_REJECT_ICMP_UNREACH; $<stmt>0->reject.expr = $3; - datatype_set($<stmt>0->reject.expr, &icmpv6_code_type); + datatype_set($<stmt>0->reject.expr, &reject_icmpv6_code_type); } | WITH ICMPX TYPE reject_with_expr close_scope_type { $<stmt>0->reject.type = NFT_REJECT_ICMPX_UNREACH; $<stmt>0->reject.expr = $4; - datatype_set($<stmt>0->reject.expr, &icmpx_code_type); + datatype_set($<stmt>0->reject.expr, &reject_icmpx_code_type); } | WITH ICMPX reject_with_expr { $<stmt>0->reject.type = NFT_REJECT_ICMPX_UNREACH; $<stmt>0->reject.expr = $3; - datatype_set($<stmt>0->reject.expr, &icmpx_code_type); + datatype_set($<stmt>0->reject.expr, &reject_icmpx_code_type); } | WITH TCP close_scope_tcp RESET close_scope_reset {
src/parser_json.c +3 -3
@@ -2331,17 +2331,17 @@ static struct stmt *json_parse_reject_stmt(struct json_ctx *ctx, stmt->reject.icmp_code =0 ; }else if (!strcmp (type,"icmpx" )) { stmt->reject.type =NFT_REJECT_ICMPX_UNREACH ; - dtype = &icmpx_code_type; + dtype = &reject_icmpx_code_type; stmt->reject.icmp_code =0 ; }else if (!strcmp (type,"icmp" )) { stmt->reject.type =NFT_REJECT_ICMP_UNREACH ; stmt->reject.family =NFPROTO_IPV4 ; - dtype = &icmp_code_type; + dtype = &reject_icmp_code_type; stmt->reject.icmp_code =0 ; }else if (!strcmp (type,"icmpv6" )) { stmt->reject.type =NFT_REJECT_ICMP_UNREACH ; stmt->reject.family =NFPROTO_IPV6 ; - dtype = &icmpv6_code_type; + dtype = &reject_icmpv6_code_type; stmt->reject.icmp_code =0 ; } }
tests/py/ip/icmp.t +3 -3
@@ -26,8 +26,8 @@ icmp code 111 accept;ok icmp code != 111 accept;ok icmp code 33-55;ok icmp code != 33-55;ok -icmp code { 2, 4, 54, 33, 56};ok;icmp code { prot-unreachable, frag-needed, 33, 54, 56} -icmp code != { prot-unreachable, frag-needed, 33, 54, 56};ok +icmp code { 2, 4, 54, 33, 56};ok +icmp code != { 2, 4, 33, 54, 56};ok icmp checksum 12343 accept;ok icmp checksum != 12343 accept;ok
@@ -73,5 +73,5 @@ icmp gateway != { 33, 55, 67, 88};ok icmp gateway != 34;ok icmp gateway != { 333, 334};ok -icmp code 1 icmp type 2;ok;icmp type 2 icmp code host-unreachable +icmp code 1 icmp type 2;ok;icmp type 2 icmp code 1 icmp code != 1 icmp type 2 icmp mtu 5;fail
tests/py/ip6/icmpv6.t +4 -4
@@ -28,10 +28,10 @@ icmpv6 type {router-renumbering, mld-listener-done, time-exceeded, nd-router-sol icmpv6 type {mld-listener-query, time-exceeded, nd-router-advert} accept;ok icmpv6 type != {mld-listener-query, time-exceeded, nd-router-advert} accept;ok -icmpv6 code 4;ok;icmpv6 code port-unreachable +icmpv6 code 4;ok icmpv6 code 3-66;ok -icmpv6 code {5, 6, 7} accept;ok;icmpv6 code {policy-fail, reject-route, 7} accept -icmpv6 code != {policy-fail, reject-route, 7} accept;ok +icmpv6 code {5, 6, 7} accept;ok +icmpv6 code != {5, 6, 7} accept;ok icmpv6 checksum 2222 log;ok icmpv6 checksum != 2222 log;ok
@@ -84,7 +84,7 @@ icmpv6 max-delay != 33-45;ok icmpv6 max-delay {33, 55, 67, 88};ok icmpv6 max-delay != {33, 55, 67, 88};ok -icmpv6 type parameter-problem icmpv6 code no-route;ok +icmpv6 type parameter-problem icmpv6 code 0;ok icmpv6 type mld-listener-query icmpv6 taddr 2001:db8::133;ok icmpv6 type nd-neighbor-solicit icmpv6 taddr 2001:db8::133;ok
Signature · 1 line
2.30.2