Remove 'if (tree)' around (indirect) calls to expert functions;

Reformat hf[] entries;
'offset++' --> 'offset += 1' for consistency;
tabs --> spaces to match editor modelines;
Rework/add whitespace.

svn path=/trunk/; revision=53987

1 files changed, 256 insertions, 231 deletions

diff --git a/epan/dissectors/packet-hpsw.c b/epan/dissectors/packet-hpsw.c
index 273265a144..4bc37f42fd 100644
--- a/epan/dissectors/packet-hpsw.c
+++ b/epan/dissectors/packet-hpsw.c
@@ -76,273 +76,298 @@ static expert_field ei_hpsw_tlvlength_bad = EI_INIT;
 #define HPFOO_OWN_MAC_ADDR    0xe
 
 static const value_string hpsw_tlv_type_vals[] = {
-	{ HPFOO_DEVICE_NAME,    "Device Name" },
-	{ HPFOO_DEVICE_VERSION, "Version" },
-	{ HPFOO_CONFIG_NAME,    "Config Name" },
-	{ HPFOO_ROOT_MAC_ADDR,  "Root MAC Addr" },
-	{ HPFOO_IP_ADDR,        "IP Addr" },
-	{ HPFOO_FIELD_6,        "Field 6" },
-	{ HPFOO_DOMAIN,         "Domain" },
-	{ HPFOO_FIELD_8,        "Field 8" },
-	{ HPFOO_FIELD_9,        "Field 9" },
-	{ HPFOO_FIELD_10,       "Field 10" },
-	{ HPFOO_NEIGHBORS,      "Neighbors" },
-	{ HPFOO_FIELD_12,       "Field 12" },
-	{ HPFOO_DEVICE_ID,      "Device ID" },
-	{ HPFOO_OWN_MAC_ADDR,   "2nd MAC Addr" },
-	{ 0x00,                 NULL }
+    { HPFOO_DEVICE_NAME,    "Device Name" },
+    { HPFOO_DEVICE_VERSION, "Version" },
+    { HPFOO_CONFIG_NAME,    "Config Name" },
+    { HPFOO_ROOT_MAC_ADDR,  "Root MAC Addr" },
+    { HPFOO_IP_ADDR,        "IP Addr" },
+    { HPFOO_FIELD_6,        "Field 6" },
+    { HPFOO_DOMAIN,         "Domain" },
+    { HPFOO_FIELD_8,        "Field 8" },
+    { HPFOO_FIELD_9,        "Field 9" },
+    { HPFOO_FIELD_10,       "Field 10" },
+    { HPFOO_NEIGHBORS,      "Neighbors" },
+    { HPFOO_FIELD_12,       "Field 12" },
+    { HPFOO_DEVICE_ID,      "Device ID" },
+    { HPFOO_OWN_MAC_ADDR,   "2nd MAC Addr" },
+    { 0x00,                 NULL }
 };
 
 static void
 dissect_hpsw_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length,
