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-isdn.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-isdn.c')
-rw-r--r-- | epan/dissectors/packet-isdn.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-isdn.c b/epan/dissectors/packet-isdn.c index c1344929..d92a5ef0 100644 --- a/epan/dissectors/packet-isdn.c +++ b/epan/dissectors/packet-isdn.c @@ -18,11 +18,11 @@ void proto_register_isdn(void); void proto_reg_handoff_isdn(void); -static int proto_isdn = -1; -static int hf_isdn_direction = -1; -static int hf_isdn_channel = -1; +static int proto_isdn; +static int hf_isdn_direction; +static int hf_isdn_channel; -static gint ett_isdn = -1; +static int ett_isdn; static dissector_handle_t isdn_handle; @@ -91,8 +91,8 @@ dissect_isdn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) struct isdn_phdr *isdn = (struct isdn_phdr *)data; proto_tree *isdn_tree; proto_item *ti; - static const guint8 v120_sabme[3] = { 0x08, 0x01, 0x7F }; - static const guint8 ppp[2] = { 0xFF, 0x03 }; + static const uint8_t v120_sabme[3] = { 0x08, 0x01, 0x7F }; + static const uint8_t ppp[2] = { 0xFF, 0x03 }; conversation_t *conv; col_set_str(pinfo->cinfo, COL_PROTOCOL, "ISDN"); @@ -212,7 +212,7 @@ proto_register_isdn(void) { "Channel", "isdn.channel", FT_UINT8, BASE_DEC, VALS(channel_vals), 0x0, NULL, HFILL }}, }; - static gint *ett[] = { + static int *ett[] = { &ett_isdn, }; module_t *isdn_module; @@ -226,7 +226,7 @@ proto_register_isdn(void) prefs_register_enum_preference(isdn_module, "dchannel_protocol", "D-channel protocol", "The protocol running on the D channel", - &dchannel_protocol, dchannel_protocol_options, FALSE); + &dchannel_protocol, dchannel_protocol_options, false); isdn_handle = register_dissector("isdn", dissect_isdn, proto_isdn); } |