Merging upstream version 4.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 433 insertions, 430 deletions

diff --git a/epan/dissectors/packet-lisp.c b/epan/dissectors/packet-lisp.c
index 56f9a3ec..c9b23c87 100644
--- a/epan/dissectors/packet-lisp.c
+++ b/epan/dissectors/packet-lisp.c
@@ -127,298 +127,298 @@ void proto_reg_handoff_lisp(void);
 #define ELP_FLAG_S          0x0001
 
 /* Initialize the protocol and registered fields */
-static int proto_lisp = -1;
-static int hf_lisp_type = -1;
-static int hf_lisp_irc = -1;
-static int hf_lisp_records = -1;
-static int hf_lisp_nonce = -1;
-static int hf_lisp_keyid = -1;
-static int hf_lisp_authlen = -1;
-static int hf_lisp_auth = -1;
-static int hf_lisp_msrtr_keyid = -1;
-static int hf_lisp_msrtr_authlen = -1;
-static int hf_lisp_msrtr_auth = -1;
-static int hf_lisp_xtrid = -1;
-static int hf_lisp_siteid = -1;
+static int proto_lisp;
+static int hf_lisp_type;
+static int hf_lisp_irc;
+static int hf_lisp_records;
+static int hf_lisp_nonce;
+static int hf_lisp_keyid;
+static int hf_lisp_authlen;
+static int hf_lisp_auth;
+static int hf_lisp_msrtr_keyid;
+static int hf_lisp_msrtr_authlen;
+static int hf_lisp_msrtr_auth;
+static int hf_lisp_xtrid;
+static int hf_lisp_siteid;
 
 /* Map-Request fields */
-static int hf_lisp_mreq_flags = -1;
-static int hf_lisp_mreq_flags_auth = -1;
-static int hf_lisp_mreq_flags_mrp = -1;
-static int hf_lisp_mreq_flags_probe = -1;
-static int hf_lisp_mreq_flags_smr = -1;
-static int hf_lisp_mreq_flags_pitr = -1;
-static int hf_lisp_mreq_flags_smri = -1;
-static int hf_lisp_mreq_res = -1;
-static int hf_lisp_mreq_srceid_afi = -1;
-static int hf_lisp_mreq_srceid_string = -1;
-static int hf_lisp_mreq_srceid_ipv4 = -1;
-static int hf_lisp_mreq_srceid_ipv6 = -1;
-static int hf_lisp_mreq_srceid_mac = -1;
-static int hf_lisp_mreq_itr_rloc = -1;
-static int hf_lisp_mreq_itr_rloc_afi = -1;
-static int hf_lisp_mreq_itr_rloc_ipv4 = -1;
-static int hf_lisp_mreq_itr_rloc_ipv6 = -1;
-static int hf_lisp_mreq_record = -1;
-static int hf_lisp_mreq_record_res = -1;
-static int hf_lisp_mreq_record_prefix_length = -1;
-static int hf_lisp_mreq_record_prefix_afi = -1;
-static int hf_lisp_mreq_record_prefix_ipv4 = -1;
-static int hf_lisp_mreq_record_prefix_ipv6 = -1;
-static int hf_lisp_mreq_record_prefix_mac = -1;
-static int hf_lisp_mreq_record_prefix_dn = -1;
+static int hf_lisp_mreq_flags;
+static int hf_lisp_mreq_flags_auth;
+static int hf_lisp_mreq_flags_mrp;
+static int hf_lisp_mreq_flags_probe;
+static int hf_lisp_mreq_flags_smr;
+static int hf_lisp_mreq_flags_pitr;
+static int hf_lisp_mreq_flags_smri;
+static int hf_lisp_mreq_res;
+static int hf_lisp_mreq_srceid_afi;
+static int hf_lisp_mreq_srceid_string;
+static int hf_lisp_mreq_srceid_ipv4;
+static int hf_lisp_mreq_srceid_ipv6;
+static int hf_lisp_mreq_srceid_mac;
+static int hf_lisp_mreq_itr_rloc;
+static int hf_lisp_mreq_itr_rloc_afi;
+static int hf_lisp_mreq_itr_rloc_ipv4;
+static int hf_lisp_mreq_itr_rloc_ipv6;
+static int hf_lisp_mreq_record;
+static int hf_lisp_mreq_record_res;
+static int hf_lisp_mreq_record_prefix_length;
+static int hf_lisp_mreq_record_prefix_afi;
+static int hf_lisp_mreq_record_prefix_ipv4;
+static int hf_lisp_mreq_record_prefix_ipv6;
+static int hf_lisp_mreq_record_prefix_mac;
+static int hf_lisp_mreq_record_prefix_dn;
 
 /* Map-Reply fields */
-static int hf_lisp_mrep_record = -1;
-static int hf_lisp_mrep_flags_probe = -1;
-static int hf_lisp_mrep_flags_enlr = -1;
-static int hf_lisp_mrep_flags_sec = -1;
-static int hf_lisp_mrep_res = -1;
+static int hf_lisp_mrep_record;
+static int hf_lisp_mrep_flags_probe;
+static int hf_lisp_mrep_flags_enlr;
+static int hf_lisp_mrep_flags_sec;
+static int hf_lisp_mrep_res;
 
 /* Map-Register fields */
-static int hf_lisp_mreg_flags_pmr = -1;
-static int hf_lisp_mreg_flags_sec = -1;
-static int hf_lisp_mreg_flags_xtrid = -1;
-static int hf_lisp_mreg_flags_rtr = -1;
-static int hf_lisp_mreg_flags_wmn = -1;
-static int hf_lisp_mreg_res = -1;
+static int hf_lisp_mreg_flags_pmr;
+static int hf_lisp_mreg_flags_sec;
+static int hf_lisp_mreg_flags_xtrid;
+static int hf_lisp_mreg_flags_rtr;
+static int hf_lisp_mreg_flags_wmn;
+static int hf_lisp_mreg_res;
 
 /* Map-Notify fields */
-static int hf_lisp_mnot_flags_xtrid = -1;
-static int hf_lisp_mnot_flags_rtr = -1;
-static int hf_lisp_mnot_res = -1;
+static int hf_lisp_mnot_flags_xtrid;
+static int hf_lisp_mnot_flags_rtr;
+static int hf_lisp_mnot_res;
 
 /* Map-Referral fields */
-static int hf_lisp_mref_res = -1;
-static int hf_lisp_referral_sigcnt = -1;
-static int hf_lisp_referral_incomplete = -1;
+static int hf_lisp_mref_res;
+static int hf_lisp_referral_sigcnt;
+static int hf_lisp_referral_incomplete;
 
 /* Info fields */
-static int hf_lisp_info_r = -1;
-static int hf_lisp_info_res1 = -1;
-static int hf_lisp_info_ttl = -1;
-static int hf_lisp_info_res2 = -1;
-static int hf_lisp_info_prefix_masklen = -1;
-static int hf_lisp_info_prefix_afi = -1;
-static int hf_lisp_info_prefix_ipv4 = -1;
-static int hf_lisp_info_prefix_ipv6 = -1;
-static int hf_lisp_info_afi = -1;
+static int hf_lisp_info_r;
+static int hf_lisp_info_res1;
+static int hf_lisp_info_ttl;
+static int hf_lisp_info_res2;
+static int hf_lisp_info_prefix_masklen;
+static int hf_lisp_info_prefix_afi;
+static int hf_lisp_info_prefix_ipv4;
+static int hf_lisp_info_prefix_ipv6;
+static int hf_lisp_info_afi;
 
 /* Mapping record fields */
