diff options
Diffstat (limited to 'epan/dissectors/packet-aruba-erm.c')
| -rw-r--r-- | epan/dissectors/packet-aruba-erm.c | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/epan/dissectors/packet-aruba-erm.c b/epan/dissectors/packet-aruba-erm.c index 918154a270..a1c1f666fd 100644 --- a/epan/dissectors/packet-aruba-erm.c +++ b/epan/dissectors/packet-aruba-erm.c @@ -78,7 +78,7 @@ * * Radiotap (type 6): * - * As part of 802.11ax developement, Aruba has added radiotap capture + * As part of 802.11ax development, Aruba has added radiotap capture * encapsulation. This new format can be used with any model of AP * be it 11ax, 11ac or 11n. * Note: type 6 is _only_ supported in ArubaOS 8.6 and higher. @@ -126,27 +126,27 @@ void proto_reg_handoff_aruba_erm_radio(void); static gint aruba_erm_type = 0; #endif -static int proto_aruba_erm = -1; -static int proto_aruba_erm_type0 = -1; -static int proto_aruba_erm_type1 = -1; -static int proto_aruba_erm_type2 = -1; -static int proto_aruba_erm_type3 = -1; -static int proto_aruba_erm_type4 = -1; -static int proto_aruba_erm_type5 = -1; -static int proto_aruba_erm_type6 = -1; +static int proto_aruba_erm; +static int proto_aruba_erm_type0; +static int proto_aruba_erm_type1; +static int proto_aruba_erm_type2; +static int proto_aruba_erm_type3; +static int proto_aruba_erm_type4; +static int proto_aruba_erm_type5; +static int proto_aruba_erm_type6; -static int hf_aruba_erm_time = -1; -static int hf_aruba_erm_incl_len = -1; -static int hf_aruba_erm_orig_len = -1; -static int hf_aruba_erm_data_rate = -1; -static int hf_aruba_erm_data_rate_gen = -1; -static int hf_aruba_erm_channel = -1; -static int hf_aruba_erm_signal_strength = -1; +static int hf_aruba_erm_time; +static int hf_aruba_erm_incl_len; +static int hf_aruba_erm_orig_len; +static int hf_aruba_erm_data_rate; +static int hf_aruba_erm_data_rate_gen; +static int hf_aruba_erm_channel; +static int hf_aruba_erm_signal_strength; -static gint ett_aruba_erm = -1; +static gint ett_aruba_erm; -static expert_field ei_aruba_erm_airmagnet = EI_INIT; -static expert_field ei_aruba_erm_decode = EI_INIT; +static expert_field ei_aruba_erm_airmagnet; +static expert_field ei_aruba_erm_decode; static dissector_handle_t aruba_erm_handle; static dissector_handle_t aruba_erm_handle_type0; @@ -386,7 +386,7 @@ dissect_aruba_erm_type6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi static void aruba_erm_prompt(packet_info *pinfo _U_, gchar* result) { - g_snprintf(result, MAX_DECODE_AS_PROMPT_LEN, "Aruba ERM payload as"); + snprintf(result, MAX_DECODE_AS_PROMPT_LEN, "Aruba ERM payload as"); } void @@ -468,10 +468,18 @@ proto_register_aruba_erm(void) expert_aruba_erm = expert_register_protocol(proto_aruba_erm); expert_register_field_array(expert_aruba_erm, ei, array_length(ei)); - register_dissector("aruba_erm", dissect_aruba_erm, proto_aruba_erm); + aruba_erm_handle = register_dissector("aruba_erm", dissect_aruba_erm, proto_aruba_erm); aruba_erm_subdissector_table = register_decode_as_next_proto(proto_aruba_erm, "aruba_erm.type", "Aruba ERM Type", aruba_erm_prompt); + + aruba_erm_handle_type0 = register_dissector("aruba_erm.type0", dissect_aruba_erm_type0, proto_aruba_erm_type0); + aruba_erm_handle_type1 = register_dissector("aruba_erm.type1", dissect_aruba_erm_type1, proto_aruba_erm_type1); + aruba_erm_handle_type2 = register_dissector("aruba_erm.type2", dissect_aruba_erm_type2, proto_aruba_erm_type2); + aruba_erm_handle_type3 = register_dissector("aruba_erm.type3", dissect_aruba_erm_type3, proto_aruba_erm_type3); + aruba_erm_handle_type4 = register_dissector("aruba_erm.type4", dissect_aruba_erm_type4, proto_aruba_erm_type4); + aruba_erm_handle_type5 = register_dissector("aruba_erm.type5", dissect_aruba_erm_type5, proto_aruba_erm_type5); + aruba_erm_handle_type6 = register_dissector("aruba_erm.type6", dissect_aruba_erm_type6, proto_aruba_erm_type6); } void @@ -482,14 +490,6 @@ proto_reg_handoff_aruba_erm(void) ppi_handle = find_dissector_add_dependency("ppi", proto_aruba_erm); peek_handle = find_dissector_add_dependency("peekremote", proto_aruba_erm); radiotap_handle = find_dissector_add_dependency("radiotap", proto_aruba_erm); - aruba_erm_handle = create_dissector_handle(dissect_aruba_erm, proto_aruba_erm); - aruba_erm_handle_type0 = create_dissector_handle(dissect_aruba_erm_type0, proto_aruba_erm_type0); - aruba_erm_handle_type1 = create_dissector_handle(dissect_aruba_erm_type1, proto_aruba_erm_type1); - aruba_erm_handle_type2 = create_dissector_handle(dissect_aruba_erm_type2, proto_aruba_erm_type2); - aruba_erm_handle_type3 = create_dissector_handle(dissect_aruba_erm_type3, proto_aruba_erm_type3); - aruba_erm_handle_type4 = create_dissector_handle(dissect_aruba_erm_type4, proto_aruba_erm_type4); - aruba_erm_handle_type5 = create_dissector_handle(dissect_aruba_erm_type5, proto_aruba_erm_type5); - aruba_erm_handle_type6 = create_dissector_handle(dissect_aruba_erm_type6, proto_aruba_erm_type6); dissector_add_uint_range_with_preference("udp.port", "", aruba_erm_handle); dissector_add_for_decode_as("aruba_erm.type", aruba_erm_handle_type0); |