-    proto_tree *tree, proto_item *ti, guint8 type)
+                 proto_tree *tree, proto_item *ti, guint8 type)
 {
-	switch (type) {
-
-	case HPFOO_DEVICE_NAME:
-		if (length > 0) {
-			proto_tree_add_item(tree, hf_hpsw_device_name, tvb, offset, length, ENC_NA|ENC_ASCII);
-		} else {
-			expert_add_info_format(pinfo, ti, &ei_hpsw_tlvlength_bad, "Device Name: Bad length %u", length);
-		}
-		break;
-
-	case HPFOO_DEVICE_VERSION:
-		if (length > 0) {
-			proto_tree_add_item(tree, hf_hpsw_device_version, tvb, offset, length, ENC_NA|ENC_ASCII);
-		} else {
-			expert_add_info_format(pinfo, ti, &ei_hpsw_tlvlength_bad, "Version: Bad length %u", length);
-		}
-		break;
-
-	case HPFOO_CONFIG_NAME:
-		if (length > 0) {
-			proto_tree_add_item(tree, hf_hpsw_config_name, tvb, offset, length, ENC_NA|ENC_ASCII);
-		} else {
-			expert_add_info_format(pinfo, ti, &ei_hpsw_tlvlength_bad, "Config Name: Bad length %u", length);
-		}
-		break;
-
-	case HPFOO_ROOT_MAC_ADDR:
-		if (length == 6) {
-			proto_tree_add_item(tree, hf_hpsw_root_mac_addr, tvb, offset, length, ENC_NA);
-		} else {
-			expert_add_info_format(pinfo, ti, &ei_hpsw_tlvlength_bad, "Root MAC Addr: Bad length %u", length);
-		}
-		break;
-
-	case HPFOO_IP_ADDR:
-		if (length == 4) {
-			proto_tree_add_item(tree, hf_hpsw_ip_addr, tvb, offset, length, ENC_BIG_ENDIAN);
-		} else {
-			expert_add_info_format(pinfo, ti, &ei_hpsw_tlvlength_bad, "IP Addr: Bad length %u", length);
-		}
-		break;
-
-	case HPFOO_FIELD_6:
-		if (length == 2) {
-			proto_tree_add_item(tree, hf_hpsw_field_6, tvb, offset, length, ENC_BIG_ENDIAN);
-		} else {
-			expert_add_info_format(pinfo, ti, &ei_hpsw_tlvlength_bad, "Field 6: Bad length %u", length);
-		}
-		break;
-
-	case HPFOO_DOMAIN:
-		if (length > 0) {
-			proto_tree_add_item(tree, hf_hpsw_domain, tvb, offset, length, ENC_NA|ENC_ASCII);
-		} else {
-			expert_add_info_format(pinfo, ti, &ei_hpsw_tlvlength_bad, "Domain: Bad length %u", length);
-		}
-		break;
-
-	case HPFOO_FIELD_8:
-		if (length == 2) {
-			proto_tree_add_item(tree, hf_hpsw_field_8, tvb, offset, length, ENC_BIG_ENDIAN);
-		} else {
-			expert_add_info_format(pinfo, ti, &ei_hpsw_tlvlength_bad, "Field 8: Bad length %u", length);
-		}
-		break;
-
-	case HPFOO_FIELD_9:
-		if (length == 2) {
-			proto_tree_add_item(tree, hf_hpsw_field_9, tvb, offset, length, ENC_BIG_ENDIAN);
-		} else {
-			expert_add_info_format(pinfo, ti, &ei_hpsw_tlvlength_bad, "Field 9: Bad length %u", length);
-		}
-		break;
-
-	case HPFOO_FIELD_10:
-		if (length == 4) {
-			proto_tree_add_item(tree, hf_hpsw_field_10, tvb, offset, length, ENC_BIG_ENDIAN);
-		} else {
-			expert_add_info_format(pinfo, ti, &ei_hpsw_tlvlength_bad, "Field 10: Bad length %u", length);
-		}
-		break;
-
-	case HPFOO_NEIGHBORS:
-		if (!(length % 6))
-		{   int i = length/6;
-			proto_item_set_text(ti, "Number of neighbor MAC Addresses: %u", i);
-			for ( ; i; i--)
-			{
-				proto_tree_add_item(tree, hf_hpsw_neighbor_mac_addr, tvb, offset, length, ENC_NA);
-				offset += 6;
-			}
-		} else {
-			expert_add_info_format(pinfo, ti, &ei_hpsw_tlvlength_bad, "Neighbors: Bad length %u", length);
-		}
-		break;
-
-	case HPFOO_FIELD_12:
-		if (length == 1) {
-			proto_tree_add_item(tree, hf_hpsw_field_12, tvb, offset, length, ENC_NA);
-		} else {
-			expert_add_info_format(pinfo, ti, &ei_hpsw_tlvlength_bad, "Field 12: Bad length %u", length);
-		}
-		break;
-
-	case HPFOO_DEVICE_ID:
-		if (length > 6) {
-			proto_tree_add_item(tree, hf_hpsw_device_id, tvb, offset, 6, ENC_NA);
-			proto_tree_add_item(tree, hf_hpsw_device_id_data, tvb, offset+6, length-6, ENC_NA);
-		} else {
-			expert_add_info_format(pinfo, ti, &ei_hpsw_tlvlength_bad, "Device ID: Bad length %u", length);
-		}
-		break;
-
-	case HPFOO_OWN_MAC_ADDR:
-		if (length == 6) {
-			proto_tree_add_item(tree, hf_hpsw_own_mac_addr, tvb, offset, length, ENC_NA);
-		} else {
-			expert_add_info_format(pinfo, ti, &ei_hpsw_tlvlength_bad, "Own MAC Addr: Bad length %u", length);
-		}
-		break;
-
-	default:
-		proto_tree_add_text(tree, tvb, offset, length, "Data");
-		break;
-	}
+    switch (type) {
+
+    case HPFOO_DEVICE_NAME:
+        if (length > 0) {
+            proto_tree_add_item(tree, hf_hpsw_device_name, tvb, offset, length, ENC_NA|ENC_ASCII);
+        } else {
+            expert_add_info_format(pinfo, ti, &ei_hpsw_tlvlength_bad, "Device Name: Bad length %u", length);
+        }
+        break;
+
+    case HPFOO_DEVICE_VERSION:
+        if (length > 0) {
+            proto_tree_add_item(tree, hf_hpsw_device_version, tvb, offset, length, ENC_NA|ENC_ASCII);
+        } else {
+            expert_add_info_format(pinfo, ti, &ei_hpsw_tlvlength_bad, "Version: Bad length %u", length);
+        }
+        break;
+
+    case HPFOO_CONFIG_NAME:
+        if (length > 0) {
+            proto_tree_add_item(tree, hf_hpsw_config_name, tvb, offset, length, ENC_NA|ENC_ASCII);
+        } else {
+            expert_add_info_format(pinfo, ti, &ei_hpsw_tlvlength_bad, "Config Name: Bad length %u", length);
+        }
+        break;
+
+    case HPFOO_ROOT_MAC_ADDR:
+        if (length == 6) {
+            proto_tree_add_item(tree, hf_hpsw_root_mac_addr, tvb, offset, length, ENC_NA);
+        } else {
+            expert_add_info_format(pinfo, ti, &ei_hpsw_tlvlength_bad, "Root MAC Addr: Bad length %u", length);
+        }
+        break;
+
+    case HPFOO_IP_ADDR:
+        if (length == 4) {
+            proto_tree_add_item(tree, hf_hpsw_ip_addr, tvb, offset, length, ENC_BIG_ENDIAN);
+        } else {
+            expert_add_info_format(pinfo, ti, &ei_hpsw_tlvlength_bad, "IP Addr: Bad length %u", length);
+        }
+        break;
+
+    case HPFOO_FIELD_6:
+        if (length == 2) {
+            proto_tree_add_item(tree, hf_hpsw_field_6, tvb, offset, length, ENC_BIG_ENDIAN);
+        } else {
+            expert_add_info_format(pinfo, ti, &ei_hpsw_tlvlength_bad, "Field 6: Bad length %u", length);
+        }
+        break;
+
+    case HPFOO_DOMAIN:
+        if (length > 0) {
+            proto_tree_add_item(tree, hf_hpsw_domain, tvb, offset, length, ENC_NA|ENC_ASCII);
+        } else {
+            expert_add_info_format(pinfo, ti, &ei_hpsw_tlvlength_bad, "Domain: Bad length %u", length);
+        }
+        break;
+
+    case HPFOO_FIELD_8:
+        if (length == 2) {
+            proto_tree_add_item(tree, hf_hpsw_field_8, tvb, offset, length, ENC_BIG_ENDIAN);
+        } else {
+            expert_add_info_format(pinfo, ti, &ei_hpsw_tlvlength_bad, "Field 8: Bad length %u", length);
+        }
+        break;
+
+    case HPFOO_FIELD_9:
+        if (length == 2) {
+            proto_tree_add_item(tree, hf_hpsw_field_9, tvb, offset, length, ENC_BIG_ENDIAN);
+        } else {
+            expert_add_info_format(pinfo, ti, &ei_hpsw_tlvlength_bad, "Field 9: Bad length %u", length);
+        }
+        break;
+
+    case HPFOO_FIELD_10:
+        if (length == 4) {
+            proto_tree_add_item(tree, hf_hpsw_field_10, tvb, offset, length, ENC_BIG_ENDIAN);
+        } else {
+            expert_add_info_format(pinfo, ti, &ei_hpsw_tlvlength_bad, "Field 10: Bad length %u", length);
+        }
+        break;
+
+    case HPFOO_NEIGHBORS:
+        if (!(length % 6))
+        {   int i = length/6;
+            proto_item_set_text(ti, "Number of neighbor MAC Addresses: %u", i);
+            for ( ; i; i--)
+            {
+                proto_tree_add_item(tree, hf_hpsw_neighbor_mac_addr, tvb, offset, length, ENC_NA);
+                offset += 6;
+            }
+        } else {
+            expert_add_info_format(pinfo, ti, &ei_hpsw_tlvlength_bad, "Neighbors: Bad length %u", length);
+        }
+        break;
+
+    case HPFOO_FIELD_12:
+        if (length == 1) {
+            proto_tree_add_item(tree, hf_hpsw_field_12, tvb, offset, length, ENC_NA);
+        } else {
+            expert_add_info_format(pinfo, ti, &ei_hpsw_tlvlength_bad, "Field 12: Bad length %u", length);
+        }
+        break;
+
+    case HPFOO_DEVICE_ID:
+        if (length > 6) {
+            proto_tree_add_item(tree, hf_hpsw_device_id, tvb, offset, 6, ENC_NA);
+            proto_tree_add_item(tree, hf_hpsw_device_id_data, tvb, offset+6, length-6, ENC_NA);
+        } else {
+            expert_add_info_format(pinfo, ti, &ei_hpsw_tlvlength_bad, "Device ID: Bad length %u", length);
+        }
+        break;
+
+    case HPFOO_OWN_MAC_ADDR:
+        if (length == 6) {
+            proto_tree_add_item(tree, hf_hpsw_own_mac_addr, tvb, offset, length, ENC_NA);
+        } else {
+            expert_add_info_format(pinfo, ti, &ei_hpsw_tlvlength_bad, "Own MAC Addr: Bad length %u", length);
+        }
+        break;
+
+    default:
+        proto_tree_add_text(tree, tvb, offset, length, "Data");
+        break;
+    }
 }
 
 static void
 dissect_hpsw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-	proto_tree	*hp_tree = NULL;