-static int hf_lisp_mapping = -1;
-static int hf_lisp_mapping_ttl = -1;
-static int hf_lisp_mapping_loccnt = -1;
-static int hf_lisp_mapping_eid_masklen = -1;
-static int hf_lisp_mapping_act = -1;
-static int hf_lisp_mapping_auth = -1;
-static int hf_lisp_mapping_res1 = -1;
-static int hf_lisp_mapping_res2 = -1;
-static int hf_lisp_mapping_ver = -1;
-static int hf_lisp_mapping_eid_afi = -1;
-static int hf_lisp_mapping_eid_ipv4 = -1;
-static int hf_lisp_mapping_eid_ipv6 = -1;
-static int hf_lisp_mapping_eid_mac = -1;
-static int hf_lisp_mapping_eid_dn = -1;
+static int hf_lisp_mapping;
+static int hf_lisp_mapping_ttl;
+static int hf_lisp_mapping_loccnt;
+static int hf_lisp_mapping_eid_masklen;
+static int hf_lisp_mapping_act;
+static int hf_lisp_mapping_auth;
+static int hf_lisp_mapping_res1;
+static int hf_lisp_mapping_res2;
+static int hf_lisp_mapping_ver;
+static int hf_lisp_mapping_eid_afi;
+static int hf_lisp_mapping_eid_ipv4;
+static int hf_lisp_mapping_eid_ipv6;
+static int hf_lisp_mapping_eid_mac;
+static int hf_lisp_mapping_eid_dn;
 
 /* Locator fields */
-static int hf_lisp_loc = -1;
-static int hf_lisp_loc_priority = -1;
-static int hf_lisp_loc_weight = -1;
-static int hf_lisp_loc_mpriority = -1;
-static int hf_lisp_loc_mweight = -1;
-static int hf_lisp_loc_flags = -1;
-static int hf_lisp_loc_flags_local = -1;
-static int hf_lisp_loc_flags_probe = -1;
-static int hf_lisp_loc_flags_reach = -1;
-static int hf_lisp_loc_flags_res = -1;
-static int hf_lisp_loc_afi = -1;
-static int hf_lisp_loc_locator = -1;
+static int hf_lisp_loc;
+static int hf_lisp_loc_priority;
+static int hf_lisp_loc_weight;
+static int hf_lisp_loc_mpriority;
+static int hf_lisp_loc_mweight;
+static int hf_lisp_loc_flags;
+static int hf_lisp_loc_flags_local;
+static int hf_lisp_loc_flags_probe;
+static int hf_lisp_loc_flags_reach;
+static int hf_lisp_loc_flags_res;
+static int hf_lisp_loc_afi;
+static int hf_lisp_loc_locator;
 
 /* LCAF fields */
-static int hf_lisp_lcaf = -1;
-static int hf_lisp_lcaf_header = -1;
-static int hf_lisp_lcaf_res1 = -1;
-static int hf_lisp_lcaf_flags = -1;
-static int hf_lisp_lcaf_type = -1;
-static int hf_lisp_lcaf_res2 = -1;
-static int hf_lisp_lcaf_length = -1;
+static int hf_lisp_lcaf;
+static int hf_lisp_lcaf_header;
+static int hf_lisp_lcaf_res1;
+static int hf_lisp_lcaf_flags;
+static int hf_lisp_lcaf_type;
+static int hf_lisp_lcaf_res2;
+static int hf_lisp_lcaf_length;
 
 /* LCAF AFI List fields */
-static int hf_lisp_lcaf_afi_list_item = -1;
-static int hf_lisp_lcaf_afi_list_afi = -1;
-static int hf_lisp_lcaf_afi_list_ipv4 = -1;
-static int hf_lisp_lcaf_afi_list_ipv6 = -1;
-static int hf_lisp_lcaf_afi_list_mac = -1;
-static int hf_lisp_lcaf_afi_list_dn = -1;
+static int hf_lisp_lcaf_afi_list_item;
+static int hf_lisp_lcaf_afi_list_afi;
+static int hf_lisp_lcaf_afi_list_ipv4;
+static int hf_lisp_lcaf_afi_list_ipv6;
+static int hf_lisp_lcaf_afi_list_mac;
+static int hf_lisp_lcaf_afi_list_dn;
 
 /* LCAF IID fields */
-static int hf_lisp_lcaf_iid = -1;
-static int hf_lisp_lcaf_iid_afi = -1;
-static int hf_lisp_lcaf_iid_ipv4 = -1;
-static int hf_lisp_lcaf_iid_ipv6 = -1;
-static int hf_lisp_lcaf_iid_mac = -1;
-static int hf_lisp_lcaf_iid_dn = -1;
+static int hf_lisp_lcaf_iid;
+static int hf_lisp_lcaf_iid_afi;
+static int hf_lisp_lcaf_iid_ipv4;
+static int hf_lisp_lcaf_iid_ipv6;
+static int hf_lisp_lcaf_iid_mac;
+static int hf_lisp_lcaf_iid_dn;
 
 /* LCAF ASN fields */
-static int hf_lisp_lcaf_asn = -1;
-static int hf_lisp_lcaf_asn_afi = -1;
-static int hf_lisp_lcaf_asn_ipv4 = -1;
-static int hf_lisp_lcaf_asn_ipv6 = -1;
-static int hf_lisp_lcaf_asn_mac = -1;
-static int hf_lisp_lcaf_asn_dn = -1;
+static int hf_lisp_lcaf_asn;
+static int hf_lisp_lcaf_asn_afi;
+static int hf_lisp_lcaf_asn_ipv4;
+static int hf_lisp_lcaf_asn_ipv6;
+static int hf_lisp_lcaf_asn_mac;
+static int hf_lisp_lcaf_asn_dn;
 
 /* LCAF Geo Coordinates fields */
-static int hf_lisp_lcaf_geo_lat = -1;
-static int hf_lisp_lcaf_geo_lat_hemisphere = -1;
-static int hf_lisp_lcaf_geo_lat_deg = -1;
-static int hf_lisp_lcaf_geo_lat_min = -1;
-static int hf_lisp_lcaf_geo_lat_sec = -1;
-static int hf_lisp_lcaf_geo_lon = -1;
-static int hf_lisp_lcaf_geo_lon_hemisphere = -1;
-static int hf_lisp_lcaf_geo_lon_deg = -1;
-static int hf_lisp_lcaf_geo_lon_min = -1;
-static int hf_lisp_lcaf_geo_lon_sec = -1;
-static int hf_lisp_lcaf_geo_alt = -1;
-static int hf_lisp_lcaf_geo_afi = -1;
-static int hf_lisp_lcaf_geo_ipv4 = -1;
-static int hf_lisp_lcaf_geo_ipv6 = -1;
-static int hf_lisp_lcaf_geo_mac = -1;
-static int hf_lisp_lcaf_geo_dn = -1;
+static int hf_lisp_lcaf_geo_lat;
+static int hf_lisp_lcaf_geo_lat_hemisphere;
+static int hf_lisp_lcaf_geo_lat_deg;
+static int hf_lisp_lcaf_geo_lat_min;
+static int hf_lisp_lcaf_geo_lat_sec;
+static int hf_lisp_lcaf_geo_lon;
+static int hf_lisp_lcaf_geo_lon_hemisphere;
+static int hf_lisp_lcaf_geo_lon_deg;
+static int hf_lisp_lcaf_geo_lon_min;
+static int hf_lisp_lcaf_geo_lon_sec;
+static int hf_lisp_lcaf_geo_alt;
+static int hf_lisp_lcaf_geo_afi;
+static int hf_lisp_lcaf_geo_ipv4;
+static int hf_lisp_lcaf_geo_ipv6;
+static int hf_lisp_lcaf_geo_mac;
+static int hf_lisp_lcaf_geo_dn;
 
 /* LCAF NATT fields */
-static int hf_lisp_lcaf_natt_msport = -1;
-static int hf_lisp_lcaf_natt_etrport = -1;
-static int hf_lisp_lcaf_natt_rloc = -1;
-static int hf_lisp_lcaf_natt_rloc_afi = -1;
-static int hf_lisp_lcaf_natt_rloc_ipv4 = -1;
-static int hf_lisp_lcaf_natt_rloc_ipv6 = -1;
+static int hf_lisp_lcaf_natt_msport;
+static int hf_lisp_lcaf_natt_etrport;
+static int hf_lisp_lcaf_natt_rloc;
+static int hf_lisp_lcaf_natt_rloc_afi;
+static int hf_lisp_lcaf_natt_rloc_ipv4;
+static int hf_lisp_lcaf_natt_rloc_ipv6;
 
 /* LCAF Nonce Locator fields */
