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-mesh.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-mesh.c')
| -rw-r--r-- | epan/dissectors/packet-mesh.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-mesh.c b/epan/dissectors/packet-mesh.c index c9100744..e6def1d2 100644 --- a/epan/dissectors/packet-mesh.c +++ b/epan/dissectors/packet-mesh.c @@ -17,12 +17,12 @@ void proto_register_mesh(void); /* Initialize the protocol and registered fields */ -static int proto_mesh = -1; -static int hf_mesh_ttl = -1; -static int hf_mesh_e2eseq = -1; +static int proto_mesh; +static int hf_mesh_ttl; +static int hf_mesh_e2eseq; /* Initialize the subtree pointers */ -static gint ett_mesh = -1; +static int ett_mesh; /* Code to actually dissect the packets */ static int @@ -31,8 +31,8 @@ dissect_mesh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ /* Set up structures needed to add the protocol subtree and manage it */ proto_item *ti; proto_tree *mesh_tree; - guint8 mesh_ttl; - guint16 mesh_e2eseq; + uint8_t mesh_ttl; + uint16_t mesh_e2eseq; /* Make entries in Protocol column and Info column on summary display */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "Mesh"); @@ -42,7 +42,7 @@ dissect_mesh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ mesh_tree = proto_item_add_subtree(ti, ett_mesh); /* add an item to the subtree, see section 1.6 for more information */ - mesh_ttl = tvb_get_guint8(tvb, 2); + mesh_ttl = tvb_get_uint8(tvb, 2); proto_tree_add_uint(mesh_tree, hf_mesh_ttl, tvb, 2, 1, mesh_ttl); mesh_e2eseq = tvb_get_ntohs(tvb, 3); @@ -75,7 +75,7 @@ proto_register_mesh(void) }; /* Setup protocol subtree array */ - static gint *ett[] = { + static int *ett[] = { &ett_mesh }; |