-	proto_tree	*tlv_tree = NULL;
-	proto_item	*ti = NULL;
-	guint8		version;
+    proto_tree *hp_tree;
+    proto_tree *tlv_tree;
+    proto_item *ti;
+    guint8      version;
+    gint        offset = 0;
 
-	col_set_str(pinfo->cinfo, COL_PROTOCOL, "HP");
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "HP");
+    col_set_str(pinfo->cinfo, COL_INFO, "HP Switch Protocol");
 
-	col_set_str(pinfo->cinfo, COL_INFO, "HP Switch Protocol");
+    version = tvb_get_guint8(tvb, 0);
 
-	version = tvb_get_guint8(tvb, 0);
+    ti = proto_tree_add_item(tree, proto_hpsw, tvb, 0, -1, ENC_NA);
+    hp_tree = proto_item_add_subtree(ti, ett_hpsw);
+    proto_tree_add_uint(hp_tree, hf_hpsw_version, tvb, 0, 1, version);
+    offset += 1;
 
-	if (tree) {
-		guint16 offset =0;
+    proto_tree_add_item(hp_tree, hf_hpsw_type, tvb, 1, 1, ENC_BIG_ENDIAN);
+    offset += 1;
 
-		ti = proto_tree_add_item(tree, proto_hpsw, tvb, 0, -1, ENC_NA);
-		hp_tree = proto_item_add_subtree(ti, ett_hpsw);
-		proto_tree_add_uint(hp_tree, hf_hpsw_version, tvb, 0, 1, version);
-		offset++;
+    while ( tvb_reported_length_remaining(tvb, offset) > 0 )
+    {
+        guint8 type, length;
 
-		proto_tree_add_item(hp_tree, hf_hpsw_type, tvb, 1, 1, ENC_BIG_ENDIAN);
-		offset++;
+        type   = tvb_get_guint8(tvb, offset);
+        length = tvb_get_guint8(tvb, offset+1);
 
-		while ( tvb_reported_length_remaining(tvb, offset) > 0 )
-		{
-			guint8 type,length;
+        /* make sure still in valid tlv */
+        if (( length < 1 ) || ( length > tvb_length_remaining(tvb, offset+2)))
+            break;
 
-			type = tvb_get_guint8(tvb, offset);
-			length = tvb_get_guint8(tvb, offset+1);
+        ti = proto_tree_add_text(hp_tree, tvb, offset, length+2, "%s",
+                                 val_to_str(type, hpsw_tlv_type_vals, "Unknown TLV type: 0x%02x"));
 
-			/* make sure still in valid tlv */
-			if (( length < 1 ) || ( length > tvb_length_remaining(tvb,offset+2)))
-				break;
+        tlv_tree = proto_item_add_subtree(ti, ett_hpsw_tlv);
 
-			ti = proto_tree_add_text(hp_tree,tvb,offset,length+2,"%s",
-						val_to_str(type,hpsw_tlv_type_vals,"Unknown TLV type: 0x%02x"));
+        /* type */
+        proto_tree_add_uint(tlv_tree, hf_hpsw_tlvtype, tvb, offset, 1, type);
+        offset += 1;
 
-			tlv_tree=proto_item_add_subtree(ti,ett_hpsw_tlv);
+        /* LENGTH (not inclusive of type and length bytes) */
+        proto_tree_add_uint(tlv_tree, hf_hpsw_tlvlength, tvb, offset, 1, length);
+        offset += 1;
 
-			/* type */
-			proto_tree_add_uint(tlv_tree, hf_hpsw_tlvtype, tvb, offset, 1, type);
-			offset++;
+        dissect_hpsw_tlv(tvb, pinfo, offset, length, tlv_tree, ti, type);
 
-			/* LENGTH (not inclusive of type and length bytes) */
-			proto_tree_add_uint(tlv_tree, hf_hpsw_tlvlength, tvb, offset, 1, length);
-			offset++;
+        offset += length;
 
-			dissect_hpsw_tlv(tvb,pinfo,offset,length,tlv_tree,ti,type);
-
-			offset += length;
-
-		}
-
-	}
+    }
 }
 
 void
 proto_register_hpsw(void)
 {
-	static hf_register_info hf[] = {
-		{ &hf_hpsw_version,
-		{ "Version", "hpsw.version", FT_UINT8, BASE_HEX,
-			NULL, 0x0, NULL, HFILL }},
-		{ &hf_hpsw_type,
-		{ "Type", "hpsw.type", FT_UINT8, BASE_HEX,
-			NULL, 0x0, NULL, HFILL }},
-		{ &hf_hpsw_tlvtype,
-		{ "Type", "hpsw.tlv_type", FT_UINT8, BASE_HEX,
-			VALS(hpsw_tlv_type_vals), 0x0, NULL, HFILL }},
-		{ &hf_hpsw_tlvlength,
-		{ "Length", "hpsw.tlv_len", FT_UINT8, BASE_DEC,
-			NULL, 0x0, NULL, HFILL }},
-		{ &hf_hpsw_device_name, { "Device Name", "hpsw.device_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-		{ &hf_hpsw_device_version, { "Version", "hpsw.device_version", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-		{ &hf_hpsw_config_name, { "Config Name", "hpsw.config_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-		{ &hf_hpsw_root_mac_addr, { "Root MAC Addr", "hpsw.root_mac_addr", FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-		{ &hf_hpsw_ip_addr, { "IP Addr", "hpsw.ip_addr", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-		{ &hf_hpsw_field_6, { "Field 6", "hpsw.field_6", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
-		{ &hf_hpsw_domain, { "Domain", "hpsw.domain", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-		{ &hf_hpsw_field_8, { "Field 8", "hpsw.field_8", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
-		{ &hf_hpsw_field_9, { "Field 9", "hpsw.field_9", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
-		{ &hf_hpsw_field_10, { "Field 10", "hpsw.field_10", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
-		{ &hf_hpsw_neighbor_mac_addr, { "MAC Addr", "hpsw.neighbor_mac_addr", FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-		{ &hf_hpsw_field_12, { "Field 12", "hpsw.field_12", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
-		{ &hf_hpsw_own_mac_addr, { "Own MAC Addr", "hpsw.own_mac_addr", FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-		{ &hf_hpsw_device_id, { "Device ID", "hpsw.device_id", FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-		{ &hf_hpsw_device_id_data, { "Data", "hpsw.device_id_data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-	};
-
-	static gint *ett[] = {
-		&ett_hpsw,
-		&ett_hpsw_tlv
-	};
-
-	static ei_register_info ei[] = {
-		{ &ei_hpsw_tlvlength_bad, { "hpsw.tlv_len.bad", PI_PROTOCOL, PI_WARN, "Bad length", EXPFILL }},
-	};
-
-	expert_module_t* expert_hpsw;
-
-	proto_hpsw = proto_register_protocol( "HP Switch Protocol", "HPSW", "hpsw");
-	proto_register_field_array(proto_hpsw, hf, array_length(hf));
-	proto_register_subtree_array(ett, array_length(ett));
-	expert_hpsw = expert_register_protocol(proto_hpsw);
-	expert_register_field_array(expert_hpsw, ei, array_length(ei));
-
-	register_dissector("hpsw", dissect_hpsw, proto_hpsw);
+    static hf_register_info hf[] = {
+        { &hf_hpsw_version,
+          { "Version", "hpsw.version", FT_UINT8, BASE_HEX,
+            NULL, 0x0, NULL, HFILL }},
+        { &hf_hpsw_type,
+          { "Type", "hpsw.type", FT_UINT8, BASE_HEX,
+            NULL, 0x0, NULL, HFILL }},
+        { &hf_hpsw_tlvtype,
+          { "Type", "hpsw.tlv_type", FT_UINT8, BASE_HEX,
+            VALS(hpsw_tlv_type_vals), 0x0, NULL, HFILL }},
+        { &hf_hpsw_tlvlength,
+          { "Length", "hpsw.tlv_len", FT_UINT8, BASE_DEC,
+            NULL, 0x0, NULL, HFILL }},
+        { &hf_hpsw_device_name,
+          { "Device Name", "hpsw.device_name", FT_STRING, BASE_NONE,
+            NULL, 0x0, NULL, HFILL }},
+        { &hf_hpsw_device_version,
+          { "Version", "hpsw.device_version", FT_STRING, BASE_NONE,
+            NULL, 0x0, NULL, HFILL }},
+        { &hf_hpsw_config_name,
+          { "Config Name", "hpsw.config_name", FT_STRING, BASE_NONE,
+            NULL, 0x0, NULL, HFILL }},
+        { &hf_hpsw_root_mac_addr,
+          { "Root MAC Addr", "hpsw.root_mac_addr", FT_ETHER, BASE_NONE,
+            NULL, 0x0, NULL, HFILL }},
+        { &hf_hpsw_ip_addr,
+          { "IP Addr", "hpsw.ip_addr", FT_IPv4, BASE_NONE,
+            NULL, 0x0, NULL, HFILL }},
+        { &hf_hpsw_field_6,
+          { "Field 6", "hpsw.field_6", FT_UINT16, BASE_HEX,
+            NULL, 0x0, NULL, HFILL }},
+        { &hf_hpsw_domain,
+          { "Domain", "hpsw.domain", FT_STRING, BASE_NONE,
+            NULL, 0x0, NULL, HFILL }},
+        { &hf_hpsw_field_8,
+          { "Field 8", "hpsw.field_8", FT_UINT16, BASE_HEX,
+            NULL, 0x0, NULL, HFILL }},
+        { &hf_hpsw_field_9,
+          { "Field 9", "hpsw.field_9", FT_UINT16, BASE_HEX,
+            NULL, 0x0, NULL, HFILL }},
+        { &hf_hpsw_field_10,
+          { "Field 10", "hpsw.field_10", FT_UINT32, BASE_HEX,
+            NULL, 0x0, NULL, HFILL }},
+        { &hf_hpsw_neighbor_mac_addr,
+          { "MAC Addr", "hpsw.neighbor_mac_addr", FT_ETHER, BASE_NONE,
+            NULL, 0x0, NULL, HFILL }},
+        { &hf_hpsw_field_12,
+          { "Field 12", "hpsw.field_12", FT_UINT8, BASE_HEX,
+            NULL, 0x0, NULL, HFILL }},
+        { &hf_hpsw_own_mac_addr,
+          { "Own MAC Addr", "hpsw.own_mac_addr", FT_ETHER, BASE_NONE,
+            NULL, 0x0, NULL, HFILL }},
+        { &hf_hpsw_device_id,
+          { "Device ID", "hpsw.device_id", FT_ETHER, BASE_NONE,
+            NULL, 0x0, NULL, HFILL }},
+        { &hf_hpsw_device_id_data,
+          { "Data", "hpsw.device_id_data", FT_BYTES, BASE_NONE,
+            NULL, 0x0, NULL, HFILL }},
+    };
+
+    static gint *ett[] = {
+        &ett_hpsw,
+        &ett_hpsw_tlv
+    };
+
+    static ei_register_info ei[] = {
+        { &ei_hpsw_tlvlength_bad, { "hpsw.tlv_len.bad", PI_PROTOCOL, PI_WARN, "Bad length", EXPFILL }},
+    };
+
+    expert_module_t* expert_hpsw;
+
+    proto_hpsw = proto_register_protocol( "HP Switch Protocol", "HPSW", "hpsw");
+    proto_register_field_array(proto_hpsw, hf, array_length(hf));
+    proto_register_subtree_array(ett, array_length(ett));
+    expert_hpsw = expert_register_protocol(proto_hpsw);
+    expert_register_field_array(expert_hpsw, ei, array_length(ei));
+
+    register_dissector("hpsw", dissect_hpsw, proto_hpsw);
 }
 
 void
 proto_reg_handoff_hpsw(void)
 {
-	dissector_handle_t hpsw_handle;
+    dissector_handle_t hpsw_handle;
 
-	hpsw_handle = find_dissector("hpsw");
+    hpsw_handle = find_dissector("hpsw");
 
-	dissector_add_uint("hpext.dxsap", HPEXT_HPSW, hpsw_handle);
+    dissector_add_uint("hpext.dxsap", HPEXT_HPSW, hpsw_handle);
 }
 
 /*