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-bctp.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-bctp.c')
| -rw-r--r-- | epan/dissectors/packet-bctp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-bctp.c b/epan/dissectors/packet-bctp.c index 07309826..7726927f 100644 --- a/epan/dissectors/packet-bctp.c +++ b/epan/dissectors/packet-bctp.c @@ -24,13 +24,13 @@ void proto_register_bctp(void); void proto_reg_handoff_bctp(void); -static int proto_bctp = -1; -static int hf_bctp_bvei = -1; -static int hf_bctp_bvi = -1; -static int hf_bctp_tpei = -1; -static int hf_bctp_tpi = -1; +static int proto_bctp; +static int hf_bctp_bvei; +static int hf_bctp_bvi; +static int hf_bctp_tpei; +static int hf_bctp_tpi; -static gint ett_bctp = -1; +static int ett_bctp; static dissector_table_t bctp_dissector_table; static dissector_handle_t text_handle; @@ -58,7 +58,7 @@ static int dissect_bctp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, voi proto_item* pi = proto_tree_add_item(tree, proto_bctp, tvb,0,2, ENC_NA); proto_tree* pt = proto_item_add_subtree(pi,ett_bctp); tvbuff_t* sub_tvb = tvb_new_subset_remaining(tvb, 2); - guint8 tpi = tvb_get_guint8(tvb,1) & 0x3f; + uint8_t tpi = tvb_get_uint8(tvb,1) & 0x3f; proto_tree_add_item(pt, hf_bctp_bvei, tvb,0,2, ENC_BIG_ENDIAN); proto_tree_add_item(pt, hf_bctp_bvi, tvb,0,2, ENC_BIG_ENDIAN); @@ -85,7 +85,7 @@ proto_register_bctp (void) {&hf_bctp_tpei, {"TPEI", "bctp.tpei", FT_UINT16, BASE_HEX, NULL, 0x0040, "Tunneled Protocol Error Indicator", HFILL }}, {&hf_bctp_tpi, {"TPI", "bctp.tpi", FT_UINT16, BASE_HEX, NULL, 0x003F, "Tunneled Protocol Indicator", HFILL }}, }; - static gint *ett[] = { + static int *ett[] = { &ett_bctp }; |