-static int hf_lisp_lcaf_nonce_loc_res = -1;
-static int hf_lisp_lcaf_nonce_loc = -1;
-static int hf_lisp_lcaf_nonce_loc_afi = -1;
-static int hf_lisp_lcaf_nonce_loc_ipv4 = -1;
-static int hf_lisp_lcaf_nonce_loc_ipv6 = -1;
-static int hf_lisp_lcaf_nonce_loc_mac = -1;
-static int hf_lisp_lcaf_nonce_loc_dn = -1;
+static int hf_lisp_lcaf_nonce_loc_res;
+static int hf_lisp_lcaf_nonce_loc;
+static int hf_lisp_lcaf_nonce_loc_afi;
+static int hf_lisp_lcaf_nonce_loc_ipv4;
+static int hf_lisp_lcaf_nonce_loc_ipv6;
+static int hf_lisp_lcaf_nonce_loc_mac;
+static int hf_lisp_lcaf_nonce_loc_dn;
 
 /* LCAF Multicast Group Membership Information fields */
-static int hf_lisp_lcaf_mcinfo_flags = -1;
-static int hf_lisp_lcaf_mcinfo_flags_res = -1;
-static int hf_lisp_lcaf_mcinfo_flags_rp = -1;
-static int hf_lisp_lcaf_mcinfo_flags_leave = -1;
-static int hf_lisp_lcaf_mcinfo_flags_join = -1;
-static int hf_lisp_lcaf_mcinfo_iid = -1;
-static int hf_lisp_lcaf_mcinfo_res = -1;
-static int hf_lisp_lcaf_mcinfo_src_masklen = -1;
-static int hf_lisp_lcaf_mcinfo_grp_masklen = -1;
-static int hf_lisp_lcaf_mcinfo_src = -1;
-static int hf_lisp_lcaf_mcinfo_src_afi = -1;
-static int hf_lisp_lcaf_mcinfo_src_ipv4 = -1;
-static int hf_lisp_lcaf_mcinfo_src_ipv6 = -1;
-static int hf_lisp_lcaf_mcinfo_grp = -1;
-static int hf_lisp_lcaf_mcinfo_grp_afi = -1;
-static int hf_lisp_lcaf_mcinfo_grp_ipv4 = -1;
-static int hf_lisp_lcaf_mcinfo_grp_ipv6 = -1;
+static int hf_lisp_lcaf_mcinfo_flags;
+static int hf_lisp_lcaf_mcinfo_flags_res;
+static int hf_lisp_lcaf_mcinfo_flags_rp;
+static int hf_lisp_lcaf_mcinfo_flags_leave;
+static int hf_lisp_lcaf_mcinfo_flags_join;
+static int hf_lisp_lcaf_mcinfo_iid;
+static int hf_lisp_lcaf_mcinfo_res;
+static int hf_lisp_lcaf_mcinfo_src_masklen;
+static int hf_lisp_lcaf_mcinfo_grp_masklen;
+static int hf_lisp_lcaf_mcinfo_src;
+static int hf_lisp_lcaf_mcinfo_src_afi;
+static int hf_lisp_lcaf_mcinfo_src_ipv4;
+static int hf_lisp_lcaf_mcinfo_src_ipv6;
+static int hf_lisp_lcaf_mcinfo_grp;
+static int hf_lisp_lcaf_mcinfo_grp_afi;
+static int hf_lisp_lcaf_mcinfo_grp_ipv4;
+static int hf_lisp_lcaf_mcinfo_grp_ipv6;
 
 /* LCAF ELP fields */
-static int hf_lisp_lcaf_elp_hop = -1;
-static int hf_lisp_lcaf_elp_hop_flags = -1;
-static int hf_lisp_lcaf_elp_hop_flags_res = -1;
-static int hf_lisp_lcaf_elp_hop_flags_lookup = -1;
-static int hf_lisp_lcaf_elp_hop_flags_probe = -1;
-static int hf_lisp_lcaf_elp_hop_flags_strict = -1;
-static int hf_lisp_lcaf_elp_hop_afi = -1;
-static int hf_lisp_lcaf_elp_hop_ipv4 = -1;
-static int hf_lisp_lcaf_elp_hop_ipv6 = -1;
+static int hf_lisp_lcaf_elp_hop;
+static int hf_lisp_lcaf_elp_hop_flags;
+static int hf_lisp_lcaf_elp_hop_flags_res;
+static int hf_lisp_lcaf_elp_hop_flags_lookup;
+static int hf_lisp_lcaf_elp_hop_flags_probe;
+static int hf_lisp_lcaf_elp_hop_flags_strict;
+static int hf_lisp_lcaf_elp_hop_afi;
+static int hf_lisp_lcaf_elp_hop_ipv4;
+static int hf_lisp_lcaf_elp_hop_ipv6;
 
 /* LCAF Source/Destination 2-Tuple Lookups fields */
-static int hf_lisp_lcaf_srcdst_res = -1;
-static int hf_lisp_lcaf_srcdst_src_masklen = -1;
-static int hf_lisp_lcaf_srcdst_dst_masklen = -1;
-static int hf_lisp_lcaf_srcdst_src = -1;
-static int hf_lisp_lcaf_srcdst_src_afi = -1;
-static int hf_lisp_lcaf_srcdst_src_ipv4 = -1;
-static int hf_lisp_lcaf_srcdst_src_ipv6 = -1;
-static int hf_lisp_lcaf_srcdst_src_mac = -1;
-static int hf_lisp_lcaf_srcdst_dst = -1;
-static int hf_lisp_lcaf_srcdst_dst_afi = -1;
-static int hf_lisp_lcaf_srcdst_dst_ipv4 = -1;
-static int hf_lisp_lcaf_srcdst_dst_ipv6 = -1;
-static int hf_lisp_lcaf_srcdst_dst_mac = -1;
+static int hf_lisp_lcaf_srcdst_res;
+static int hf_lisp_lcaf_srcdst_src_masklen;
+static int hf_lisp_lcaf_srcdst_dst_masklen;
+static int hf_lisp_lcaf_srcdst_src;
+static int hf_lisp_lcaf_srcdst_src_afi;
+static int hf_lisp_lcaf_srcdst_src_ipv4;
+static int hf_lisp_lcaf_srcdst_src_ipv6;
+static int hf_lisp_lcaf_srcdst_src_mac;
+static int hf_lisp_lcaf_srcdst_dst;
+static int hf_lisp_lcaf_srcdst_dst_afi;
+static int hf_lisp_lcaf_srcdst_dst_ipv4;
+static int hf_lisp_lcaf_srcdst_dst_ipv6;
+static int hf_lisp_lcaf_srcdst_dst_mac;
 
 /* LCAF RLE fields */
-static int hf_lisp_lcaf_rle_entry = -1;
-static int hf_lisp_lcaf_rle_entry_res = -1;
-static int hf_lisp_lcaf_rle_entry_level = -1;
-static int hf_lisp_lcaf_rle_entry_afi = -1;
-static int hf_lisp_lcaf_rle_entry_ipv4 = -1;
-static int hf_lisp_lcaf_rle_entry_ipv6 = -1;
+static int hf_lisp_lcaf_rle_entry;
+static int hf_lisp_lcaf_rle_entry_res;
+static int hf_lisp_lcaf_rle_entry_level;
+static int hf_lisp_lcaf_rle_entry_afi;
+static int hf_lisp_lcaf_rle_entry_ipv4;
+static int hf_lisp_lcaf_rle_entry_ipv6;
 
 /* LCAF Key/Value Pair fields */
-static int hf_lisp_lcaf_kv_key = -1;
-static int hf_lisp_lcaf_kv_key_afi = -1;
-static int hf_lisp_lcaf_kv_key_ipv4 = -1;
-static int hf_lisp_lcaf_kv_key_ipv6 = -1;
-static int hf_lisp_lcaf_kv_key_mac = -1;
-static int hf_lisp_lcaf_kv_key_dn = -1;
-static int hf_lisp_lcaf_kv_value = -1;
-static int hf_lisp_lcaf_kv_value_afi = -1;
-static int hf_lisp_lcaf_kv_value_ipv4 = -1;
-static int hf_lisp_lcaf_kv_value_ipv6 = -1;
-static int hf_lisp_lcaf_kv_value_mac = -1;
-static int hf_lisp_lcaf_kv_value_dn = -1;
+static int hf_lisp_lcaf_kv_key;
+static int hf_lisp_lcaf_kv_key_afi;
+static int hf_lisp_lcaf_kv_key_ipv4;
+static int hf_lisp_lcaf_kv_key_ipv6;
+static int hf_lisp_lcaf_kv_key_mac;
+static int hf_lisp_lcaf_kv_key_dn;
+static int hf_lisp_lcaf_kv_value;
+static int hf_lisp_lcaf_kv_value_afi;
+static int hf_lisp_lcaf_kv_value_ipv4;
+static int hf_lisp_lcaf_kv_value_ipv6;
+static int hf_lisp_lcaf_kv_value_mac;
+static int hf_lisp_lcaf_kv_value_dn;
 
 /* Vendor Specific LCAF fields */
