summaryrefslogtreecommitdiff
path: root/epan/dissectors/packet-aruba-adp.c
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2014-02-10 23:10:24 +0100
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2014-02-10 22:17:37 +0000
commit0e3081a56b49b6cdaf5c99bb908d3579a872489c (patch)
tree8357cb302fb89b9ee82e8b38e3da5558bf2530fd /epan/dissectors/packet-aruba-adp.c
parent38b7e2e3913ac469858b7bdfd99fefa9a404b3c3 (diff)
downloadwireshark-0e3081a56b49b6cdaf5c99bb908d3579a872489c.tar.gz
Fix indent (Use 4 spaces and modelines info)
Change-Id: I1cae6fd52f84a4d2f101357adddfda010da847e0 Reviewed-on: https://code.wireshark.org/review/168 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-aruba-adp.c')
-rw-r--r--epan/dissectors/packet-aruba-adp.c130
1 files changed, 64 insertions, 66 deletions
diff --git a/epan/dissectors/packet-aruba-adp.c b/epan/dissectors/packet-aruba-adp.c
index 8ced3a5e45..c50baaa366 100644
--- a/epan/dissectors/packet-aruba-adp.c
+++ b/epan/dissectors/packet-aruba-adp.c
@@ -48,122 +48,120 @@ static int hf_adp_switchip = -1;
static const value_string adp_type_val[] =
{
- {1, "Request"},
- {2, "Response"},
- {0, NULL},
+ {1, "Request"},
+ {2, "Response"},
+ {0, NULL},
};
static void
dissect_aruba_adp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
- proto_tree *ti = NULL;
- proto_tree *aruba_adp_tree = NULL;
- guint16 type;
- const gchar *mac_str;
- const gchar *switchip;
+ proto_tree *ti = NULL;
+ proto_tree *aruba_adp_tree = NULL;
+ guint16 type;
+ const gchar *mac_str;
+ const gchar *switchip;
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "ADP");
- col_clear(pinfo->cinfo, COL_INFO);
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "ADP");
+ col_clear(pinfo->cinfo, COL_INFO);
- if (tree) {
- ti = proto_tree_add_item(tree, proto_aruba_adp, tvb, 0, 0, ENC_NA);
- aruba_adp_tree = proto_item_add_subtree(ti, ett_aruba_adp);
+ if (tree) {
+ ti = proto_tree_add_item(tree, proto_aruba_adp, tvb, 0, 0, ENC_NA);
+ aruba_adp_tree = proto_item_add_subtree(ti, ett_aruba_adp);
+ }
proto_tree_add_item(aruba_adp_tree, hf_adp_version, tvb, 0, 2, ENC_BIG_ENDIAN);
- }
- type = tvb_get_ntohs(tvb, 2);
- if (tree) {
+
proto_tree_add_item(aruba_adp_tree, hf_adp_type, tvb, 2, 2, ENC_BIG_ENDIAN);
+ type = tvb_get_ntohs(tvb, 2);
proto_tree_add_item(aruba_adp_tree, hf_adp_id, tvb, 4, 2, ENC_BIG_ENDIAN);
- }
- switch(type){
- case ADP_REQUEST:
+ switch(type){
+ case ADP_REQUEST:
- proto_tree_add_item(aruba_adp_tree, hf_adp_mac, tvb, 6, 6, ENC_NA);
- mac_str = tvb_ether_to_str(tvb, 6);
+ proto_tree_add_item(aruba_adp_tree, hf_adp_mac, tvb, 6, 6, ENC_NA);
+ mac_str = tvb_ether_to_str(tvb, 6);
- col_add_fstr(pinfo->cinfo, COL_INFO, "ADP Request Src MAC: %s", mac_str);
+ col_add_fstr(pinfo->cinfo, COL_INFO, "ADP Request Src MAC: %s", mac_str);
- proto_item_append_text(ti, ", Request Src MAC: %s", mac_str);
- break;
+ proto_item_append_text(ti, ", Request Src MAC: %s", mac_str);
+ break;
- case ADP_RESPONSE:
+ case ADP_RESPONSE:
- proto_tree_add_item(aruba_adp_tree, hf_adp_switchip, tvb, 6, 4, ENC_BIG_ENDIAN);
- switchip = tvb_ip_to_str(tvb, 6);
+ proto_tree_add_item(aruba_adp_tree, hf_adp_switchip, tvb, 6, 4, ENC_BIG_ENDIAN);
+ switchip = tvb_ip_to_str(tvb, 6);
- col_add_fstr(pinfo->cinfo, COL_INFO, "ADP Response Switch IP: %s", switchip);
+ col_add_fstr(pinfo->cinfo, COL_INFO, "ADP Response Switch IP: %s", switchip);
- proto_item_append_text(ti, ", Response Switch IP: %s", switchip);
- break;
+ proto_item_append_text(ti, ", Response Switch IP: %s", switchip);
+ break;
- default:
- break;
+ default:
+ break;
- }
+ }
}
void
proto_register_aruba_adp(void)
{
- static hf_register_info hf[] = {
- { &hf_adp_version,
- { "Version", "adp.version", FT_UINT16, BASE_DEC, NULL,0x0,
- "ADP version", HFILL}},
+ static hf_register_info hf[] = {
+ { &hf_adp_version,
+ { "Version", "adp.version", FT_UINT16, BASE_DEC, NULL,0x0,
+ "ADP version", HFILL}},
- { &hf_adp_type,
- { "Type", "adp.type", FT_UINT16, BASE_DEC, VALS(adp_type_val), 0x0,
- "ADP type", HFILL}},
+ { &hf_adp_type,
+ { "Type", "adp.type", FT_UINT16, BASE_DEC, VALS(adp_type_val), 0x0,
+ "ADP type", HFILL}},
- { &hf_adp_id,
- { "Transaction ID", "adp.id", FT_UINT16, BASE_DEC, NULL, 0x0,
- "ADP transaction ID", HFILL}},
+ { &hf_adp_id,
+ { "Transaction ID", "adp.id", FT_UINT16, BASE_DEC, NULL, 0x0,
+ "ADP transaction ID", HFILL}},
- { &hf_adp_mac,
- { "MAC address", "adp.mac", FT_ETHER, BASE_NONE, NULL, 0x0,
- NULL, HFILL}},
+ { &hf_adp_mac,
+ { "MAC address", "adp.mac", FT_ETHER, BASE_NONE, NULL, 0x0,
+ NULL, HFILL}},
- { &hf_adp_switchip,
- { "Switch IP", "adp.switch", FT_IPv4, BASE_NONE, NULL, 0x0,
- "Switch IP address", HFILL}},
+ { &hf_adp_switchip,
+ { "Switch IP", "adp.switch", FT_IPv4, BASE_NONE, NULL, 0x0,
+ "Switch IP address", HFILL}},
- };
+ };
- static gint *ett[] = {
- &ett_aruba_adp,
- };
+ static gint *ett[] = {
+ &ett_aruba_adp,
+ };
- proto_aruba_adp = proto_register_protocol("Aruba Discovery Protocol",
- "ADP", "adp");
- proto_register_field_array(proto_aruba_adp, hf, array_length(hf));
- proto_register_subtree_array(ett, array_length(ett));
+ proto_aruba_adp = proto_register_protocol("Aruba Discovery Protocol",
+ "ADP", "adp");
+ proto_register_field_array(proto_aruba_adp, hf, array_length(hf));
+ proto_register_subtree_array(ett, array_length(ett));
}
void
proto_reg_handoff_aruba_adp(void)
{
- dissector_handle_t adp_handle;
+ dissector_handle_t adp_handle;
- adp_handle = create_dissector_handle(dissect_aruba_adp, proto_aruba_adp);
- dissector_add_uint("udp.port", UDP_PORT_ADP, adp_handle);
+ adp_handle = create_dissector_handle(dissect_aruba_adp, proto_aruba_adp);
+ dissector_add_uint("udp.port", UDP_PORT_ADP, adp_handle);
}
/*
- * Editor modelines
+ * Editor modelines - http://www.wireshark.org/tools/modelines.html
*
- * Local Variables:
- * c-basic-offset: 2
+ * Local variables:
+ * c-basic-offset: 4
* tab-width: 8
* indent-tabs-mode: nil
* End:
*
- * ex: set shiftwidth=2 tabstop=8 expandtab:
- * :indentSize=2:tabSize=8:noTabs=true:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
*/
-