aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-manolito.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-manolito.c')
-rw-r--r--epan/dissectors/packet-manolito.c35
1 files changed, 18 insertions, 17 deletions
diff --git a/epan/dissectors/packet-manolito.c b/epan/dissectors/packet-manolito.c
index 20c730c64b..f000feb4a6 100644
--- a/epan/dissectors/packet-manolito.c
+++ b/epan/dissectors/packet-manolito.c
@@ -19,22 +19,24 @@
void proto_register_manolito(void);
void proto_reg_handoff_manolito(void);
+static dissector_handle_t manolito_handle;
+
#define MANOLITO_PORT 41170 /* Not IANA registered */
-static int proto_manolito = -1;
+static int proto_manolito;
-static int hf_manolito_checksum = -1;
-static int hf_manolito_seqno = -1;
-static int hf_manolito_src = -1;
-static int hf_manolito_dest = -1;
-static int hf_manolito_options_short = -1;
-static int hf_manolito_options = -1;
-static int hf_manolito_string = -1;
-static int hf_manolito_integer = -1;
+static int hf_manolito_checksum;
+static int hf_manolito_seqno;
+static int hf_manolito_src;
+static int hf_manolito_dest;
+static int hf_manolito_options_short;
+static int hf_manolito_options;
+static int hf_manolito_string;
+static int hf_manolito_integer;
-static gint ett_manolito = -1;
+static gint ett_manolito;
-static expert_field ei_manolito_type = EI_INIT;
+static expert_field ei_manolito_type;
#define MANOLITO_STRING 1
#define MANOLITO_INTEGER 0
@@ -157,7 +159,7 @@ dissect_manolito(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* diss
proto_tree_add_string_format(manolito_tree, hf_manolito_string, tvb, start,
4+length, str, "%s (%s): %s",
field_name_str,
- val_to_str_ext(field_name, &field_longname_ext, "unknown"),
+ val_to_str_ext_const(field_name, &field_longname_ext, "unknown"),
str);
offset += length;
}
@@ -190,9 +192,9 @@ dissect_manolito(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* diss
if (len_ok) {
proto_tree_add_uint64_format(manolito_tree, hf_manolito_integer, tvb, start,
- 4+length, n, "%s (%s): %" G_GINT64_MODIFIER "u",
+ 4+length, n, "%s (%s): %" PRIu64,
field_name_str,
- val_to_str_ext(field_name, &field_longname_ext, "unknown"),
+ val_to_str_ext_const(field_name, &field_longname_ext, "unknown"),
n);
}
else {
@@ -276,15 +278,14 @@ proto_register_manolito(void)
proto_register_subtree_array(ett, array_length(ett));
expert_manolito = expert_register_protocol(proto_manolito);
expert_register_field_array(expert_manolito, ei, array_length(ei));
+
+ manolito_handle = register_dissector("manolito", dissect_manolito, proto_manolito);
}
void
proto_reg_handoff_manolito(void)
{
- dissector_handle_t manolito_handle;
-
- manolito_handle = create_dissector_handle(dissect_manolito, proto_manolito);
dissector_add_uint_with_preference("udp.port", MANOLITO_PORT, manolito_handle);
}