-static int hf_lisp_lcaf_vendor_res = -1;
-static int hf_lisp_lcaf_vendor_oui = -1;
-static int hf_lisp_lcaf_vendor_data = -1;
+static int hf_lisp_lcaf_vendor_res;
+static int hf_lisp_lcaf_vendor_oui;
+static int hf_lisp_lcaf_vendor_data;
 
 /* Encapsulated Control Message fields */
-static int hf_lisp_ecm_flags_sec = -1;
-static int hf_lisp_ecm_flags_ddt = -1;
-static int hf_lisp_ecm_res = -1;
+static int hf_lisp_ecm_flags_sec;
+static int hf_lisp_ecm_flags_ddt;
+static int hf_lisp_ecm_res;
 
 /* Initialize the subtree pointers */
-static gint ett_lisp = -1;
-static gint ett_lisp_mr = -1;
-static gint ett_lisp_mreq_flags = -1;
-static gint ett_lisp_mapping = -1;
-static gint ett_lisp_itr = -1;
-static gint ett_lisp_record = -1;
-static gint ett_lisp_lcaf = -1;
-static gint ett_lisp_lcaf_header = -1;
-static gint ett_lisp_lcaf_geo_lat = -1;
-static gint ett_lisp_lcaf_geo_lon = -1;
-static gint ett_lisp_lcaf_natt_rloc = -1;
-static gint ett_lisp_lcaf_mcinfo_flags = -1;
-static gint ett_lisp_lcaf_mcinfo_src = -1;
-static gint ett_lisp_lcaf_mcinfo_grp = -1;
-static gint ett_lisp_lcaf_elp_hop = -1;
-static gint ett_lisp_lcaf_elp_hop_flags = -1;
-static gint ett_lisp_lcaf_srcdst_src = -1;
-static gint ett_lisp_lcaf_srcdst_dst = -1;
-static gint ett_lisp_lcaf_rle_entry = -1;
-static gint ett_lisp_lcaf_kv_key = -1;
-static gint ett_lisp_lcaf_kv_value = -1;
-static gint ett_lisp_lcaf_vendor = -1;
-static gint ett_lisp_loc = -1;
-static gint ett_lisp_loc_flags = -1;
-static gint ett_lisp_info_prefix = -1;
-static gint ett_lisp_afi_list = -1;
-
-static expert_field ei_lisp_undecoded = EI_INIT;
-static expert_field ei_lisp_expected_field = EI_INIT;
-static expert_field ei_lisp_invalid_field = EI_INIT;
-static expert_field ei_lisp_unexpected_field = EI_INIT;
+static int ett_lisp;
+static int ett_lisp_mr;
+static int ett_lisp_mreq_flags;
+static int ett_lisp_mapping;
+static int ett_lisp_itr;
+static int ett_lisp_record;
+static int ett_lisp_lcaf;
+static int ett_lisp_lcaf_header;
+static int ett_lisp_lcaf_geo_lat;
+static int ett_lisp_lcaf_geo_lon;
+static int ett_lisp_lcaf_natt_rloc;
+static int ett_lisp_lcaf_mcinfo_flags;
+static int ett_lisp_lcaf_mcinfo_src;
+static int ett_lisp_lcaf_mcinfo_grp;
+static int ett_lisp_lcaf_elp_hop;
+static int ett_lisp_lcaf_elp_hop_flags;
+static int ett_lisp_lcaf_srcdst_src;
+static int ett_lisp_lcaf_srcdst_dst;
+static int ett_lisp_lcaf_rle_entry;
+static int ett_lisp_lcaf_kv_key;
+static int ett_lisp_lcaf_kv_value;
+static int ett_lisp_lcaf_vendor;
+static int ett_lisp_loc;
+static int ett_lisp_loc_flags;
+static int ett_lisp_info_prefix;
+static int ett_lisp_afi_list;
+
+static expert_field ei_lisp_undecoded;
+static expert_field ei_lisp_expected_field;
+static expert_field ei_lisp_invalid_field;
+static expert_field ei_lisp_unexpected_field;
 
 static dissector_handle_t lisp_handle;
 
 static dissector_handle_t ipv4_handle;
 static dissector_handle_t ipv6_handle;
 
