/* packet-vtp.c
* Routines for the disassembly of Cisco's Virtual Trunking Protocol
*
- * $Id: packet-vtp.c,v 1.2 2000/03/12 04:47:51 gram Exp $
+ * $Id: packet-vtp.c,v 1.15 2001/08/28 08:28:14 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
*
- *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
static gint ett_vtp_tlv = -1;
static int
-dissect_vlan_info(const u_char *pd, int offset, proto_tree *tree);
+dissect_vlan_info(tvbuff_t *tvb, int offset, proto_tree *tree);
static void
-dissect_vlan_info_tlv(const u_char *pd, int offset, int length,
+dissect_vlan_info_tlv(tvbuff_t *tvb, int offset, int length,
proto_tree *tree, proto_item *ti, guint8 type);
#define SUMMARY_ADVERT 0x01
{ 0, NULL },
};
-void
-dissect_vtp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
+static void
+dissect_vtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
proto_item *ti;
proto_tree *vtp_tree = NULL;
+ int offset = 0;
guint8 code;
guint8 md_len;
+ const guint8 *upd_timestamp;
int vlan_info_len;
- if (check_col(fd, COL_PROTOCOL))
- col_add_str(fd, COL_PROTOCOL, "VTP");
- if (check_col(fd, COL_INFO))
- col_add_str(fd, COL_INFO, "Virtual Trunking Protocol");
+ if (check_col(pinfo->fd, COL_PROTOCOL))
+ col_set_str(pinfo->fd, COL_PROTOCOL, "VTP");
+ if (check_col(pinfo->fd, COL_INFO))
+ col_set_str(pinfo->fd, COL_INFO, "Virtual Trunking Protocol");
if (tree) {
- ti = proto_tree_add_item(tree, proto_vtp, offset, END_OF_FRAME,
- NULL);
+ ti = proto_tree_add_item(tree, proto_vtp, tvb, offset,
+ tvb_length_remaining(tvb, offset), FALSE);
vtp_tree = proto_item_add_subtree(ti, ett_vtp);
- proto_tree_add_item(vtp_tree, hf_vtp_version, offset, 1,
- pd[offset]);
+ proto_tree_add_item(vtp_tree, hf_vtp_version, tvb, offset, 1,
+ FALSE);
offset += 1;
- code = pd[offset];
- proto_tree_add_item(vtp_tree, hf_vtp_code, offset, 1,
+ code = tvb_get_guint8(tvb, offset);
+ proto_tree_add_uint(vtp_tree, hf_vtp_code, tvb, offset, 1,
code);
offset += 1;
switch (code) {
case SUMMARY_ADVERT:
- proto_tree_add_item(vtp_tree, hf_vtp_followers, offset,
- 1, pd[offset]);
+ proto_tree_add_item(vtp_tree, hf_vtp_followers, tvb, offset,
+ 1, FALSE);
offset += 1;
- md_len = pd[offset];
- proto_tree_add_item(vtp_tree, hf_vtp_md_len, offset,
+ md_len = tvb_get_guint8(tvb, offset);
+ proto_tree_add_uint(vtp_tree, hf_vtp_md_len, tvb, offset,
1, md_len);
offset += 1;
- proto_tree_add_string_format(vtp_tree, hf_vtp_md, offset,
- 32, &pd[offset], "Management Domain: %.32s",
- &pd[offset]);
+ proto_tree_add_item(vtp_tree, hf_vtp_md, tvb, offset,
+ 32, FALSE);
offset += 32;
- proto_tree_add_item(vtp_tree, hf_vtp_conf_rev_num,
- offset, 4, pntohl(&pd[offset]));
+ proto_tree_add_item(vtp_tree, hf_vtp_conf_rev_num, tvb,
+ offset, 4, FALSE);
offset += 4;
- proto_tree_add_item(vtp_tree, hf_vtp_upd_id,
- offset, 4, &pd[offset]);
+ proto_tree_add_item(vtp_tree, hf_vtp_upd_id, tvb,
+ offset, 4, FALSE);
offset += 4;
- proto_tree_add_string_format(vtp_tree, hf_vtp_upd_ts,
- offset, 12, &pd[offset],
+ upd_timestamp = tvb_get_ptr(tvb, offset, 12);
+ proto_tree_add_string_format(vtp_tree, hf_vtp_upd_ts, tvb,
+ offset, 12, upd_timestamp,
"Update Timestamp: %.2s-%.2s-%.2s %.2s:%.2s:%.2s",
- &pd[offset], &pd[offset+2], &pd[offset+4],
- &pd[offset+6], &pd[offset+8], &pd[offset+10]);
+ &upd_timestamp[0], &upd_timestamp[2], &upd_timestamp[4],
+ &upd_timestamp[6], &upd_timestamp[8], &upd_timestamp[10]);
offset += 12;
- proto_tree_add_item(vtp_tree, hf_vtp_md5_digest,
- offset, 16, &pd[offset]);
+ proto_tree_add_item(vtp_tree, hf_vtp_md5_digest, tvb,
+ offset, 16, FALSE);
break;
case SUBSET_ADVERT:
- proto_tree_add_item(vtp_tree, hf_vtp_seq_num, offset,
- 1, pd[offset]);
+ proto_tree_add_item(vtp_tree, hf_vtp_seq_num, tvb, offset,
+ 1, FALSE);
offset += 1;
- md_len = pd[offset];
- proto_tree_add_item(vtp_tree, hf_vtp_md_len, offset,
+ md_len = tvb_get_guint8(tvb, offset);
+ proto_tree_add_uint(vtp_tree, hf_vtp_md_len, tvb, offset,
1, md_len);
offset += 1;
- proto_tree_add_string_format(vtp_tree, hf_vtp_md, offset,
- 32, &pd[offset], "Management Domain: %.32s",
- &pd[offset]);
+ proto_tree_add_item(vtp_tree, hf_vtp_md, tvb, offset,
+ 32, FALSE);
offset += 32;
- proto_tree_add_item(vtp_tree, hf_vtp_conf_rev_num,
- offset, 4, pntohl(&pd[offset]));
+ proto_tree_add_item(vtp_tree, hf_vtp_conf_rev_num, tvb,
+ offset, 4, FALSE);
offset += 4;
- for (;;) {
+ while (tvb_reported_length_remaining(tvb, offset) > 0) {
vlan_info_len =
- dissect_vlan_info(pd, offset, vtp_tree);
+ dissect_vlan_info(tvb, offset, vtp_tree);
if (vlan_info_len < 0)
break;
offset += vlan_info_len;
case ADVERT_REQUEST:
offset += 1; /* skip reserved field */
- md_len = pd[offset];
- proto_tree_add_item(vtp_tree, hf_vtp_md_len, offset,
+ md_len = tvb_get_guint8(tvb, offset);
+ proto_tree_add_uint(vtp_tree, hf_vtp_md_len, tvb, offset,
1, md_len);
offset += 1;
- proto_tree_add_item(vtp_tree, hf_vtp_start_value,
- offset, 2, pntohs(&pd[offset]));
+ proto_tree_add_item(vtp_tree, hf_vtp_start_value, tvb,
+ offset, 2, FALSE);
break;
case 0x04:
*/
offset += 1; /* skip unknown field */
- md_len = pd[offset];
- proto_tree_add_item(vtp_tree, hf_vtp_md_len, offset,
+ md_len = tvb_get_guint8(tvb, offset);
+ proto_tree_add_uint(vtp_tree, hf_vtp_md_len, tvb, offset,
1, md_len);
offset += 1;
- proto_tree_add_string_format(vtp_tree, hf_vtp_md, offset,
- 32, &pd[offset], "Management Domain: %.32s",
- &pd[offset]);
+ proto_tree_add_item(vtp_tree, hf_vtp_md, tvb, offset,
+ 32, FALSE);
offset += 32;
offset += 2; /* skip unknown field */
- proto_tree_add_text(vtp_tree, offset, 2,
+ proto_tree_add_text(vtp_tree, tvb, offset, 2,
"VLAN ID of some sort: 0x%04x",
- pntohs(&pd[offset]));
+ tvb_get_ntohs(tvb, offset));
offset += 2;
break;
}
};
static int
-dissect_vlan_info(const u_char *pd, int offset, proto_tree *tree)
+dissect_vlan_info(tvbuff_t *tvb, int offset, proto_tree *tree)
{
proto_item *ti;
proto_tree *vlan_info_tree;
int vlan_info_left;
guint8 status;
guint8 vlan_name_len;
- guint16 type;
+ guint8 type;
int length;
- char *type_str;
proto_tree *tlv_tree;
- if (!BYTES_ARE_IN_FRAME(offset, 1))
- return -1;
- vlan_info_len = pd[offset];
- ti = proto_tree_add_text(tree, offset, vlan_info_len,
+ vlan_info_len = tvb_get_guint8(tvb, offset);
+ ti = proto_tree_add_text(tree, tvb, offset, vlan_info_len,
"VLAN Information");
vlan_info_tree = proto_item_add_subtree(ti, ett_vtp_vlan_info);
vlan_info_left = vlan_info_len;
- proto_tree_add_item(vlan_info_tree, hf_vtp_vlan_info_len, offset, 1,
+ proto_tree_add_uint(vlan_info_tree, hf_vtp_vlan_info_len, tvb, offset, 1,
vlan_info_len);
offset += 1;
vlan_info_left -= 1;
- if (!BYTES_ARE_IN_FRAME(offset, 1) || vlan_info_left < 1)
+ if (vlan_info_left < 1)
return -1;
- status = pd[offset];
- ti = proto_tree_add_text(vlan_info_tree, offset, 1,
+ status = tvb_get_guint8(tvb, offset);
+ ti = proto_tree_add_text(vlan_info_tree, tvb, offset, 1,
"Status: 0x%02x%s", status,
(status & VLAN_SUSPENDED) ? "(VLAN suspended)" : "");
status_tree = proto_item_add_subtree(ti, ett_vtp_vlan_status);
- proto_tree_add_item(status_tree, hf_vtp_vlan_status_vlan_susp, offset, 1,
+ proto_tree_add_boolean(status_tree, hf_vtp_vlan_status_vlan_susp, tvb, offset, 1,
status);
offset += 1;
vlan_info_left -= 1;
- if (!BYTES_ARE_IN_FRAME(offset, 1) || vlan_info_left < 1)
+ if (vlan_info_left < 1)
return -1;
- proto_tree_add_item(vlan_info_tree, hf_vtp_vlan_type, offset, 1,
- pd[offset]);
+ proto_tree_add_item(vlan_info_tree, hf_vtp_vlan_type, tvb, offset, 1,
+ FALSE);
offset += 1;
vlan_info_left -= 1;
- if (!BYTES_ARE_IN_FRAME(offset, 1) || vlan_info_left < 1)
+ if (vlan_info_left < 1)
return -1;
- vlan_name_len = pd[offset];
- proto_tree_add_item(vlan_info_tree, hf_vtp_vlan_name_len, offset, 1,
+ vlan_name_len = tvb_get_guint8(tvb, offset);
+ proto_tree_add_uint(vlan_info_tree, hf_vtp_vlan_name_len, tvb, offset, 1,
vlan_name_len);
offset += 1;
vlan_info_left -= 1;
- if (!BYTES_ARE_IN_FRAME(offset, 2) || vlan_info_left < 2)
+ if (vlan_info_left < 2)
return -1;
- proto_tree_add_item(vlan_info_tree, hf_vtp_isl_vlan_id, offset, 2,
- pntohs(&pd[offset]));
+ proto_tree_add_item(vlan_info_tree, hf_vtp_isl_vlan_id, tvb, offset, 2,
+ FALSE);
offset += 2;
vlan_info_left -= 2;
- if (!BYTES_ARE_IN_FRAME(offset, 2) || vlan_info_left < 2)
+ if (vlan_info_left < 2)
return -1;
- proto_tree_add_item(vlan_info_tree, hf_vtp_mtu_size, offset, 2,
- pntohs(&pd[offset]));
+ proto_tree_add_item(vlan_info_tree, hf_vtp_mtu_size, tvb, offset, 2,
+ FALSE);
offset += 2;
vlan_info_left -= 2;
- if (!BYTES_ARE_IN_FRAME(offset, 4) || vlan_info_left < 4)
+ if (vlan_info_left < 4)
return -1;
- proto_tree_add_item(vlan_info_tree, hf_vtp_802_10_index, offset, 4,
- pntohl(&pd[offset]));
+ proto_tree_add_item(vlan_info_tree, hf_vtp_802_10_index, tvb, offset, 4,
+ FALSE);
offset += 4;
vlan_info_left -= 4;
- /* VLAN name length appears to be rounded up to a multiple of
- 4. */
+ /* VLAN name length appears to be rounded up to a multiple of 4. */
vlan_name_len = 4*((vlan_name_len + 3)/4);
- if (!BYTES_ARE_IN_FRAME(offset, vlan_name_len)
- || vlan_info_left < vlan_name_len)
+ if (vlan_info_left < vlan_name_len)
return -1;
- proto_tree_add_string_format(vlan_info_tree, hf_vtp_vlan_name, offset,
- vlan_name_len, &pd[offset], "VLAN Name: %.*s", vlan_name_len,
- &pd[offset]);
+ proto_tree_add_item(vlan_info_tree, hf_vtp_vlan_name, tvb, offset,
+ vlan_name_len, FALSE);
offset += vlan_name_len;
vlan_info_left -= vlan_name_len;
- while (IS_DATA_IN_FRAME(offset) && vlan_info_left > 0) {
- type = pd[offset + 0];
- length = pd[offset + 1];
- type_str = val_to_str(type, vlan_tlv_type_vals,
- "Unknown (0x%04x)");
+ while (vlan_info_left > 0) {
+ type = tvb_get_guint8(tvb, offset + 0);
+ length = tvb_get_guint8(tvb, offset + 1);
- ti = proto_tree_add_notext(vlan_info_tree, offset,
- 2 + length*2);
+ ti = proto_tree_add_text(vlan_info_tree, tvb, offset,
+ 2 + length*2, "%s",
+ val_to_str(type, vlan_tlv_type_vals,
+ "Unknown TLV type: 0x%02x"));
tlv_tree = proto_item_add_subtree(ti, ett_vtp_tlv);
- proto_tree_add_item(tlv_tree, hf_vtp_vlan_tlvtype, offset,
+ proto_tree_add_uint(tlv_tree, hf_vtp_vlan_tlvtype, tvb, offset,
1, type);
- proto_tree_add_item(tlv_tree, hf_vtp_vlan_tlvlength, offset+1,
+ proto_tree_add_uint(tlv_tree, hf_vtp_vlan_tlvlength, tvb, offset+1,
1, length);
offset += 2;
vlan_info_left -= 2;
if (length > 0) {
- dissect_vlan_info_tlv(pd, offset, length*2, tlv_tree,
+ dissect_vlan_info_tlv(tvb, offset, length*2, tlv_tree,
ti, type);
}
offset += length*2;
};
static void
-dissect_vlan_info_tlv(const u_char *pd, int offset, int length,
+dissect_vlan_info_tlv(tvbuff_t *tvb, int offset, int length,
proto_tree *tree, proto_item *ti, guint8 type)
{
switch (type) {
if (length == 2) {
proto_item_set_text(ti,
"Source-Routing Ring Number: 0x%04x",
- pntohs(&pd[offset]));
- proto_tree_add_text(tree, offset, 2,
+ tvb_get_ntohs(tvb, offset));
+ proto_tree_add_text(tree, tvb, offset, 2,
"Source-Routing Ring Number: 0x%04x",
- pntohs(&pd[offset]));
+ tvb_get_ntohs(tvb, offset));
} else {
proto_item_set_text(ti,
"Source-Routing Ring Number: Bad length %u",
length);
- proto_tree_add_text(tree, offset, length,
+ proto_tree_add_text(tree, tvb, offset, length,
"Source-Routing Ring Number: Bad length %u",
length);
}
if (length == 2) {
proto_item_set_text(ti,
"Source-Routing Bridge Number: 0x%04x",
- pntohs(&pd[offset]));
- proto_tree_add_text(tree, offset, 2,
+ tvb_get_ntohs(tvb, offset));
+ proto_tree_add_text(tree, tvb, offset, 2,
"Source-Routing Bridge Number: 0x%04x",
- pntohs(&pd[offset]));
+ tvb_get_ntohs(tvb, offset));
} else {
proto_item_set_text(ti,
"Source-Routing Bridge Number: Bad length %u",
length);
- proto_tree_add_text(tree, offset, length,
+ proto_tree_add_text(tree, tvb, offset, length,
"Source-Routing Bridge Number: Bad length %u",
length);
}
if (length == 2) {
proto_item_set_text(ti,
"Spanning-Tree Protocol Type: %s",
- val_to_str(pntohs(&pd[offset]), stp_type_vals,
+ val_to_str(tvb_get_ntohs(tvb, offset), stp_type_vals,
"Unknown (0x%04x)"));
- proto_tree_add_text(tree, offset, 2,
+ proto_tree_add_text(tree, tvb, offset, 2,
"Spanning-Tree Protocol Type: %s",
- val_to_str(pntohs(&pd[offset]), stp_type_vals,
+ val_to_str(tvb_get_ntohs(tvb, offset), stp_type_vals,
"Unknown (0x%04x)"));
} else {
proto_item_set_text(ti,
"Spanning-Tree Protocol Type: Bad length %u",
length);
- proto_tree_add_text(tree, offset, length,
+ proto_tree_add_text(tree, tvb, offset, length,
"Spanning-Tree Protocol Type: Bad length %u",
length);
}
if (length == 2) {
proto_item_set_text(ti,
"Parent VLAN: 0x%04x",
- pntohs(&pd[offset]));
- proto_tree_add_text(tree, offset, 2,
+ tvb_get_ntohs(tvb, offset));
+ proto_tree_add_text(tree, tvb, offset, 2,
"Parent VLAN: 0x%04x",
- pntohs(&pd[offset]));
+ tvb_get_ntohs(tvb, offset));
} else {
proto_item_set_text(ti,
"Parent VLAN: Bad length %u",
length);
- proto_tree_add_text(tree, offset, length,
+ proto_tree_add_text(tree, tvb, offset, length,
"Parent VLAN: Bad length %u",
length);
}
if (length == 2) {
proto_item_set_text(ti,
"Translationally Bridged VLANs: 0x%04x",
- pntohs(&pd[offset]));
- proto_tree_add_text(tree, offset, 2,
+ tvb_get_ntohs(tvb, offset));
+ proto_tree_add_text(tree, tvb, offset, 2,
"Translationally Bridged VLANs: 0x%04x",
- pntohs(&pd[offset]));
+ tvb_get_ntohs(tvb, offset));
} else {
proto_item_set_text(ti,
"Translationally Bridged VLANs: Bad length %u",
length);
- proto_tree_add_text(tree, offset, length,
+ proto_tree_add_text(tree, tvb, offset, length,
"Translationally Bridged VLANs: Bad length %u",
length);
}
if (length == 2) {
proto_item_set_text(ti,
"Pruning: %s",
- val_to_str(pntohs(&pd[offset]), pruning_vals,
+ val_to_str(tvb_get_ntohs(tvb, offset), pruning_vals,
"Unknown (0x%04x)"));
- proto_tree_add_text(tree, offset, 2,
+ proto_tree_add_text(tree, tvb, offset, 2,
"Pruning: %s",
- val_to_str(pntohs(&pd[offset]), pruning_vals,
+ val_to_str(tvb_get_ntohs(tvb, offset), pruning_vals,
"Unknown (0x%04x)"));
} else {
proto_item_set_text(ti,
"Pruning: Bad length %u",
length);
- proto_tree_add_text(tree, offset, length,
+ proto_tree_add_text(tree, tvb, offset, length,
"Pruning: Bad length %u",
length);
}
if (length == 2) {
proto_item_set_text(ti,
"Bridge Type: %s",
- val_to_str(pntohs(&pd[offset]), bridge_type_vals,
+ val_to_str(tvb_get_ntohs(tvb, offset), bridge_type_vals,
"Unknown (0x%04x)"));
- proto_tree_add_text(tree, offset, 2,
+ proto_tree_add_text(tree, tvb, offset, 2,
"Bridge Type: %s",
- val_to_str(pntohs(&pd[offset]), bridge_type_vals,
+ val_to_str(tvb_get_ntohs(tvb, offset), bridge_type_vals,
"Unknown (0x%04x)"));
} else {
proto_item_set_text(ti,
"Bridge Type: Bad length %u",
length);
- proto_tree_add_text(tree, offset, length,
+ proto_tree_add_text(tree, tvb, offset, length,
"Bridge Type: Bad length %u",
length);
}
if (length == 2) {
proto_item_set_text(ti,
"Max ARE Hop Count: %u",
- pntohs(&pd[offset]));
- proto_tree_add_text(tree, offset, 2,
+ tvb_get_ntohs(tvb, offset));
+ proto_tree_add_text(tree, tvb, offset, 2,
"Max ARE Hop Count: %u",
- pntohs(&pd[offset]));
+ tvb_get_ntohs(tvb, offset));
} else {
proto_item_set_text(ti,
"Max ARE Hop Count: Bad length %u",
length);
- proto_tree_add_text(tree, offset, length,
+ proto_tree_add_text(tree, tvb, offset, length,
"Max ARE Hop Count: Bad length %u",
length);
}
if (length == 2) {
proto_item_set_text(ti,
"Max STE Hop Count: %u",
- pntohs(&pd[offset]));
- proto_tree_add_text(tree, offset, 2,
+ tvb_get_ntohs(tvb, offset));
+ proto_tree_add_text(tree, tvb, offset, 2,
"Max STE Hop Count: %u",
- pntohs(&pd[offset]));
+ tvb_get_ntohs(tvb, offset));
} else {
proto_item_set_text(ti,
"Max STE Hop Count: Bad length %u",
length);
- proto_tree_add_text(tree, offset, length,
+ proto_tree_add_text(tree, tvb, offset, length,
"Max STE Hop Count: Bad length %u",
length);
}
if (length == 2) {
proto_item_set_text(ti,
"Backup CRF Mode: %s",
- val_to_str(pntohs(&pd[offset]), backup_crf_mode_vals,
+ val_to_str(tvb_get_ntohs(tvb, offset), backup_crf_mode_vals,
"Unknown (0x%04x)"));
- proto_tree_add_text(tree, offset, 2,
+ proto_tree_add_text(tree, tvb, offset, 2,
"Backup CRF Mode: %s",
- val_to_str(pntohs(&pd[offset]), backup_crf_mode_vals,
+ val_to_str(tvb_get_ntohs(tvb, offset), backup_crf_mode_vals,
"Unknown (0x%04x)"));
} else {
proto_item_set_text(ti,
"Backup CRF Mode: Bad length %u",
length);
- proto_tree_add_text(tree, offset, length,
+ proto_tree_add_text(tree, tvb, offset, length,
"Backup CRF Mode: Bad length %u",
length);
}
break;
default:
- proto_item_set_text(ti, "Unknown TLV type: 0x%02x", type);
- proto_tree_add_text(tree, offset, length, "Data");
+ proto_tree_add_text(tree, tvb, offset, length, "Data");
break;
}
}
static hf_register_info hf[] = {
{ &hf_vtp_version,
{ "Version", "vtp.version", FT_UINT8, BASE_HEX, NULL, 0x0,
- "" }},
+ "", HFILL }},
{ &hf_vtp_code,
{ "Code", "vtp.code", FT_UINT8, BASE_HEX, VALS(type_vals), 0x0,
- "" }},
+ "", HFILL }},
{ &hf_vtp_followers,
{ "Followers", "vtp.followers", FT_UINT8, BASE_DEC, NULL, 0x0,
- "Number of following Subset-Advert messages" }},
+ "Number of following Subset-Advert messages", HFILL }},
{ &hf_vtp_md_len,
{ "Management Domain Length", "vtp.md_len", FT_UINT8, BASE_DEC, NULL, 0x0,
- "Length of management domain string" }},
+ "Length of management domain string", HFILL }},
{ &hf_vtp_md,
{ "Management Domain", "vtp.md", FT_STRING, BASE_DEC, NULL, 0,
- "Management domain" }},
+ "Management domain", HFILL }},
{ &hf_vtp_conf_rev_num,
{ "Configuration Revision Number", "vtp.conf_rev_num", FT_UINT32, BASE_DEC, NULL, 0x0,
- "Revision number of the configuration information" }},
+ "Revision number of the configuration information", HFILL }},
{ &hf_vtp_upd_id,
{ "Updater Identity", "vtp.upd_id", FT_IPv4, BASE_NONE, NULL, 0x0,
- "IP address of the updater" }},
+ "IP address of the updater", HFILL }},
{ &hf_vtp_upd_ts,
{ "Update Timestamp", "vtp.upd_ts", FT_STRING, BASE_DEC, NULL, 0,
- "Time stamp of the current configuration revision" }},
+ "Time stamp of the current configuration revision", HFILL }},
{ &hf_vtp_md5_digest,
{ "MD5 Digest", "vtp.md5_digest", FT_BYTES, BASE_HEX, NULL, 0x0,
- "" }},
+ "", HFILL }},
{ &hf_vtp_seq_num,
{ "Sequence Number", "vtp.seq_num", FT_UINT8, BASE_DEC, NULL, 0x0,
- "Order of this frame in the sequence of Subset-Advert frames" }},
+ "Order of this frame in the sequence of Subset-Advert frames", HFILL }},
{ &hf_vtp_start_value,
{ "Start Value", "vtp.start_value", FT_UINT16, BASE_HEX, NULL, 0x0,
- "Virtual LAN ID of first VLAN for which information is requested" }},
+ "Virtual LAN ID of first VLAN for which information is requested", HFILL }},
{ &hf_vtp_vlan_info_len,
{ "VLAN Information Length", "vtp.vlan_info.len", FT_UINT8, BASE_DEC, NULL, 0x0,
- "Length of the VLAN information field" }},
+ "Length of the VLAN information field", HFILL }},
{ &hf_vtp_vlan_status_vlan_susp,
{ "VLAN suspended", "vtp.vlan_info.status.vlan_susp", FT_BOOLEAN, 8, NULL, VLAN_SUSPENDED,
- "VLAN suspended" }},
+ "VLAN suspended", HFILL }},
{ &hf_vtp_vlan_type,
{ "VLAN Type", "vtp.vlan_info.vlan_type", FT_UINT8, BASE_HEX, VALS(vlan_type_vals), 0x0,
- "Type of VLAN" }},
+ "Type of VLAN", HFILL }},
{ &hf_vtp_vlan_name_len,
{ "VLAN Name Length", "vtp.vlan_info.vlan_name_len", FT_UINT8, BASE_DEC, NULL, 0x0,
- "Length of VLAN name string" }},
+ "Length of VLAN name string", HFILL }},
{ &hf_vtp_isl_vlan_id,
{ "ISL VLAN ID", "vtp.vlan_info.isl_vlan_id", FT_UINT16, BASE_HEX, NULL, 0x0,
- "ID of this VLAN on ISL trunks" }},
+ "ID of this VLAN on ISL trunks", HFILL }},
{ &hf_vtp_mtu_size,
{ "MTU Size", "vtp.vlan_info.mtu_size", FT_UINT16, BASE_DEC, NULL, 0x0,
- "MTU for this VLAN" }},
+ "MTU for this VLAN", HFILL }},
{ &hf_vtp_802_10_index,
{ "802.10 Index", "vtp.vlan_info.802_10_index", FT_UINT32, BASE_HEX, NULL, 0x0,
- "IEEE 802.10 security association identifier for this VLAN" }},
+ "IEEE 802.10 security association identifier for this VLAN", HFILL }},
{ &hf_vtp_vlan_name,
{ "VLAN Name", "vtp.vlan_info.vlan_name", FT_STRING, BASE_DEC, NULL, 0,
- "VLAN name" }},
+ "VLAN name", HFILL }},
{ &hf_vtp_vlan_tlvtype,
{ "Type", "vtp.vlan_info.tlv_type", FT_UINT8, BASE_HEX, VALS(vlan_tlv_type_vals), 0x0,
- "" }},
+ "", HFILL }},
{ &hf_vtp_vlan_tlvlength,
{ "Length", "vtp.vlan_info.tlv_len", FT_UINT8, BASE_DEC, NULL, 0x0,
- "" }},
+ "", HFILL }},
};
static gint *ett[] = {
&ett_vtp,
&ett_vtp_tlv,
};
- proto_vtp = proto_register_protocol("Virtual Trunking Protocol", "vtp");
+ proto_vtp = proto_register_protocol("Virtual Trunking Protocol",
+ "VTP", "vtp");
proto_register_field_array(proto_vtp, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_vtp(void)
+{
+ dissector_add("llc.cisco_pid", 0x2003, dissect_vtp, proto_vtp);
+}
git.samba.org / obnox / wireshark / wip.git / blobdiff