diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2023-06-23 13:52:52 +0200 |
|---|---|---|
| committer | AndersBroman <a.broman58@gmail.com> | 2023-11-03 20:38:25 +0000 |
| commit | dac5a920abf0873a4f06f26905702ddc20a72d00 (patch) | |
| tree | 2d2200e0de5955182f7ac2f1c9094278d4ea61f3 | |
| parent | 82015a0a8898ff9690fb4a3886ce9373537ebc54 (diff) | |
coap/tls: Remove SSL_COMMON_LIST_T proto init
| -rw-r--r-- | epan/dissectors/packet-coap.h | 22 | ||||
| -rw-r--r-- | epan/dissectors/packet-tls-utils.h | 37 |
2 files changed, 8 insertions, 51 deletions
diff --git a/epan/dissectors/packet-coap.h b/epan/dissectors/packet-coap.h index b8843df55e..4462134609 100644 --- a/epan/dissectors/packet-coap.h +++ b/epan/dissectors/packet-coap.h @@ -116,14 +116,14 @@ typedef struct coap_common_dissect { int opt_object_security_kid_context; int opt_object_security_kid; - /* do not forget to update COAP_COMMON_LIST_T and COAP_COMMON_HF_LIST! */ + /* do not forget to update COAP_COMMON_HF_LIST! */ } hf; struct { gint payload; gint option; - /* do not forget to update COAP_COMMON_LIST_T and COAP_COMMON_ETT_LIST! */ + /* do not forget to update COAP_COMMON_ETT_LIST! */ } ett; struct { @@ -134,7 +134,7 @@ typedef struct coap_common_dissect { expert_field opt_length_bad; expert_field opt_object_security_bad; - /* do not forget to update COAP_COMMON_LIST_T and COAP_COMMON_EI_LIST! */ + /* do not forget to update COAP_COMMON_EI_LIST! */ } ei; } coap_common_dissect_t; @@ -147,21 +147,7 @@ extern value_string_ext coap_vals_code_ext; /* {{{ */ #define COAP_COMMON_LIST_T(name) \ -coap_common_dissect_t name = { \ - /* hf */ { \ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \ - -1, -1, -1, -1, -1, -1, \ - }, \ - /* ett */ { \ - -1, -1, \ - }, \ - /* ei */ { \ - EI_INIT, EI_INIT, EI_INIT, EI_INIT, EI_INIT, \ - }, \ -} +coap_common_dissect_t name; /* }}} */ /* {{{ */ diff --git a/epan/dissectors/packet-tls-utils.h b/epan/dissectors/packet-tls-utils.h index 78b8aad0d2..40420c852b 100644 --- a/epan/dissectors/packet-tls-utils.h +++ b/epan/dissectors/packet-tls-utils.h @@ -1111,7 +1111,7 @@ typedef struct ssl_common_dissect { gint hs_ext_alps_alpn_str_len; gint hs_ext_alps_settings; - /* do not forget to update SSL_COMMON_LIST_T and SSL_COMMON_HF_LIST! */ + /* do not forget to update SSL_COMMON_HF_LIST! */ } hf; struct { gint hs_ext; @@ -1152,7 +1152,7 @@ typedef struct ssl_common_dissect { gint ech_hpke_cipher_suite; gint hs_ext_token_binding_key_parameters; - /* do not forget to update SSL_COMMON_LIST_T and SSL_COMMON_ETT_LIST! */ + /* do not forget to update SSL_COMMON_ETT_LIST! */ } ett; struct { /* Generic expert info for malformed packets. */ @@ -1168,7 +1168,7 @@ typedef struct ssl_common_dissect { expert_field ech_echconfig_invalid_version; - /* do not forget to update SSL_COMMON_LIST_T and SSL_COMMON_EI_LIST! */ + /* do not forget to update SSL_COMMON_EI_LIST! */ } ei; } ssl_common_dissect_t; @@ -1342,36 +1342,7 @@ ssl_dissect_hnd_compress_certificate(ssl_common_dissect_t *hf, tvbuff_t *tvb, pr gboolean is_from_server _U_, gboolean is_dtls _U_); /* {{{ */ #define SSL_COMMON_LIST_T(name) \ -ssl_common_dissect_t name = { \ - /* hf */ { \ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 \ - }, \ - /* ett */ { \ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \ - -1, -1, -1, -1, -1 \ - }, \ - /* ei */ { \ - EI_INIT, EI_INIT, EI_INIT, EI_INIT, EI_INIT, EI_INIT, EI_INIT, \ - EI_INIT, EI_INIT \ - }, \ -} +ssl_common_dissect_t name; /* }}} */ /* {{{ */ |