-static gboolean encapsulated = FALSE;
-static gboolean ddt_originated = FALSE;
+static bool encapsulated;
+static bool ddt_originated;
 
 static const value_string lisp_typevals[] = {
     { LISP_MAP_REQUEST,     "Map-Request" },
@@ -492,14 +492,14 @@ static const value_string oui_vals[] = {
 };
 
 static int
-get_lcaf_data(tvbuff_t *tvb, gint offset, guint8 *lcaf_type, guint16 *len)
+get_lcaf_data(tvbuff_t *tvb, int offset, uint8_t *lcaf_type, uint16_t *len)
 {
     /* Jump over Rsvd1 and Flags (16 bits) */
     offset += 2;
 
     /* Type (8 bits) */
     if (lcaf_type)
-        *lcaf_type = tvb_get_guint8(tvb, offset);
+        *lcaf_type = tvb_get_uint8(tvb, offset);
     offset += 1;
 
     /* Jump over Rsvd2 bits (8 bits) */
@@ -514,15 +514,15 @@ get_lcaf_data(tvbuff_t *tvb, gint offset, guint8 *lcaf_type, guint16 *len)
     return offset;
 }
 
-const gchar *
+const char *
 // NOLINTNEXTLINE(misc-no-recursion)
-get_addr_str(tvbuff_t *tvb, packet_info *pinfo, gint offset, guint16 afi, guint16 *addr_len)
+get_addr_str(tvbuff_t *tvb, packet_info *pinfo, int offset, uint16_t afi, uint16_t *addr_len)
 {
-    const gchar       *notset_str = "not set";
-    const gchar       *addr_str;
-    guint8             lcaf_type;
-    guint32            iid, asn;
-    guint16            cur_len;
+    const char        *notset_str = "not set";
+    const char        *addr_str;
+    uint8_t            lcaf_type;
+    uint32_t           iid, asn;
+    uint16_t           cur_len;
 
     switch (afi) {
         case AFNUM_RESERVED:
@@ -573,11 +573,11 @@ get_addr_str(tvbuff_t *tvb, packet_info *pinfo, gint offset, guint16 afi, guint1
 static int
 // NOLINTNEXTLINE(misc-no-recursion)
 dissect_lcaf_natt_rloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-        gint offset, const gchar *str, int idx)
+        int offset, const char *str, int idx)
 {
-    guint16      addr_len = 0;
-    guint16      rloc_afi;
-    const gchar *rloc_str;
+    uint16_t     addr_len = 0;
+    uint16_t     rloc_afi;
+    const char *rloc_str;
     proto_item  *ti;
     proto_tree  *rloc_tree;
 
@@ -624,12 +624,12 @@ dissect_lcaf_natt_rloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 static int
 // NOLINTNEXTLINE(misc-no-recursion)
 dissect_lcaf_elp_hop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-        gint offset, int idx, proto_item *tip)
+        int offset, int idx, proto_item *tip)
 {
-    guint16      addr_len = 0;
-    guint16      hop_afi;
-    guint16      hop_flags;
-    const gchar *hop_str;
+    uint16_t     addr_len = 0;
+    uint16_t     hop_afi;
+    uint16_t     hop_flags;
+    const char *hop_str;
     proto_item  *ti, *ti_flags;
     proto_tree  *hop_tree, *flags_tree;
 
@@ -697,12 +697,12 @@ dissect_lcaf_elp_hop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 static int
 // NOLINTNEXTLINE(misc-no-recursion)
 dissect_lcaf_rle_entry(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-        gint offset, int idx, proto_item *tip)
+        int offset, int idx, proto_item *tip)
 {
-    guint8       level;
-    guint16      addr_len = 0;
-    guint16      entry_afi;
-    const gchar *entry_str;
+    uint8_t      level;
+    uint16_t     addr_len = 0;
+    uint16_t     entry_afi;
+    const char *entry_str;
     proto_item  *ti;
     proto_tree  *entry_tree;
 
@@ -715,7 +715,7 @@ dissect_lcaf_rle_entry(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
     /* Level Value (1 byte) */
     proto_tree_add_item(entry_tree, hf_lisp_lcaf_rle_entry_level, tvb, offset, 1, ENC_BIG_ENDIAN);
-    level = tvb_get_guint8(tvb, offset);
+    level = tvb_get_uint8(tvb, offset);
     offset += 1;
 
     /* AFI (2 bytes) */
@@ -766,17 +766,17 @@ dissect_lcaf_rle_entry(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 static int
 // NOLINTNEXTLINE(misc-no-recursion)
 dissect_lcaf_afi_list(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-        gint offset, guint16 length)
+        int offset, uint16_t length)
 {
-    gint old_offset;
-    gint remaining = length;
-    gint i = 1;
-    gint str_len;
-
-    guint16            addr_len = 0;
-    guint16            afi;
-    const gchar       *lcaf_str;
-    gchar             *disp_str;
+    int old_offset;
+    int remaining = length;
+    int i = 1;
+    int str_len;
+
+    uint16_t           addr_len = 0;
+    uint16_t           afi;
+    const char        *lcaf_str;
+    char              *disp_str;
     proto_item        *tir;
     proto_tree        *lisp_afi_list_tree;
 
@@ -858,11 +858,11 @@ dissect_lcaf_afi_list(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
 static int
 // NOLINTNEXTLINE(misc-no-recursion)
-dissect_lcaf_iid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset, proto_item *tip)
+dissect_lcaf_iid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, proto_item *tip)
 {
-    const gchar *ip_address;
-    guint16 afi, addr_len = 0;
-    gint str_len;
+    const char *ip_address;
+    uint16_t afi, addr_len = 0;
+    int str_len;
 
     /* Instance ID (4 bytes) */
     proto_tree_add_item(tree, hf_lisp_lcaf_iid, tvb, offset, 4, ENC_BIG_ENDIAN);
@@ -933,11 +933,11 @@ dissect_lcaf_iid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offse
 
 static int
 // NOLINTNEXTLINE(misc-no-recursion)
-dissect_lcaf_asn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset, proto_item *tip)
+dissect_lcaf_asn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, proto_item *tip)
 {
-    const gchar *addr;
-    guint16 afi, addr_len = 0;
-    gint str_len;
+    const char *addr;
+    uint16_t afi, addr_len = 0;
+    int str_len;
 
     /* AS Number (4 bytes) */
     proto_tree_add_item(tree, hf_lisp_lcaf_asn, tvb, offset, 4, ENC_BIG_ENDIAN);
@@ -1012,17 +1012,17 @@ dissect_lcaf_asn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offse
 
 static int
 // NOLINTNEXTLINE(misc-no-recursion)
-dissect_lcaf_geo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset, proto_item *tir)
+dissect_lcaf_geo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, proto_item *tir)
 {
-    guint16 addr_len = 0;
-    gboolean north, east;
-    guint16 deg;
-    guint8 min, sec;
-    guint32 alt;
-    guint16 afi;
-    gint str_len;
-    const gchar *ip_address;
-    const guint16 mask = 0x7FFF;   /* prepare mask for N or E bit */
+    uint16_t addr_len = 0;
+    bool north, east;
+    uint16_t deg;
+    uint8_t min, sec;
+    uint32_t alt;
+    uint16_t afi;
+    int str_len;
+    const char *ip_address;
+    const uint16_t mask = 0x7FFF;   /* prepare mask for N or E bit */
     proto_item *ti_lat, *ti_lon, *ti_alt;
     proto_tree *lat_tree, *lon_tree;
 
@@ -1044,7 +1044,7 @@ dissect_lcaf_geo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offse
 
     /* Minutes (1 byte) */
     proto_tree_add_item(lat_tree, hf_lisp_lcaf_geo_lat_min, tvb, offset, 1, ENC_BIG_ENDIAN);
-    min = tvb_get_guint8(tvb, offset);
+    min = tvb_get_uint8(tvb, offset);
     if (min > 60)
         expert_add_info_format(pinfo, tree, &ei_lisp_invalid_field,
                 "Invalid latitude minutes value (%d)", min);
@@ -1052,7 +1052,7 @@ dissect_lcaf_geo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offse
 
     /* Seconds (1 byte) */
     proto_tree_add_item(lat_tree, hf_lisp_lcaf_geo_lat_sec, tvb, offset, 1, ENC_BIG_ENDIAN);
-    sec = tvb_get_guint8(tvb, offset);
+    sec = tvb_get_uint8(tvb, offset);
     if (sec > 60)
         expert_add_info_format(pinfo, tree, &ei_lisp_invalid_field,
                 "Invalid latitude seconds value (%d)", min);
@@ -1081,7 +1081,7 @@ dissect_lcaf_geo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offse
 
     /* Minutes (1 byte) */
     proto_tree_add_item(lon_tree, hf_lisp_lcaf_geo_lon_min, tvb, offset, 1, ENC_BIG_ENDIAN);
-    min = tvb_get_guint8(tvb, offset);
+    min = tvb_get_uint8(tvb, offset);
     if (min > 60)
         expert_add_info_format(pinfo, tree, &ei_lisp_invalid_field,
                 "Invalid longitude minutes value (%d)", min);
@@ -1089,7 +1089,7 @@ dissect_lcaf_geo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offse
 
     /* Seconds (1 byte) */
     proto_tree_add_item(lon_tree, hf_lisp_lcaf_geo_lon_sec, tvb, offset, 1, ENC_BIG_ENDIAN);
-    sec = tvb_get_guint8(tvb, offset);
+    sec = tvb_get_uint8(tvb, offset);
     if (sec > 60)
         expert_add_info_format(pinfo, tree, &ei_lisp_invalid_field,
                 "Invalid longitude seconds value (%d)", min);
@@ -1185,16 +1185,17 @@ dissect_lcaf_geo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offse
  */
 
 static int
+// NOLINTNEXTLINE(misc-no-recursion)
 dissect_lcaf_natt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-        gint offset, guint16 length)
+        int offset, uint16_t length)
 {
-    gint         i;
-    gint         len;
-    gint         remaining   = length;
-    const gchar *global_etr  = " of Global ETR: %s";
-    const gchar *ms          = " of MS: %s";
-    const gchar *private_etr = " of Private ETR: %s";
-    const gchar *rtr         = " of RTR %d: %s";
+    int          i;
+    int          len;
+    int          remaining   = length;
+    const char *global_etr  = " of Global ETR: %s";
+    const char *ms          = " of MS: %s";
+    const char *private_etr = " of Private ETR: %s";
+    const char *rtr         = " of RTR %d: %s";
 
     remaining -= 4;
 
@@ -1248,11 +1249,11 @@ dissect_lcaf_natt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
 static int
 // NOLINTNEXTLINE(misc-no-recursion)
-dissect_lcaf_nonce_loc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset, proto_item *tip)
+dissect_lcaf_nonce_loc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, proto_item *tip)
 {
-    const gchar *addr;
-    guint16 afi, addr_len = 0;
-    gint str_len;
+    const char *addr;
+    uint16_t afi, addr_len = 0;
+    int str_len;
 
     /* Reserved (1 byte) */
     proto_tree_add_item(tree, hf_lisp_lcaf_nonce_loc_res, tvb, offset, 1, ENC_BIG_ENDIAN);
@@ -1333,12 +1334,12 @@ dissect_lcaf_nonce_loc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint
 static int
 // NOLINTNEXTLINE(misc-no-recursion)
 dissect_lcaf_mcast_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-        gint offset, proto_item *tir)
