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-hci_h4.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-hci_h4.c')
| -rw-r--r-- | epan/dissectors/packet-hci_h4.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/epan/dissectors/packet-hci_h4.c b/epan/dissectors/packet-hci_h4.c index c35e08b3..5cd02405 100644 --- a/epan/dissectors/packet-hci_h4.c +++ b/epan/dissectors/packet-hci_h4.c @@ -20,11 +20,11 @@ #include <wiretap/wtap.h> #include "packet-bluetooth.h" -static int proto_hci_h4 = -1; -static int hf_hci_h4_type = -1; -static int hf_hci_h4_direction = -1; +static int proto_hci_h4; +static int hf_hci_h4_type; +static int hf_hci_h4_direction; -static gint ett_hci_h4 = -1; +static int ett_hci_h4; static dissector_handle_t hci_h4_handle; @@ -48,10 +48,10 @@ static const value_string hci_h4_direction_vals[] = { void proto_register_hci_h4(void); void proto_reg_handoff_hci_h4(void); -static gint +static int dissect_hci_h4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { - guint8 type; + uint8_t type; tvbuff_t *next_tvb; proto_item *main_item; proto_tree *main_tree; @@ -64,11 +64,11 @@ dissect_hci_h4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) switch (pinfo->p2p_dir) { case P2P_DIR_SENT: - col_add_fstr(pinfo->cinfo, COL_INFO, "Sent "); + col_set_str(pinfo->cinfo, COL_INFO, "Sent "); break; case P2P_DIR_RECV: - col_add_fstr(pinfo->cinfo, COL_INFO, "Rcvd "); + col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; case P2P_DIR_UNKNOWN: @@ -80,7 +80,7 @@ dissect_hci_h4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) break; } - type = tvb_get_guint8(tvb, 0); + type = tvb_get_uint8(tvb, 0); main_item = proto_tree_add_item(tree, proto_hci_h4, tvb, 0, 1, ENC_NA); main_tree = proto_item_add_subtree(main_item, ett_hci_h4); @@ -94,7 +94,7 @@ dissect_hci_h4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) val_to_str(type, hci_h4_type_vals, "Unknown HCI packet type 0x%02x")); next_tvb = tvb_new_subset_remaining(tvb, 1); - if (!dissector_try_uint_new(hci_h4_table, type, next_tvb, pinfo, tree, TRUE, bluetooth_data)) { + if (!dissector_try_uint_new(hci_h4_table, type, next_tvb, pinfo, tree, true, bluetooth_data)) { call_data_dissector(next_tvb, pinfo, tree); } @@ -118,7 +118,7 @@ proto_register_hci_h4(void) } }; - static gint *ett[] = { + static int *ett[] = { &ett_hci_h4, }; |