tvb_get_guint8(tvb, offset+20));
proto_tree_add_text(tlv_tree, tvb, offset+21, 6,
"Cluster Commander MAC: %s",
- ether_to_str(tvb_get_ptr(tvb, offset+21, 6)));
+ tvb_ether_to_str(tvb, offset+21));
proto_tree_add_text(tlv_tree, tvb, offset+27, 6,
"Switch's MAC: %s",
- ether_to_str(tvb_get_ptr(tvb, offset+27, 6)));
+ tvb_ether_to_str(tvb, offset+27));
proto_tree_add_text(tlv_tree, tvb, offset+33, 1,
"UNKNOWN: 0x%02X",
tvb_get_guint8(tvb, offset+33));
case TYPE_SPARE_POE:
if (tree) {
- tlvi = proto_tree_add_text(cdp_tree, tvb, offset, length,
+ tlvi = proto_tree_add_text(cdp_tree, tvb, offset, length,
"Spare Pair PoE");
tlv_tree = proto_item_add_subtree(tlvi, ett_cdp_tlv);
}
static void
-dissect_spare_poe_tlv(tvbuff_t *tvb, int offset, int length,
- proto_tree *tree)
+dissect_spare_poe_tlv(tvbuff_t *tvb, int offset, int length,
+ proto_tree *tree)
{
proto_item *ti;
proto_tree *tlv_tree;
}
tlv_data = tvb_get_guint8(tvb, offset);
- ti = proto_tree_add_text(tree, tvb, offset, length,
+ ti = proto_tree_add_text(tree, tvb, offset, length,
"Spare Pair PoE: 0x%02x", tlv_data);
tlv_tree = proto_item_add_subtree(ti, ett_cdp_spare_poe_tlv);
if (tree) {
proto_tree_add_text(tree, tvb, offset, 6,
"Neighbor: %s",
- ether_to_str(tvb_get_ptr(tvb, offset, 6)));
+ tvb_ether_to_str(tvb, offset));
}
offset += 6;
length -= 6;
if (tree) {
proto_tree_add_text(tree, tvb, offset, 6,
"Sending Router System ID: %s",
- ether_to_str(tvb_get_ptr(tvb, offset, 6)));
+ tvb_ether_to_str(tvb, offset));
}
if (check_col(pinfo->cinfo, COL_INFO)) {
col_append_fstr(pinfo->cinfo, COL_INFO, ", System ID: %s",
- ether_to_str(tvb_get_ptr(tvb, offset, 6)));
+ tvb_ether_to_str(tvb, offset));
}
offset += 6;
if (tree) {
proto_tree_add_text(tree, tvb, offset, 6,
"Designated Router System ID: %s",
- ether_to_str(tvb_get_ptr(tvb, offset, 6)));
+ tvb_ether_to_str(tvb, offset));
proto_tree_add_text(tree, tvb, offset+6, 1,
"Designated Router Pseudonode ID: %u",
tvb_get_guint8(tvb, offset+6));
if (tree) {
proto_tree_add_text(tree, tvb, offset, 6,
"Node number: %s",
- ether_to_str(tvb_get_ptr(tvb, offset, 6)));
+ tvb_ether_to_str(tvb, offset));
}
offset += 6;
length -= 6;
if (tree) {
proto_tree_add_text(tree, tvb, offset, 6,
"Router System ID: %s",
- ether_to_str(tvb_get_ptr(tvb, offset, 6)));
+ tvb_ether_to_str(tvb, offset));
proto_tree_add_text(tree, tvb, offset+6, 1,
"Router Pseudonode ID: %u",
tvb_get_guint8(tvb, offset+6));
if (tree) {
proto_tree_add_text(tree, tvb, offset, 6,
"Node number: %s",
- ether_to_str(tvb_get_ptr(tvb, offset, 6)));
+ tvb_ether_to_str(tvb, offset));
}
offset += 6;
length -= 6;
if (check_col(pinfo->cinfo, COL_INFO)) {
col_append_fstr(pinfo->cinfo, COL_INFO, ", LSP ID: %s",
- ether_to_str(tvb_get_ptr(tvb, offset, 6)));
+ tvb_ether_to_str(tvb, offset));
}
if (tree) {
proto_tree_add_text(tree, tvb, offset, 6,
"LSP ID system ID: %s",
- ether_to_str(tvb_get_ptr(tvb, offset, 6)));
+ tvb_ether_to_str(tvb, offset));
}
offset += 6;
/* XXX - append the pseudonode ID */
ti = proto_tree_add_text(tree, tvb, offset, 16,
"LSP-ID: %s, Sequence: 0x%08x, Lifetime: %5us, Checksum: 0x%04x",
- ether_to_str(tvb_get_ptr(tvb, offset+2, 6)), /* XXX - rest of system ID */
+ tvb_ether_to_str(tvb, offset+2), /* XXX - rest of system ID */
tvb_get_ntohl(tvb, offset+10),
tvb_get_ntohs(tvb, offset),
tvb_get_ntohs(tvb, offset+14));
proto_tree_add_text(subtree, tvb, offset+2, 6,
"LSP ID source ID: %s",
- ether_to_str(tvb_get_ptr(tvb, offset+2, 6)));
+ tvb_ether_to_str(tvb, offset+2));
proto_tree_add_text(subtree, tvb, offset+8, 1,
"LSP ID pseudonode ID: %u",
tvb_get_guint8(tvb, offset+8));
ti = proto_tree_add_text(tree, tvb, offset, 16,
"LSP-ID: %s, Sequence: 0x%08x, Lifetime: %5us, Checksum: 0x%04x",
- ether_to_str(tvb_get_ptr(tvb, offset+2, 6)), /* XXX - rest of system ID */
+ tvb_ether_to_str(tvb, offset+2), /* XXX - rest of system ID */
tvb_get_ntohl(tvb, offset+10),
tvb_get_ntohs(tvb, offset),
tvb_get_ntohs(tvb, offset+14));
proto_tree_add_text(subtree, tvb, offset+2, 6,
"LSP ID source ID: %s",
- ether_to_str(tvb_get_ptr(tvb, offset+2, 6)));
+ tvb_ether_to_str(tvb, offset+2));
proto_tree_add_text(subtree, tvb, offset+8, 1,
"LSP ID pseudonode ID: %u",
tvb_get_guint8(tvb, offset+8));
if (check_col(pinfo->cinfo, COL_INFO)) {
col_append_fstr(pinfo->cinfo, COL_INFO, ", Source ID: %s",
- ether_to_str(tvb_get_ptr(tvb, offset, 6)));
+ tvb_ether_to_str(tvb, offset));
}
if (tree) {
proto_tree_add_text(tree, tvb, offset, 6,
"Source ID system ID: %s",
- ether_to_str(tvb_get_ptr(tvb, offset, 6)));
+ tvb_ether_to_str(tvb, offset));
}
offset += 6;
/* XXX - add the pseudonode ID */
if (check_col(pinfo->cinfo, COL_INFO)) {
col_append_fstr(pinfo->cinfo, COL_INFO, ", Start LSP ID: %s",
- ether_to_str(tvb_get_ptr(tvb, offset, 6)));
+ tvb_ether_to_str(tvb, offset));
}
if (tree) {
proto_tree_add_text(tree, tvb, offset, 6,
"Start LSP ID source ID: %s",
- ether_to_str(tvb_get_ptr(tvb, offset, 6)));
+ tvb_ether_to_str(tvb, offset));
}
offset += 6;
/* XXX - append the pseudonode ID */
if (check_col(pinfo->cinfo, COL_INFO)) {
col_append_fstr(pinfo->cinfo, COL_INFO, ", End LSP ID: %s",
- ether_to_str(tvb_get_ptr(tvb, offset, 6)));
+ tvb_ether_to_str(tvb, offset));
}
if (tree) {
proto_tree_add_text(tree, tvb, offset, 6,
"End LSP ID source ID: %s",
- ether_to_str(tvb_get_ptr(tvb, offset, 6)));
+ tvb_ether_to_str(tvb, offset));
}
offset += 6;
/* XXX - append the pseudonode ID */
if (check_col(pinfo->cinfo, COL_INFO)) {
col_append_fstr(pinfo->cinfo, COL_INFO, ", Source ID: %s",
- ether_to_str(tvb_get_ptr(tvb, offset, 6)));
+ tvb_ether_to_str(tvb, offset));
}
if (tree) {
proto_tree_add_text(tree, tvb, offset, 6,
"Source ID system ID: %s",
- ether_to_str(tvb_get_ptr(tvb, offset, 6)));
+ tvb_ether_to_str(tvb, offset));
}
offset += 6;
/* XXX - add the pseudonode ID */