+        int offset, proto_item *tir)
 {
-    guint8       src_masklen, grp_masklen;
-    guint16      afi, addr_len = 0;
-    guint32      iid;
-    const gchar *src_str, *grp_str;
+    uint8_t      src_masklen, grp_masklen;
+    uint16_t     afi, addr_len = 0;
+    uint32_t     iid;
+    const char *src_str, *grp_str;
     proto_item  *ti_src, *ti_grp;
     proto_tree  *src_tree, *grp_tree;
 
@@ -1353,12 +1354,12 @@ dissect_lcaf_mcast_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
     /* Source Mask Length (1 byte) */
     proto_tree_add_item(tree, hf_lisp_lcaf_mcinfo_src_masklen, tvb, offset, 1, ENC_BIG_ENDIAN);
-    src_masklen = tvb_get_guint8(tvb, offset);
+    src_masklen = tvb_get_uint8(tvb, offset);
     offset += 1;
 
     /* Group Mask Length (1 byte) */
     proto_tree_add_item(tree, hf_lisp_lcaf_mcinfo_grp_masklen, tvb, offset, 1, ENC_BIG_ENDIAN);
-    grp_masklen = tvb_get_guint8(tvb, offset);
+    grp_masklen = tvb_get_uint8(tvb, offset);
     offset += 1;
 
     ti_src   = proto_tree_add_item(tree, hf_lisp_lcaf_mcinfo_src, tvb, offset, 2, ENC_NA);
@@ -1455,12 +1456,13 @@ dissect_lcaf_mcast_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
  */
 
 static int
+// NOLINTNEXTLINE(misc-no-recursion)
 dissect_lcaf_elp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-        gint offset, guint16 length, proto_item *tir)
