aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-batadv.c
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2023-11-20 08:16:40 +0100
committerStig Bjørlykke <stig@bjorlykke.org>2023-11-20 08:20:54 +0100
commit2a9bc63325c99653c5da873c273430add3b5e9dd (patch)
tree120dee357b44bb38baf6ca9cf592e0cef6e4bea3 /epan/dissectors/packet-batadv.c
parente8e16400d8e3f933bd0eb1f06c661557a28e4ed4 (diff)
Remove init of proto variables
Remove init of proto, header field, expert info and subtree variables. This will reduces the binary size by approximate 1266320 bytes due to using .bss to zero-initialize the fields. The conversion is done using the tools/convert-proto-init.py script.
Diffstat (limited to 'epan/dissectors/packet-batadv.c')
-rw-r--r--epan/dissectors/packet-batadv.c460
1 files changed, 230 insertions, 230 deletions
diff --git a/epan/dissectors/packet-batadv.c b/epan/dissectors/packet-batadv.c
index aee96fd84a..6fee5dfda9 100644
--- a/epan/dissectors/packet-batadv.c
+++ b/epan/dissectors/packet-batadv.c
@@ -471,239 +471,239 @@ struct unicast_tvlv_packet_v15 {
/* End content from packet-batadv.h */
/* trees */
-static gint ett_batadv_batman = -1;
-static gint ett_batadv_batman_flags = -1;
-static gint ett_batadv_batman_gwflags = -1;
-static gint ett_batadv_batman_tt = -1;
-static gint ett_batadv_iv_ogm = -1;
-static gint ett_batadv_iv_ogm_flags = -1;
-static gint ett_batadv_elp = -1;
-static gint ett_batadv_ogm2 = -1;
-//static gint ett_batadv_ogm2_flags = -1;
-static gint ett_batadv_bcast = -1;
-static gint ett_batadv_icmp = -1;
-static gint ett_batadv_icmp_rr = -1;
-static gint ett_batadv_unicast = -1;
-static gint ett_batadv_unicast_4addr = -1;
-static gint ett_batadv_unicast_frag = -1;
-static gint ett_batadv_unicast_tvlv = -1;
-static gint ett_batadv_vis = -1;
-static gint ett_batadv_vis_entry = -1;
-static gint ett_batadv_tt_query = -1;
-static gint ett_batadv_tt_query_flags = -1;
-static gint ett_batadv_tt_entry = -1;
-static gint ett_batadv_tt_entry_flags = -1;
-static gint ett_batadv_roam_adv = -1;
-static gint ett_batadv_coded = -1;
-static gint ett_batadv_tvlv = -1;
-static gint ett_batadv_tvlv_mcast_flags = -1;
-static gint ett_batadv_tvlv_vid = -1;
-static gint ett_batadv_tvlv_tt_flags = -1;
-static gint ett_batadv_tvlv_tt_vlan = -1;
-static gint ett_batadv_tvlv_tt_change = -1;
-static gint ett_msg_fragment = -1;
-static gint ett_msg_fragments = -1;
-
-static expert_field ei_batadv_tvlv_unknown_version = EI_INIT;
-static expert_field ei_batadv_tvlv_tt_vlan_crc = EI_INIT;
-static expert_field ei_batadv_tvlv_tt_vlan_empty = EI_INIT;
+static gint ett_batadv_batman;
+static gint ett_batadv_batman_flags;
+static gint ett_batadv_batman_gwflags;
+static gint ett_batadv_batman_tt;
+static gint ett_batadv_iv_ogm;
+static gint ett_batadv_iv_ogm_flags;
+static gint ett_batadv_elp;
+static gint ett_batadv_ogm2;
+//static gint ett_batadv_ogm2_flags;
+static gint ett_batadv_bcast;
+static gint ett_batadv_icmp;
+static gint ett_batadv_icmp_rr;
+static gint ett_batadv_unicast;
+static gint ett_batadv_unicast_4addr;
+static gint ett_batadv_unicast_frag;
+static gint ett_batadv_unicast_tvlv;
+static gint ett_batadv_vis;
+static gint ett_batadv_vis_entry;
+static gint ett_batadv_tt_query;
+static gint ett_batadv_tt_query_flags;
+static gint ett_batadv_tt_entry;
+static gint ett_batadv_tt_entry_flags;
+static gint ett_batadv_roam_adv;
+static gint ett_batadv_coded;
+static gint ett_batadv_tvlv;
+static gint ett_batadv_tvlv_mcast_flags;
+static gint ett_batadv_tvlv_vid;
+static gint ett_batadv_tvlv_tt_flags;
+static gint ett_batadv_tvlv_tt_vlan;
+static gint ett_batadv_tvlv_tt_change;
+static gint ett_msg_fragment;
+static gint ett_msg_fragments;
+
+static expert_field ei_batadv_tvlv_unknown_version;
+static expert_field ei_batadv_tvlv_tt_vlan_crc;
+static expert_field ei_batadv_tvlv_tt_vlan_empty;
/* hfs */
-static int hf_batadv_packet_type = -1;
-
-static int hf_batadv_batman_version = -1;
-static int hf_batadv_batman_flags = -1;
-static int hf_batadv_batman_ttl = -1;
-static int hf_batadv_batman_gwflags = -1;
-static int hf_batadv_batman_gwflags_dl_speed = -1;
-static int hf_batadv_batman_gwflags_ul_speed = -1;
-static int hf_batadv_batman_tq = -1;
-static int hf_batadv_batman_seqno = -1;
-static int hf_batadv_batman_seqno32 = -1;
-static int hf_batadv_batman_orig = -1;
-static int hf_batadv_batman_prev_sender = -1;
-static int hf_batadv_batman_num_tt = -1;
-static int hf_batadv_batman_tt_num_changes = -1;
-static int hf_batadv_batman_ttvn = -1;
-static int hf_batadv_batman_tt_crc = -1;
-static int hf_batadv_batman_tt = -1;
-
-static int hf_batadv_iv_ogm_version = -1;
-static int hf_batadv_iv_ogm_ttl = -1;
-static int hf_batadv_iv_ogm_flags = -1;
-static int hf_batadv_iv_ogm_seqno = -1;
-static int hf_batadv_iv_ogm_orig = -1;
-static int hf_batadv_iv_ogm_prev_sender = -1;
-static int hf_batadv_iv_ogm_tq = -1;
-static int hf_batadv_iv_ogm_tvlv_len = -1;
-
-static int hf_batadv_elp_version = -1;
-static int hf_batadv_elp_orig = -1;
-static int hf_batadv_elp_seqno = -1;
-static int hf_batadv_elp_interval = -1;
-
-static int hf_batadv_ogm2_version = -1;
-static int hf_batadv_ogm2_ttl = -1;
-static int hf_batadv_ogm2_flags = -1;
-static int hf_batadv_ogm2_seqno = -1;
-static int hf_batadv_ogm2_orig = -1;
-static int hf_batadv_ogm2_tvlv_len = -1;
-static int hf_batadv_ogm2_throughput = -1;
-
-static int hf_batadv_bcast_version = -1;
-static int hf_batadv_bcast_orig = -1;
-static int hf_batadv_bcast_seqno = -1;
-static int hf_batadv_bcast_seqno32 = -1;
-static int hf_batadv_bcast_ttl = -1;
-
-static int hf_batadv_icmp_version = -1;
-static int hf_batadv_icmp_msg_type = -1;
-static int hf_batadv_icmp_dst = -1;
-static int hf_batadv_icmp_orig = -1;
-static int hf_batadv_icmp_ttl = -1;
-static int hf_batadv_icmp_uid = -1;
-static int hf_batadv_icmp_seqno = -1;
-
-static int hf_batadv_icmp_rr_pointer = -1;
-static int hf_batadv_icmp_rr_ether = -1;
-
-static int hf_batadv_icmp_tp_subtype = -1;
-static int hf_batadv_icmp_tp_session = -1;
-static int hf_batadv_icmp_tp_seqno = -1;
-static int hf_batadv_icmp_tp_timestamp = -1;
-
-static int hf_batadv_unicast_version = -1;
-static int hf_batadv_unicast_dst = -1;
-static int hf_batadv_unicast_ttl = -1;
-static int hf_batadv_unicast_ttvn = -1;
-
-static int hf_batadv_unicast_4addr_version = -1;
-static int hf_batadv_unicast_4addr_dst = -1;
-static int hf_batadv_unicast_4addr_ttl = -1;
-static int hf_batadv_unicast_4addr_ttvn = -1;
-static int hf_batadv_unicast_4addr_src = -1;
-static int hf_batadv_unicast_4addr_subtype = -1;
-
-static int hf_batadv_unicast_frag_version = -1;
-static int hf_batadv_unicast_frag_dst = -1;
-static int hf_batadv_unicast_frag_ttl = -1;
-static int hf_batadv_unicast_frag_ttvn = -1;
-static int hf_batadv_unicast_frag_flags = -1;
-static int hf_batadv_unicast_frag_orig = -1;
-static int hf_batadv_unicast_frag_seqno = -1;
-static int hf_batadv_unicast_frag_no = -1;
-static int hf_batadv_unicast_frag_priority = -1;
-static int hf_batadv_unicast_frag_total_size = -1;
-
-static int hf_batadv_unicast_tvlv_version = -1;
-static int hf_batadv_unicast_tvlv_ttl = -1;
-static int hf_batadv_unicast_tvlv_dst = -1;
-static int hf_batadv_unicast_tvlv_src = -1;
-static int hf_batadv_unicast_tvlv_len = -1;
-
-static int hf_batadv_vis_version = -1;
-static int hf_batadv_vis_type = -1;
-static int hf_batadv_vis_seqno = -1;
-static int hf_batadv_vis_seqno32 = -1;
-static int hf_batadv_vis_entries = -1;
-static int hf_batadv_vis_ttl = -1;
-static int hf_batadv_vis_vis_orig = -1;
-static int hf_batadv_vis_target_orig = -1;
-static int hf_batadv_vis_sender_orig = -1;
-static int hf_batadv_vis_entry_src = -1;
-static int hf_batadv_vis_entry_dst = -1;
-static int hf_batadv_vis_entry_quality = -1;
-
-static int hf_batadv_tt_query_version = -1;
-static int hf_batadv_tt_query_ttl = -1;
-static int hf_batadv_tt_query_flags = -1;
-static int hf_batadv_tt_query_flags_type = -1;
-static int hf_batadv_tt_query_flags_full_table = -1;
-static int hf_batadv_tt_query_dst = -1;
-static int hf_batadv_tt_query_src = -1;
-static int hf_batadv_tt_query_ttvn = -1;
-static int hf_batadv_tt_query_tt_crc = -1;
-static int hf_batadv_tt_query_entries = -1;
-static int hf_batadv_tt_entry = -1;
-static int hf_batadv_tt_entry_flags = -1;
-static int hf_batadv_tt_entry_flags_change_del = -1;
-static int hf_batadv_tt_entry_flags_client_roam = -1;
-
-static int hf_batadv_roam_adv_version = -1;
-static int hf_batadv_roam_adv_ttl = -1;
-static int hf_batadv_roam_adv_dst = -1;
-static int hf_batadv_roam_adv_src = -1;
-static int hf_batadv_roam_adv_client = -1;
-
-static int hf_batadv_coded_version = -1;
-static int hf_batadv_coded_ttl = -1;
-static int hf_batadv_coded_first_ttvn = -1;
-static int hf_batadv_coded_first_source = -1;
-static int hf_batadv_coded_first_orig_dest = -1;
-static int hf_batadv_coded_first_crc = -1;
-static int hf_batadv_coded_second_ttl = -1;
-static int hf_batadv_coded_second_ttvn = -1;
-static int hf_batadv_coded_second_dest = -1;
-static int hf_batadv_coded_second_source = -1;
-static int hf_batadv_coded_second_orig_dest = -1;
-static int hf_batadv_coded_second_crc = -1;
-static int hf_batadv_coded_coded_len = -1;
-
-static int hf_msg_fragments = -1;
-static int hf_msg_fragment = -1;
-static int hf_msg_fragment_overlap = -1;
-static int hf_msg_fragment_overlap_conflicts = -1;
-static int hf_msg_fragment_multiple_tails = -1;
-static int hf_msg_fragment_too_long_fragment = -1;
-static int hf_msg_fragment_error = -1;
-static int hf_msg_fragment_count = -1;
-static int hf_msg_reassembled_in = -1;
-static int hf_msg_reassembled_length = -1;
-
-static int hf_batadv_tvlv_type = -1;
-static int hf_batadv_tvlv_version = -1;
-static int hf_batadv_tvlv_len = -1;
-
-static int hf_batadv_tvlv_gw_download = -1;
-static int hf_batadv_tvlv_gw_upload = -1;
-
-static int hf_batadv_tvlv_roam_addr = -1;
-static int hf_batadv_tvlv_roam_vid = -1;
-static int hf_batadv_tvlv_vid_vlan = -1;
-static int hf_batadv_tvlv_vid_tagged = -1;
-
-static int hf_batadv_tvlv_tt_flags = -1;
-static int hf_batadv_tvlv_tt_flags_type = -1;
-static int hf_batadv_tvlv_tt_flags_full_table = -1;
-static int hf_batadv_tvlv_tt_ttvn = -1;
-static int hf_batadv_tvlv_tt_num_vlan = -1;
-static int hf_batadv_tvlv_tt_vlan_crc = -1;
-static int hf_batadv_tvlv_tt_vlan_crc_status = -1;
-static int hf_batadv_tvlv_tt_vlan_vid = -1;
-static int hf_batadv_tvlv_tt_change_flags = -1;
-static int hf_batadv_tvlv_tt_change_vid = -1;
-static int hf_batadv_tvlv_tt_change_addr = -1;
+static int hf_batadv_packet_type;
+
+static int hf_batadv_batman_version;
+static int hf_batadv_batman_flags;
+static int hf_batadv_batman_ttl;
+static int hf_batadv_batman_gwflags;
+static int hf_batadv_batman_gwflags_dl_speed;
+static int hf_batadv_batman_gwflags_ul_speed;
+static int hf_batadv_batman_tq;
+static int hf_batadv_batman_seqno;
+static int hf_batadv_batman_seqno32;
+static int hf_batadv_batman_orig;
+static int hf_batadv_batman_prev_sender;
+static int hf_batadv_batman_num_tt;
+static int hf_batadv_batman_tt_num_changes;
+static int hf_batadv_batman_ttvn;
+static int hf_batadv_batman_tt_crc;
+static int hf_batadv_batman_tt;
+
+static int hf_batadv_iv_ogm_version;
+static int hf_batadv_iv_ogm_ttl;
+static int hf_batadv_iv_ogm_flags;
+static int hf_batadv_iv_ogm_seqno;
+static int hf_batadv_iv_ogm_orig;
+static int hf_batadv_iv_ogm_prev_sender;
+static int hf_batadv_iv_ogm_tq;
+static int hf_batadv_iv_ogm_tvlv_len;
+
+static int hf_batadv_elp_version;
+static int hf_batadv_elp_orig;
+static int hf_batadv_elp_seqno;
+static int hf_batadv_elp_interval;
+
+static int hf_batadv_ogm2_version;
+static int hf_batadv_ogm2_ttl;
+static int hf_batadv_ogm2_flags;
+static int hf_batadv_ogm2_seqno;
+static int hf_batadv_ogm2_orig;
+static int hf_batadv_ogm2_tvlv_len;
+static int hf_batadv_ogm2_throughput;
+
+static int hf_batadv_bcast_version;
+static int hf_batadv_bcast_orig;
+static int hf_batadv_bcast_seqno;
+static int hf_batadv_bcast_seqno32;
+static int hf_batadv_bcast_ttl;
+
+static int hf_batadv_icmp_version;
+static int hf_batadv_icmp_msg_type;
+static int hf_batadv_icmp_dst;
+static int hf_batadv_icmp_orig;
+static int hf_batadv_icmp_ttl;
+static int hf_batadv_icmp_uid;
+static int hf_batadv_icmp_seqno;
+
+static int hf_batadv_icmp_rr_pointer;
+static int hf_batadv_icmp_rr_ether;
+
+static int hf_batadv_icmp_tp_subtype;
+static int hf_batadv_icmp_tp_session;
+static int hf_batadv_icmp_tp_seqno;
+static int hf_batadv_icmp_tp_timestamp;
+
+static int hf_batadv_unicast_version;
+static int hf_batadv_unicast_dst;
+static int hf_batadv_unicast_ttl;
+static int hf_batadv_unicast_ttvn;
+
+static int hf_batadv_unicast_4addr_version;
+static int hf_batadv_unicast_4addr_dst;
+static int hf_batadv_unicast_4addr_ttl;
+static int hf_batadv_unicast_4addr_ttvn;
+static int hf_batadv_unicast_4addr_src;
+static int hf_batadv_unicast_4addr_subtype;
+
+static int hf_batadv_unicast_frag_version;
+static int hf_batadv_unicast_frag_dst;
+static int hf_batadv_unicast_frag_ttl;
+static int hf_batadv_unicast_frag_ttvn;
+static int hf_batadv_unicast_frag_flags;
+static int hf_batadv_unicast_frag_orig;
+static int hf_batadv_unicast_frag_seqno;
+static int hf_batadv_unicast_frag_no;
+static int hf_batadv_unicast_frag_priority;
+static int hf_batadv_unicast_frag_total_size;
+
+static int hf_batadv_unicast_tvlv_version;
+static int hf_batadv_unicast_tvlv_ttl;
+static int hf_batadv_unicast_tvlv_dst;
+static int hf_batadv_unicast_tvlv_src;
+static int hf_batadv_unicast_tvlv_len;
+
+static int hf_batadv_vis_version;
+static int hf_batadv_vis_type;
+static int hf_batadv_vis_seqno;
+static int hf_batadv_vis_seqno32;
+static int hf_batadv_vis_entries;
+static int hf_batadv_vis_ttl;
+static int hf_batadv_vis_vis_orig;
+static int hf_batadv_vis_target_orig;
+static int hf_batadv_vis_sender_orig;
+static int hf_batadv_vis_entry_src;
+static int hf_batadv_vis_entry_dst;
+static int hf_batadv_vis_entry_quality;
+
+static int hf_batadv_tt_query_version;
+static int hf_batadv_tt_query_ttl;
+static int hf_batadv_tt_query_flags;
+static int hf_batadv_tt_query_flags_type;
+static int hf_batadv_tt_query_flags_full_table;
+static int hf_batadv_tt_query_dst;
+static int hf_batadv_tt_query_src;
+static int hf_batadv_tt_query_ttvn;
+static int hf_batadv_tt_query_tt_crc;
+static int hf_batadv_tt_query_entries;
+static int hf_batadv_tt_entry;
+static int hf_batadv_tt_entry_flags;
+static int hf_batadv_tt_entry_flags_change_del;
+static int hf_batadv_tt_entry_flags_client_roam;
+
+static int hf_batadv_roam_adv_version;
+static int hf_batadv_roam_adv_ttl;
+static int hf_batadv_roam_adv_dst;
+static int hf_batadv_roam_adv_src;
+static int hf_batadv_roam_adv_client;
+
+static int hf_batadv_coded_version;
+static int hf_batadv_coded_ttl;
+static int hf_batadv_coded_first_ttvn;
+static int hf_batadv_coded_first_source;
+static int hf_batadv_coded_first_orig_dest;
+static int hf_batadv_coded_first_crc;
+static int hf_batadv_coded_second_ttl;
+static int hf_batadv_coded_second_ttvn;
+static int hf_batadv_coded_second_dest;
+static int hf_batadv_coded_second_source;
+static int hf_batadv_coded_second_orig_dest;
+static int hf_batadv_coded_second_crc;
+static int hf_batadv_coded_coded_len;
+
+static int hf_msg_fragments;
+static int hf_msg_fragment;
+static int hf_msg_fragment_overlap;
+static int hf_msg_fragment_overlap_conflicts;
+static int hf_msg_fragment_multiple_tails;
+static int hf_msg_fragment_too_long_fragment;
+static int hf_msg_fragment_error;
+static int hf_msg_fragment_count;
+static int hf_msg_reassembled_in;
+static int hf_msg_reassembled_length;
+
+static int hf_batadv_tvlv_type;
+static int hf_batadv_tvlv_version;
+static int hf_batadv_tvlv_len;
+
+static int hf_batadv_tvlv_gw_download;
+static int hf_batadv_tvlv_gw_upload;
+
+static int hf_batadv_tvlv_roam_addr;
+static int hf_batadv_tvlv_roam_vid;
+static int hf_batadv_tvlv_vid_vlan;
+static int hf_batadv_tvlv_vid_tagged;
+
+static int hf_batadv_tvlv_tt_flags;
+static int hf_batadv_tvlv_tt_flags_type;
+static int hf_batadv_tvlv_tt_flags_full_table;
+static int hf_batadv_tvlv_tt_ttvn;
+static int hf_batadv_tvlv_tt_num_vlan;
+static int hf_batadv_tvlv_tt_vlan_crc;
+static int hf_batadv_tvlv_tt_vlan_crc_status;
+static int hf_batadv_tvlv_tt_vlan_vid;
+static int hf_batadv_tvlv_tt_change_flags;
+static int hf_batadv_tvlv_tt_change_vid;
+static int hf_batadv_tvlv_tt_change_addr;
/* flags */
-static int hf_batadv_batman_flags_directlink = -1;
-static int hf_batadv_batman_flags_vis_server = -1;
-static int hf_batadv_batman_flags_not_best_next_hop = -1;
-static int hf_batadv_batman_flags_primaries_first_hop = -1;
-static int hf_batadv_unicast_frag_flags_head = -1;
-static int hf_batadv_unicast_frag_flags_largetail = -1;
-static int hf_batadv_iv_ogm_flags_not_best_next_hop = -1;
-static int hf_batadv_iv_ogm_flags_primaries_first_hop = -1;
-static int hf_batadv_iv_ogm_flags_directlink = -1;
-static int hf_batadv_tvlv_mcast_flags = -1;
-static int hf_batadv_tvlv_mcast_flags_unsnoopables = -1;
-static int hf_batadv_tvlv_mcast_flags_ipv4 = -1;
-static int hf_batadv_tvlv_mcast_flags_ipv6 = -1;
-static int hf_batadv_tvlv_mcast_flags_no_rtr4 = -1;
-static int hf_batadv_tvlv_mcast_flags_no_rtr6 = -1;
-static int hf_batadv_tvlv_tt_change_flags_del = -1;
-static int hf_batadv_tvlv_tt_change_flags_roam = -1;
-static int hf_batadv_tvlv_tt_change_flags_wifi = -1;
-static int hf_batadv_tvlv_tt_change_flags_isolate = -1;
+static int hf_batadv_batman_flags_directlink;
+static int hf_batadv_batman_flags_vis_server;
+static int hf_batadv_batman_flags_not_best_next_hop;
+static int hf_batadv_batman_flags_primaries_first_hop;
+static int hf_batadv_unicast_frag_flags_head;
+static int hf_batadv_unicast_frag_flags_largetail;
+static int hf_batadv_iv_ogm_flags_not_best_next_hop;
+static int hf_batadv_iv_ogm_flags_primaries_first_hop;
+static int hf_batadv_iv_ogm_flags_directlink;
+static int hf_batadv_tvlv_mcast_flags;
+static int hf_batadv_tvlv_mcast_flags_unsnoopables;
+static int hf_batadv_tvlv_mcast_flags_ipv4;
+static int hf_batadv_tvlv_mcast_flags_ipv6;
+static int hf_batadv_tvlv_mcast_flags_no_rtr4;
+static int hf_batadv_tvlv_mcast_flags_no_rtr6;
+static int hf_batadv_tvlv_tt_change_flags_del;
+static int hf_batadv_tvlv_tt_change_flags_roam;
+static int hf_batadv_tvlv_tt_change_flags_wifi;
+static int hf_batadv_tvlv_tt_change_flags_isolate;
static const value_string unicast_4addr_typenames[] = {
{ UNICAST_4ADDR_DATA, "Data" },
@@ -905,7 +905,7 @@ static int dissect_batadv_tvlv_v15_tt_change(tvbuff_t *tvb, packet_info *pinfo _
/* other dissectors */
static dissector_handle_t eth_handle;
-static int proto_batadv_plugin = -1;
+static int proto_batadv_plugin;
/* tap */
static int batadv_tap = -1;