diff options
| author | Florian Westphal <fw@strlen.de> | 2020-11-23 00:30:17 +0100 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2020-12-09 18:33:53 +0100 |
| commit | bd0d2f4038ba1ac9db4653a4f632553db83db3b0 (patch) | |
| tree | c2851906d96b0fdb5e027eaee4e741cd572a0604 | |
| parent | fd314278115255ccee23ab6cffb2b0a033238fbb (diff) | |
exthdr: remove unused proto_key member from struct
also, no need for this struct to be in the parser.
Signed-off-by: Florian Westphal <fw@strlen.de>
| -rw-r--r-- | include/exthdr.h | 1 | ||||
| -rw-r--r-- | src/exthdr.c | 4 | ||||
| -rw-r--r-- | src/parser_bison.y | 1 |
3 files changed, 0 insertions, 6 deletions
diff --git a/include/exthdr.h b/include/exthdr.h index c9a3c211..1bc756f9 100644 --- a/include/exthdr.h +++ b/include/exthdr.h @@ -30,7 +30,6 @@ struct exthdr_desc { const char *name; enum exthdr_desc_id id; uint8_t type; - int proto_key; struct proto_hdr_template templates[10]; }; diff --git a/src/exthdr.c b/src/exthdr.c index 5eb66529..b0243ada 100644 --- a/src/exthdr.c +++ b/src/exthdr.c @@ -409,7 +409,6 @@ const struct exthdr_desc exthdr_rt2 = { .name = "rt2", .id = EXTHDR_DESC_RT2, .type = IPPROTO_ROUTING, - .proto_key = 2, .templates = { [RT2HDR_RESERVED] = {}, [RT2HDR_ADDR] = {}, @@ -423,7 +422,6 @@ const struct exthdr_desc exthdr_rt0 = { .name = "rt0", .id = EXTHDR_DESC_RT0, .type = IPPROTO_ROUTING, - .proto_key = 0, .templates = { [RT0HDR_RESERVED] = RT0_FIELD("reserved", ip6r0_reserved, &integer_type), [RT0HDR_ADDR_1] = RT0_FIELD("addr[1]", ip6r0_addr[0], &ip6addr_type), @@ -439,7 +437,6 @@ const struct exthdr_desc exthdr_rt4 = { .name = "srh", .id = EXTHDR_DESC_SRH, .type = IPPROTO_ROUTING, - .proto_key = 4, .templates = { [RT4HDR_LASTENT] = RT4_FIELD("last-entry", ip6r4_last_entry, &integer_type), [RT4HDR_FLAGS] = RT4_FIELD("flags", ip6r4_flags, &integer_type), @@ -458,7 +455,6 @@ const struct exthdr_desc exthdr_rt = { .name = "rt", .id = EXTHDR_DESC_RT, .type = IPPROTO_ROUTING, - .proto_key = -1, #if 0 .protocol_key = RTHDR_TYPE, .protocols = { diff --git a/src/parser_bison.y b/src/parser_bison.y index e8aa5bb8..08aadaa3 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -184,7 +184,6 @@ int nft_lex(void *, void *, void *); struct handle_spec handle_spec; struct position_spec position_spec; struct prio_spec prio_spec; - const struct exthdr_desc *exthdr_desc; } %token TOKEN_EOF 0 "end of file" |