+        int offset, uint16_t length, proto_item *tir)
 {
-    gint len;
-    gint remaining = length;
-    gint i = 1;
+    int len;
+    int remaining = length;
+    int i = 1;
 
     while (remaining > 0) {
         len = dissect_lcaf_elp_hop(tvb, pinfo, tree, offset, i, tir);
@@ -1495,11 +1497,11 @@ dissect_lcaf_elp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 static int
 // NOLINTNEXTLINE(misc-no-recursion)
 dissect_lcaf_src_dst_key(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-        gint offset, proto_item *tir)
+        int offset, proto_item *tir)
 {
-    guint8       src_masklen, dst_masklen;
-    guint16      afi, addr_len = 0;
-    const gchar *src_str, *dst_str;
+    uint8_t      src_masklen, dst_masklen;
+    uint16_t     afi, addr_len = 0;
+    const char *src_str, *dst_str;
     proto_item  *ti_src, *ti_dst;
     proto_tree  *src_tree, *dst_tree;
 
@@ -1509,12 +1511,12 @@ dissect_lcaf_src_dst_key(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
     /* Source Prefix Mask Length (1 byte) */
     proto_tree_add_item(tree, hf_lisp_lcaf_srcdst_src_masklen, tvb, offset, 1, ENC_BIG_ENDIAN);
-    src_masklen = tvb_get_guint8(tvb, offset);
+    src_masklen = tvb_get_uint8(tvb, offset);
     offset += 1;
 
     /* Destination Prefix Mask Length (1 byte) */
     proto_tree_add_item(tree, hf_lisp_lcaf_srcdst_dst_masklen, tvb, offset, 1, ENC_BIG_ENDIAN);
-    dst_masklen = tvb_get_guint8(tvb, offset);
+    dst_masklen = tvb_get_uint8(tvb, offset);
     offset += 1;
 
     ti_src   = proto_tree_add_item(tree, hf_lisp_lcaf_srcdst_src, tvb, offset, 2, ENC_NA);
@@ -1622,12 +1624,13 @@ dissect_lcaf_src_dst_key(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
  */
 
 static int
+// NOLINTNEXTLINE(misc-no-recursion)
 dissect_lcaf_rle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-        gint offset, guint16 length, proto_item *tir)
+        int offset, uint16_t length, proto_item *tir)
 {
-    gint len;
-    gint remaining = length;
-    gint i = 1;
+    int len;
+    int remaining = length;
+    int i = 1;
 
     while (remaining > 0) {
         len = dissect_lcaf_rle_entry(tvb, pinfo, tree, offset, i, tir);
@@ -1660,13 +1663,13 @@ dissect_lcaf_rle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 static int
 // NOLINTNEXTLINE(misc-no-recursion)
 dissect_lcaf_kv_addr_pair(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-        gint offset)
+        int offset)
 {
-    guint16      afi, addr_len = 0;
-    const gchar *key_str, *value_str;
+    uint16_t     afi, addr_len = 0;
+    const char *key_str, *value_str;
     proto_item  *ti_key, *ti_value;
     proto_tree  *key_tree, *value_tree;
-    gint         str_len;
+    int          str_len;
 
     ti_key   = proto_tree_add_item(tree, hf_lisp_lcaf_kv_key, tvb, offset, 2, ENC_NA);
     key_tree = proto_item_add_subtree(ti_key, ett_lisp_lcaf_kv_key);
@@ -1779,9 +1782,9 @@ dissect_lcaf_kv_addr_pair(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
 static int
 dissect_lcaf_vendor(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-        gint offset, guint16 length)
+        int offset, uint16_t length)
 {
-    gint len;
+    int len;
     proto_item  *ti_vendor;
     proto_tree  *vendor_tree;
 
@@ -1838,10 +1841,10 @@ dissect_lcaf_vendor(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
 int
 // NOLINTNEXTLINE(misc-no-recursion)
-dissect_lcaf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset, proto_item *tip)
+dissect_lcaf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, proto_item *tip)
 {
-    guint8       lcaf_type;
-    guint16      len;
+    uint8_t      lcaf_type;
+    uint16_t     len;
     proto_item  *tir, *ti_header, *ti_flags, *ti;
     proto_tree  *lcaf_tree, *lcaf_header_tree, *flags_tree;
     tvbuff_t    *payload_tvb;
@@ -1864,7 +1867,7 @@ dissect_lcaf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset, p
 
     /* Type (8 bits) */
     proto_tree_add_item(lcaf_header_tree, hf_lisp_lcaf_type, tvb, offset, 1, ENC_BIG_ENDIAN);
-    lcaf_type = tvb_get_guint8(tvb, offset);
+    lcaf_type = tvb_get_uint8(tvb, offset);
     proto_item_append_text(tir, ": %s", val_to_str(lcaf_type, lcaf_typevals, "Unknown (%d)"));
     offset += 1;
 
@@ -1959,15 +1962,15 @@ dissect_lcaf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset, p
 static int
 dissect_lisp_locator(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_mapping_tree, int rec)
 {
-    gint         offset   = 0;
-    guint16      addr_len = 0;
-    guint8       prio;
-    guint8       weight;
-    guint8       m_prio;
-    guint8       m_weight;
-    guint16      flags;
-    guint16      loc_afi;
-    const gchar *locator;
+    int          offset   = 0;
+    uint16_t     addr_len = 0;
+    uint8_t      prio;
+    uint8_t      weight;
+    uint8_t      m_prio;
+    uint8_t      m_weight;
+    uint16_t     flags;
+    uint16_t     loc_afi;
+    const char *locator;
     proto_item  *tir, *ti_flags;
     proto_tree  *lisp_lcaf_tree, *lisp_loc_tree, *lisp_flags_tree;
 
@@ -1976,19 +1979,19 @@ dissect_lisp_locator(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_mapping
     lisp_loc_tree = proto_item_add_subtree(tir, ett_lisp_loc);
 
     proto_tree_add_item(lisp_loc_tree, hf_lisp_loc_priority, tvb, offset, 1, ENC_BIG_ENDIAN);
-    prio = tvb_get_guint8(tvb, offset);
+    prio = tvb_get_uint8(tvb, offset);
     offset += 1;
 
     proto_tree_add_item(lisp_loc_tree, hf_lisp_loc_weight, tvb, offset, 1, ENC_BIG_ENDIAN);
-    weight = tvb_get_guint8(tvb, offset);
+    weight = tvb_get_uint8(tvb, offset);
     offset += 1;
 
     proto_tree_add_item(lisp_loc_tree, hf_lisp_loc_mpriority, tvb, offset, 1, ENC_BIG_ENDIAN);
-    m_prio = tvb_get_guint8(tvb, offset);
+    m_prio = tvb_get_uint8(tvb, offset);
     offset += 1;
 
     proto_tree_add_item(lisp_loc_tree, hf_lisp_loc_mweight, tvb, offset, 1, ENC_BIG_ENDIAN);
-    m_weight = tvb_get_guint8(tvb, offset);
+    m_weight = tvb_get_uint8(tvb, offset);
     offset += 1;
 
     ti_flags = proto_tree_add_item(lisp_loc_tree, hf_lisp_loc_flags, tvb, offset, 2, ENC_BIG_ENDIAN);
@@ -2053,20 +2056,20 @@ dissect_lisp_locator(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_mapping
 
 int
 dissect_lisp_mapping(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree,
-        guint8 rec_cnt, int rec, gboolean referral, gint offset, proto_item *tim)
+        uint8_t rec_cnt, int rec, bool referral, int offset, proto_item *tim)
 {
     int          i;
-    gint         str_len;
-    guint16      addr_len      = 0;
-    guint8       prefix_mask, loc_cnt;
-    guint16      flags;
-    guint16      act;
-    guint16      prefix_afi, eid_afi;
-    const gchar *prefix;
+    int          str_len;
+    uint16_t     addr_len      = 0;
+    uint8_t      prefix_mask, loc_cnt;
+    uint16_t     flags;
+    uint16_t     act;
+    uint16_t     prefix_afi, eid_afi;
+    const char *prefix;
     proto_item  *tir;
     proto_tree  *lisp_mapping_tree, *lcaf_prefix_tree;
 
-    prefix_mask   = tvb_get_guint8(tvb, offset + 5);
+    prefix_mask   = tvb_get_uint8(tvb, offset + 5);
     flags         = tvb_get_ntohs(tvb, offset + 6);
     prefix_afi    = tvb_get_ntohs(tvb, offset + 10);
 
@@ -2105,7 +2108,7 @@ dissect_lisp_mapping(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree,
 
     /* Locator count (8 bits) */
     proto_tree_add_item(lisp_mapping_tree, hf_lisp_mapping_loccnt, tvb, offset, 1, ENC_BIG_ENDIAN);
-    loc_cnt = tvb_get_guint8(tvb, offset);
+    loc_cnt = tvb_get_uint8(tvb, offset);
     offset += 1;
 
     /* EID mask length (8 bits) */
@@ -2226,18 +2229,18 @@ static void
 dissect_lisp_map_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree)
 {
     int                i;
-    guint16            addr_len    = 0;
-    gint               offset      = 0;
-    guint16            flags;
-    gboolean           mrep;
-    gboolean           smr;
-    gboolean           probe;
-    gboolean           pitr;
-    gboolean           smr_invoked;
-    guint8             itr_rec_cnt = 0;
-    guint8             rec_cnt     = 0;
-    guint16            src_eid_afi;
-    const gchar       *src_eid;
+    uint16_t           addr_len    = 0;
+    int                offset      = 0;
+    uint16_t           flags;
+    bool               mrep;
+    bool               smr;
+    bool               probe;
+    bool               pitr;
+    bool               smr_invoked;
+    uint8_t            itr_rec_cnt = 0;
+    uint8_t            rec_cnt     = 0;
+    uint16_t           src_eid_afi;
+    const char        *src_eid;
     proto_item        *ti_flags;
     proto_tree        *flags_tree, *lcaf_src_eid_tree, *lcaf_prefix_tree;
     tvbuff_t          *next_tvb;
@@ -2275,12 +2278,12 @@ dissect_lisp_map_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tre
     proto_tree_add_item(lisp_tree, hf_lisp_mreq_res, tvb, offset, 3, ENC_BIG_ENDIAN);
 
     /* ITR record count (5 bits) */
-    itr_rec_cnt = tvb_get_guint8(tvb, offset + 2) & 0x1F;
+    itr_rec_cnt = tvb_get_uint8(tvb, offset + 2) & 0x1F;
     proto_tree_add_item(lisp_tree, hf_lisp_irc, tvb, offset, 3, ENC_BIG_ENDIAN);
     offset += 3;
 
     /* Record count (8 bits) */
-    rec_cnt = tvb_get_guint8(tvb, offset);
+    rec_cnt = tvb_get_uint8(tvb, offset);
     proto_tree_add_item(lisp_tree, hf_lisp_records, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset += 1;
 
@@ -2330,7 +2333,7 @@ dissect_lisp_map_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tre
 
     /* ITR records */
     for(i=0; i < itr_rec_cnt+1; i++) {
-        guint16 itr_afi;
+        uint16_t itr_afi;
         proto_item *tir;
         proto_tree *lisp_itr_tree;
 
@@ -2364,15 +2367,15 @@ dissect_lisp_map_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tre
 
     /* Query records */
     for(i=0; i < rec_cnt; i++) {
-        gint str_len;
-        guint16 prefix_mask;
-        guint16 prefix_afi;
-        const gchar *prefix;
+        int str_len;
+        uint16_t prefix_mask;
+        uint16_t prefix_afi;
+        const char *prefix;
         proto_item *tir;
         proto_tree *lisp_record_tree;
 
         addr_len = 0;
-        prefix_mask = tvb_get_guint8(tvb, offset + 1);
+        prefix_mask = tvb_get_uint8(tvb, offset + 1);
         prefix_afi = tvb_get_ntohs(tvb, offset + 2);
         prefix = get_addr_str(tvb, pinfo, offset + 4, prefix_afi, &addr_len);
 
@@ -2436,7 +2439,7 @@ dissect_lisp_map_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tre
         tim = proto_tree_add_item(lisp_tree, hf_lisp_mrep_record, tvb, offset, -1, ENC_NA);
         lisp_mr_tree = proto_item_add_subtree(tim, ett_lisp_mr);
 
-        offset = dissect_lisp_mapping(tvb, pinfo, lisp_mr_tree, 0, 1, FALSE, offset, NULL);
+        offset = dissect_lisp_mapping(tvb, pinfo, lisp_mr_tree, 0, 1, false, offset, NULL);
     }
 
     next_tvb = tvb_new_subset_remaining(tvb, offset);
@@ -2477,14 +2480,14 @@ static void
 dissect_lisp_map_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree)
 {
     int       i;
-    gint      offset  = 0;
-    gboolean  probe;
-    guint8    flags;
-    guint8    rec_cnt = 0;
+    int       offset  = 0;
+    bool      probe;
+    uint8_t   flags;
+    uint8_t   rec_cnt = 0;
     tvbuff_t *next_tvb;
 
     /* Flags (2 bits) */
-    flags = tvb_get_guint8(tvb, offset);
+    flags = tvb_get_uint8(tvb, offset);
     probe = flags & (MAP_REP_FLAG_P >> 16);
     proto_tree_add_item(lisp_tree, hf_lisp_mrep_flags_probe, tvb, offset, 3, ENC_BIG_ENDIAN);
     proto_tree_add_item(lisp_tree, hf_lisp_mrep_flags_enlr, tvb, offset, 3, ENC_BIG_ENDIAN);
@@ -2500,7 +2503,7 @@ dissect_lisp_map_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree)
     offset += 3;
 
     /* Record count (8 bits) */
-    rec_cnt = tvb_get_guint8(tvb, offset);
+    rec_cnt = tvb_get_uint8(tvb, offset);
     proto_tree_add_item(lisp_tree, hf_lisp_records, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset += 1;
 
@@ -2510,7 +2513,7 @@ dissect_lisp_map_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree)
 
     /* Reply records */
     for(i=0; i < rec_cnt; i++) {
-        offset = dissect_lisp_mapping(tvb, pinfo, lisp_tree, rec_cnt, i+1, FALSE, offset, NULL);
+        offset = dissect_lisp_mapping(tvb, pinfo, lisp_tree, rec_cnt, i+1, false, offset, NULL);
     }
 
     next_tvb = tvb_new_subset_remaining(tvb, offset);
@@ -2551,17 +2554,17 @@ dissect_lisp_map_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree)
  *
  */
 
-gint
+int
 dissect_lisp_map_register(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree,
-        gint offset, proto_item *tim, gboolean keep_going)
+        int offset, proto_item *tim, bool keep_going)
 {
     int       i;
-    guint8    rec_cnt = 0;
+    uint8_t   rec_cnt = 0;
     tvbuff_t *next_tvb;
-    guint16   authlen = 0;
-    guint16   flags;
-    gboolean  xtrid;
-    gboolean  rtr;
+    uint16_t  authlen = 0;
+    uint16_t  flags;
+    bool      xtrid;
+    bool      rtr;
 
     /* Flags (1 bit) */
     proto_tree_add_item(lisp_tree, hf_lisp_mreg_flags_pmr, tvb, offset, 3, ENC_BIG_ENDIAN);
@@ -2588,7 +2591,7 @@ dissect_lisp_map_register(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tr
     offset += 3;
 
     /* Record count (8 bits) */
-    rec_cnt = tvb_get_guint8(tvb, offset);
+    rec_cnt = tvb_get_uint8(tvb, offset);
     proto_tree_add_item(lisp_tree, hf_lisp_records, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset += 1;
 
@@ -2611,7 +2614,7 @@ dissect_lisp_map_register(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tr
     offset += authlen;
 
     for(i=0; i < rec_cnt; i++) {
-        offset = dissect_lisp_mapping(tvb, pinfo, lisp_tree, rec_cnt, i+1, FALSE, offset, tim);
+        offset = dissect_lisp_mapping(tvb, pinfo, lisp_tree, rec_cnt, i+1, false, offset, tim);
     }
 
     /* If I bit is set, we have an xTR-ID and a site-ID field */
@@ -2669,13 +2672,13 @@ static void
 dissect_lisp_map_notify(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree)
 {
     int       i;
-    gint      offset  = 0;
-    guint8    rec_cnt = 0;
+    int       offset  = 0;
+    uint8_t   rec_cnt = 0;
     tvbuff_t *next_tvb;
-    guint16   authlen = 0;
-    guint16   flags;
-    gboolean  xtrid;
-    gboolean  rtr;
+    uint16_t  authlen = 0;
+    uint16_t  flags;
+    bool      xtrid;
+    bool      rtr;
 
     /* Flags defined in NAT Traversal draft (2 bits) */
     flags = tvb_get_ntohs(tvb, offset);
@@ -2693,7 +2696,7 @@ dissect_lisp_map_notify(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree
     offset += 3;
 
     /* Record count (8 bits) */
-    rec_cnt = tvb_get_guint8(tvb, offset);
+    rec_cnt = tvb_get_uint8(tvb, offset);
     proto_tree_add_item(lisp_tree, hf_lisp_records, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset += 1;
 
@@ -2716,7 +2719,7 @@ dissect_lisp_map_notify(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree
     offset += authlen;
 
     for(i=0; i < rec_cnt; i++) {
-        offset = dissect_lisp_mapping(tvb, pinfo, lisp_tree, rec_cnt, i+1, FALSE, offset, NULL);
+        offset = dissect_lisp_mapping(tvb, pinfo, lisp_tree, rec_cnt, i+1, false, offset, NULL);
     }
 
     /* If I bit is set, we have an xTR-ID and a site-ID field */
@@ -2780,8 +2783,8 @@ static void
 dissect_lisp_map_referral(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree)
 {
     int       i;
-    gint      offset  = 0;
-    guint8    rec_cnt = 0;
+    int       offset  = 0;
+    uint8_t   rec_cnt = 0;
     tvbuff_t *next_tvb;
 
     /* Reserved bits (20 bits) */
@@ -2789,7 +2792,7 @@ dissect_lisp_map_referral(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tr
     offset += 3;
 
     /* Record count (8 bits) */
-    rec_cnt = tvb_get_guint8(tvb, offset);
+    rec_cnt = tvb_get_uint8(tvb, offset);
     proto_tree_add_item(lisp_tree, hf_lisp_records, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset += 1;
 
@@ -2799,7 +2802,7 @@ dissect_lisp_map_referral(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tr
 
     /* Referral records */
     for(i=0; i < rec_cnt; i++) {
-        offset = dissect_lisp_mapping(tvb, pinfo, lisp_tree, rec_cnt, i+1, TRUE, offset, NULL);
+        offset = dissect_lisp_mapping(tvb, pinfo, lisp_tree, rec_cnt, i+1, true, offset, NULL);
     }
 
     next_tvb = tvb_new_subset_remaining(tvb, offset);
@@ -2837,20 +2840,20 @@ dissect_lisp_map_referral(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tr
 static void
 dissect_lisp_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree)
 {
-    gint         offset   = 0;
+    int          offset   = 0;
     tvbuff_t    *next_tvb;
-    guint8       flags;
-    gboolean     reply;
-    guint16      authlen  = 0;
-    guint8       prefix_mask;
-    guint16      prefix_afi, afi;
-    const gchar *prefix;
-    guint16      addr_len = 0;
+    uint8_t      flags;
+    bool         reply;
+    uint16_t     authlen  = 0;
+    uint8_t      prefix_mask;
+    uint16_t     prefix_afi, afi;
+    const char *prefix;
+    uint16_t     addr_len = 0;
     proto_item  *tir, *ti_prefix;
     proto_tree  *prefix_tree;
 
     /* Flags (1 bit) */
-    flags = tvb_get_guint8(tvb, offset);
+    flags = tvb_get_uint8(tvb, offset);
     reply = flags & (INFO_FLAG_R >> 16);
 
     if (reply)
@@ -2893,7 +2896,7 @@ dissect_lisp_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree)
     prefix_tree = proto_tree_add_subtree(lisp_tree, tvb, offset, 3, ett_lisp_info_prefix, &ti_prefix, "EID Prefix: ");
 
     proto_tree_add_item(prefix_tree, hf_lisp_info_prefix_masklen, tvb, offset, 1, ENC_BIG_ENDIAN);
-    prefix_mask = tvb_get_guint8(tvb, offset); offset += 1;
+    prefix_mask = tvb_get_uint8(tvb, offset); offset += 1;
 
     proto_tree_add_item(prefix_tree, hf_lisp_info_prefix_afi, tvb, offset, 2, ENC_BIG_ENDIAN);
     prefix_afi = tvb_get_ntohs(tvb, offset);  offset += 2;
@@ -2963,11 +2966,11 @@ static void
 dissect_lisp_ecm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree *lisp_tree)
 {
     tvbuff_t *next_tvb;
-    guint8    flags;
-    guint8    ip_ver;
+    uint8_t   flags;
+    uint8_t   ip_ver;
 
     /* Flags (2 bits) */
-    flags = tvb_get_guint8(tvb, 0);
+    flags = tvb_get_uint8(tvb, 0);
     ddt_originated = flags & (ECM_FLAG_D >> 24);
 
     proto_tree_add_item(lisp_tree, hf_lisp_ecm_flags_sec, tvb, 0, 4, ENC_BIG_ENDIAN);
@@ -2989,7 +2992,7 @@ dissect_lisp_ecm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree
             call_data_dissector(next_tvb, pinfo, tree);
             break;
     }
-    encapsulated = FALSE;
+    encapsulated = false;
 }
 
 
@@ -3000,7 +3003,7 @@ dissect_lisp_ecm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree
 static int
 dissect_lisp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
-    guint8 type;
+    uint8_t type;
 
     proto_tree *lisp_tree = NULL;
 
@@ -3022,7 +3025,7 @@ dissect_lisp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
 
     if (ddt_originated) {
         col_append_str(pinfo->cinfo, COL_INFO, " (DDT-originated)");
-        ddt_originated = FALSE;
+        ddt_originated = false;
     }
 
     if (tree) {
@@ -3049,7 +3052,7 @@ dissect_lisp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
         dissect_lisp_map_reply(tvb, pinfo, lisp_tree);
         break;
     case LISP_MAP_REGISTER:
-        dissect_lisp_map_register(tvb, pinfo, lisp_tree, 0, NULL, TRUE);
+        dissect_lisp_map_register(tvb, pinfo, lisp_tree, 0, NULL, true);
         break;
     case LISP_MAP_NOTIFY:
         dissect_lisp_map_notify(tvb, pinfo, lisp_tree);
@@ -3061,7 +3064,7 @@ dissect_lisp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
         dissect_lisp_info(tvb, pinfo, lisp_tree);
         break;
     case LISP_ECM:
-        encapsulated = TRUE;
+        encapsulated = true;
         dissect_lisp_ecm(tvb, pinfo, tree, lisp_tree);
         break;
     default:
@@ -3704,7 +3707,7 @@ proto_register_lisp(void)
     };
 
     /* Setup protocol subtree array */
-    static gint *ett[] = {
+    static int *ett[] = {
         &ett_lisp,
         &ett_lisp_mr,
         &ett_lisp_mreq_flags,