diff options
Diffstat (limited to 'epan/dissectors/packet-rpl.c')
| -rw-r--r-- | epan/dissectors/packet-rpl.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/epan/dissectors/packet-rpl.c b/epan/dissectors/packet-rpl.c index 66d4142a40..e76d601f59 100644 --- a/epan/dissectors/packet-rpl.c +++ b/epan/dissectors/packet-rpl.c @@ -43,21 +43,21 @@ static int hf_rpl_flags; static int hf_rpl_data; static int hf_rpl_ec; -static gint ett_rpl; -static gint ett_rpl_0004; -static gint ett_rpl_0008; -static gint ett_rpl_4003; -static gint ett_rpl_4006; -static gint ett_rpl_4007; -static gint ett_rpl_4009; -static gint ett_rpl_400a; -static gint ett_rpl_400b; -static gint ett_rpl_400c; -static gint ett_rpl_4011; -static gint ett_rpl_4018; -static gint ett_rpl_c005; -static gint ett_rpl_c014; -static gint ett_rpl_unkn; +static int ett_rpl; +static int ett_rpl_0004; +static int ett_rpl_0008; +static int ett_rpl_4003; +static int ett_rpl_4006; +static int ett_rpl_4007; +static int ett_rpl_4009; +static int ett_rpl_400a; +static int ett_rpl_400b; +static int ett_rpl_400c; +static int ett_rpl_4011; +static int ett_rpl_4018; +static int ett_rpl_c005; +static int ett_rpl_c014; +static int ett_rpl_unkn; static dissector_handle_t rpl_handle; @@ -83,13 +83,14 @@ static const value_string rpl_type_vals[] = { }; static void +// NOLINTNEXTLINE(misc-no-recursion) dissect_rpl_container(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - guint16 len, type, sublen, subtyp; + uint16_t len, type, sublen, subtyp; proto_tree *rpl_container_tree; - guint16 offset; - gint ett_type; - gint length, reported_length; + uint16_t offset; + int ett_type; + int length, reported_length; len = tvb_get_ntohs(tvb, 0); proto_tree_add_item(tree, hf_rpl_len, tvb, 0, 2, ENC_BIG_ENDIAN); @@ -248,7 +249,7 @@ dissect_rpl_container(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) static int dissect_rpl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint16 rpl_len, rpl_type; + uint16_t rpl_len, rpl_type; proto_item *ti; proto_tree *rpl_tree; tvbuff_t *next_tvb; @@ -365,7 +366,7 @@ proto_register_rpl(void) "RPL EC", HFILL }}, }; - static gint *ett[] = { + static int *ett[] = { &ett_rpl, &ett_rpl_0004, &ett_rpl_0008, @@ -383,8 +384,7 @@ proto_register_rpl(void) &ett_rpl_unkn }; - proto_rpl = proto_register_protocol("Remote Program Load", - "RPL", "rpl"); + proto_rpl = proto_register_protocol("Remote Program Load", "RPL", "rpl"); proto_register_field_array(proto_rpl, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); rpl_handle = register_dissector("rpl", dissect_rpl, proto_rpl); |