diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
| commit | a86c5f7cae7ec9a3398300555a0b644689d946a1 (patch) | |
| tree | 39fe4b107c71174fd1e8a8ceb9a4d2aa14116248 /epan/dissectors/packet-nsh.c | |
| parent | Releasing progress-linux version 4.2.6-1~progress7.99u1. (diff) | |
| download | wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.tar.xz wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.zip | |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/dissectors/packet-nsh.c')
| -rw-r--r-- | epan/dissectors/packet-nsh.c | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/epan/dissectors/packet-nsh.c b/epan/dissectors/packet-nsh.c index 21f63378..43d6a0ae 100644 --- a/epan/dissectors/packet-nsh.c +++ b/epan/dissectors/packet-nsh.c @@ -48,26 +48,26 @@ static const value_string nsh_next_protocols[] = { }; -static int proto_nsh = -1; -static int hf_nsh_version = -1; -static int hf_nsh_oam = -1; -static int hf_nsh_critical_metadata = -1; -static int hf_nsh_ttl = -1; -static int hf_nsh_length = -1; -static int hf_nsh_md_type = -1; -static int hf_nsh_next_proto = -1; -static int hf_nsh_service_pathID = -1; -static int hf_nsh_service_index = -1; -static int hf_nsh_context_header = -1; -static int hf_nsh_metadata_class = -1; -static int hf_nsh_metadata_type = -1; -static int hf_nsh_metadata_unassignedbit = -1; -static int hf_nsh_metadata_length = -1; -static int hf_nsh_metadata = -1; - -static expert_field ei_nsh_length_invalid = EI_INIT; - -static gint ett_nsh = -1; +static int proto_nsh; +static int hf_nsh_version; +static int hf_nsh_oam; +static int hf_nsh_critical_metadata; +static int hf_nsh_ttl; +static int hf_nsh_length; +static int hf_nsh_md_type; +static int hf_nsh_next_proto; +static int hf_nsh_service_pathID; +static int hf_nsh_service_index; +static int hf_nsh_context_header; +static int hf_nsh_metadata_class; +static int hf_nsh_metadata_type; +static int hf_nsh_metadata_unassignedbit; +static int hf_nsh_metadata_length; +static int hf_nsh_metadata; + +static expert_field ei_nsh_length_invalid; + +static int ett_nsh; static dissector_table_t subdissector_table; @@ -93,7 +93,7 @@ static void dissect_nsh_md_type_2(tvbuff_t *tvb, proto_tree *nsh_tree, int offset, int nsh_bytes_len) { - guint32 type2_metadata_len = 0; + uint32_t type2_metadata_len = 0; int pad_len; while (offset < nsh_bytes_len) { @@ -130,7 +130,7 @@ dissect_nsh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) int offset = 0; int md_type = -1; - guint32 nsh_bytes_len; + uint32_t nsh_bytes_len; int nsh_next_proto = -1; proto_item *length_pi; tvbuff_t *next_tvb; @@ -158,10 +158,10 @@ dissect_nsh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) proto_item_set_len(ti, nsh_bytes_len); - md_type = tvb_get_guint8(tvb, offset + 2); + md_type = tvb_get_uint8(tvb, offset + 2); proto_tree_add_item(nsh_tree, hf_nsh_md_type, tvb, offset + 2, 1, ENC_BIG_ENDIAN); - nsh_next_proto = tvb_get_guint8(tvb, offset + 3); + nsh_next_proto = tvb_get_uint8(tvb, offset + 3); proto_tree_add_item(nsh_tree, hf_nsh_next_proto, tvb, offset + 3, 1, ENC_BIG_ENDIAN); /*NSH Service Path Header */ @@ -338,7 +338,7 @@ proto_register_nsh(void) }; - static gint *ett[] = { + static int *ett[] = { &ett_nsh, }; |