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-rfid-felica.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 '')
| -rw-r--r-- | epan/dissectors/packet-rfid-felica.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/epan/dissectors/packet-rfid-felica.c b/epan/dissectors/packet-rfid-felica.c index 86e2de96..c5094b34 100644 --- a/epan/dissectors/packet-rfid-felica.c +++ b/epan/dissectors/packet-rfid-felica.c @@ -25,40 +25,40 @@ void proto_register_felica(void); -static int proto_felica = -1; +static int proto_felica; /* Opcodes */ -static int hf_felica_opcode = -1; +static int hf_felica_opcode; /* System Code */ -static int hf_felica_sys_code = -1; +static int hf_felica_sys_code; /* Timeslot */ -static int hf_felica_timeslot = -1; +static int hf_felica_timeslot; /* Manufacture ID/NFCID2 */ -static int hf_felica_idm = -1; +static int hf_felica_idm; /* Request Code */ -static int hf_felica_req_code = -1; +static int hf_felica_req_code; /* Manufacture Parameter/PAD */ -static int hf_felica_pnm = -1; +static int hf_felica_pnm; /* Number of Services */ -static int hf_felica_nbr_of_svcs = -1; +static int hf_felica_nbr_of_svcs; -static int hf_felica_svc_code = -1; +static int hf_felica_svc_code; -static int hf_felica_nbr_of_blocks = -1; -static int hf_felica_block_nbr = -1; +static int hf_felica_nbr_of_blocks; +static int hf_felica_block_nbr; /* Status flag 1 */ -static int hf_felica_status_flag1 = -1; +static int hf_felica_status_flag1; /* Status flag 2 */ -static int hf_felica_status_flag2 = -1; +static int hf_felica_status_flag2; /* - Commands - */ #define CMD_POLLING 0x00 @@ -205,14 +205,14 @@ static const value_string felica_sys_codes[] = { }; /* Subtree handles: set by register_subtree_array */ -static gint ett_felica = -1; +static int ett_felica; static int dissect_felica(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_item *item; proto_tree *felica_tree; - guint8 opcode; - guint8 rwe_pos = 0; + uint8_t opcode; + uint8_t rwe_pos = 0; tvbuff_t *rwe_resp_data_tvb; col_set_str(pinfo->cinfo, COL_PROTOCOL, "FeliCa"); @@ -221,7 +221,7 @@ static int dissect_felica(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v item = proto_tree_add_item(tree, proto_felica, tvb, 0, -1, ENC_NA); felica_tree = proto_item_add_subtree(item, ett_felica); - opcode = tvb_get_guint8(tvb, 0); + opcode = tvb_get_uint8(tvb, 0); col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(opcode, felica_opcodes, "Unknown")); @@ -283,7 +283,7 @@ static int dissect_felica(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v proto_tree_add_item(felica_tree, hf_felica_nbr_of_blocks, tvb, 12, 1, ENC_BIG_ENDIAN); /* Iterate through the block list, and update the tree */ - for (rwe_pos = 0; rwe_pos < tvb_get_guint8(tvb, 12); rwe_pos++) { + for (rwe_pos = 0; rwe_pos < tvb_get_uint8(tvb, 12); rwe_pos++) { proto_tree_add_item(felica_tree, hf_felica_block_nbr, tvb, 13 + 2 * rwe_pos, 2, ENC_NA); } @@ -523,7 +523,7 @@ proto_register_felica(void) } }; - static gint *ett[] = { + static int *ett[] = { &ett_felica }; |