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-ndp.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-ndp.c')
| -rw-r--r-- | epan/dissectors/packet-ndp.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/epan/dissectors/packet-ndp.c b/epan/dissectors/packet-ndp.c index dff04c41..fea47d16 100644 --- a/epan/dissectors/packet-ndp.c +++ b/epan/dissectors/packet-ndp.c @@ -243,15 +243,15 @@ static const value_string ndp_state_val[] = #define NDP_STATE 9 #define NDP_NUMBER_OF_LINKS 10 -static int proto_ndp = -1; -static int hf_ndp_ip_address = -1; -static int hf_ndp_segment_identifier = -1; -static int hf_ndp_chassis_type = -1; -static int hf_ndp_backplane_type = -1; -static int hf_ndp_state = -1; -static int hf_ndp_number_of_links = -1; +static int proto_ndp; +static int hf_ndp_ip_address; +static int hf_ndp_segment_identifier; +static int hf_ndp_chassis_type; +static int hf_ndp_backplane_type; +static int hf_ndp_state; +static int hf_ndp_number_of_links; -static gint ett_ndp = -1; +static int ett_ndp; static dissector_handle_t ndp_handle; @@ -266,7 +266,7 @@ dissect_ndp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) hello_type = ""; if (pinfo->dl_dst.type == AT_ETHER) { - const guint8 *dstmac = (const guint8 *)pinfo->dl_dst.data; + const uint8_t *dstmac = (const uint8_t *)pinfo->dl_dst.data; switch (dstmac[5]) { @@ -346,7 +346,7 @@ proto_register_ndp(void) "Number of interconnect ports", HFILL }}, }; - static gint *ett[] = { + static int *ett[] = { &ett_ndp, }; proto_ndp = proto_register_protocol("Nortel Discovery Protocol", "NDP", "ndp"); |