diff options
Diffstat (limited to 'epan/dissectors/packet-tuxedo.c')
| -rw-r--r-- | epan/dissectors/packet-tuxedo.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/epan/dissectors/packet-tuxedo.c b/epan/dissectors/packet-tuxedo.c index 423f2619..cb98838b 100644 --- a/epan/dissectors/packet-tuxedo.c +++ b/epan/dissectors/packet-tuxedo.c @@ -18,11 +18,11 @@ void proto_register_tuxedo(void); void proto_reg_handoff_tuxedo(void); -static int proto_tuxedo = -1; -static int hf_tuxedo_magic = -1; -static int hf_tuxedo_opcode = -1; +static int proto_tuxedo; +static int hf_tuxedo_magic; +static int hf_tuxedo_opcode; -static gint ett_tuxedo = -1; +static int ett_tuxedo; static dissector_handle_t tuxedo_handle; @@ -91,8 +91,8 @@ dissect_tuxedo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ { proto_tree *tuxedoroot_tree = NULL; proto_item *ti; - guint32 magic; - guint32 opcode; + uint32_t magic; + uint32_t opcode; col_set_str(pinfo->cinfo, COL_PROTOCOL, "TUXEDO"); @@ -127,12 +127,12 @@ dissect_tuxedo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ return tvb_captured_length(tvb); } -static gboolean -dissect_tuxedo_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) +static bool +dissect_tuxedo_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { if (tvb_captured_length(tvb) >= 8) { - guint32 magic; + uint32_t magic; magic = tvb_get_ntohl(tvb, 0); if (magic == TUXEDO_MAGIC || magic == TUXEDO_SMAGIC) { @@ -142,10 +142,10 @@ dissect_tuxedo_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d conversation_set_dissector(conversation, tuxedo_handle); dissect_tuxedo(tvb, pinfo, tree, data); - return TRUE; + return true; } } - return FALSE; + return false; } void @@ -159,7 +159,7 @@ proto_register_tuxedo(void) { "Opcode", "tuxedo.opcode", FT_UINT32, BASE_HEX, VALS(tuxedo_opcode_vals), 0x0, "TUXEDO opcode", HFILL }} }; - static gint *ett[] = { + static int *ett[] = { &ett_tuxedo, }; |