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-oicq.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-oicq.c')
| -rw-r--r-- | epan/dissectors/packet-oicq.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/epan/dissectors/packet-oicq.c b/epan/dissectors/packet-oicq.c index 6e192f01..b3a0353d 100644 --- a/epan/dissectors/packet-oicq.c +++ b/epan/dissectors/packet-oicq.c @@ -38,19 +38,19 @@ static dissector_handle_t oicq_handle; */ /* By default, but can be completely different */ -#define UDP_PORT_OICQ 8000 /* Not IANA regisrered */ +#define UDP_PORT_OICQ 8000 /* Not IANA registered */ -static int proto_oicq = -1; +static int proto_oicq; -static int hf_oicq_flag = -1; -static int hf_oicq_version = -1; -static int hf_oicq_command = -1; -static int hf_oicq_seq = -1; -static int hf_oicq_qqid = -1; -static int hf_oicq_data = -1; +static int hf_oicq_flag; +static int hf_oicq_version; +static int hf_oicq_command; +static int hf_oicq_seq; +static int hf_oicq_qqid; +static int hf_oicq_data; -static gint ett_oicq = -1; +static int ett_oicq; static const value_string oicq_flag_vals[] = { { 0x02, "Oicq packet" }, @@ -112,7 +112,7 @@ dissect_oicq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ /* heuristic: OICQ iff (([0] == STX) && ([3/4] == <valid_command>) ) */ /* (Supposedly each OICQ message ends with an ETX so a test for */ /* same could also be part of the heuristic). */ - if ( (try_val_to_str(tvb_get_guint8(tvb, 0), oicq_flag_vals) == NULL) || + if ( (try_val_to_str(tvb_get_uint8(tvb, 0), oicq_flag_vals) == NULL) || (try_val_to_str(tvb_get_ntohs(tvb, 3), oicq_command_vals) == NULL) ) return 0; @@ -172,7 +172,7 @@ proto_register_oicq(void) "Data", "oicq.data", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, }; - static gint *ett[] = { + static int *ett[] = { &ett_oicq, }; |