aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authoretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2009-10-27 06:05:02 +0000
committeretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2009-10-27 06:05:02 +0000
commit3a17331b9cf64702551f17385e23ea4c259a6269 (patch)
treedbc3e012f340ee4de6b208eb516c2069a6a10792 /epan
parentc8e63cbfde838ca7eeabbd9991eb1d84cbaadbf8 (diff)
From Francesco Fondelli:
RSVP extensions for G.709 Optical Transport Networks Control, RFC 4328 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4148 With some changes from me: -(readme.developer:" Furthermore, 'display' field must be ORed with 'BASE_RANGE_STRING' (e.g. BASE_DEC|BASE_RANGE_STRING)." - Prefix headerfields with hf_ - Remove check_col git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30727 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-lmp.c611
-rw-r--r--epan/dissectors/packet-ospf.c306
-rw-r--r--epan/dissectors/packet-rsvp.c555
-rw-r--r--epan/dissectors/packet-rsvp.h4
4 files changed, 797 insertions, 679 deletions
diff --git a/epan/dissectors/packet-lmp.c b/epan/dissectors/packet-lmp.c
index d7212dceee..0219df8aa0 100644
--- a/epan/dissectors/packet-lmp.c
+++ b/epan/dissectors/packet-lmp.c
@@ -291,7 +291,7 @@ static const value_string lmp_trace_type_str[] = {
* LMP Filter values
*/
-enum lmp_filter_keys {
+enum hf_lmp_filter_keys {
/* Message types ---------------- */
LMPF_MSG,
@@ -499,7 +499,7 @@ enum lmp_filter_keys {
LMPF_MAX
};
-static int lmp_filter[LMPF_MAX];
+static int hf_lmp_filter[LMPF_MAX];
static int
lmp_valid_class(int class)
@@ -695,10 +695,8 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
version = (tvb_get_guint8(tvb, offset+0)) >> 4;
flags = tvb_get_guint8(tvb, offset+2);
message_type = tvb_get_guint8(tvb, offset+3);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_str(pinfo->cinfo, COL_INFO,
- val_to_str(message_type, message_type_vals, "Unknown (%u). "));
- }
+ col_add_str(pinfo->cinfo, COL_INFO,
+ val_to_str(message_type, message_type_vals, "Unknown (%u). "));
if (tree) {
msg_length = tvb_get_ntohs(tvb, offset+4);
@@ -714,11 +712,11 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
ti = proto_tree_add_text(lmp_header_tree, tvb, offset+2, 1, "Flags: %02x",
flags);
lmp_header_flags_tree = proto_item_add_subtree(ti, lmp_subtree[LMP_TREE_HEADER_FLAGS]);
- proto_tree_add_boolean(lmp_header_flags_tree, lmp_filter[LMPF_HDR_FLAGS_CC_DOWN],
+ proto_tree_add_boolean(lmp_header_flags_tree, hf_lmp_filter[LMPF_HDR_FLAGS_CC_DOWN],
tvb, offset+2, 1, flags);
- proto_tree_add_boolean(lmp_header_flags_tree, lmp_filter[LMPF_HDR_FLAGS_REBOOT],
+ proto_tree_add_boolean(lmp_header_flags_tree, hf_lmp_filter[LMPF_HDR_FLAGS_REBOOT],
tvb, offset+2, 1, flags);
- proto_tree_add_uint(lmp_header_tree, lmp_filter[LMPF_MSG], tvb,
+ proto_tree_add_uint(lmp_header_tree, hf_lmp_filter[LMPF_MSG], tvb,
offset+3, 1, message_type);
proto_tree_add_text(lmp_header_tree, tvb, offset+4, 2, "Length: %d bytes",
msg_length);
@@ -728,7 +726,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
(message_type >= LMP_MSG_SERVICE_CONFIG && message_type <= LMP_MSG_SERVICE_CONFIG_NACK) ||
(message_type >= LMP_MSG_DISCOVERY_RESP && message_type <= LMP_MSG_DISCOVERY_RESP_NACK) ) {
hidden_item = proto_tree_add_boolean(lmp_header_tree,
- lmp_filter[lmp_msg_to_filter_num(message_type)],
+ hf_lmp_filter[lmp_msg_to_filter_num(message_type)],
tvb, offset+3, 1, 1);
PROTO_ITEM_SET_HIDDEN(hidden_item);
} else {
@@ -778,13 +776,13 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
type = tvb_get_guint8(tvb, offset);
negotiable = (type >> 7); type &= 0x7f;
object_type = val_to_str(class, lmp_class_vals, "Unknown");
- hidden_item = proto_tree_add_uint(lmp_tree, lmp_filter[LMPF_OBJECT], tvb,
+ hidden_item = proto_tree_add_uint(lmp_tree, hf_lmp_filter[LMPF_OBJECT], tvb,
offset, 1, class);
PROTO_ITEM_SET_HIDDEN(hidden_item);
if (lmp_valid_class(class)) {
ti = proto_tree_add_item(lmp_tree,
- lmp_filter[lmp_class_to_filter_num(class)],
+ hf_lmp_filter[lmp_class_to_filter_num(class)],
tvb, offset, obj_length, FALSE);
} else {
proto_tree_add_protocol_format(lmp_tree, proto_malformed, tvb,
@@ -809,7 +807,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_text(lmp_object_header_tree, tvb, offset+1, 1,
"Object Class: %u - %s",
class, object_type);
- proto_tree_add_item(lmp_object_header_tree, lmp_filter[LMPF_VAL_CTYPE],
+ proto_tree_add_item(lmp_object_header_tree, hf_lmp_filter[LMPF_VAL_CTYPE],
tvb, offset, 1, type);
offset2 = offset+4;
mylen = obj_length - 4;
@@ -825,14 +823,14 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case 1:
l = LMPF_VAL_LOCAL_CCID;
proto_item_append_text(ti, ": %d", tvb_get_ntohl(tvb, offset2));
- proto_tree_add_uint(lmp_object_tree, lmp_filter[l], tvb,
+ proto_tree_add_uint(lmp_object_tree, hf_lmp_filter[l], tvb,
offset2, 4, tvb_get_ntohl(tvb, offset2));
break;
case 2:
l = LMPF_VAL_REMOTE_CCID;
proto_item_append_text(ti, ": %d", tvb_get_ntohl(tvb, offset2));
- proto_tree_add_uint(lmp_object_tree, lmp_filter[l], tvb,
+ proto_tree_add_uint(lmp_object_tree, hf_lmp_filter[l], tvb,
offset2, 4, tvb_get_ntohl(tvb, offset2));
default:
proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
@@ -848,7 +846,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
l = LMPF_VAL_LOCAL_NODE_ID;
proto_item_append_text(ti, ": %s",
ip_to_str(tvb_get_ptr(tvb, offset2, 4)));
- proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb,
+ proto_tree_add_item(lmp_object_tree, hf_lmp_filter[l], tvb,
offset2, 4, FALSE);
break;
@@ -856,7 +854,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
l = LMPF_VAL_REMOTE_NODE_ID;
proto_item_append_text(ti, ": %s",
ip_to_str(tvb_get_ptr(tvb, offset2, 4)));
- proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb,
+ proto_tree_add_item(lmp_object_tree, hf_lmp_filter[l], tvb,
offset2, 4, FALSE);
break;
@@ -877,7 +875,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
LMPF_VAL_REMOTE_LINK_ID_IPV4;
proto_item_append_text(ti, ": IPv4 %s",
ip_to_str(tvb_get_ptr(tvb, offset2, 4)));
- proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb,
+ proto_tree_add_item(lmp_object_tree, hf_lmp_filter[l], tvb,
offset2, 4, FALSE);
break;
@@ -896,7 +894,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
LMPF_VAL_REMOTE_LINK_ID_UNNUM;
proto_item_append_text(ti, ": Unnumbered %d",
tvb_get_ntohl(tvb, offset2));
- proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb,
+ proto_tree_add_item(lmp_object_tree, hf_lmp_filter[l], tvb,
offset2, 4, FALSE);
break;
@@ -917,7 +915,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
LMPF_VAL_REMOTE_INTERFACE_ID_IPV4;
proto_item_append_text(ti, ": IPv4 %s",
ip_to_str(tvb_get_ptr(tvb, offset2, 4)));
- proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb,
+ proto_tree_add_item(lmp_object_tree, hf_lmp_filter[l], tvb,
offset2, 4, FALSE);
break;
@@ -937,7 +935,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
LMPF_VAL_REMOTE_INTERFACE_ID_UNNUM;
proto_item_append_text(ti, ": Unnumbered %d",
tvb_get_ntohl(tvb, offset2));
- proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb,
+ proto_tree_add_item(lmp_object_tree, hf_lmp_filter[l], tvb,
offset2, 4, FALSE);
break;
@@ -956,14 +954,14 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
l = LMPF_VAL_MESSAGE_ID;
proto_item_append_text(ti, ": %d", tvb_get_ntohl(tvb, offset2));
- proto_tree_add_uint(lmp_object_tree, lmp_filter[l], tvb,
+ proto_tree_add_uint(lmp_object_tree, hf_lmp_filter[l], tvb,
offset2, 4, tvb_get_ntohl(tvb, offset2));
break;
case 2:
l = LMPF_VAL_MESSAGE_ID_ACK;
proto_item_append_text(ti, ": %d", tvb_get_ntohl(tvb, offset2));
- proto_tree_add_uint(lmp_object_tree, lmp_filter[l], tvb,
+ proto_tree_add_uint(lmp_object_tree, hf_lmp_filter[l], tvb,
offset2, 4, tvb_get_ntohl(tvb, offset2));
break;
@@ -983,10 +981,10 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tvb_get_ntohs(tvb, offset2),
tvb_get_ntohs(tvb, offset2+2));
proto_tree_add_uint(lmp_object_tree,
- lmp_filter[LMPF_VAL_CONFIG_HELLO],
+ hf_lmp_filter[LMPF_VAL_CONFIG_HELLO],
tvb, offset2, 2, tvb_get_ntohs(tvb, offset2));
proto_tree_add_uint(lmp_object_tree,
- lmp_filter[LMPF_VAL_CONFIG_HELLO_DEAD],
+ hf_lmp_filter[LMPF_VAL_CONFIG_HELLO_DEAD],
tvb, offset2+2, 2,
tvb_get_ntohs(tvb, offset2+2));
break;
@@ -1007,11 +1005,11 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tvb_get_ntohl(tvb, offset2),
tvb_get_ntohl(tvb, offset2+4));
proto_tree_add_uint(lmp_object_tree,
- lmp_filter[LMPF_VAL_HELLO_TXSEQ],
+ hf_lmp_filter[LMPF_VAL_HELLO_TXSEQ],
tvb, offset2, 4,
tvb_get_ntohl(tvb, offset2));
proto_tree_add_uint(lmp_object_tree,
- lmp_filter[LMPF_VAL_HELLO_RXSEQ],
+ hf_lmp_filter[LMPF_VAL_HELLO_RXSEQ],
tvb, offset2+4, 4,
tvb_get_ntohl(tvb, offset2+4));
break;
@@ -1030,16 +1028,16 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case 1:
l = tvb_get_ntohs(tvb, offset2);
ti2 = proto_tree_add_item(lmp_object_tree,
- lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS],
+ hf_lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS],
tvb, offset2, 2, FALSE);
lmp_flags_tree = proto_item_add_subtree(ti2,
lmp_subtree[LMP_TREE_BEGIN_VERIFY_FLAGS]);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS_ALL_LINKS],
+ hf_lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS_ALL_LINKS],
tvb, offset2, 2, l);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS_LINK_TYPE],
+ hf_lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS_LINK_TYPE],
tvb, offset2, 2, l);
proto_tree_add_text(lmp_object_tree, tvb, offset2+2, 2,
"Verify Interval: %d ms",
@@ -1048,7 +1046,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
"Number of Data Links: %d",
tvb_get_ntohl(tvb, offset2+4));
proto_tree_add_item(lmp_object_tree,
- lmp_filter[LMPF_VAL_BEGIN_VERIFY_ENCTYPE],
+ hf_lmp_filter[LMPF_VAL_BEGIN_VERIFY_ENCTYPE],
tvb, offset2+8, 1, FALSE);
proto_tree_add_text(lmp_object_tree, tvb, offset2+10, 2,
"Verify Transport Mechanism: 0x%0x",
@@ -1099,7 +1097,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_item_append_text(ti, ": %d",
tvb_get_ntohl(tvb, offset2));
proto_tree_add_uint(lmp_object_tree,
- lmp_filter[LMPF_VAL_VERIFY_ID],
+ hf_lmp_filter[LMPF_VAL_VERIFY_ID],
tvb, offset2, 4,
tvb_get_ntohl(tvb, offset2));
break;
@@ -1113,7 +1111,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case LMP_CLASS_TE_LINK:
l = tvb_get_guint8(tvb, offset2);
ti2 = proto_tree_add_uint(lmp_object_tree,
- lmp_filter[LMPF_VAL_TE_LINK_FLAGS],
+ hf_lmp_filter[LMPF_VAL_TE_LINK_FLAGS],
tvb, offset2, 1, l);
proto_item_append_text(ti2, ": %s%s",
@@ -1123,10 +1121,10 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
lmp_flags_tree = proto_item_add_subtree(ti2,
lmp_subtree[LMP_TREE_TE_LINK_FLAGS]);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_TE_LINK_FLAGS_FAULT_MGMT],
+ hf_lmp_filter[LMPF_VAL_TE_LINK_FLAGS_FAULT_MGMT],
tvb, offset2, 1, l);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_TE_LINK_FLAGS_LINK_VERIFY],
+ hf_lmp_filter[LMPF_VAL_TE_LINK_FLAGS_LINK_VERIFY],
tvb, offset2, 1, l);
switch(type) {
@@ -1135,10 +1133,10 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
ip_to_str(tvb_get_ptr(tvb, offset2+4, 4)),
ip_to_str(tvb_get_ptr(tvb, offset2+8, 4)));
proto_tree_add_item(lmp_object_tree,
- lmp_filter[LMPF_VAL_TE_LINK_LOCAL_IPV4],
+ hf_lmp_filter[LMPF_VAL_TE_LINK_LOCAL_IPV4],
tvb, offset2+4, 4, FALSE);
proto_tree_add_item(lmp_object_tree,
- lmp_filter[LMPF_VAL_TE_LINK_REMOTE_IPV4],
+ hf_lmp_filter[LMPF_VAL_TE_LINK_REMOTE_IPV4],
tvb, offset2+8, 4, FALSE);
break;
@@ -1160,11 +1158,11 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tvb_get_ntohl(tvb, offset2+8));
proto_tree_add_item(lmp_object_tree,
- lmp_filter[LMPF_VAL_TE_LINK_LOCAL_UNNUM],
+ hf_lmp_filter[LMPF_VAL_TE_LINK_LOCAL_UNNUM],
tvb, offset2+4, 4, FALSE);
proto_tree_add_item(lmp_object_tree,
- lmp_filter[LMPF_VAL_TE_LINK_REMOTE_UNNUM],
+ hf_lmp_filter[LMPF_VAL_TE_LINK_REMOTE_UNNUM],
tvb, offset2+8, 4, FALSE);
break;
default:
@@ -1178,7 +1176,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
l = tvb_get_guint8(tvb, offset2);
ti2 = proto_tree_add_uint(lmp_object_tree,
- lmp_filter[LMPF_VAL_DATA_LINK_FLAGS],
+ hf_lmp_filter[LMPF_VAL_DATA_LINK_FLAGS],
tvb, offset2, 1, l);
proto_item_append_text(ti2, ": %s%s",
(l&0x01) ? "Interface-Type-Port " : "Interface-Type-Component-Link ",
@@ -1187,10 +1185,10 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
lmp_flags_tree = proto_item_add_subtree(ti2,
lmp_subtree[LMP_TREE_DATA_LINK_FLAGS]);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_DATA_LINK_FLAGS_PORT],
+ hf_lmp_filter[LMPF_VAL_DATA_LINK_FLAGS_PORT],
tvb, offset2, 1, l);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_DATA_LINK_FLAGS_ALLOCATED],
+ hf_lmp_filter[LMPF_VAL_DATA_LINK_FLAGS_ALLOCATED],
tvb, offset2, 1, l);
switch(type) {
@@ -1200,11 +1198,11 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
ip_to_str(tvb_get_ptr(tvb, offset2+8, 4)));
proto_tree_add_item(lmp_object_tree,
- lmp_filter[LMPF_VAL_DATA_LINK_LOCAL_IPV4],
+ hf_lmp_filter[LMPF_VAL_DATA_LINK_LOCAL_IPV4],
tvb, offset2+4, 4, FALSE);
proto_tree_add_item(lmp_object_tree,
- lmp_filter[LMPF_VAL_DATA_LINK_REMOTE_IPV4],
+ hf_lmp_filter[LMPF_VAL_DATA_LINK_REMOTE_IPV4],
tvb, offset2+8, 4, FALSE);
l = 12;
break;
@@ -1227,9 +1225,9 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tvb_get_ntohl(tvb, offset2+4),
tvb_get_ntohl(tvb, offset2+8));
proto_tree_add_item(lmp_object_tree,
- lmp_filter[LMPF_VAL_DATA_LINK_LOCAL_UNNUM],
+ hf_lmp_filter[LMPF_VAL_DATA_LINK_LOCAL_UNNUM],
tvb, offset2+4, 4, FALSE);
- proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_DATA_LINK_REMOTE_UNNUM],
+ proto_tree_add_item(lmp_object_tree, hf_lmp_filter[LMPF_VAL_DATA_LINK_REMOTE_UNNUM],
tvb, offset2+8, 4, FALSE);
l = 12;
break;
@@ -1243,7 +1241,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
while (l < obj_length - 4) {
mylen = tvb_get_guint8(tvb, offset2+l+1);
ti2 = proto_tree_add_item(lmp_object_tree,
- lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ],
+ hf_lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ],
tvb, offset2+l, mylen, FALSE);
lmp_subobj_tree = proto_item_add_subtree(ti2,
lmp_subtree[LMP_TREE_DATA_LINK_SUBOBJ]);
@@ -1260,17 +1258,17 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_item_set_text(ti2, "Interface Switching Capability: "
"Switching Cap: %s, Encoding Type: %s, "
"Min BW: %.3f Mbps, Max BW: %.3f Mbps",
- val_to_str(tvb_get_guint8(tvb, offset2+l+2),
- gmpls_switching_type_str, "Unknown (%d)"),
- val_to_str(tvb_get_guint8(tvb, offset2+l+3),
- gmpls_lsp_enc_str, "Unknown (%d)"),
+ rval_to_str(tvb_get_guint8(tvb, offset2+l+2),
+ gmpls_switching_type_rvals, "Unknown (%d)"),
+ rval_to_str(tvb_get_guint8(tvb, offset2+l+3),
+ gmpls_lsp_enc_rvals, "Unknown (%d)"),
tvb_get_ntohieee_float(tvb, offset2+l+4)*8/1000000,
tvb_get_ntohieee_float(tvb, offset2+l+8)*8/1000000);
proto_tree_add_item(lmp_subobj_tree,
- lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ_SWITCHING_TYPE],
+ hf_lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ_SWITCHING_TYPE],
tvb, offset2+l+2, 1, FALSE);
proto_tree_add_item(lmp_subobj_tree,
- lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ_LSP_ENCODING],
+ hf_lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ_LSP_ENCODING],
tvb, offset2+l+3, 1, FALSE);
proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l+4, 4,
"Minimum Reservable Bandwidth: %.3f Mbps",
@@ -1428,7 +1426,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case LMP_CLASS_ERROR:
l = tvb_get_ntohl(tvb, offset2);
- ti2 = proto_tree_add_uint(lmp_object_tree, lmp_filter[LMPF_VAL_ERROR],
+ ti2 = proto_tree_add_uint(lmp_object_tree, hf_lmp_filter[LMPF_VAL_ERROR],
tvb, offset2, 4, l);
switch(type) {
@@ -1442,16 +1440,16 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
lmp_flags_tree = proto_item_add_subtree(ti2,
lmp_subtree[LMP_TREE_ERROR_FLAGS]);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_ERROR_VERIFY_UNSUPPORTED_LINK],
+ hf_lmp_filter[LMPF_VAL_ERROR_VERIFY_UNSUPPORTED_LINK],
tvb, offset, 4, l);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_ERROR_VERIFY_UNWILLING],
+ hf_lmp_filter[LMPF_VAL_ERROR_VERIFY_UNWILLING],
tvb, offset, 4, l);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_ERROR_VERIFY_TRANSPORT],
+ hf_lmp_filter[LMPF_VAL_ERROR_VERIFY_TRANSPORT],
tvb, offset, 4, l);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_ERROR_VERIFY_TE_LINK_ID],
+ hf_lmp_filter[LMPF_VAL_ERROR_VERIFY_TE_LINK_ID],
tvb, offset, 4, l);
break;
@@ -1466,22 +1464,22 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
lmp_flags_tree = proto_item_add_subtree(ti2,
lmp_subtree[LMP_TREE_ERROR_FLAGS]);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_PARAMETERS],
+ hf_lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_PARAMETERS],
tvb, offset, 4, l);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_ERROR_SUMMARY_RENEGOTIATE],
+ hf_lmp_filter[LMPF_VAL_ERROR_SUMMARY_RENEGOTIATE],
tvb, offset, 4, l);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_TE_LINK],
+ hf_lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_TE_LINK],
tvb, offset, 4, l);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_DATA_LINK],
+ hf_lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_DATA_LINK],
tvb, offset, 4, l);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_ERROR_SUMMARY_UNKNOWN_TEL_CTYPE],
+ hf_lmp_filter[LMPF_VAL_ERROR_SUMMARY_UNKNOWN_TEL_CTYPE],
tvb, offset, 4, l);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_ERROR_SUMMARY_UNKNOWN_DL_CTYPE],
+ hf_lmp_filter[LMPF_VAL_ERROR_SUMMARY_UNKNOWN_DL_CTYPE],
tvb, offset, 4, l);
break;
@@ -1493,13 +1491,13 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
lmp_flags_tree = proto_item_add_subtree(ti2,
lmp_subtree[LMP_TREE_ERROR_FLAGS]);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_ERROR_TRACE_UNSUPPORTED_TYPE],
+ hf_lmp_filter[LMPF_VAL_ERROR_TRACE_UNSUPPORTED_TYPE],
tvb, offset, 4, l);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_ERROR_TRACE_INVALID_MSG],
+ hf_lmp_filter[LMPF_VAL_ERROR_TRACE_INVALID_MSG],
tvb, offset, 4, l);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_ERROR_TRACE_UNKNOWN_CTYPE],
+ hf_lmp_filter[LMPF_VAL_ERROR_TRACE_UNKNOWN_CTYPE],
tvb, offset, 4, l);
break;
@@ -1513,19 +1511,19 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
lmp_flags_tree = proto_item_add_subtree(ti2,
lmp_subtree[LMP_TREE_ERROR_FLAGS]);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_ERROR_LAD_AREA_ID_MISMATCH],
+ hf_lmp_filter[LMPF_VAL_ERROR_LAD_AREA_ID_MISMATCH],
tvb, offset, 4, l);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_ERROR_LAD_TCP_ID_MISMATCH],
+ hf_lmp_filter[LMPF_VAL_ERROR_LAD_TCP_ID_MISMATCH],
tvb, offset, 4, l);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_ERROR_LAD_DA_DCN_MISMATCH],
+ hf_lmp_filter[LMPF_VAL_ERROR_LAD_DA_DCN_MISMATCH],
tvb, offset, 4, l);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_ERROR_LAD_CAPABILITY_MISMATCH],
+ hf_lmp_filter[LMPF_VAL_ERROR_LAD_CAPABILITY_MISMATCH],
tvb, offset, 4, l);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_ERROR_LAD_UNKNOWN_CTYPE],
+ hf_lmp_filter[LMPF_VAL_ERROR_LAD_UNKNOWN_CTYPE],
tvb, offset, 4, l);
break;
@@ -1542,20 +1540,20 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case 1:
l = tvb_get_ntohs(tvb, offset2);
proto_tree_add_uint(lmp_object_tree,
- lmp_filter[LMPF_VAL_TRACE_LOCAL_TYPE],
+ hf_lmp_filter[LMPF_VAL_TRACE_LOCAL_TYPE],
tvb, offset2, 2, l);
proto_item_append_text(lmp_object_tree, ": %s",
val_to_str(l, lmp_trace_type_str, "Unknown (%d)"));
l = tvb_get_ntohs(tvb, offset2+2);
proto_tree_add_uint(lmp_object_tree,
- lmp_filter[LMPF_VAL_TRACE_LOCAL_LEN],
+ hf_lmp_filter[LMPF_VAL_TRACE_LOCAL_LEN],
tvb, offset2+2, 2, l);
if (l && l <= obj_length - 8) {
proto_item_append_text(lmp_object_tree, " = %s",
tvb_format_text(tvb, offset2+4, l));
proto_tree_add_string(lmp_object_tree,
- lmp_filter[LMPF_VAL_TRACE_LOCAL_MSG],
+ hf_lmp_filter[LMPF_VAL_TRACE_LOCAL_MSG],
tvb, offset2+4, l, tvb_format_text(tvb,
offset2+4,l));
}
@@ -1567,19 +1565,19 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case 2:
l = tvb_get_ntohs(tvb, offset2);
proto_tree_add_uint(lmp_object_tree,
- lmp_filter[LMPF_VAL_TRACE_REMOTE_TYPE],
+ hf_lmp_filter[LMPF_VAL_TRACE_REMOTE_TYPE],
tvb, offset2, 2, l);
proto_item_append_text(lmp_object_tree, ": %s",
val_to_str(l, lmp_trace_type_str, "Unknown (%d)"));
l = tvb_get_ntohs(tvb, offset2+2);
proto_tree_add_uint(lmp_object_tree,
- lmp_filter[LMPF_VAL_TRACE_REMOTE_LEN],
+ hf_lmp_filter[LMPF_VAL_TRACE_REMOTE_LEN],
tvb, offset2+2, 2, l);
proto_item_append_text(lmp_object_tree, " = %s",
tvb_format_text(tvb, offset2+4, l));
proto_tree_add_string(lmp_object_tree,
- lmp_filter[LMPF_VAL_TRACE_REMOTE_MSG],
+ hf_lmp_filter[LMPF_VAL_TRACE_REMOTE_MSG],
tvb, offset2+4, l, tvb_format_text(tvb, offset2+4,l));
break;
@@ -1596,7 +1594,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case 1:
l = tvb_get_ntohs(tvb, offset2);
proto_tree_add_uint(lmp_object_tree,
- lmp_filter[LMPF_VAL_TRACE_REQ_TYPE],
+ hf_lmp_filter[LMPF_VAL_TRACE_REQ_TYPE],
tvb, offset2, 2, l);
proto_item_append_text(lmp_object_tree, ": %s",
val_to_str(l, lmp_trace_type_str, "Unknown (%d)"));
@@ -1622,7 +1620,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
l = tvb_get_guint8(tvb, offset2);
ti2 = proto_tree_add_uint(lmp_object_tree,
- lmp_filter[LMPF_VAL_SERVICE_CONFIG_SP_FLAGS],
+ hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_SP_FLAGS],
tvb, offset2, 1, l);
proto_item_append_text(ti2, ": %s %s",
(l & 0x01) ? "RSVP-based UNI signaling supported " : "",
@@ -1632,11 +1630,11 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
lmp_subtree[LMP_TREE_SERVICE_CONFIG_SP_FLAGS]);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_SERVICE_CONFIG_SP_FLAGS_RSVP],
+ hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_SP_FLAGS_RSVP],
tvb, offset2, 1, l);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_SERVICE_CONFIG_SP_FLAGS_LDP],
+ hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_SP_FLAGS_LDP],
tvb, offset2, 1, l);
/* UNI version */
@@ -1693,7 +1691,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* TP Transparency */
l = tvb_get_guint8(tvb, offset2+2);
ti2 = proto_tree_add_uint(lmp_object_tree,
- lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS],
+ hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS],
tvb, offset2+2, 1, l);
proto_item_append_text(ti2, ": %s%s%s",
@@ -1705,28 +1703,28 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
lmp_subtree[LMP_TREE_SERVICE_CONFIG_CPSA_TP_FLAGS]);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS_PATH_OVERHEAD],
+ hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS_PATH_OVERHEAD],
tvb, offset2+2, 1, l);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS_LINE_OVERHEAD],
+ hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS_LINE_OVERHEAD],
tvb, offset2+2, 1, l);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS_SECTION_OVERHEAD],
+ hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS_SECTION_OVERHEAD],
tvb, offset2+2, 1, l);
/* Contiguous Concatentation Types */
l = tvb_get_guint8(tvb, offset2+3);
ti2 = proto_tree_add_uint(lmp_object_tree,
- lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_CCT_FLAGS],
+ hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_CCT_FLAGS],
tvb, offset2+3, 1, l);
lmp_flags_tree = proto_item_add_subtree(ti2,
lmp_subtree[LMP_TREE_SERVICE_CONFIG_CPSA_CCT_FLAGS]);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_CCT_FLAGS_CC_SUPPORTED],
+ hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_CCT_FLAGS_CC_SUPPORTED],
tvb, offset2+3, 1, l);
/* Min and Max NCC */
@@ -1735,12 +1733,12 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tvb_get_ntohs(tvb, offset2+6));
proto_tree_add_uint(lmp_object_tree,
- lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_MIN_NCC],
+ hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_MIN_NCC],
tvb, offset2+4, 2,
tvb_get_ntohs(tvb, offset2+4));
proto_tree_add_uint(lmp_object_tree,
- lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_MAX_NCC],
+ hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_MAX_NCC],
tvb, offset2+6, 2,
tvb_get_ntohs(tvb, offset2+6));
@@ -1750,12 +1748,12 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tvb_get_ntohs(tvb, offset2+10));
proto_tree_add_uint(lmp_object_tree,
- lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_MIN_NVC],
+ hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_MIN_NVC],
tvb, offset2+8, 2,
tvb_get_ntohs(tvb, offset2+8));
proto_tree_add_uint(lmp_object_tree,
- lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_MAX_NVC],
+ hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_MAX_NVC],
tvb, offset2+10, 2,
tvb_get_ntohs(tvb, offset2+10));
@@ -1764,7 +1762,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
ip_to_str(tvb_get_ptr(tvb, offset2+12, 4)));
proto_tree_add_item(lmp_object_tree,
- lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_INTERFACE_ID],
+ hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_INTERFACE_ID],
tvb, offset2+12, 4, FALSE);
break;
@@ -1776,7 +1774,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Transparency */
l = tvb_get_ntohl(tvb, offset2);
ti2 = proto_tree_add_uint(lmp_object_tree,
- lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TRANSPARENCY_FLAGS],
+ hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TRANSPARENCY_FLAGS],
tvb, offset2, 4, l);
proto_item_append_text(ti2, ": %s %s",
@@ -1787,25 +1785,25 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
lmp_subtree[LMP_TREE_SERVICE_CONFIG_NSA_TRANSPARENCY_FLAGS]);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TRANSPARENCY_FLAGS_SOH],
+ hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TRANSPARENCY_FLAGS_SOH],
tvb, offset2, 4, l);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TRANSPARENCY_FLAGS_LOH],
+ hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TRANSPARENCY_FLAGS_LOH],
tvb, offset2, 4, l);
/* TCM Monitoring */
l = tvb_get_guint8(tvb, offset2+7);
ti2 = proto_tree_add_uint(lmp_object_tree,
- lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TCM_FLAGS],
+ hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TCM_FLAGS],
tvb, offset2+7, 1, l);
proto_item_append_text(ti2, ": %s",
(l & 0x01) ? "Transparent Support of TCM available " : "");
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TCM_FLAGS_TCM_SUPPORTED],
+ hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TCM_FLAGS_TCM_SUPPORTED],
tvb, offset2+7, 1, l);
break;
@@ -1816,7 +1814,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
l = tvb_get_guint8(tvb,offset2+3);
ti2 = proto_tree_add_uint(lmp_object_tree,
- lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS],
+ hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS],
tvb, offset2+3, 1, l);
proto_item_append_text(ti2, ": %s%s%s",
@@ -1829,15 +1827,15 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
lmp_subtree[LMP_TREE_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS]);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS_NODE],
+ hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS_NODE],
tvb, offset2+3, 1, l);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS_LINK],
+ hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS_LINK],
tvb, offset2+3, 1, l);
proto_tree_add_boolean(lmp_flags_tree,
- lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS_SRLG],
+ hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS_SRLG],
tvb, offset2+3, 1, l);
break;
@@ -1855,7 +1853,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
l = LMPF_VAL_LOCAL_DA_DCN_ADDR;
proto_item_append_text(ti, ": %s",
ip_to_str(tvb_get_ptr(tvb, offset2, 4)));
- proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb,
+ proto_tree_add_item(lmp_object_tree, hf_lmp_filter[l], tvb,
offset2, 4, FALSE);
break;
@@ -1863,7 +1861,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
l = LMPF_VAL_REMOTE_DA_DCN_ADDR;
proto_item_append_text(ti, ": %s",
ip_to_str(tvb_get_ptr(tvb, offset2, 4)));
- proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb,
+ proto_tree_add_item(lmp_object_tree, hf_lmp_filter[l], tvb,
offset2, 4, FALSE);
break;
@@ -1880,28 +1878,28 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case 1:
proto_item_append_text(ti, ": IPv4");
proto_tree_add_item(lmp_object_tree,
- lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_NODE_ID],
+ hf_lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_NODE_ID],
tvb, offset2, 4, FALSE);
proto_tree_add_item(lmp_object_tree,
- lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_AREA_ID],
+ hf_lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_AREA_ID],
tvb, offset2+4, 4, FALSE);
proto_tree_add_item(lmp_object_tree,
- lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_TE_LINK_ID],
+ hf_lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_TE_LINK_ID],
tvb, offset2+8, 4, FALSE);
proto_tree_add_item(lmp_object_tree,
- lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_COMPONENT_ID],
+ hf_lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_COMPONENT_ID],
tvb, offset2+12, 4, FALSE);
proto_tree_add_item(lmp_object_tree,
- lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_SC_PC_ID],
+ hf_lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_SC_PC_ID],
tvb, offset2+16, 4, FALSE);
proto_tree_add_item(lmp_object_tree,
- lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_SC_PC_ADDR],
+ hf_lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_SC_PC_ADDR],
tvb, offset2+20, 4, FALSE);
l = 24;
while (l < obj_length - 4) {
mylen = tvb_get_guint8(tvb, offset2+l+1);
ti2 = proto_tree_add_item(lmp_object_tree,
- lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ],
+ hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ],
tvb, offset2+l, mylen, FALSE);
lmp_subobj_tree = proto_item_add_subtree(ti2,
lmp_subtree[LMP_TREE_LAD_INFO_SUBOBJ]);
@@ -1927,13 +1925,13 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
ip_to_str(tvb_get_ptr(tvb, offset2+l+8, 4)),
ip_to_str(tvb_get_ptr(tvb, offset2+l+12, 4)));
proto_tree_add_item(lmp_subobj_tree,
- lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_PRI_AREA_ID],
+ hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_PRI_AREA_ID],
tvb, offset2+l+4, 4, FALSE);
proto_tree_add_item(lmp_subobj_tree,
- lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_PRI_RC_PC_ID],
+ hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_PRI_RC_PC_ID],
tvb, offset2+l+8, 4, FALSE);
proto_tree_add_item(lmp_subobj_tree,
- lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_PRI_RC_PC_ADDR],
+ hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_PRI_RC_PC_ADDR],
tvb, offset2+l+12, 4, FALSE);
break;
@@ -1945,28 +1943,28 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
ip_to_str(tvb_get_ptr(tvb, offset2+l+8, 4)),
ip_to_str(tvb_get_ptr(tvb, offset2+l+12, 4)));
proto_tree_add_item(lmp_subobj_tree,
- lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_SEC_AREA_ID],
+ hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_SEC_AREA_ID],
tvb, offset2+l+4, 4, FALSE);
proto_tree_add_item(lmp_subobj_tree,
- lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_SEC_RC_PC_ID],
+ hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_SEC_RC_PC_ID],
tvb, offset2+l+8, 4, FALSE);
proto_tree_add_item(lmp_subobj_tree,
- lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_SEC_RC_PC_ADDR],
+ hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_SEC_RC_PC_ADDR],
tvb, offset2+l+12, 4, FALSE);
break;
case 252:
proto_item_set_text(ti2, "SONET/SDH Layer Capability: "
"Switching Cap: %s, Encoding Type: %s",
- val_to_str(tvb_get_guint8(tvb, offset2+l+4),
- gmpls_switching_type_str, "Unknown (%d)"),
- val_to_str(tvb_get_guint8(tvb, offset2+l+5),
- gmpls_lsp_enc_str, "Unknown (%d)"));
+ rval_to_str(tvb_get_guint8(tvb, offset2+l+4),
+ gmpls_switching_type_rvals, "Unknown (%d)"),
+ rval_to_str(tvb_get_guint8(tvb, offset2+l+5),
+ gmpls_lsp_enc_rvals, "Unknown (%d)"));
proto_tree_add_item(lmp_subobj_tree,
- lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_SWITCHING_TYPE],
+ hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_SWITCHING_TYPE],
tvb, offset2+l+4, 1, FALSE);
proto_tree_add_item(lmp_subobj_tree,
- lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_LSP_ENCODING],
+ hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_LSP_ENCODING],
tvb, offset2+l+5, 1, FALSE);
for (j = 0; j < (mylen - 8) / 4; j++) {
@@ -2054,646 +2052,647 @@ proto_register_lmp(void)
static hf_register_info lmpf_info[] = {
/* Message type number */
- {&lmp_filter[LMPF_MSG],
+ {&hf_lmp_filter[LMPF_MSG],
{ "Message Type", "lmp.msg", FT_UINT8, BASE_DEC, VALS(message_type_vals), 0x0,
NULL, HFILL }},
/* Message type shorthands */
- {&lmp_filter[LMPF_MSG_CONFIG],
+ {&hf_lmp_filter[LMPF_MSG_CONFIG],
{ "Config Message", "lmp.msg.config", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_CONFIG_ACK],
+ {&hf_lmp_filter[LMPF_MSG_CONFIG_ACK],
{ "ConfigAck Message", "lmp.msg.configack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_CONFIG_NACK],
+ {&hf_lmp_filter[LMPF_MSG_CONFIG_NACK],
{ "ConfigNack Message", "lmp.msg.confignack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_HELLO],
+ {&hf_lmp_filter[LMPF_MSG_HELLO],
{ "HELLO Message", "lmp.msg.hello", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_BEGIN_VERIFY],
+ {&hf_lmp_filter[LMPF_MSG_BEGIN_VERIFY],
{ "BeginVerify Message", "lmp.msg.beginverify", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_BEGIN_VERIFY_ACK],
+ {&hf_lmp_filter[LMPF_MSG_BEGIN_VERIFY_ACK],
{ "BeginVerifyAck Message", "lmp.msg.beginverifyack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_BEGIN_VERIFY_NACK],
+ {&hf_lmp_filter[LMPF_MSG_BEGIN_VERIFY_NACK],
{ "BeginVerifyNack Message", "lmp.msg.beginverifynack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_END_VERIFY],
+ {&hf_lmp_filter[LMPF_MSG_END_VERIFY],
{ "EndVerify Message", "lmp.msg.endverify", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_END_VERIFY_ACK],
+ {&hf_lmp_filter[LMPF_MSG_END_VERIFY_ACK],
{ "EndVerifyAck Message", "lmp.msg.endverifyack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_TEST],
+ {&hf_lmp_filter[LMPF_MSG_TEST],
{ "Test Message", "lmp.msg.test", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_TEST_STATUS_SUCCESS],
+ {&hf_lmp_filter[LMPF_MSG_TEST_STATUS_SUCCESS],
{ "TestStatusSuccess Message", "lmp.msg.teststatussuccess", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_TEST_STATUS_FAILURE],
+ {&hf_lmp_filter[LMPF_MSG_TEST_STATUS_FAILURE],
{ "TestStatusFailure Message", "lmp.msg.teststatusfailure", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_TEST_STATUS_ACK],
+ {&hf_lmp_filter[LMPF_MSG_TEST_STATUS_ACK],
{ "TestStatusAck Message", "lmp.msg.teststatusack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_LINK_SUMMARY],
+ {&hf_lmp_filter[LMPF_MSG_LINK_SUMMARY],
{ "LinkSummary Message", "lmp.msg.linksummary", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_LINK_SUMMARY_ACK],
+ {&hf_lmp_filter[LMPF_MSG_LINK_SUMMARY_ACK],
{ "LinkSummaryAck Message", "lmp.msg.linksummaryack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_LINK_SUMMARY_NACK],
+ {&hf_lmp_filter[LMPF_MSG_LINK_SUMMARY_NACK],
{ "LinkSummaryNack Message", "lmp.msg.linksummarynack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_CHANNEL_STATUS],
+ {&hf_lmp_filter[LMPF_MSG_CHANNEL_STATUS],
{ "ChannelStatus Message", "lmp.msg.channelstatus", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_CHANNEL_STATUS_ACK],
+ {&hf_lmp_filter[LMPF_MSG_CHANNEL_STATUS_ACK],
{ "ChannelStatusAck Message", "lmp.msg.channelstatusack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_CHANNEL_STATUS_REQ],
+ {&hf_lmp_filter[LMPF_MSG_CHANNEL_STATUS_REQ],
{ "ChannelStatusRequest Message", "lmp.msg.channelstatusrequest", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_CHANNEL_STATUS_RESP],
+ {&hf_lmp_filter[LMPF_MSG_CHANNEL_STATUS_RESP],
{ "ChannelStatusResponse Message", "lmp.msg.channelstatusresponse", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_TRACE_MONITOR],
+ {&hf_lmp_filter[LMPF_MSG_TRACE_MONITOR],
{ "TraceMonitor Message", "lmp.msg.tracemonitor", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_TRACE_MONITOR_ACK],
+ {&hf_lmp_filter[LMPF_MSG_TRACE_MONITOR_ACK],
{ "TraceMonitorAck Message", "lmp.msg.tracemonitorack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_TRACE_MONITOR_NACK],
+ {&hf_lmp_filter[LMPF_MSG_TRACE_MONITOR_NACK],
{ "TraceMonitorNack Message", "lmp.msg.tracemonitornack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_TRACE_MISMATCH],
+ {&hf_lmp_filter[LMPF_MSG_TRACE_MISMATCH],
{ "TraceMismatch Message", "lmp.msg.tracemismatch", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_TRACE_MISMATCH_ACK],
+ {&hf_lmp_filter[LMPF_MSG_TRACE_MISMATCH_ACK],
{ "TraceMismatchAck Message", "lmp.msg.tracemismatchack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_TRACE_REQUEST],
+ {&hf_lmp_filter[LMPF_MSG_TRACE_REQUEST],
{ "TraceRequest Message", "lmp.msg.tracerequest", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_TRACE_REPORT],
+ {&hf_lmp_filter[LMPF_MSG_TRACE_REPORT],
{ "TraceReport Message", "lmp.msg.tracereport", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_TRACE_REQUEST_NACK],
+ {&hf_lmp_filter[LMPF_MSG_TRACE_REQUEST_NACK],
{ "TraceRequestNack Message", "lmp.msg.tracerequestnack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_INSERT_TRACE],
+ {&hf_lmp_filter[LMPF_MSG_INSERT_TRACE],
{ "InsertTrace Message", "lmp.msg.inserttrace", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_INSERT_TRACE_ACK],
+ {&hf_lmp_filter[LMPF_MSG_INSERT_TRACE_ACK],
{ "InsertTraceAck Message", "lmp.msg.inserttraceack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_INSERT_TRACE_NACK],
+ {&hf_lmp_filter[LMPF_MSG_INSERT_TRACE_NACK],
{ "InsertTraceNack Message", "lmp.msg.inserttracenack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_SERVICE_CONFIG],
+ {&hf_lmp_filter[LMPF_MSG_SERVICE_CONFIG],
{ "ServiceConfig Message", "lmp.msg.serviceconfig", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_SERVICE_CONFIG_ACK],
+ {&hf_lmp_filter[LMPF_MSG_SERVICE_CONFIG_ACK],
{ "ServiceConfigAck Message", "lmp.msg.serviceconfigack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_SERVICE_CONFIG_NACK],
+ {&hf_lmp_filter[LMPF_MSG_SERVICE_CONFIG_NACK],
{ "ServiceConfigNack Message", "lmp.msg.serviceconfignack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_DISCOVERY_RESP],
+ {&hf_lmp_filter[LMPF_MSG_DISCOVERY_RESP],
{ "DiscoveryResponse Message", "lmp.msg.discoveryresp", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_DISCOVERY_RESP_ACK],
+ {&hf_lmp_filter[LMPF_MSG_DISCOVERY_RESP_ACK],
{ "DiscoveryResponseAck Message", "lmp.msg.discoveryrespack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_MSG_DISCOVERY_RESP_NACK],
+ {&hf_lmp_filter[LMPF_MSG_DISCOVERY_RESP_NACK],
{ "DiscoveryResponseNack Message", "lmp.msg.discoveryrespnack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
/* LMP Message Header Fields ------------------- */
- {&lmp_filter[LMPF_HDR_FLAGS],
+ {&hf_lmp_filter[LMPF_HDR_FLAGS],
{ "LMP Header - Flags", "lmp.hdr.flags", FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_HDR_FLAGS_CC_DOWN],
+ {&hf_lmp_filter[LMPF_HDR_FLAGS_CC_DOWN],
{ "ControlChannelDown", "lmp.hdr.ccdown", FT_BOOLEAN, 8, NULL, 0x01,
NULL, HFILL }},
- {&lmp_filter[LMPF_HDR_FLAGS_REBOOT],
+ {&hf_lmp_filter[LMPF_HDR_FLAGS_REBOOT],
{ "Reboot", "lmp.hdr.reboot", FT_BOOLEAN, 8, NULL, 0x02,
NULL, HFILL }},
/* LMP object class filters ------------------------------- */
- {&lmp_filter[LMPF_OBJECT],
+ {&hf_lmp_filter[LMPF_OBJECT],
{ "LOCAL_CCID", "lmp.object", FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_CLASS_CCID],
+ {&hf_lmp_filter[LMPF_CLASS_CCID],
{ "CCID", "lmp.obj.ccid", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_CLASS_NODE_ID],
+ {&hf_lmp_filter[LMPF_CLASS_NODE_ID],
{ "NODE_ID", "lmp.obj.Nodeid", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_CLASS_LINK_ID],
+ {&hf_lmp_filter[LMPF_CLASS_LINK_ID],
{ "LINK_ID", "lmp.obj.linkid", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_CLASS_INTERFACE_ID],
+ {&hf_lmp_filter[LMPF_CLASS_INTERFACE_ID],
{ "INTERFACE_ID", "lmp.obj.interfaceid", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_CLASS_MESSAGE_ID],
+ {&hf_lmp_filter[LMPF_CLASS_MESSAGE_ID],
{ "MESSAGE_ID", "lmp.obj.messageid", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_CLASS_CONFIG],
+ {&hf_lmp_filter[LMPF_CLASS_CONFIG],
{ "CONFIG", "lmp.obj.config", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_CLASS_HELLO],
+ {&hf_lmp_filter[LMPF_CLASS_HELLO],
{ "HELLO", "lmp.obj.hello", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_CLASS_BEGIN_VERIFY],
+ {&hf_lmp_filter[LMPF_CLASS_BEGIN_VERIFY],
{ "BEGIN_VERIFY", "lmp.obj.begin_verify", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_CLASS_BEGIN_VERIFY_ACK],
+ {&hf_lmp_filter[LMPF_CLASS_BEGIN_VERIFY_ACK],
{ "BEGIN_VERIFY_ACK", "lmp.obj.begin_verify_ack", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_CLASS_VERIFY_ID],
+ {&hf_lmp_filter[LMPF_CLASS_VERIFY_ID],
{ "VERIFY_ID", "lmp.obj.verifyid", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_CLASS_TE_LINK],
+ {&hf_lmp_filter[LMPF_CLASS_TE_LINK],
{ "TE_LINK", "lmp.obj.te_link", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_CLASS_DATA_LINK],
+ {&hf_lmp_filter[LMPF_CLASS_DATA_LINK],
{ "DATA_LINK", "lmp.obj.data_link", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_CLASS_CHANNEL_STATUS],
+ {&hf_lmp_filter[LMPF_CLASS_CHANNEL_STATUS],
{ "CHANNEL_STATUS", "lmp.obj.channel_status", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_CLASS_CHANNEL_STATUS_REQUEST],
+ {&hf_lmp_filter[LMPF_CLASS_CHANNEL_STATUS_REQUEST],
{ "CHANNEL_STATUS_REQUEST", "lmp.obj.channel_status_request", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_CLASS_ERROR],
+ {&hf_lmp_filter[LMPF_CLASS_ERROR],
{ "ERROR", "lmp.obj.error", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_CLASS_TRACE],
+ {&hf_lmp_filter[LMPF_CLASS_TRACE],
{ "TRACE", "lmp.obj.trace", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_CLASS_TRACE_REQ],
+ {&hf_lmp_filter[LMPF_CLASS_TRACE_REQ],
{ "TRACE REQ", "lmp.obj.trace_req", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_CLASS_SERVICE_CONFIG],
+ {&hf_lmp_filter[LMPF_CLASS_SERVICE_CONFIG],
{ "SERVICE_CONFIG", "lmp.obj.serviceconfig", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_CLASS_DA_DCN_ADDRESS],
+ {&hf_lmp_filter[LMPF_CLASS_DA_DCN_ADDRESS],
{ "DA_DCN_ADDRESS", "lmp.obj.dadcnaddr", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_CLASS_LOCAL_LAD_INFO],
+ {&hf_lmp_filter[LMPF_CLASS_LOCAL_LAD_INFO],
{ "LOCAL_LAD_INFO", "lmp.obj.localladinfo", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
/* Other LMP Value Filters ------------------------------ */
- {&lmp_filter[LMPF_VAL_CTYPE],
+ {&hf_lmp_filter[LMPF_VAL_CTYPE],
{ "Object C-Type", "lmp.obj.ctype", FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_LOCAL_CCID],
+ {&hf_lmp_filter[LMPF_VAL_LOCAL_CCID],
{ "Local CCID Value", "lmp.local_ccid", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_REMOTE_CCID],
+ {&hf_lmp_filter[LMPF_VAL_REMOTE_CCID],
{ "Remote CCID Value", "lmp.remote_ccid", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_LOCAL_NODE_ID],
+ {&hf_lmp_filter[LMPF_VAL_LOCAL_NODE_ID],
{ "Local Node ID Value", "lmp.local_nodeid", FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_REMOTE_NODE_ID],
+ {&hf_lmp_filter[LMPF_VAL_REMOTE_NODE_ID],
{ "Remote Node ID Value", "lmp.remote_nodeid", FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_LOCAL_LINK_ID_IPV4],
+ {&hf_lmp_filter[LMPF_VAL_LOCAL_LINK_ID_IPV4],
{ "Local Link ID - IPv4", "lmp.local_linkid_ipv4", FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_LOCAL_LINK_ID_UNNUM],
+ {&hf_lmp_filter[LMPF_VAL_LOCAL_LINK_ID_UNNUM],
{ "Local Link ID - Unnumbered", "lmp.local_linkid_unnum", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_REMOTE_LINK_ID_IPV4],
+ {&hf_lmp_filter[LMPF_VAL_REMOTE_LINK_ID_IPV4],
{ "Remote Link ID - IPv4", "lmp.remote_linkid_ipv4", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_REMOTE_LINK_ID_UNNUM],
+ {&hf_lmp_filter[LMPF_VAL_REMOTE_LINK_ID_UNNUM],
{ "Remote Link ID - Unnumbered", "lmp.remote_linkid_unnum", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_LOCAL_INTERFACE_ID_IPV4],
+ {&hf_lmp_filter[LMPF_VAL_LOCAL_INTERFACE_ID_IPV4],
{ "Local Interface ID - IPv4", "lmp.local_interfaceid_ipv4", FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_LOCAL_INTERFACE_ID_UNNUM],
+ {&hf_lmp_filter[LMPF_VAL_LOCAL_INTERFACE_ID_UNNUM],
{ "Local Interface ID - Unnumbered", "lmp.local_interfaceid_unnum", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_REMOTE_INTERFACE_ID_IPV4],
+ {&hf_lmp_filter[LMPF_VAL_REMOTE_INTERFACE_ID_IPV4],
{ "Remote Interface ID - IPv4", "lmp.remote_interfaceid_ipv4", FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_REMOTE_INTERFACE_ID_UNNUM],
+ {&hf_lmp_filter[LMPF_VAL_REMOTE_INTERFACE_ID_UNNUM],
{ "Remote Interface ID - Unnumbered", "lmp.remote_interfaceid_unnum", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_MESSAGE_ID],
+ {&hf_lmp_filter[LMPF_VAL_MESSAGE_ID],
{ "Message-ID Value", "lmp.messageid", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_MESSAGE_ID_ACK],
+ {&hf_lmp_filter[LMPF_VAL_MESSAGE_ID_ACK],
{ "Message-ID Ack Value", "lmp.messageid_ack", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_CONFIG_HELLO],
+ {&hf_lmp_filter[LMPF_VAL_CONFIG_HELLO],
{ "HelloInterval", "lmp.hellointerval", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_CONFIG_HELLO_DEAD],
+ {&hf_lmp_filter[LMPF_VAL_CONFIG_HELLO_DEAD],
{ "HelloDeadInterval", "lmp.hellodeadinterval", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_HELLO_TXSEQ],
+ {&hf_lmp_filter[LMPF_VAL_HELLO_TXSEQ],
{ "TxSeqNum", "lmp.txseqnum", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_HELLO_RXSEQ],
+ {&hf_lmp_filter[LMPF_VAL_HELLO_RXSEQ],
{ "RxSeqNum", "lmp.rxseqnum", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS],
+ {&hf_lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS],
{ "Flags", "lmp.begin_verify.flags", FT_UINT16, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS_ALL_LINKS],
+ {&hf_lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS_ALL_LINKS],
{ "Verify All Links", "lmp.begin_verify.all_links",
FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS_LINK_TYPE],
+ {&hf_lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS_LINK_TYPE],
{ "Data Link Type", "lmp.begin_verify.link_type",
FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_BEGIN_VERIFY_ENCTYPE],
- { "Encoding Type", "lmp.begin_verify.enctype", FT_UINT8, BASE_DEC, VALS(gmpls_lsp_enc_str), 0x0,
+ {&hf_lmp_filter[LMPF_VAL_BEGIN_VERIFY_ENCTYPE],
+ { "Encoding Type", "lmp.begin_verify.enctype",
+ FT_UINT8, BASE_DEC|BASE_RANGE_STRING, RVALS(&gmpls_lsp_enc_rvals), 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_VERIFY_ID],
+ {&hf_lmp_filter[LMPF_VAL_VERIFY_ID],
{ "Verify-ID", "lmp.verifyid", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_TE_LINK_FLAGS],
+ {&hf_lmp_filter[LMPF_VAL_TE_LINK_FLAGS],
{ "TE-Link Flags", "lmp.te_link_flags", FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_TE_LINK_FLAGS_FAULT_MGMT],
+ {&hf_lmp_filter[LMPF_VAL_TE_LINK_FLAGS_FAULT_MGMT],
{ "Fault Management Supported", "lmp.te_link.fault_mgmt",
FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_TE_LINK_FLAGS_LINK_VERIFY],
+ {&hf_lmp_filter[LMPF_VAL_TE_LINK_FLAGS_LINK_VERIFY],
{ "Link Verification Supported", "lmp.te_link.link_verify",
FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_TE_LINK_LOCAL_IPV4],
+ {&hf_lmp_filter[LMPF_VAL_TE_LINK_LOCAL_IPV4],
{ "TE-Link Local ID - IPv4", "lmp.te_link.local_ipv4", FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_TE_LINK_LOCAL_UNNUM],
+ {&hf_lmp_filter[LMPF_VAL_TE_LINK_LOCAL_UNNUM],
{ "TE-Link Local ID - Unnumbered", "lmp.te_link.local_unnum", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_TE_LINK_REMOTE_IPV4],
+ {&hf_lmp_filter[LMPF_VAL_TE_LINK_REMOTE_IPV4],
{ "TE-Link Remote ID - IPv4", "lmp.te_link.remote_ipv4", FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_TE_LINK_REMOTE_UNNUM],
+ {&hf_lmp_filter[LMPF_VAL_TE_LINK_REMOTE_UNNUM],
{ "TE-Link Remote ID - Unnumbered", "lmp.te_link.remote_unnum", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_DATA_LINK_FLAGS],
+ {&hf_lmp_filter[LMPF_VAL_DATA_LINK_FLAGS],
{ "Data-Link Flags", "lmp.data_link_flags", FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_DATA_LINK_FLAGS_PORT],
+ {&hf_lmp_filter[LMPF_VAL_DATA_LINK_FLAGS_PORT],
{ "Data-Link is Individual Port", "lmp.data_link.port",
FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_DATA_LINK_FLAGS_ALLOCATED],
+ {&hf_lmp_filter[LMPF_VAL_DATA_LINK_FLAGS_ALLOCATED],
{ "Data-Link is Allocated", "lmp.data_link.link_verify",
FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_DATA_LINK_LOCAL_IPV4],
+ {&hf_lmp_filter[LMPF_VAL_DATA_LINK_LOCAL_IPV4],
{ "Data-Link Local ID - IPv4", "lmp.data_link.local_ipv4", FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_DATA_LINK_LOCAL_UNNUM],
+ {&hf_lmp_filter[LMPF_VAL_DATA_LINK_LOCAL_UNNUM],
{ "Data-Link Local ID - Unnumbered", "lmp.data_link.local_unnum", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_DATA_LINK_REMOTE_IPV4],
+ {&hf_lmp_filter[LMPF_VAL_DATA_LINK_REMOTE_IPV4],
{ "Data-Link Remote ID - IPv4", "lmp.data_link.remote_ipv4", FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_DATA_LINK_REMOTE_UNNUM],
+ {&hf_lmp_filter[LMPF_VAL_DATA_LINK_REMOTE_UNNUM],
{ "Data-Link Remote ID - Unnumbered", "lmp.data_link.remote_unnum", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ],
+ {&hf_lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ],
{ "Subobject", "lmp.data_link_subobj", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ_SWITCHING_TYPE],
- { "Interface Switching Capability", "lmp.data_link_switching", FT_UINT8, BASE_DEC,
- VALS(gmpls_switching_type_str), 0x0, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ_LSP_ENCODING],
- { "LSP Encoding Type", "lmp.data_link_encoding", FT_UINT8, BASE_DEC,
- VALS(gmpls_lsp_enc_str), 0x0, NULL, HFILL }},
+ {&hf_lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ_SWITCHING_TYPE],
+ { "Interface Switching Capability", "lmp.data_link_switching", FT_UINT8, BASE_DEC|BASE_RANGE_STRING,
+ RVALS(&gmpls_switching_type_rvals), 0x0, NULL, HFILL }},
+ {&hf_lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ_LSP_ENCODING],
+ { "LSP Encoding Type", "lmp.data_link_encoding", FT_UINT8, BASE_DEC|BASE_RANGE_STRING,
+ RVALS(&gmpls_lsp_enc_rvals), 0x0, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_ERROR],
+ {&hf_lmp_filter[LMPF_VAL_ERROR],
{ "Error Code", "lmp.error", FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_ERROR_VERIFY_UNSUPPORTED_LINK],
+ {&hf_lmp_filter[LMPF_VAL_ERROR_VERIFY_UNSUPPORTED_LINK],
{ "Verification - Unsupported for this TE-Link", "lmp.error.verify_unsupported_link",
FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_ERROR_VERIFY_UNWILLING],
+ {&hf_lmp_filter[LMPF_VAL_ERROR_VERIFY_UNWILLING],
{ "Verification - Unwilling to Verify at this time", "lmp.error.verify_unwilling",
FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_ERROR_VERIFY_TRANSPORT],
+ {&hf_lmp_filter[LMPF_VAL_ERROR_VERIFY_TRANSPORT],
{ "Verification - Transport Unsupported", "lmp.error.verify_unsupported_transport",
FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_ERROR_VERIFY_TE_LINK_ID],
+ {&hf_lmp_filter[LMPF_VAL_ERROR_VERIFY_TE_LINK_ID],
{ "Verification - TE Link ID Configuration Error", "lmp.error.verify_te_link_id",
FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_ERROR_VERIFY_UNKNOWN_CTYPE],
+ {&hf_lmp_filter[LMPF_VAL_ERROR_VERIFY_UNKNOWN_CTYPE],
{ "Verification - Unknown Object C-Type", "lmp.error.verify_unknown_ctype",
FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_PARAMETERS],
+ {&hf_lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_PARAMETERS],
{ "Summary - Unacceptable non-negotiable parameters", "lmp.error.summary_bad_params",
FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_ERROR_SUMMARY_RENEGOTIATE],
+ {&hf_lmp_filter[LMPF_VAL_ERROR_SUMMARY_RENEGOTIATE],
{ "Summary - Renegotiate Parametere", "lmp.error.summary_renegotiate",
FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_TE_LINK],
+ {&hf_lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_TE_LINK],
{ "Summary - Bad TE Link Object", "lmp.error.summary_bad_te_link",
FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_DATA_LINK],
+ {&hf_lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_DATA_LINK],
{ "Summary - Bad Data Link Object", "lmp.error.summary_bad_data_link",
FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_ERROR_SUMMARY_UNKNOWN_TEL_CTYPE],
+ {&hf_lmp_filter[LMPF_VAL_ERROR_SUMMARY_UNKNOWN_TEL_CTYPE],
{ "Summary - Bad TE Link C-Type", "lmp.error.summary_unknown_tel_ctype",
FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_ERROR_SUMMARY_UNKNOWN_DL_CTYPE],
+ {&hf_lmp_filter[LMPF_VAL_ERROR_SUMMARY_UNKNOWN_DL_CTYPE],
{ "Summary - Bad Data Link C-Type", "lmp.error.summary_unknown_dl_ctype",
FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_REMOTE_LINK_ID],
+ {&hf_lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_REMOTE_LINK_ID],
{ "Summary - Bad Remote Link ID", "lmp.error.summary_bad_remote_link_id",
FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_ERROR_CONFIG_BAD_PARAMETERS],
+ {&hf_lmp_filter[LMPF_VAL_ERROR_CONFIG_BAD_PARAMETERS],
{ "Config - Unacceptable non-negotiable parameters", "lmp.error.config_bad_params",
FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_ERROR_CONFIG_RENEGOTIATE],
+ {&hf_lmp_filter[LMPF_VAL_ERROR_CONFIG_RENEGOTIATE],
{ "Config - Renegotiate Parameter", "lmp.error.config_renegotiate",
FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_ERROR_CONFIG_BAD_CCID],
+ {&hf_lmp_filter[LMPF_VAL_ERROR_CONFIG_BAD_CCID],
{ "Config - Bad CC ID", "lmp.error.config_bad_ccid",
FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_ERROR_TRACE_UNSUPPORTED_TYPE],
+ {&hf_lmp_filter[LMPF_VAL_ERROR_TRACE_UNSUPPORTED_TYPE],
{ "Trace - Unsupported trace type", "lmp.error.trace_unsupported_type",
FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_ERROR_TRACE_INVALID_MSG],
+ {&hf_lmp_filter[LMPF_VAL_ERROR_TRACE_INVALID_MSG],
{ "Trace - Invalid Trace Message", "lmp.error.trace_invalid_msg",
FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_ERROR_TRACE_UNKNOWN_CTYPE],
+ {&hf_lmp_filter[LMPF_VAL_ERROR_TRACE_UNKNOWN_CTYPE],
{ "Trace - Unknown Object C-Type", "lmp.error.trace_unknown_ctype",
FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_ERROR_LAD_AREA_ID_MISMATCH],
+ {&hf_lmp_filter[LMPF_VAL_ERROR_LAD_AREA_ID_MISMATCH],
{ "LAD - Domain Routing Area ID Mismatch detected", "lmp.error.lad_area_id_mismatch",
FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_ERROR_LAD_TCP_ID_MISMATCH],
+ {&hf_lmp_filter[LMPF_VAL_ERROR_LAD_TCP_ID_MISMATCH],
{ "LAD - TCP ID Mismatch detected", "lmp.error.lad_tcp_id_mismatch",
FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_ERROR_LAD_DA_DCN_MISMATCH],
+ {&hf_lmp_filter[LMPF_VAL_ERROR_LAD_DA_DCN_MISMATCH],
{ "LAD - DA DCN Mismatch detected", "lmp.error.lad_da_dcn_mismatch",
FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_ERROR_LAD_CAPABILITY_MISMATCH],
+ {&hf_lmp_filter[LMPF_VAL_ERROR_LAD_CAPABILITY_MISMATCH],
{ "LAD - Capability Mismatch detected", "lmp.error.lad_capability_mismatch",
FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_ERROR_LAD_UNKNOWN_CTYPE],
+ {&hf_lmp_filter[LMPF_VAL_ERROR_LAD_UNKNOWN_CTYPE],
{ "LAD - Unknown Object C-Type", "lmp.error.lad_unknown_ctype",
FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_TRACE_LOCAL_TYPE],
+ {&hf_lmp_filter[LMPF_VAL_TRACE_LOCAL_TYPE],
{ "Local Trace Type", "lmp.trace.local_type", FT_UINT16, BASE_DEC,
VALS(lmp_trace_type_str), 0x0, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_TRACE_LOCAL_LEN],
+ {&hf_lmp_filter[LMPF_VAL_TRACE_LOCAL_LEN],
{ "Local Trace Length", "lmp.trace.local_length", FT_UINT16, BASE_DEC,
NULL, 0x0, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_TRACE_LOCAL_MSG],
+ {&hf_lmp_filter[LMPF_VAL_TRACE_LOCAL_MSG],
{ "Local Trace Message", "lmp.trace.local_msg", FT_STRING, BASE_NONE,
NULL, 0x0, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_TRACE_REMOTE_TYPE],
+ {&hf_lmp_filter[LMPF_VAL_TRACE_REMOTE_TYPE],
{ "Remote Trace Type", "lmp.trace.remote_type", FT_UINT16, BASE_DEC,
VALS(lmp_trace_type_str), 0x0, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_TRACE_REMOTE_LEN],
+ {&hf_lmp_filter[LMPF_VAL_TRACE_REMOTE_LEN],
{ "Remote Trace Length", "lmp.trace.remote_length", FT_UINT16, BASE_DEC,
NULL, 0x0, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_TRACE_REMOTE_MSG],
+ {&hf_lmp_filter[LMPF_VAL_TRACE_REMOTE_MSG],
{ "Remote Trace Message", "lmp.trace.remote_msg", FT_STRING, BASE_NONE,
NULL, 0x0, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_TRACE_REQ_TYPE],
+ {&hf_lmp_filter[LMPF_VAL_TRACE_REQ_TYPE],
{ "Trace Type", "lmp.trace_req.type", FT_UINT16, BASE_DEC,
VALS(lmp_trace_type_str), 0x0, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_SP_FLAGS],
+ {&hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_SP_FLAGS],
{ "Service Config - Supported Signalling Protocols",
"lmp.service_config.sp", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}},
- {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_SP_FLAGS_RSVP],
+ {&hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_SP_FLAGS_RSVP],
{ "RSVP is supported", "lmp.service_config.sp.rsvp",
FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL}},
- {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_SP_FLAGS_LDP],
+ {&hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_SP_FLAGS_LDP],
{ "LDP is supported", "lmp.service_config.sp.ldp",
FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL}},
- {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS],
+ {&hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS],
{ "Client Port Service Attributes", "lmp.service_config.cpsa",
FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}},
- {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS_PATH_OVERHEAD],
+ {&hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS_PATH_OVERHEAD],
{ "Path/VC Overhead Transparency Supported",
"lmp.service_config.cpsa.path_overhead",
FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL}},
- {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS_LINE_OVERHEAD],
+ {&hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS_LINE_OVERHEAD],
{ "Line/MS Overhead Transparency Supported",
"lmp.service_config.cpsa.line_overhead",
FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL}},
- {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS_SECTION_OVERHEAD],
+ {&hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS_SECTION_OVERHEAD],
{ "Section/RS Overhead Transparency Supported",
"lmp.service_config.cpsa.section_overhead",
FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL}},
- {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_CCT_FLAGS],
+ {&hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_CCT_FLAGS],
{ "Contiguous Concatenation Types", "lmp.service_config.cct",
FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}},
- {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_CCT_FLAGS_CC_SUPPORTED],
+ {&hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_CCT_FLAGS_CC_SUPPORTED],
{ "Contiguous Concatenation Types Supported",
"lmp.service_config.cpsa.line_overhead",
FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL}},
- {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_MIN_NCC],
+ {&hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_MIN_NCC],
{ "Minimum Number of Contiguously Concatenated Components",
"lmp.service_config.cpsa.min_ncc",
FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}},
- {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_MAX_NCC],
+ {&hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_MAX_NCC],
{ "Maximum Number of Contiguously Concatenated Components",
"lmp.service_config.cpsa.max_ncc",
FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}},
- {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_MIN_NVC],
+ {&hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_MIN_NVC],
{ "Maximum Number of Contiguously Concatenated Components",
"lmp.service_config.cpsa.min_nvc",
FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}},
- {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_MAX_NVC],
+ {&hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_MAX_NVC],
{ "Minimum Number of Virtually Concatenated Components",
"lmp.service_config.cpsa.max_nvc",
FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}},
- {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_INTERFACE_ID],
+ {&hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_INTERFACE_ID],
{ "Local interface id of the client interface referred to",
"lmp.service_config.cpsa.local_ifid",
FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL}},
- {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TRANSPARENCY_FLAGS],
+ {&hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TRANSPARENCY_FLAGS],
{ "Network Transparency Flags",
"lmp.service_config.nsa.transparency",
FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
- {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TRANSPARENCY_FLAGS_SOH],
+ {&hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TRANSPARENCY_FLAGS_SOH],
{ "Standard SOH/RSOH transparency supported",
"lmp.service_config.nsa.transparency.soh",
FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL}},
- {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TRANSPARENCY_FLAGS_LOH],
+ {&hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TRANSPARENCY_FLAGS_LOH],
{ "Standard LOH/MSOH transparency supported",
"lmp.service_config.nsa.transparency.loh",
FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL}},
- {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TCM_FLAGS],
+ {&hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TCM_FLAGS],
{ "TCM Monitoring",
"lmp.service_config.nsa.tcm",
FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}},
- {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TCM_FLAGS_TCM_SUPPORTED],
+ {&hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TCM_FLAGS_TCM_SUPPORTED],
{ "TCM Monitoring Supported",
"lmp.service_config.nsa.transparency.tcm",
FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL}},
- {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS],
+ {&hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS],
{ "Network Diversity Flags",
"lmp.service_config.nsa.diversity",
FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}},
- {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS_NODE],
+ {&hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS_NODE],
{ "Node diversity supported",
"lmp.service_config.nsa.diversity.node",
FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL}},
- {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS_LINK],
+ {&hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS_LINK],
{ "Link diversity supported",
"lmp.service_config.nsa.diversity.link",
FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL}},
- {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS_SRLG],
+ {&hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS_SRLG],
{ "SRLG diversity supported",
"lmp.service_config.nsa.diversity.srlg",
FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL}},
- {&lmp_filter[LMPF_VAL_LOCAL_DA_DCN_ADDR],
+ {&hf_lmp_filter[LMPF_VAL_LOCAL_DA_DCN_ADDR],
{ "Local DA DCN Address", "lmp.local_da_dcn_addr", FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_REMOTE_DA_DCN_ADDR],
+ {&hf_lmp_filter[LMPF_VAL_REMOTE_DA_DCN_ADDR],
{ "Remote DA DCN Address", "lmp.remote_da_dcn_addr", FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_NODE_ID],
+ {&hf_lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_NODE_ID],
{ "Node ID", "lmp.local_lad_node_id", FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_AREA_ID],
+ {&hf_lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_AREA_ID],
{ "Area ID", "lmp.local_lad_area_id", FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_TE_LINK_ID],
+ {&hf_lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_TE_LINK_ID],
{ "TE Link ID", "lmp.local_lad_telink_id", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_COMPONENT_ID],
+ {&hf_lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_COMPONENT_ID],
{ "Component Link ID", "lmp.local_lad_comp_id", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_SC_PC_ID],
+ {&hf_lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_SC_PC_ID],
{ "SC PC ID", "lmp.local_lad_sc_pc_id", FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_SC_PC_ADDR],
+ {&hf_lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_SC_PC_ADDR],
{ "SC PC Address", "lmp.local_lad_sc_pc_addr", FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ],
+ {&hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ],
{ "Subobject", "lmp.lad_info_subobj", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_PRI_AREA_ID],
+ {&hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_PRI_AREA_ID],
{ "SC PC Address", "lmp.lad_pri_area_id", FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_PRI_RC_PC_ID],
+ {&hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_PRI_RC_PC_ID],
{ "SC PC Address", "lmp.lad_pri_rc_pc_id", FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_PRI_RC_PC_ADDR],
+ {&hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_PRI_RC_PC_ADDR],
{ "SC PC Address", "lmp.lad_pri_rc_pc_addr", FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_SEC_AREA_ID],
+ {&hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_SEC_AREA_ID],
{ "SC PC Address", "lmp.lad_sec_area_id", FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_SEC_RC_PC_ID],
+ {&hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_SEC_RC_PC_ID],
{ "SC PC Address", "lmp.lad_sec_rc_pc_id", FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_SEC_RC_PC_ADDR],
+ {&hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_SEC_RC_PC_ADDR],
{ "SC PC Address", "lmp.lad_sec_rc_pc_addr", FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_SWITCHING_TYPE],
- { "Interface Switching Capability", "lmp.lad_switching", FT_UINT8, BASE_DEC,
- VALS(gmpls_switching_type_str), 0x0, NULL, HFILL }},
- {&lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_LSP_ENCODING],
- { "LSP Encoding Type", "lmp.lad_encoding", FT_UINT8, BASE_DEC,
- VALS(gmpls_lsp_enc_str), 0x0, NULL, HFILL }},
+ {&hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_SWITCHING_TYPE],
+ { "Interface Switching Capability", "lmp.lad_switching", FT_UINT8, BASE_DEC|BASE_RANGE_STRING,
+ RVALS(&gmpls_switching_type_rvals), 0x0, NULL, HFILL }},
+ {&hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_LSP_ENCODING],
+ { "LSP Encoding Type", "lmp.lad_encoding", FT_UINT8, BASE_DEC|BASE_RANGE_STRING,
+ RVALS(&gmpls_lsp_enc_rvals), 0x0, NULL, HFILL }},
};
for (i=0; i<NUM_LMP_SUBTREES; i++) {
diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c
index b5cd68a5e2..a4a99323af 100644
--- a/epan/dissectors/packet-ospf.c
+++ b/epan/dissectors/packet-ospf.c
@@ -663,7 +663,7 @@ enum {
OSPFF_MAX
};
-static int ospf_filter[OSPFF_MAX];
+static int hf_ospf_filter[OSPFF_MAX];
static gint ospf_msg_type_to_filter (guint8 msg_type)
{
@@ -832,7 +832,7 @@ dissect_ospf_bitfield (proto_tree *parent_tree, tvbuff_t *tvb, int offset,
int hfindex, index;
gint returned_length;
- hfindex = ospf_filter[bfinfo->hfindex];
+ hfindex = hf_ospf_filter[bfinfo->hfindex];
hfinfo = proto_registrar_get_nth(hfindex);
switch (hfinfo->type) {
case FT_UINT8:
@@ -862,7 +862,7 @@ dissect_ospf_bitfield (proto_tree *parent_tree, tvbuff_t *tvb, int offset,
str = ep_alloc(MAX_OPTIONS_LEN);
str[0] = 0;
for (i = 0, pos = 0; i < bfinfo->num; i++) {
- index = ospf_filter[bfinfo->index[i]];
+ index = hf_ospf_filter[bfinfo->index[i]];
hfinfo = proto_registrar_get_nth(index);
if (flags & hfinfo->bitmask) {
returned_length = g_snprintf(&str[pos], MAX_OPTIONS_LEN-pos, "%s%s",
@@ -971,10 +971,8 @@ dissect_ospf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
packet_type = tvb_get_guint8(tvb, 1);
- if (check_col(pinfo->cinfo, COL_INFO)) {
col_add_str(pinfo->cinfo, COL_INFO,
val_to_str(packet_type, pt_vals, "Unknown (%u)"));
- }
if (tree) {
ospflen = tvb_get_ntohs(tvb, 2);
@@ -988,17 +986,17 @@ dissect_ospf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_text(ospf_header_tree, tvb, 0, 1, "OSPF Version: %u",
version);
- proto_tree_add_item(ospf_header_tree, ospf_filter[OSPFF_MSG_TYPE],
+ proto_tree_add_item(ospf_header_tree, hf_ospf_filter[OSPFF_MSG_TYPE],
tvb, 1, 1, FALSE);
if (ospf_msg_type_to_filter(packet_type) != -1) {
hidden_item = proto_tree_add_item(ospf_header_tree,
- ospf_filter[ospf_msg_type_to_filter(packet_type)],
+ hf_ospf_filter[ospf_msg_type_to_filter(packet_type)],
tvb, 1, 1, FALSE);
PROTO_ITEM_SET_HIDDEN(hidden_item);
}
proto_tree_add_text(ospf_header_tree, tvb, 2, 2, "Packet Length: %u",
ospflen);
- proto_tree_add_item(ospf_header_tree, ospf_filter[OSPFF_SRC_ROUTER],
+ proto_tree_add_item(ospf_header_tree, hf_ospf_filter[OSPFF_SRC_ROUTER],
tvb, 4, 4, FALSE);
areaid=tvb_get_ntohl(tvb,8);
proto_tree_add_text(ospf_header_tree, tvb, 8, 4, "Area ID: %s%s",
@@ -1270,31 +1268,31 @@ dissect_ospfv3_lls_tlv(tvbuff_t *tvb, int offset, proto_tree *tree)
switch(type) {
case LLS_V3_EXT_OPT:
- ti = proto_tree_add_item(tree, ospf_filter[OSPFF_V3_LLS_EXT_OPTIONS_TLV], tvb,
+ ti = proto_tree_add_item(tree, hf_ospf_filter[OSPFF_V3_LLS_EXT_OPTIONS_TLV], tvb,
offset, length + 4, FALSE);
break;
case LLS_V3_STATE_CHECK:
- ti = proto_tree_add_item(tree, ospf_filter[OSPFF_V3_LLS_STATE_TLV], tvb,
+ ti = proto_tree_add_item(tree, hf_ospf_filter[OSPFF_V3_LLS_STATE_TLV], tvb,
offset, length + 4, FALSE);
break;
case LLS_V3_NBR_DROP:
- ti = proto_tree_add_item(tree, ospf_filter[OSPFF_V3_LLS_DROP_TLV], tvb,
+ ti = proto_tree_add_item(tree, hf_ospf_filter[OSPFF_V3_LLS_DROP_TLV], tvb,
offset, length + 4, FALSE);
break;
case LLS_V3_RELAYS:
- ti = proto_tree_add_item(tree, ospf_filter[OSPFF_V3_LLS_RELAY_TLV], tvb,
+ ti = proto_tree_add_item(tree, hf_ospf_filter[OSPFF_V3_LLS_RELAY_TLV], tvb,
offset, length + 4, FALSE);
break;
case LLS_V3_WILLING:
- ti = proto_tree_add_item(tree, ospf_filter[OSPFF_V3_LLS_WILLINGNESS_TLV], tvb,
+ ti = proto_tree_add_item(tree, hf_ospf_filter[OSPFF_V3_LLS_WILLINGNESS_TLV], tvb,
offset, length + 4, FALSE);
break;
case LLS_V3_RQST_FROM:
- ti = proto_tree_add_item(tree, ospf_filter[OSPFF_V3_LLS_RF_TLV], tvb,
+ ti = proto_tree_add_item(tree, hf_ospf_filter[OSPFF_V3_LLS_RF_TLV], tvb,
offset, length + 4, FALSE);
break;
case LLS_V3_FULL_STATE:
- ti = proto_tree_add_item(tree, ospf_filter[OSPFF_V3_LLS_FSF_TLV], tvb,
+ ti = proto_tree_add_item(tree, hf_ospf_filter[OSPFF_V3_LLS_FSF_TLV], tvb,
offset, length + 4, FALSE);
break;
default:
@@ -1319,7 +1317,7 @@ dissect_ospfv3_lls_tlv(tvbuff_t *tvb, int offset, proto_tree *tree)
dissect_ospf_bitfield(ospf_lls_tlv_tree, tvb, offset + 4, &bfinfo_v3_lls_ext_options);
break;
case LLS_V3_STATE_CHECK:
- proto_tree_add_item(ospf_lls_tlv_tree, ospf_filter[OSPFF_V3_LLS_STATE_SCS],
+ proto_tree_add_item(ospf_lls_tlv_tree, hf_ospf_filter[OSPFF_V3_LLS_STATE_SCS],
tvb, offset+4, 2, FALSE);
dissect_ospf_bitfield(ospf_lls_tlv_tree, tvb, offset + 6,
@@ -1337,7 +1335,7 @@ dissect_ospfv3_lls_tlv(tvbuff_t *tvb, int offset, proto_tree *tree)
break;
case LLS_V3_RELAYS:
relays_added = tvb_get_guint8(tvb, offset+4);
- proto_tree_add_item(ospf_lls_tlv_tree, ospf_filter[OSPFF_V3_LLS_RELAY_ADDED],
+ proto_tree_add_item(ospf_lls_tlv_tree, hf_ospf_filter[OSPFF_V3_LLS_RELAY_ADDED],
tvb, offset+4, 1, FALSE);
dissect_ospf_bitfield(ospf_lls_tlv_tree, tvb, offset + 5,
&bfinfo_v3_lls_relay_options);
@@ -1357,7 +1355,7 @@ dissect_ospfv3_lls_tlv(tvbuff_t *tvb, int offset, proto_tree *tree)
}
break;
case LLS_V3_WILLING:
- proto_tree_add_item(ospf_lls_tlv_tree, ospf_filter[OSPFF_V3_LLS_WILLINGNESS],
+ proto_tree_add_item(ospf_lls_tlv_tree, hf_ospf_filter[OSPFF_V3_LLS_WILLINGNESS],
tvb, offset+4, 1, FALSE);
break;
@@ -1569,7 +1567,7 @@ dissect_ospf_ls_req(tvbuff_t *tvb, int offset, proto_tree *tree, guint8 version,
switch ( version ) {
case OSPF_VERSION_2:
- proto_tree_add_item(ospf_lsr_tree, ospf_filter[OSPFF_LS_TYPE],
+ proto_tree_add_item(ospf_lsr_tree, hf_ospf_filter[OSPFF_LS_TYPE],
tvb, offset, 4, FALSE);
break;
case OSPF_VERSION_3:
@@ -1586,7 +1584,7 @@ dissect_ospf_ls_req(tvbuff_t *tvb, int offset, proto_tree *tree, guint8 version,
proto_tree_add_text(ospf_lsr_tree, tvb, offset + 4, 4, "Link State ID: %s",
ip_to_str(tvb_get_ptr(tvb, offset + 4, 4)));
- proto_tree_add_item(ospf_lsr_tree, ospf_filter[OSPFF_ADV_ROUTER],
+ proto_tree_add_item(ospf_lsr_tree, hf_ospf_filter[OSPFF_ADV_ROUTER],
tvb, offset + 8, 4, FALSE);
offset += 12;
@@ -1744,7 +1742,7 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, int offset, proto_tree *tree,
ti = proto_tree_add_text(tree, tvb, offset, length,
"MPLS Traffic Engineering LSA");
- hidden_item = proto_tree_add_item(tree, ospf_filter[OSPFF_LS_MPLS],
+ hidden_item = proto_tree_add_item(tree, hf_ospf_filter[OSPFF_LS_MPLS],
tvb, offset, 2, FALSE);
PROTO_ITEM_SET_HIDDEN(hidden_item);
mpls_tree = proto_item_add_subtree(ti, ett_ospf_lsa_mpls);
@@ -1764,7 +1762,7 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, int offset, proto_tree *tree,
proto_tree_add_text(tlv_tree, tvb, offset, 2, "TLV Type: 1 - Router Address");
proto_tree_add_text(tlv_tree, tvb, offset+2, 2, "TLV Length: %u",
tlv_length);
- proto_tree_add_item(tlv_tree, ospf_filter[OSPFF_LS_MPLS_ROUTERID],
+ proto_tree_add_item(tlv_tree, hf_ospf_filter[OSPFF_LS_MPLS_ROUTERID],
tvb, offset+4, 4, FALSE);
break;
@@ -1795,7 +1793,7 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, int offset, proto_tree *tree,
"TLV Type: %u: %s", stlv_type, stlv_name);
proto_tree_add_text(stlv_tree, tvb, stlv_offset+2, 2, "TLV Length: %u",
stlv_len);
- proto_tree_add_item(stlv_tree, ospf_filter[OSPFF_LS_MPLS_LINKTYPE],
+ proto_tree_add_item(stlv_tree, hf_ospf_filter[OSPFF_LS_MPLS_LINKTYPE],
tvb, stlv_offset+4, 1,FALSE);
break;
@@ -1808,7 +1806,7 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, int offset, proto_tree *tree,
"TLV Type: %u: %s", stlv_type, stlv_name);
proto_tree_add_text(stlv_tree, tvb, stlv_offset+2, 2, "TLV Length: %u",
stlv_len);
- proto_tree_add_item(stlv_tree, ospf_filter[OSPFF_LS_MPLS_LINKID],
+ proto_tree_add_item(stlv_tree, hf_ospf_filter[OSPFF_LS_MPLS_LINKID],
tvb, stlv_offset+4, 4, FALSE);
break;
@@ -1826,8 +1824,8 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, int offset, proto_tree *tree,
for (i=0; i < stlv_len; i+=4)
proto_tree_add_item(stlv_tree,
stlv_type==MPLS_LINK_LOCAL_IF ?
- ospf_filter[OSPFF_LS_MPLS_LOCAL_ADDR] :
- ospf_filter[OSPFF_LS_MPLS_REMOTE_ADDR],
+ hf_ospf_filter[OSPFF_LS_MPLS_LOCAL_ADDR] :
+ hf_ospf_filter[OSPFF_LS_MPLS_REMOTE_ADDR],
tvb, stlv_offset+4+i, 4, FALSE);
break;
@@ -1855,7 +1853,7 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, int offset, proto_tree *tree,
stlv_len);
stlv_admingrp = tvb_get_ntohl(tvb, stlv_offset + 4);
mask = 1;
- ti = proto_tree_add_item(stlv_tree, ospf_filter[OSPFF_LS_MPLS_LINKCOLOR],
+ ti = proto_tree_add_item(stlv_tree, hf_ospf_filter[OSPFF_LS_MPLS_LINKCOLOR],
tvb, stlv_offset+4, 4, FALSE);
stlv_admingrp_tree = proto_item_add_subtree(ti, ett_ospf_lsa_mpls_link_stlv_admingrp);
if (stlv_admingrp_tree == NULL)
@@ -1929,7 +1927,7 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, int offset, proto_tree *tree,
proto_tree_add_text(stlv_tree, tvb, stlv_offset+2, 2, "TLV Length: %u",
stlv_len);
- proto_tree_add_item(stlv_tree, ospf_filter[OSPFF_LS_MPLS_BC_MODEL_ID],
+ proto_tree_add_item(stlv_tree, hf_ospf_filter[OSPFF_LS_MPLS_BC_MODEL_ID],
tvb, stlv_offset+4, 1, FALSE);
/* 3 octets reserved +5, +6 and +7 (all 0x00) */
@@ -1981,10 +1979,10 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, int offset, proto_tree *tree,
proto_tree_add_text(stlv_tree, tvb, stlv_offset+2, 2, "TLV Length: %u",
stlv_len);
proto_tree_add_item(stlv_tree,
- ospf_filter[OSPFF_LS_MPLS_LOCAL_IFID],
+ hf_ospf_filter[OSPFF_LS_MPLS_LOCAL_IFID],
tvb, stlv_offset+4, 4, FALSE);
proto_tree_add_item(stlv_tree,
- ospf_filter[OSPFF_LS_MPLS_REMOTE_IFID],
+ hf_ospf_filter[OSPFF_LS_MPLS_REMOTE_IFID],
tvb, stlv_offset+8, 4, FALSE);
break;
@@ -1998,11 +1996,11 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, int offset, proto_tree *tree,
stlv_len);
switch_cap = tvb_get_guint8 (tvb, stlv_offset+4);
proto_tree_add_text(stlv_tree, tvb, stlv_offset+4, 1, "Switching Type: %s",
- val_to_str(tvb_get_guint8(tvb,stlv_offset+4),
- gmpls_switching_type_str, "Unknown (%d)"));
+ rval_to_str(tvb_get_guint8(tvb,stlv_offset+4),
+ gmpls_switching_type_rvals, "Unknown (%d)"));
proto_tree_add_text(stlv_tree, tvb, stlv_offset+5, 1, "Encoding: %s",
- val_to_str(tvb_get_guint8(tvb,stlv_offset+5),
- gmpls_lsp_enc_str, "Unknown (%d)"));
+ rval_to_str(tvb_get_guint8(tvb,stlv_offset+5),
+ gmpls_lsp_enc_rvals, "Unknown (%d)"));
for (i = 0; i < 8; i++) {
proto_tree_add_text(stlv_tree, tvb, stlv_offset+8+(i*4), 4,
"Pri %d: %.10g bytes/s (%.0f bits/s)", i,
@@ -2064,7 +2062,7 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, int offset, proto_tree *tree,
proto_tree_add_text(stlv_tree, tvb, stlv_offset+2, 2, "TLV Length: %u",
stlv_len);
proto_tree_add_item(stlv_tree,
- ospf_filter[OSPFF_LS_OIF_LOCAL_NODE_ID],
+ hf_ospf_filter[OSPFF_LS_OIF_LOCAL_NODE_ID],
tvb, stlv_offset + 4, 4, FALSE);
break;
@@ -2078,7 +2076,7 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, int offset, proto_tree *tree,
proto_tree_add_text(stlv_tree, tvb, stlv_offset+2, 2, "TLV Length: %u",
stlv_len);
proto_tree_add_item(stlv_tree,
- ospf_filter[OSPFF_LS_OIF_REMOTE_NODE_ID],
+ hf_ospf_filter[OSPFF_LS_OIF_REMOTE_NODE_ID],
tvb, stlv_offset + 4, 4, FALSE);
break;
@@ -2090,11 +2088,11 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, int offset, proto_tree *tree,
proto_tree_add_text(stlv_tree, tvb, stlv_offset+2, 2, "TLV Length: %u",
stlv_len);
proto_tree_add_text(stlv_tree, tvb, stlv_offset+4, 1, "Switching Cap: %s",
- val_to_str(tvb_get_guint8 (tvb, stlv_offset+4),
- gmpls_switching_type_str, "Unknown (%d)"));
+ rval_to_str(tvb_get_guint8 (tvb, stlv_offset+4),
+ gmpls_switching_type_rvals, "Unknown (%d)"));
proto_tree_add_text(stlv_tree, tvb, stlv_offset+5, 1, "Encoding: %s",
- val_to_str(tvb_get_guint8(tvb,stlv_offset+5),
- gmpls_lsp_enc_str, "Unknown (%d)"));
+ rval_to_str(tvb_get_guint8(tvb,stlv_offset+5),
+ gmpls_lsp_enc_rvals, "Unknown (%d)"));
for (i = 0; i < (stlv_len - 4) / 4; i++) {
proto_tree_add_text(stlv_tree, tvb, stlv_offset+8+(i*4), 4,
"%s: %d free timeslots",
@@ -2247,7 +2245,7 @@ static void dissect_ospf_lsa_grace_tlv (tvbuff_t *tvb, int offset,
*/
tlv_length_with_pad = tlv_length + 4 + ((4 - (tlv_length % 4)) % 4);
- tree_item = proto_tree_add_item(tree, ospf_filter[OSPFF_V2_GRACE_TLV], tvb, offset,
+ tree_item = proto_tree_add_item(tree, hf_ospf_filter[OSPFF_V2_GRACE_TLV], tvb, offset,
tlv_length_with_pad, FALSE);
tlv_tree = proto_item_add_subtree(tree_item, ett_ospf_lsa_grace_tlv);
proto_tree_add_text(tlv_tree, tvb, offset, 2, "Type: %s (%u)",
@@ -2257,14 +2255,14 @@ static void dissect_ospf_lsa_grace_tlv (tvbuff_t *tvb, int offset,
switch (tlv_type) {
case GRACE_TLV_PERIOD:
grace_period = tvb_get_ntohl(tvb, offset + 4);
- grace_tree_item = proto_tree_add_item(tlv_tree, ospf_filter[OSPFF_V2_GRACE_PERIOD], tvb,
+ grace_tree_item = proto_tree_add_item(tlv_tree, hf_ospf_filter[OSPFF_V2_GRACE_PERIOD], tvb,
offset + 4, tlv_length, FALSE);
proto_item_append_text(grace_tree_item, " seconds");
proto_item_set_text(tree_item, "Grace Period: %u seconds", grace_period);
break;
case GRACE_TLV_REASON:
restart_reason = tvb_get_guint8(tvb, offset + 4);
- proto_tree_add_item(tlv_tree, ospf_filter[OSPFF_V2_GRACE_REASON], tvb, offset + 4,
+ proto_tree_add_item(tlv_tree, hf_ospf_filter[OSPFF_V2_GRACE_REASON], tvb, offset + 4,
tlv_length, FALSE);
proto_item_set_text(tree_item, "Restart Reason: %s (%u)",
val_to_str(restart_reason, restart_reason_vals, "Unknown Restart Reason"),
@@ -2272,7 +2270,7 @@ static void dissect_ospf_lsa_grace_tlv (tvbuff_t *tvb, int offset,
break;
case GRACE_TLV_IP:
restart_ip = tvb_get_ipv4(tvb, offset + 4);
- proto_tree_add_item(tlv_tree, ospf_filter[OSPFF_V2_GRACE_IP], tvb, offset + 4,
+ proto_tree_add_item(tlv_tree, hf_ospf_filter[OSPFF_V2_GRACE_IP], tvb, offset + 4,
tlv_length, FALSE);
proto_item_set_text(tree_item, "Restart IP: %s (%s)",
get_hostname(restart_ip), ip_to_str((guint8 *)&restart_ip));
@@ -2362,11 +2360,11 @@ dissect_ospf_v2_lsa(tvbuff_t *tvb, int offset, proto_tree *tree,
(tvb_get_ntohs(tvb, offset) & OSPF_DNA_LSA) ? "True" : "False");
options = tvb_get_guint8 (tvb, offset + 2);
dissect_ospf_bitfield(ospf_lsa_tree, tvb, offset + 2, &bfinfo_v2_options);
- proto_tree_add_item(ospf_lsa_tree, ospf_filter[OSPFF_LS_TYPE], tvb,
+ proto_tree_add_item(ospf_lsa_tree, hf_ospf_filter[OSPFF_LS_TYPE], tvb,
offset + 3, 1, FALSE);
if (ospf_ls_type_to_filter(ls_type) != -1) {
hidden_item = proto_tree_add_item(ospf_lsa_tree,
- ospf_filter[ospf_ls_type_to_filter(ls_type)], tvb,
+ hf_ospf_filter[ospf_ls_type_to_filter(ls_type)], tvb,
offset + 3, 1, FALSE);
PROTO_ITEM_SET_HIDDEN(hidden_item);
}
@@ -2379,7 +2377,7 @@ dissect_ospf_v2_lsa(tvbuff_t *tvb, int offset, proto_tree *tree,
if (is_opaque(ls_type)) {
ls_id_type = tvb_get_guint8(tvb, offset + 4);
- proto_tree_add_uint(ospf_lsa_tree, ospf_filter[OSPFF_LS_OPAQUE_TYPE],
+ proto_tree_add_uint(ospf_lsa_tree, hf_ospf_filter[OSPFF_LS_OPAQUE_TYPE],
tvb, offset + 4, 1, ls_id_type);
switch (ls_id_type) {
@@ -2387,7 +2385,7 @@ dissect_ospf_v2_lsa(tvbuff_t *tvb, int offset, proto_tree *tree,
case OSPF_LSA_MPLS_TE:
proto_tree_add_text(ospf_lsa_tree, tvb, offset + 5, 1, "Link State ID TE-LSA Reserved: %u",
tvb_get_guint8(tvb, offset + 5));
- proto_tree_add_item(ospf_lsa_tree, ospf_filter[OSPFF_LS_MPLS_TE_INSTANCE],
+ proto_tree_add_item(ospf_lsa_tree, hf_ospf_filter[OSPFF_LS_MPLS_TE_INSTANCE],
tvb, offset + 6, 2, FALSE);
break;
@@ -2402,7 +2400,7 @@ dissect_ospf_v2_lsa(tvbuff_t *tvb, int offset, proto_tree *tree,
ip_to_str(tvb_get_ptr(tvb, offset + 4, 4)));
}
- proto_tree_add_item(ospf_lsa_tree, ospf_filter[OSPFF_ADV_ROUTER],
+ proto_tree_add_item(ospf_lsa_tree, hf_ospf_filter[OSPFF_ADV_ROUTER],
tvb, offset + 8, 4, FALSE);
proto_tree_add_text(ospf_lsa_tree, tvb, offset + 12, 4, "LS Sequence Number: 0x%08x",
tvb_get_ntohl(tvb, offset + 12));
@@ -2679,7 +2677,7 @@ dissect_ospf_v3_lsa(tvbuff_t *tvb, int offset, proto_tree *tree,
proto_tree_add_text(ospf_lsa_tree, tvb, offset + 4, 4, "Link State ID: %s",
ip_to_str(tvb_get_ptr(tvb, offset + 4, 4)));
- proto_tree_add_item(ospf_lsa_tree, ospf_filter[OSPFF_ADV_ROUTER],
+ proto_tree_add_item(ospf_lsa_tree, hf_ospf_filter[OSPFF_ADV_ROUTER],
tvb, offset + 8, 4, FALSE);
proto_tree_add_text(ospf_lsa_tree, tvb, offset + 12, 4, "LS Sequence Number: 0x%08x",
tvb_get_ntohl(tvb, offset + 12));
@@ -3064,339 +3062,339 @@ proto_register_ospf(void)
static hf_register_info ospff_info[] = {
/* Message type number */
- {&ospf_filter[OSPFF_MSG_TYPE],
+ {&hf_ospf_filter[OSPFF_MSG_TYPE],
{ "Message Type", "ospf.msg", FT_UINT8, BASE_DEC, VALS(pt_vals), 0x0,
NULL, HFILL }},
/* Message types */
- {&ospf_filter[OSPFF_MSG_HELLO],
+ {&hf_ospf_filter[OSPFF_MSG_HELLO],
{ "Hello", "ospf.msg.hello", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&ospf_filter[OSPFF_MSG_DB_DESC],
+ {&hf_ospf_filter[OSPFF_MSG_DB_DESC],
{ "Database Description", "ospf.msg.dbdesc", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&ospf_filter[OSPFF_MSG_LS_REQ],
+ {&hf_ospf_filter[OSPFF_MSG_LS_REQ],
{ "Link State Adv Request", "ospf.msg.lsreq", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&ospf_filter[OSPFF_MSG_LS_UPD],
+ {&hf_ospf_filter[OSPFF_MSG_LS_UPD],
{ "Link State Adv Update", "ospf.msg.lsupdate", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&ospf_filter[OSPFF_MSG_LS_ACK],
+ {&hf_ospf_filter[OSPFF_MSG_LS_ACK],
{ "Link State Adv Acknowledgement", "ospf.msg.lsack", FT_BOOLEAN,
BASE_NONE, NULL, 0x0, NULL, HFILL }},
/* LS Types */
- {&ospf_filter[OSPFF_LS_TYPE],
+ {&hf_ospf_filter[OSPFF_LS_TYPE],
{ "Link-State Advertisement Type", "ospf.lsa", FT_UINT8, BASE_DEC,
VALS(ls_type_vals), 0x0, NULL, HFILL }},
- {&ospf_filter[OSPFF_LS_OPAQUE_TYPE],
+ {&hf_ospf_filter[OSPFF_LS_OPAQUE_TYPE],
{ "Link State ID Opaque Type", "ospf.lsid_opaque_type", FT_UINT8, BASE_DEC,
VALS(ls_opaque_type_vals), 0x0, NULL, HFILL }},
- {&ospf_filter[OSPFF_LS_MPLS_TE_INSTANCE],
+ {&hf_ospf_filter[OSPFF_LS_MPLS_TE_INSTANCE],
{ "Link State ID TE-LSA Instance", "ospf.lsid_te_lsa.instance", FT_UINT16, BASE_DEC,
NULL, 0x0, NULL, HFILL }},
- {&ospf_filter[OSPFF_LS_ROUTER],
+ {&hf_ospf_filter[OSPFF_LS_ROUTER],
{ "Router LSA", "ospf.lsa.router", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&ospf_filter[OSPFF_LS_NETWORK],
+ {&hf_ospf_filter[OSPFF_LS_NETWORK],
{ "Network LSA", "ospf.lsa.network", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&ospf_filter[OSPFF_LS_SUMMARY],
+ {&hf_ospf_filter[OSPFF_LS_SUMMARY],
{ "Summary LSA (IP Network)", "ospf.lsa.summary", FT_BOOLEAN, BASE_NONE,
NULL, 0x0, NULL, HFILL }},
- {&ospf_filter[OSPFF_LS_ASBR],
+ {&hf_ospf_filter[OSPFF_LS_ASBR],
{ "Summary LSA (ASBR)", "ospf.lsa.asbr", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&ospf_filter[OSPFF_LS_ASEXT],
+ {&hf_ospf_filter[OSPFF_LS_ASEXT],
{ "AS-External LSA (ASBR)", "ospf.lsa.asext", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&ospf_filter[OSPFF_LS_GRPMEMBER],
+ {&hf_ospf_filter[OSPFF_LS_GRPMEMBER],
{ "Group Membership LSA", "ospf.lsa.member", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&ospf_filter[OSPFF_LS_ASEXT7],
+ {&hf_ospf_filter[OSPFF_LS_ASEXT7],
{ "NSSA AS-External LSA", "ospf.lsa.nssa", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&ospf_filter[OSPFF_LS_EXTATTR],
+ {&hf_ospf_filter[OSPFF_LS_EXTATTR],
{ "External Attributes LSA", "ospf.lsa.attr", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&ospf_filter[OSPFF_LS_OPAQUE],
+ {&hf_ospf_filter[OSPFF_LS_OPAQUE],
{ "Opaque LSA", "ospf.lsa.opaque", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
/* Other interesting OSPF values */
- {&ospf_filter[OSPFF_SRC_ROUTER],
+ {&hf_ospf_filter[OSPFF_SRC_ROUTER],
{ "Source OSPF Router", "ospf.srcrouter", FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&ospf_filter[OSPFF_ADV_ROUTER],
+ {&hf_ospf_filter[OSPFF_ADV_ROUTER],
{ "Advertising Router", "ospf.advrouter", FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&ospf_filter[OSPFF_LS_MPLS],
+ {&hf_ospf_filter[OSPFF_LS_MPLS],
{ "MPLS Traffic Engineering LSA", "ospf.lsa.mpls", FT_BOOLEAN,
BASE_NONE, NULL, 0x0, NULL, HFILL }},
- {&ospf_filter[OSPFF_LS_MPLS_ROUTERID],
+ {&hf_ospf_filter[OSPFF_LS_MPLS_ROUTERID],
{ "MPLS/TE Router ID", "ospf.mpls.routerid", FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&ospf_filter[OSPFF_LS_MPLS_LINKTYPE],
+ {&hf_ospf_filter[OSPFF_LS_MPLS_LINKTYPE],
{ "MPLS/TE Link Type", "ospf.mpls.linktype", FT_UINT8, BASE_DEC,
VALS(mpls_link_stlv_ltype_str), 0x0, NULL, HFILL }},
- {&ospf_filter[OSPFF_LS_MPLS_LINKID],
+ {&hf_ospf_filter[OSPFF_LS_MPLS_LINKID],
{ "MPLS/TE Link ID", "ospf.mpls.linkid", FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&ospf_filter[OSPFF_LS_MPLS_LOCAL_ADDR],
+ {&hf_ospf_filter[OSPFF_LS_MPLS_LOCAL_ADDR],
{ "MPLS/TE Local Interface Address", "ospf.mpls.local_addr", FT_IPv4,
BASE_NONE, NULL, 0x0, NULL, HFILL }},
- {&ospf_filter[OSPFF_LS_MPLS_REMOTE_ADDR],
+ {&hf_ospf_filter[OSPFF_LS_MPLS_REMOTE_ADDR],
{ "MPLS/TE Remote Interface Address", "ospf.mpls.remote_addr", FT_IPv4,
BASE_NONE, NULL, 0x0, NULL, HFILL }},
- {&ospf_filter[OSPFF_LS_MPLS_LOCAL_IFID],
+ {&hf_ospf_filter[OSPFF_LS_MPLS_LOCAL_IFID],
{ "MPLS/TE Local Interface Index", "ospf.mpls.local_id", FT_UINT32,
BASE_DEC, NULL, 0x0, NULL, HFILL }},
- {&ospf_filter[OSPFF_LS_MPLS_REMOTE_IFID],
+ {&hf_ospf_filter[OSPFF_LS_MPLS_REMOTE_IFID],
{ "MPLS/TE Remote Interface Index", "ospf.mpls.remote_id", FT_UINT32,
BASE_DEC, NULL, 0x0, NULL, HFILL }},
- {&ospf_filter[OSPFF_LS_MPLS_LINKCOLOR],
+ {&hf_ospf_filter[OSPFF_LS_MPLS_LINKCOLOR],
{ "MPLS/TE Link Resource Class/Color", "ospf.mpls.linkcolor", FT_UINT32,
BASE_HEX, NULL, 0x0, NULL, HFILL }},
- {&ospf_filter[OSPFF_LS_MPLS_BC_MODEL_ID],
+ {&hf_ospf_filter[OSPFF_LS_MPLS_BC_MODEL_ID],
{ "MPLS/DSTE Bandwidth Constraints Model Id", "ospf.mpls.bc", FT_UINT8,
BASE_RANGE_STRING | BASE_DEC, RVALS(&mpls_link_stlv_bcmodel_rvals), 0x0,
NULL, HFILL }},
- {&ospf_filter[OSPFF_LS_OIF_LOCAL_NODE_ID],
+ {&hf_ospf_filter[OSPFF_LS_OIF_LOCAL_NODE_ID],
{ "Local Node ID", "ospf.oif.local_node_id", FT_IPv4,
BASE_NONE, NULL, 0x0, NULL, HFILL }},
- {&ospf_filter[OSPFF_LS_OIF_REMOTE_NODE_ID],
+ {&hf_ospf_filter[OSPFF_LS_OIF_REMOTE_NODE_ID],
{ "Remote Node ID", "ospf.oif.remote_node_id", FT_IPv4,
BASE_NONE, NULL, 0x0, NULL, HFILL }},
- {&ospf_filter[OSPFF_V2_OPTIONS],
+ {&hf_ospf_filter[OSPFF_V2_OPTIONS],
{ "Options", "ospf.v2.options", FT_UINT8, BASE_HEX,
NULL, 0x0, NULL, HFILL }},
- {&ospf_filter[OSPFF_V2_OPTIONS_MT],
+ {&hf_ospf_filter[OSPFF_V2_OPTIONS_MT],
{ "MT", "ospf.v2.options.mt", FT_BOOLEAN, 8,
TFS(&tfs_v2_options_mt), OSPF_V2_OPTIONS_MT, "", HFILL }},
- {&ospf_filter[OSPFF_V2_OPTIONS_E],
+ {&hf_ospf_filter[OSPFF_V2_OPTIONS_E],
{ "E", "ospf.v2.options.e", FT_BOOLEAN, 8,
TFS(&tfs_v2_options_e), OSPF_V2_OPTIONS_E, NULL, HFILL }},
- {&ospf_filter[OSPFF_V2_OPTIONS_MC],
+ {&hf_ospf_filter[OSPFF_V2_OPTIONS_MC],
{ "MC", "ospf.v2.options.mc", FT_BOOLEAN, 8,
TFS(&tfs_v2_options_mc), OSPF_V2_OPTIONS_MC, NULL, HFILL }},
- {&ospf_filter[OSPFF_V2_OPTIONS_NP],
+ {&hf_ospf_filter[OSPFF_V2_OPTIONS_NP],
{ "NP", "ospf.v2.options.np", FT_BOOLEAN, 8,
TFS(&tfs_v2_options_np), OSPF_V2_OPTIONS_NP, NULL, HFILL }},
- {&ospf_filter[OSPFF_V2_OPTIONS_L],
+ {&hf_ospf_filter[OSPFF_V2_OPTIONS_L],
{ "L", "ospf.v2.options.l", FT_BOOLEAN, 8,
TFS(&tfs_v2_options_l), OSPF_V2_OPTIONS_L, NULL, HFILL }},
- {&ospf_filter[OSPFF_V2_OPTIONS_DC],
+ {&hf_ospf_filter[OSPFF_V2_OPTIONS_DC],
{ "DC", "ospf.v2.options.dc", FT_BOOLEAN, 8,
TFS(&tfs_v2_options_dc), OSPF_V2_OPTIONS_DC, NULL, HFILL }},
- {&ospf_filter[OSPFF_V2_OPTIONS_O],
+ {&hf_ospf_filter[OSPFF_V2_OPTIONS_O],
{ "O", "ospf.v2.options.o", FT_BOOLEAN, 8,
TFS(&tfs_v2_options_o), OSPF_V2_OPTIONS_O, NULL, HFILL }},
- {&ospf_filter[OSPFF_V2_OPTIONS_DN],
+ {&hf_ospf_filter[OSPFF_V2_OPTIONS_DN],
{ "DN", "ospf.v2.options.dn", FT_BOOLEAN, 8,
TFS(&tfs_v2_options_dn), OSPF_V2_OPTIONS_DN, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_OPTIONS],
+ {&hf_ospf_filter[OSPFF_V3_OPTIONS],
{ "Options", "ospf.v3.options", FT_UINT24, BASE_HEX,
NULL, 0x0, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_OPTIONS_V6],
+ {&hf_ospf_filter[OSPFF_V3_OPTIONS_V6],
{ "V6", "ospf.v3.options.v6", FT_BOOLEAN, 24,
TFS(&tfs_v3_options_v6), OSPF_V3_OPTIONS_V6, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_OPTIONS_E],
+ {&hf_ospf_filter[OSPFF_V3_OPTIONS_E],
{ "E", "ospf.v3.options.e", FT_BOOLEAN, 24,
TFS(&tfs_v3_options_e), OSPF_V3_OPTIONS_E, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_OPTIONS_MC],
+ {&hf_ospf_filter[OSPFF_V3_OPTIONS_MC],
{ "MC", "ospf.v3.options.mc", FT_BOOLEAN, 24,
TFS(&tfs_v3_options_mc), OSPF_V3_OPTIONS_MC, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_OPTIONS_N],
+ {&hf_ospf_filter[OSPFF_V3_OPTIONS_N],
{ "N", "ospf.v3.options.n", FT_BOOLEAN, 24,
TFS(&tfs_v3_options_n), OSPF_V3_OPTIONS_N, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_OPTIONS_R],
+ {&hf_ospf_filter[OSPFF_V3_OPTIONS_R],
{ "R", "ospf.v3.options.r", FT_BOOLEAN, 24,
TFS(&tfs_v3_options_r), OSPF_V3_OPTIONS_R, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_OPTIONS_DC],
+ {&hf_ospf_filter[OSPFF_V3_OPTIONS_DC],
{ "DC", "ospf.v3.options.dc", FT_BOOLEAN, 24,
TFS(&tfs_v3_options_dc), OSPF_V3_OPTIONS_DC, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_OPTIONS_AF],
+ {&hf_ospf_filter[OSPFF_V3_OPTIONS_AF],
{ "AF", "ospf.v3.options.af", FT_BOOLEAN, 24,
TFS(&tfs_v3_options_af), OSPF_V3_OPTIONS_AF, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_OPTIONS_L],
+ {&hf_ospf_filter[OSPFF_V3_OPTIONS_L],
{ "L", "ospf.v3.options.l", FT_BOOLEAN, 24,
TFS(&tfs_v3_options_l), OSPF_V3_OPTIONS_L, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_OPTIONS_I],
+ {&hf_ospf_filter[OSPFF_V3_OPTIONS_I],
{ "I", "ospf.v3.options.i", FT_BOOLEAN, 24,
TFS(&tfs_v3_options_i), OSPF_V3_OPTIONS_I, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_OPTIONS_F],
+ {&hf_ospf_filter[OSPFF_V3_OPTIONS_F],
{ "F", "ospf.v3.options.f", FT_BOOLEAN, 24,
TFS(&tfs_v3_options_f), OSPF_V3_OPTIONS_F, NULL, HFILL }},
- {&ospf_filter[OSPFF_DBD],
+ {&hf_ospf_filter[OSPFF_DBD],
{ "DB Description", "ospf.dbd", FT_UINT8, BASE_HEX,
NULL, 0x0, NULL, HFILL }},
- {&ospf_filter[OSPFF_DBD_R],
+ {&hf_ospf_filter[OSPFF_DBD_R],
{ "R", "ospf.dbd.r", FT_BOOLEAN, 8,
TFS(&tfs_dbd_r), OSPF_DBD_FLAG_R, NULL, HFILL }},
- {&ospf_filter[OSPFF_DBD_I],
+ {&hf_ospf_filter[OSPFF_DBD_I],
{ "I", "ospf.dbd.i", FT_BOOLEAN, 8,
TFS(&tfs_dbd_i), OSPF_DBD_FLAG_I, NULL, HFILL }},
- {&ospf_filter[OSPFF_DBD_M],
+ {&hf_ospf_filter[OSPFF_DBD_M],
{ "M", "ospf.dbd.m", FT_BOOLEAN, 8,
TFS(&tfs_dbd_m), OSPF_DBD_FLAG_M, NULL, HFILL }},
- {&ospf_filter[OSPFF_DBD_MS],
+ {&hf_ospf_filter[OSPFF_DBD_MS],
{ "MS", "ospf.dbd.ms", FT_BOOLEAN, 8,
TFS(&tfs_dbd_ms), OSPF_DBD_FLAG_MS, NULL, HFILL }},
- {&ospf_filter[OSPFF_LLS_EXT_OPTIONS],
+ {&hf_ospf_filter[OSPFF_LLS_EXT_OPTIONS],
{ "Options", "ospf.lls.ext.options", FT_UINT32, BASE_HEX,
NULL, 0x0, NULL, HFILL }},
- {&ospf_filter[OSPFF_LLS_EXT_OPTIONS_LR],
+ {&hf_ospf_filter[OSPFF_LLS_EXT_OPTIONS_LR],
{ "LR", "ospf.lls.ext.options.lr", FT_BOOLEAN, 32,
TFS(&tfs_lls_ext_options_lr), OSPF_LLS_EXT_OPTIONS_LR, NULL, HFILL }},
- {&ospf_filter[OSPFF_LLS_EXT_OPTIONS_RS],
+ {&hf_ospf_filter[OSPFF_LLS_EXT_OPTIONS_RS],
{ "RS", "ospf.lls.ext.options.rs", FT_BOOLEAN, 32,
TFS(&tfs_lls_ext_options_rs), OSPF_LLS_EXT_OPTIONS_RS, NULL, HFILL }},
- {&ospf_filter[OSPFF_V2_ROUTER_LSA_FLAG],
+ {&hf_ospf_filter[OSPFF_V2_ROUTER_LSA_FLAG],
{ "Flags", "ospf.v2.router.lsa.flags", FT_UINT8, BASE_HEX,
NULL, 0x0, NULL, HFILL }},
- {&ospf_filter[OSPFF_V2_ROUTER_LSA_FLAG_B],
+ {&hf_ospf_filter[OSPFF_V2_ROUTER_LSA_FLAG_B],
{ "B", "ospf.v2.router.lsa.flags.b", FT_BOOLEAN, 8,
TFS(&tfs_v2_router_lsa_flags_b), OSPF_V2_ROUTER_LSA_FLAG_B, NULL, HFILL }},
- {&ospf_filter[OSPFF_V2_ROUTER_LSA_FLAG_E],
+ {&hf_ospf_filter[OSPFF_V2_ROUTER_LSA_FLAG_E],
{ "E", "ospf.v2.router.lsa.flags.e", FT_BOOLEAN, 8,
TFS(&tfs_v2_router_lsa_flags_e), OSPF_V2_ROUTER_LSA_FLAG_E, NULL, HFILL }},
- {&ospf_filter[OSPFF_V2_ROUTER_LSA_FLAG_V],
+ {&hf_ospf_filter[OSPFF_V2_ROUTER_LSA_FLAG_V],
{ "V", "ospf.v2.router.lsa.flags.v", FT_BOOLEAN, 8,
TFS(&tfs_v2_router_lsa_flags_v), OSPF_V2_ROUTER_LSA_FLAG_V, NULL, HFILL }},
- {&ospf_filter[OSPFF_V2_ROUTER_LSA_FLAG_W],
+ {&hf_ospf_filter[OSPFF_V2_ROUTER_LSA_FLAG_W],
{ "W", "ospf.v2.router.lsa.flags.w", FT_BOOLEAN, 8,
TFS(&tfs_v2_router_lsa_flags_w), OSPF_V2_ROUTER_LSA_FLAG_W, "", HFILL }},
- {&ospf_filter[OSPFF_V2_ROUTER_LSA_FLAG_N],
+ {&hf_ospf_filter[OSPFF_V2_ROUTER_LSA_FLAG_N],
{ "N", "ospf.v2.router.lsa.flags.n", FT_BOOLEAN, 8,
TFS(&tfs_v2_router_lsa_flags_n), OSPF_V2_ROUTER_LSA_FLAG_N, "", HFILL }},
- {&ospf_filter[OSPFF_V3_ROUTER_LSA_FLAG],
+ {&hf_ospf_filter[OSPFF_V3_ROUTER_LSA_FLAG],
{ "Flags", "ospf.v3.router.lsa.flags", FT_UINT8, BASE_HEX,
NULL, 0x0, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_ROUTER_LSA_FLAG_B],
+ {&hf_ospf_filter[OSPFF_V3_ROUTER_LSA_FLAG_B],
{ "B", "ospf.v3.router.lsa.flags.b", FT_BOOLEAN, 8,
TFS(&tfs_v3_router_lsa_flags_b), OSPF_V3_ROUTER_LSA_FLAG_B, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_ROUTER_LSA_FLAG_E],
+ {&hf_ospf_filter[OSPFF_V3_ROUTER_LSA_FLAG_E],
{ "E", "ospf.v3.router.lsa.flags.e", FT_BOOLEAN, 8,
TFS(&tfs_v3_router_lsa_flags_e), OSPF_V3_ROUTER_LSA_FLAG_E, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_ROUTER_LSA_FLAG_V],
+ {&hf_ospf_filter[OSPFF_V3_ROUTER_LSA_FLAG_V],
{ "V", "ospf.v3.router.lsa.flags.v", FT_BOOLEAN, 8,
TFS(&tfs_v3_router_lsa_flags_v), OSPF_V3_ROUTER_LSA_FLAG_V, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_ROUTER_LSA_FLAG_W],
+ {&hf_ospf_filter[OSPFF_V3_ROUTER_LSA_FLAG_W],
{ "W", "ospf.v3.router.lsa.flags.w", FT_BOOLEAN, 8,
TFS(&tfs_v3_router_lsa_flags_w), OSPF_V3_ROUTER_LSA_FLAG_W, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_AS_EXTERNAL_FLAG],
+ {&hf_ospf_filter[OSPFF_V3_AS_EXTERNAL_FLAG],
{ "Flags", "ospf.v3.as.external.flags", FT_UINT8, BASE_HEX,
NULL, 0x0, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_AS_EXTERNAL_FLAG_T],
+ {&hf_ospf_filter[OSPFF_V3_AS_EXTERNAL_FLAG_T],
{ "T", "ospf.v3.as.external.flags.t", FT_BOOLEAN, 8,
TFS(&tfs_v3_as_external_flags_t), OSPF_V3_AS_EXTERNAL_FLAG_T, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_AS_EXTERNAL_FLAG_F],
+ {&hf_ospf_filter[OSPFF_V3_AS_EXTERNAL_FLAG_F],
{ "F", "ospf.v3.as.external.flags.f", FT_BOOLEAN, 8,
TFS(&tfs_v3_as_external_flags_f), OSPF_V3_AS_EXTERNAL_FLAG_F, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_AS_EXTERNAL_FLAG_E],
+ {&hf_ospf_filter[OSPFF_V3_AS_EXTERNAL_FLAG_E],
{ "E", "ospf.v3.as.external.flags.e", FT_BOOLEAN, 8,
TFS(&tfs_v3_as_external_flags_e), OSPF_V3_AS_EXTERNAL_FLAG_E, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_PREFIX_OPTION],
+ {&hf_ospf_filter[OSPFF_V3_PREFIX_OPTION],
{ "PrefixOptions", "ospf.v3.prefix.options", FT_UINT8, BASE_HEX,
NULL, 0x0, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_PREFIX_OPTION_NU],
+ {&hf_ospf_filter[OSPFF_V3_PREFIX_OPTION_NU],
{ "NU", "ospf.v3.prefix.options.nu", FT_BOOLEAN, 8,
TFS(&tfs_v3_prefix_options_nu), OSPF_V3_PREFIX_OPTION_NU, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_PREFIX_OPTION_LA],
+ {&hf_ospf_filter[OSPFF_V3_PREFIX_OPTION_LA],
{ "LA", "ospf.v3.prefix.options.la", FT_BOOLEAN, 8,
TFS(&tfs_v3_prefix_options_la), OSPF_V3_PREFIX_OPTION_LA, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_PREFIX_OPTION_MC],
+ {&hf_ospf_filter[OSPFF_V3_PREFIX_OPTION_MC],
{ "MC", "ospf.v3.prefix.options.mc", FT_BOOLEAN, 8,
TFS(&tfs_v3_prefix_options_mc), OSPF_V3_PREFIX_OPTION_MC, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_PREFIX_OPTION_P],
+ {&hf_ospf_filter[OSPFF_V3_PREFIX_OPTION_P],
{ "P", "ospf.v3.prefix.options.p", FT_BOOLEAN, 8,
TFS(&tfs_v3_prefix_options_p), OSPF_V3_PREFIX_OPTION_P, NULL, HFILL }},
/* OSPF Restart TLVs */
- {&ospf_filter[OSPFF_V2_GRACE_TLV],
+ {&hf_ospf_filter[OSPFF_V2_GRACE_TLV],
{ "Grace TLV", "ospf.v2.grace", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}},
- {&ospf_filter[OSPFF_V2_GRACE_PERIOD],
+ {&hf_ospf_filter[OSPFF_V2_GRACE_PERIOD],
{ "Grace Period", "ospf.v2.grace.period", FT_UINT32, BASE_DEC,
NULL, 0x0,
"The number of seconds neighbors should advertise the router as fully adjacent",
HFILL }},
- {&ospf_filter[OSPFF_V2_GRACE_REASON],
+ {&hf_ospf_filter[OSPFF_V2_GRACE_REASON],
{ "Restart Reason", "ospf.v2.grace.reason", FT_UINT8, BASE_DEC,
VALS(restart_reason_vals), 0x0, "The reason the router is restarting", HFILL }},
- {&ospf_filter[OSPFF_V2_GRACE_IP],
+ {&hf_ospf_filter[OSPFF_V2_GRACE_IP],
{ "Restart IP", "ospf.v2.grace.ip", FT_IPv4, BASE_NONE,
NULL, 0x0, "The IP address of the interface originating this LSA", HFILL }},
/* OSPFv3 LLS TLVs */
- {&ospf_filter[OSPFF_V3_LLS_EXT_OPTIONS_TLV],
+ {&hf_ospf_filter[OSPFF_V3_LLS_EXT_OPTIONS_TLV],
{ "Extended Options TLV", "ospf.v3.lls.ext.options.tlv", FT_NONE, BASE_NONE,
NULL, 0x0, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_LLS_EXT_OPTIONS],
+ {&hf_ospf_filter[OSPFF_V3_LLS_EXT_OPTIONS],
{ "Options", "ospf.v3.lls.ext.options", FT_UINT32, BASE_HEX,
NULL, 0x0, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_LLS_EXT_OPTIONS_LR],
+ {&hf_ospf_filter[OSPFF_V3_LLS_EXT_OPTIONS_LR],
{ "LR", "ospf.v3.lls.ext.options.lr", FT_BOOLEAN, 32,
TFS(&tfs_v3_lls_ext_options_lr), OSPF_V3_LLS_EXT_OPTIONS_LR, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_LLS_EXT_OPTIONS_RS],
+ {&hf_ospf_filter[OSPFF_V3_LLS_EXT_OPTIONS_RS],
{ "RS", "ospf.v3.lls.ext.options.rs", FT_BOOLEAN, 32,
TFS(&tfs_v3_lls_ext_options_rs), OSPF_V3_LLS_EXT_OPTIONS_RS, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_LLS_STATE_TLV],
+ {&hf_ospf_filter[OSPFF_V3_LLS_STATE_TLV],
{ "State Check Sequence TLV", "ospf.v3.lls.state.tlv", FT_NONE, BASE_NONE,
NULL, 0x0, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_LLS_STATE_SCS],
+ {&hf_ospf_filter[OSPFF_V3_LLS_STATE_SCS],
{ "SCS Number", "ospf.v3.lls.state.scs", FT_UINT16, BASE_DEC,
NULL, 0x0, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_LLS_STATE_OPTIONS],
+ {&hf_ospf_filter[OSPFF_V3_LLS_STATE_OPTIONS],
{ "Options", "ospf.v3.lls.state.options", FT_UINT8, BASE_HEX,
NULL, 0x0, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_LLS_STATE_OPTIONS_R],
+ {&hf_ospf_filter[OSPFF_V3_LLS_STATE_OPTIONS_R],
{ "R", "ospf.v3.lls.state.options.r", FT_BOOLEAN, 8,
TFS(&tfs_v3_lls_state_options_r), OSPF_V3_LLS_STATE_OPTIONS_R, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_LLS_STATE_OPTIONS_A],
+ {&hf_ospf_filter[OSPFF_V3_LLS_STATE_OPTIONS_A],
{ "A", "ospf.v3.lls.state.options.a", FT_BOOLEAN, 8,
TFS(&tfs_v3_lls_state_options_a), OSPF_V3_LLS_STATE_OPTIONS_A , NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_LLS_STATE_OPTIONS_N],
+ {&hf_ospf_filter[OSPFF_V3_LLS_STATE_OPTIONS_N],
{ "N", "ospf.v3.lls.state.options.n", FT_BOOLEAN, 8,
TFS(&tfs_v3_lls_state_options_n), OSPF_V3_LLS_STATE_OPTIONS_N ,NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_LLS_DROP_TLV],
+ {&hf_ospf_filter[OSPFF_V3_LLS_DROP_TLV],
{ "Neighbor Drop TLV", "ospf.v3.lls.drop.tlv", FT_NONE, BASE_NONE,
NULL, 0x0, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_LLS_RELAY_TLV],
+ {&hf_ospf_filter[OSPFF_V3_LLS_RELAY_TLV],
{ "Active Overlapping Relays TLV", "ospf.v3.lls.relay.tlv", FT_NONE, BASE_NONE,
NULL, 0x0, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_LLS_RELAY_ADDED],
+ {&hf_ospf_filter[OSPFF_V3_LLS_RELAY_ADDED],
{ "Relays Added", "ospf.v3.lls.relay.added", FT_UINT8, BASE_DEC,
NULL, 0x0, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_LLS_RELAY_OPTIONS],
+ {&hf_ospf_filter[OSPFF_V3_LLS_RELAY_OPTIONS],
{ "Options", "ospf.v3.lls.relay.options", FT_UINT8, BASE_HEX,
NULL, 0x0, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_LLS_RELAY_OPTIONS_A],
+ {&hf_ospf_filter[OSPFF_V3_LLS_RELAY_OPTIONS_A],
{ "A", "ospf.v3.lls.relay.options.a", FT_BOOLEAN, 8,
TFS(&tfs_v3_lls_relay_options_a), OSPF_V3_LLS_RELAY_OPTIONS_A , NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_LLS_RELAY_OPTIONS_N],
+ {&hf_ospf_filter[OSPFF_V3_LLS_RELAY_OPTIONS_N],
{ "N", "ospf.v3.lls.relay.options.n", FT_BOOLEAN, 8,
TFS(&tfs_v3_lls_relay_options_n), OSPF_V3_LLS_RELAY_OPTIONS_N ,NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_LLS_WILLINGNESS_TLV],
+ {&hf_ospf_filter[OSPFF_V3_LLS_WILLINGNESS_TLV],
{ "Willingness TLV", "ospf.v3.lls.willingness.tlv", FT_NONE, BASE_NONE,
NULL, 0x0, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_LLS_WILLINGNESS],
+ {&hf_ospf_filter[OSPFF_V3_LLS_WILLINGNESS],
{ "Willingness", "ospf.v3.lls.willingness", FT_UINT8, BASE_DEC,
NULL, 0x0, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_LLS_RF_TLV],
+ {&hf_ospf_filter[OSPFF_V3_LLS_RF_TLV],
{ "Request From TLV", "ospf.v3.lls.rf.tlv", FT_NONE, BASE_NONE,
NULL, 0x0, NULL, HFILL }},
- {&ospf_filter[OSPFF_V3_LLS_FSF_TLV],
+ {&hf_ospf_filter[OSPFF_V3_LLS_FSF_TLV],
{ "Full State For TLV", "ospf.v3.lls.fsf.tlv", FT_NONE, BASE_NONE,
NULL, 0x0, NULL, HFILL }}
};
diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c
index 5a0a74d72a..1945d9ac0c 100644
--- a/epan/dissectors/packet-rsvp.c
+++ b/epan/dissectors/packet-rsvp.c
@@ -62,6 +62,10 @@
* June 9, 2007: added support for draft-ietf-ccamp-ethernet-traffic-parameters-02
* and draft-ietf-ccamp-lsp-hierarchy-bis-02; added support for NOTIFY_REQUEST
* and RECOVERY_LABEL objects (Roberto Morro) * <roberto.morro[AT]tilab.com>
+ *
+ * Oct 21, 2009: add support for RFC4328, new G.709 traffic parameters,
+ * update gpid, switching and encoding type values to actual IANA numbers.
+ * (FF) <francesco.fondelli[AT]gmail.com>
*/
@@ -761,29 +765,117 @@ static const value_string adspec_params[] = {
{ 0, NULL }
};
-const value_string gmpls_lsp_enc_str[] = {
- { 1, "Packet"},
- { 2, "Ethernet v2/DIX"},
- { 3, "ANSI PDH"},
- { 5, "SONET/SDH"},
- { 6, "VCAT"}, /* provisional value */
- { 7, "Digital Wrapper"},
- { 8, "Lambda (photonic)"},
- { 9, "Fiber"},
- {11, "FiberChannel"},
- { 0, NULL }
+/*
+ * FF: please keep this list in sync with
+ * http://www.iana.org/assignments/gmpls-sig-parameters
+ * Registry Name: 'LSP Encoding Types'
+ */
+const range_string gmpls_lsp_enc_rvals[] = {
+ { 1, 1, "Packet" },
+ { 2, 2, "Ethernet" },
+ { 3, 3, "ANSI/ETSI PDH" },
+ { 4, 4, "Reserved" },
+ { 5, 5, "SDH ITU-T G.707 / SONET ANSI T1.105" },
+ { 6, 6, "Reserved" },
+ { 7, 7, "Digital Wrapper" },
+ { 8, 8, "Lambda (photonic)" },
+ { 9, 9, "Fiber" },
+ { 10, 10, "Reserved" },
+ { 11, 11, "FiberChannel" },
+ { 12, 12, "G.709 ODUk (Digital Path)" },
+ { 13, 13, "G.709 Optical Channel" },
+ { 14, 239, "Unassigned" },
+ { 240, 255, "Experimental Usage/temporarily" },
+ { 0, 0, NULL }
};
-const value_string gmpls_switching_type_str[] = {
- { 1, "Packet-Switch Capable-1 (PSC-1)"},
- { 2, "Packet-Switch Capable-2 (PSC-2)"},
- { 3, "Packet-Switch Capable-3 (PSC-3)"},
- { 4, "Packet-Switch Capable-4 (PSC-4)"},
- { 51, "Layer-2 Switch Capable (L2SC)"},
- {100, "Time-Division-Multiplex Capable (TDM)"},
- {150, "Lambda-Switch Capable (LSC)"},
- {200, "Fiber-Switch Capable (FSC)"},
- { 0, NULL }
+/*
+ * FF: please keep this list in sync with
+ * http://www.iana.org/assignments/gmpls-sig-parameters
+ * Registry Name: 'Switching Types'
+ */
+const range_string gmpls_switching_type_rvals[] = {
+ { 1, 1, "Packet-Switch Capable-1 (PSC-1)" },
+ { 2, 2, "Packet-Switch Capable-2 (PSC-2)" },
+ { 3, 3, "Packet-Switch Capable-3 (PSC-3)" },
+ { 4, 4, "Packet-Switch Capable-4 (PSC-4)" },
+ { 5, 50, "Unassigned" },
+ { 51, 51, "Layer-2 Switch Capable (L2SC)" },
+ { 52, 99, "Unassigned" },
+ { 100, 100, "Time-Division-Multiplex Capable (TDM)" },
+ { 101, 149, "Unassigned" },
+ { 150, 150, "Lambda-Switch Capable (LSC)" },
+ { 151, 169, "Unassigned" },
+ { 200, 200, "Fiber-Switch Capable (FSC)" },
+ { 201, 255, "Unassigned" },
+ { 0, 0, NULL }
+};
+
+/*
+ * FF: please keep this list in sync with
+ * http://www.iana.org/assignments/gmpls-sig-parameters
+ * Registry Name: 'Generalized PID (G-PID)'
+ */
+static const range_string gmpls_gpid_rvals[] = {
+ { 0, 0, "Unknown" },
+ { 1, 4, "Reserved" },
+ { 5, 5, "Asynchronous mapping of E4" },
+ { 6, 6, "Asynchronous mapping of DS3/T3" },
+ { 7, 7, "Asynchronous mapping of E3" },
+ { 8, 8, "Bit synchronous mapping of E3" },
+ { 9, 9, "Byte synchronous mapping of E3" },
+ { 10, 10, "Asynchronous mapping of DS2/T2" },
+ { 11, 11, "Bit synchronous mapping of DS2/T2" },
+ { 12, 12, "Reserved" },
+ { 13, 13, "Asynchronous mapping of E1" },
+ { 14, 14, "Byte synchronous mapping of E1" },
+ { 15, 15, "Byte synchronous mapping of 31 * DS0" },
+ { 16, 16, "Asynchronous mapping of DS1/T1" },
+ { 17, 17, "Bit synchronous mapping of DS1/T1" },
+ { 18, 18, "Byte synchronous mapping of DS1/T1" },
+ { 19, 19, "VC-11 in VC-12" },
+ { 20, 21, "Reserved" },
+ { 22, 22, "DS1 SF Asynchronous" },
+ { 23, 23, "DS1 ESF Asynchronous" },
+ { 24, 24, "DS3 M23 Asynchronous" },
+ { 25, 25, "DS3 C-Bit Parity Asynchronous" },
+ { 26, 26, "VT/LOVC" },
+ { 27, 27, "STS SPE/HOVC" },
+ { 28, 28, "POS - No Scrambling, 16 bit CRC" },
+ { 29, 29, "POS - No Scrambling, 32 bit CRC" },
+ { 30, 30, "POS - Scrambling, 16 bit CRC" },
+ { 31, 31, "POS - Scrambling, 32 bit CRC" },
+ { 32, 32, "ATM mapping" },
+ { 33, 33, "Ethernet PHY" },
+ { 34, 34, "SONET/SDH" },
+ { 35, 35, "Reserved (SONET deprecated)" },
+ { 36, 36, "Digital Wrapper" },
+ { 37, 37, "Lambda" },
+ { 38, 38, "ANSI/ETSI PDH" },
+ { 39, 39, "Reserved" },
+ { 40, 40, "Link Access Protocol SDH (LAPS - X.85 and X.86)" },
+ { 41, 41, "FDDI" },
+ { 42, 42, "DQDB (ETSI ETS 300 216)" },
+ { 43, 43, "FiberChannel-3 (Services)" },
+ { 44, 44, "HDLC" },
+ { 45, 45, "Ethernet V2/DIX (only)" },
+ { 46, 46, "Ethernet 802.3 (only)" },
+ { 47, 47, "G.709 ODUj" },
+ { 48, 48, "G.709 OTUk(v)" },
+ { 49, 49, "CBR/CBRa" },
+ { 50, 50, "CBRb" },
+ { 51, 51, "BSOT" },
+ { 52, 52, "BSNT" },
+ { 53, 53, "IP/PPP (GFP)" },
+ { 54, 54, "Ethernet MAC (framed GFP)" },
+ { 55, 55, "Ethernet PHY (transparent GFP" },
+ { 56, 56, "ESCON" },
+ { 57, 57, "FICON" },
+ { 58, 58, "Fiber Channel" },
+ { 59, 31743, "Unassigned" },
+ { 31744, 32767, "Experimental Usage/temporarily" },
+ { 32768, 65535, "Reserved" },
+ { 0, 0, NULL },
};
const value_string gmpls_protection_cap_str[] = {
@@ -798,47 +890,6 @@ const value_string gmpls_protection_cap_str[] = {
{ 0, NULL }
};
-static const value_string gmpls_gpid_str[] = {
- { 5, "Asynchronous mapping of E3 (SDH)"},
- { 8, "Bit synchronous mapping of E3 (SDH)"},
- { 9, "Byte synchronous mapping of E3 (SDH)"},
- {10, "Asynchronous mapping of DS2/T2 (SDH)"},
- {11, "Bit synchronous mapping of DS2/T2 (SONET, SDH)"},
- {13, "Asynchronous mapping of E1 (SONET, SDH)"},
- {14, "Byte synchronous mapping of E1 (SONET, SDH)"},
- {15, "Byte synchronous mapping of 31 * DS0 (SONET, SDH)"},
- {16, "Asynchronous mapping of DS1/T1 (SONET, SDH)"},
- {17, "Bit synchronous mapping of DS1/T1 (SONET, SDH)"},
- {18, "Byte synchronous mapping of DS1/T1 (SONET, SDH)"},
- {19, "VC-11 in VC-12 (SDH)"},
- {22, "DS1 SF Asynchronous (SONET)"},
- {23, "DS1 ESF Asynchronous (SONET)"},
- {24, "DS3 M23 Asynchronous (SONET)"},
- {25, "DS3 C-Bit Parity Asynchronous (SONET)"},
- {26, "VT/LOVC (SONET, SDH)"},
- {27, "STS SPE/HOVC (SONET, SDH)"},
- {28, "POS - No Scrambling, 16 bit CRC (SONET, SDH)"},
- {29, "POS - No Scrambling, 32 bit CRC (SONET, SDH)"},
- {30, "POS - Scrambling, 16 bit CRC (SONET, SDH)"},
- {31, "POS - Scrambling, 32 bit CRC (SONET, SDH)"},
- {32, "ATM Mapping (SONET, SDH)"},
- {33, "Ethernet (SDH, Lambda, Fiber)"},
- {34, "SDH (Lambda, Fiber)"},
- {35, "SONET (Lambda, Fiber)"},
- {36, "Digital Wrapper (Lambda, Fiber)"},
- {37, "Lambda (Fiber)"},
- {38, "ETSI PDH (SDH)"},
- {39, "ANSI PDH (SONET, SDH)"},
- {40, "Link Access Protocol SDH: LAPS - X.85 and X.86 (SONET, SDH)"},
- {41, "FDDI (SONET, SDH, Lambda, Fiber)"},
- {42, "DQDB: ETSI ETS 300 216 (SONET, SDH)"},
- {43, "FiberChannel-3 Services (FiberChannel)"},
- {44, "HDLC"},
- {45, "Ethernet V2/DIX (only)"},
- {46, "Ethernet 802.3 (only)"},
- { 0, NULL },
-};
-
const value_string gmpls_sonet_signal_type_str[] = {
{ 1, "VT1.5 SPE / VC-11"},
{ 2, "VT2 SPE / VC-12"},
@@ -877,6 +928,20 @@ static const value_string ouni_guni_diversity_str[] = {
{0, NULL}
};
+/* FF: RFC 4328 G.709 signal type */
+const range_string gmpls_g709_signal_type_rvals[] = {
+ { 0, 0, "Not significant"},
+ { 1, 1, "ODU1 (i.e., 2.5 Gbps)"},
+ { 2, 2, "ODU2 (i.e., 10 Gbps)"},
+ { 3, 3, "ODU3 (i.e., 40 Gbps)"},
+ { 4, 5, "Reserved (for future use)"},
+ { 6, 6, "OCh at 2.5 Gbps"},
+ { 7, 7, "OCh at 10 Gbps"},
+ { 8, 8, "OCh at 40 Gbps"},
+ { 9, 255, "Reserved (for future use)"},
+ { 0, 0, NULL}
+};
+
/* -------------------- Stuff for MPLS/TE objects -------------------- */
static const value_string proto_vals[] = { {IP_PROTO_ICMP, "ICMP"},
@@ -887,7 +952,7 @@ static const value_string proto_vals[] = { {IP_PROTO_ICMP, "ICMP"},
{0, NULL } };
/* Filter keys */
-enum rsvp_filter_keys {
+enum hf_rsvp_filter_keys {
/* Message types */
RSVPF_MSG, /* Message type */
@@ -1001,7 +1066,7 @@ enum rsvp_filter_keys {
RSVPF_MAX
};
-static int rsvp_filter[RSVPF_MAX];
+static int hf_rsvp_filter[RSVPF_MAX];
/* RSVP Conversation related Hash functions */
@@ -1426,17 +1491,17 @@ dissect_rsvp_session (proto_item *ti, proto_tree *rsvp_object_tree,
proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1,
"C-type: 1 - IPv4");
proto_tree_add_item(rsvp_object_tree,
- rsvp_filter[RSVPF_SESSION_IP],
+ hf_rsvp_filter[RSVPF_SESSION_IP],
tvb, offset2, 4, FALSE);
proto_tree_add_item(rsvp_object_tree,
- rsvp_filter[RSVPF_SESSION_PROTO], tvb,
+ hf_rsvp_filter[RSVPF_SESSION_PROTO], tvb,
offset2+4, 1, FALSE);
proto_tree_add_text(rsvp_object_tree, tvb, offset2+5, 1,
"Flags: %x",
tvb_get_guint8(tvb, offset2+5));
proto_tree_add_item(rsvp_object_tree,
- rsvp_filter[RSVPF_SESSION_PORT], tvb,
+ hf_rsvp_filter[RSVPF_SESSION_PORT], tvb,
offset2+6, 2, FALSE);
/*
@@ -1479,11 +1544,11 @@ dissect_rsvp_session (proto_item *ti, proto_tree *rsvp_object_tree,
proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1,
"C-type: 7 - IPv4 LSP");
proto_tree_add_item(rsvp_object_tree,
- rsvp_filter[RSVPF_SESSION_IP],
+ hf_rsvp_filter[RSVPF_SESSION_IP],
tvb, offset2, 4, FALSE);
proto_tree_add_item(rsvp_object_tree,
- rsvp_filter[RSVPF_SESSION_TUNNEL_ID],
+ hf_rsvp_filter[RSVPF_SESSION_TUNNEL_ID],
tvb, offset2+6, 2, FALSE);
proto_tree_add_text(rsvp_object_tree, tvb, offset2+8, 4,
@@ -1491,7 +1556,7 @@ dissect_rsvp_session (proto_item *ti, proto_tree *rsvp_object_tree,
tvb_get_ntohl(tvb, offset2+8),
ip_to_str(tvb_get_ptr(tvb, offset2+8, 4)));
hidden_item = proto_tree_add_item(rsvp_object_tree,
- rsvp_filter[RSVPF_SESSION_EXT_TUNNEL_ID],
+ hf_rsvp_filter[RSVPF_SESSION_EXT_TUNNEL_ID],
tvb, offset2+8, 4, FALSE);
PROTO_ITEM_SET_HIDDEN(hidden_item);
@@ -1510,7 +1575,7 @@ dissect_rsvp_session (proto_item *ti, proto_tree *rsvp_object_tree,
proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1,
"C-type: 9 - IPv4 Aggregate");
proto_tree_add_item(rsvp_object_tree,
- rsvp_filter[RSVPF_SESSION_IP],
+ hf_rsvp_filter[RSVPF_SESSION_IP],
tvb, offset2, 4, FALSE);
proto_tree_add_text(rsvp_object_tree, tvb, offset2+7, 1,
@@ -1533,18 +1598,18 @@ dissect_rsvp_session (proto_item *ti, proto_tree *rsvp_object_tree,
proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1,
"C-type: 11 - IPv4 UNI");
proto_tree_add_item(rsvp_object_tree,
- rsvp_filter[RSVPF_SESSION_IP],
+ hf_rsvp_filter[RSVPF_SESSION_IP],
tvb, offset2, 4, FALSE);
proto_tree_add_item(rsvp_object_tree,
- rsvp_filter[RSVPF_SESSION_TUNNEL_ID],
+ hf_rsvp_filter[RSVPF_SESSION_TUNNEL_ID],
tvb, offset2+6, 2, FALSE);
proto_tree_add_text(rsvp_object_tree, tvb, offset2+8, 4,
"Extended IPv4 Address: %s",
ip_to_str(tvb_get_ptr(tvb, offset2+8, 4)));
hidden_item = proto_tree_add_item(rsvp_object_tree,
- rsvp_filter[RSVPF_SESSION_EXT_TUNNEL_ID],
+ hf_rsvp_filter[RSVPF_SESSION_EXT_TUNNEL_ID],
tvb, offset2+8, 4, FALSE);
PROTO_ITEM_SET_HIDDEN(hidden_item);
@@ -1564,18 +1629,18 @@ dissect_rsvp_session (proto_item *ti, proto_tree *rsvp_object_tree,
proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1,
"C-type: 15 - IPv4 E-NNI");
proto_tree_add_item(rsvp_object_tree,
- rsvp_filter[RSVPF_SESSION_IP],
+ hf_rsvp_filter[RSVPF_SESSION_IP],
tvb, offset2, 4, FALSE);
proto_tree_add_item(rsvp_object_tree,
- rsvp_filter[RSVPF_SESSION_TUNNEL_ID],
+ hf_rsvp_filter[RSVPF_SESSION_TUNNEL_ID],
tvb, offset2+6, 2, FALSE);
proto_tree_add_text(rsvp_object_tree, tvb, offset2+8, 4,
"Extended IPv4 Address: %s",
ip_to_str(tvb_get_ptr(tvb, offset2+8, 4)));
hidden_item = proto_tree_add_item(rsvp_object_tree,
- rsvp_filter[RSVPF_SESSION_EXT_TUNNEL_ID],
+ hf_rsvp_filter[RSVPF_SESSION_EXT_TUNNEL_ID],
tvb, offset2+8, 4, FALSE);
PROTO_ITEM_SET_HIDDEN(hidden_item);
@@ -2079,10 +2144,10 @@ dissect_rsvp_template_filter (proto_item *ti, proto_tree *rsvp_object_tree,
proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1,
"C-type: 1 - IPv4");
proto_tree_add_item(rsvp_object_tree,
- rsvp_filter[RSVPF_SENDER_IP],
+ hf_rsvp_filter[RSVPF_SENDER_IP],
tvb, offset2, 4, FALSE);
proto_tree_add_item(rsvp_object_tree,
- rsvp_filter[RSVPF_SENDER_PORT],
+ hf_rsvp_filter[RSVPF_SENDER_PORT],
tvb, offset2+6, 2, FALSE);
/*
@@ -2107,10 +2172,10 @@ dissect_rsvp_template_filter (proto_item *ti, proto_tree *rsvp_object_tree,
proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1,
"C-type: 7 - IPv4 LSP");
proto_tree_add_item(rsvp_object_tree,
- rsvp_filter[RSVPF_SENDER_IP],
+ hf_rsvp_filter[RSVPF_SENDER_IP],
tvb, offset2, 4, FALSE);
proto_tree_add_item(rsvp_object_tree,
- rsvp_filter[RSVPF_SENDER_LSP_ID],
+ hf_rsvp_filter[RSVPF_SENDER_LSP_ID],
tvb, offset2+6, 2, FALSE);
/*
@@ -2124,7 +2189,7 @@ dissect_rsvp_template_filter (proto_item *ti, proto_tree *rsvp_object_tree,
proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1,
"C-type: 9 - IPv4 Aggregate");
proto_tree_add_item(rsvp_object_tree,
- rsvp_filter[RSVPF_SENDER_IP],
+ hf_rsvp_filter[RSVPF_SENDER_IP],
tvb, offset2, 4, FALSE);
/*
@@ -2267,7 +2332,7 @@ dissect_rsvp_tspec (proto_item *ti, proto_tree *rsvp_object_tree,
mylen -= 4;
offset2 += 4;
- proto_item_set_text(ti, "SENDER TSPEC: IntServ: ");
+ proto_item_set_text(ti, "SENDER TSPEC: IntServ, ");
while (mylen > 0) {
guint8 service_num;
@@ -2420,7 +2485,7 @@ dissect_rsvp_tspec (proto_item *ti, proto_tree *rsvp_object_tree,
break;
case 4: /* SONET/SDH Tspec */
- proto_item_set_text(ti, "SENDER TSPEC: SONET/SDH: ");
+ proto_item_set_text(ti, "SENDER TSPEC: SONET/SDH, ");
proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1,
"C-type: 4 - SONET/SDH");
@@ -2515,8 +2580,38 @@ dissect_rsvp_tspec (proto_item *ti, proto_tree *rsvp_object_tree,
tvb_get_ntohl(tvb, offset2+8), tvb_get_ntohl(tvb, offset2+12));
break;
+ case 5: /* FF: G.709 TSPEC, RFC 4328 */
+ proto_item_set_text(ti, "SENDER TSPEC: G.709, ");
+
+ proto_tree_add_text(rsvp_object_tree, tvb, offset + 3, 1,
+ "C-type: 5 - G.709");
+ signal_type = tvb_get_guint8(tvb, offset2);
+ proto_tree_add_text(rsvp_object_tree, tvb, offset2, 1,
+ "Signal Type: %d - %s", signal_type,
+ rval_to_str(signal_type,
+ gmpls_g709_signal_type_rvals,
+ "Unknown"));
+ proto_tree_add_text(rsvp_object_tree, tvb, offset2 + 2, 2,
+ "Number of Multiplexed Components (NMC): %d",
+ tvb_get_ntohs(tvb, offset2 + 2));
+ proto_tree_add_text(rsvp_object_tree, tvb, offset2 + 4, 2,
+ "Number of Virtual Components (NVC): %d",
+ tvb_get_ntohs(tvb, offset2 + 4));
+
+ proto_tree_add_text(rsvp_object_tree, tvb, offset2 + 6, 2,
+ "Multiplier (MT): %d",
+ tvb_get_ntohs(tvb, offset2 + 6));
+ proto_item_append_text(ti, "Signal [%s], NMC %d, NVC %d, MT %d",
+ rval_to_str(signal_type,
+ gmpls_g709_signal_type_rvals,
+ "Unknown"),
+ tvb_get_ntohs(tvb, offset2 + 2),
+ tvb_get_ntohs(tvb, offset2 + 4),
+ tvb_get_ntohs(tvb, offset2 + 6));
+ break;
+
case 6: /* Ethernet TSPEC draft-ietf-ccamp-ethernet-traffic-parameters-02 */
- proto_item_set_text(ti, "SENDER TSPEC: Ethernet: ");
+ proto_item_set_text(ti, "SENDER TSPEC: Ethernet, ");
proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1,
"C-type: 6 - Ethernet");
switch_gran = tvb_get_ntohs(tvb, offset2);
@@ -2751,7 +2846,7 @@ dissect_rsvp_flowspec (proto_item *ti, proto_tree *rsvp_object_tree,
break;
case 4:
- proto_item_set_text(ti, "FLOWSPEC: SONET/SDH: ");
+ proto_item_set_text(ti, "FLOWSPEC: SONET/SDH, ");
proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1,
"C-type: 4 - SONET/SDH");
@@ -2846,8 +2941,38 @@ dissect_rsvp_flowspec (proto_item *ti, proto_tree *rsvp_object_tree,
tvb_get_ntohl(tvb, offset2+8), tvb_get_ntohl(tvb, offset2+12));
break;
+ case 5: /* FF: G.709 FLOWSPEC, RFC 4328 */
+ proto_item_set_text(ti, "FLOWSPEC: G.709, ");
+
+ proto_tree_add_text(rsvp_object_tree, tvb, offset + 3, 1,
+ "C-type: 5 - G.709");
+ signal_type = tvb_get_guint8(tvb, offset2);
+ proto_tree_add_text(rsvp_object_tree, tvb, offset2, 1,
+ "Signal Type: %d - %s", signal_type,
+ rval_to_str(signal_type,
+ gmpls_g709_signal_type_rvals,
+ "Unknown"));
+ proto_tree_add_text(rsvp_object_tree, tvb, offset2 + 2, 2,
+ "Number of Multiplexed Components (NMC): %d",
+ tvb_get_ntohs(tvb, offset2 + 2));
+ proto_tree_add_text(rsvp_object_tree, tvb, offset2 + 4, 2,
+ "Number of Virtual Components (NVC): %d",
+ tvb_get_ntohs(tvb, offset2 + 4));
+
+ proto_tree_add_text(rsvp_object_tree, tvb, offset2 + 6, 2,
+ "Multiplier (MT): %d",
+ tvb_get_ntohs(tvb, offset2 + 6));
+ proto_item_append_text(ti, "Signal [%s], NMC %d, NVC %d, MT %d",
+ rval_to_str(signal_type,
+ gmpls_g709_signal_type_rvals,
+ "Unknown"),
+ tvb_get_ntohs(tvb, offset2 + 2),
+ tvb_get_ntohs(tvb, offset2 + 4),
+ tvb_get_ntohs(tvb, offset2 + 6));
+ break;
+
case 6: /* Ethernet FLOWSPEC draft-ietf-ccamp-ethernet-traffic-parameters-02 */
- proto_item_set_text(ti, "FLOWSPEC: Ethernet: ");
+ proto_item_set_text(ti, "FLOWSPEC: Ethernet, ");
proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1,
"C-type: 6 - Ethernet");
switch_gran = tvb_get_ntohs(tvb, offset2);
@@ -3133,23 +3258,23 @@ dissect_rsvp_label_request (proto_item *ti, proto_tree *rsvp_object_tree,
"C-type: 4 (Generalized Label Request)");
proto_tree_add_text(rsvp_object_tree, tvb, offset2, 1,
"LSP Encoding Type: %s",
- val_to_str(lsp_enc, gmpls_lsp_enc_str, "Unknown (%d)"));
+ rval_to_str(lsp_enc, gmpls_lsp_enc_rvals, "Unknown (%d)"));
proto_tree_add_text(rsvp_object_tree, tvb, offset2+1, 1,
"Switching Type: %s",
- val_to_str(tvb_get_guint8(tvb,offset2+1),
- gmpls_switching_type_str, "Unknown (%d)"));
+ rval_to_str(tvb_get_guint8(tvb,offset2+1),
+ gmpls_switching_type_rvals, "Unknown (%d)"));
proto_tree_add_text(rsvp_object_tree, tvb, offset2+2, 2,
"G-PID: %s (0x%0x)",
- val_to_str(l3pid, gmpls_gpid_str,
+ rval_to_str(l3pid, gmpls_gpid_rvals,
val_to_str(l3pid, etype_vals,
"Unknown G-PID(0x%04x)")),
l3pid);
proto_item_set_text(ti, "LABEL REQUEST: Generalized: LSP Encoding=%s, "
"Switching Type=%s, G-PID=%s ",
- val_to_str(lsp_enc, gmpls_lsp_enc_str, "Unknown (%d)"),
- val_to_str(tvb_get_guint8(tvb,offset2+1),
- gmpls_switching_type_str, "Unknown (%d)"),
- val_to_str(l3pid, gmpls_gpid_str,
+ rval_to_str(lsp_enc, gmpls_lsp_enc_rvals, "Unknown (%d)"),
+ rval_to_str(tvb_get_guint8(tvb,offset2+1),
+ gmpls_switching_type_rvals, "Unknown (%d)"),
+ rval_to_str(l3pid, gmpls_gpid_rvals,
val_to_str(l3pid, etype_vals,
"Unknown (0x%04x)")));
break;
@@ -4149,12 +4274,12 @@ dissect_rsvp_lsp_tunnel_if_id_tlv(proto_tree *rsvp_object_tree,
"Length: %u", tlv_len);
proto_tree_add_text(rsvp_lsp_tunnel_if_id_subtree, tvb, offset+tlv_off+4, 1,
"LSP Encoding Type: %s",
- val_to_str(tvb_get_guint8(tvb,offset+tlv_off+4),
- gmpls_lsp_enc_str, "Unknown (%d)"));
+ rval_to_str(tvb_get_guint8(tvb,offset+tlv_off+4),
+ gmpls_lsp_enc_rvals, "Unknown (%d)"));
proto_tree_add_text(rsvp_lsp_tunnel_if_id_subtree, tvb, offset+tlv_off+5, 1,
"Switching Type: %s",
- val_to_str(tvb_get_guint8(tvb,offset+tlv_off+5),
- gmpls_switching_type_str, "Unknown (%d)"));
+ rval_to_str(tvb_get_guint8(tvb,offset+tlv_off+5),
+ gmpls_switching_type_rvals, "Unknown (%d)"));
proto_tree_add_text(rsvp_lsp_tunnel_if_id_subtree, tvb, offset+tlv_off+6, 1,
"Signal Type: %s",
val_to_str(tvb_get_guint8(tvb,offset+tlv_off+6),
@@ -4170,10 +4295,10 @@ dissect_rsvp_lsp_tunnel_if_id_tlv(proto_tree *rsvp_object_tree,
"SC PC SCN Address: %s",
ip_to_str(tvb_get_ptr(tvb, offset+tlv_off+20, 4)));
proto_item_append_text(ti, "LSP Encoding=%s, Switching Type=%s, Signal Type=%s",
- val_to_str(tvb_get_guint8(tvb,offset+tlv_off+4),
- gmpls_lsp_enc_str, "Unknown (%d)"),
- val_to_str(tvb_get_guint8(tvb,offset+tlv_off+5),
- gmpls_switching_type_str, "Unknown (%d)"),
+ rval_to_str(tvb_get_guint8(tvb,offset+tlv_off+4),
+ gmpls_lsp_enc_rvals, "Unknown (%d)"),
+ rval_to_str(tvb_get_guint8(tvb,offset+tlv_off+5),
+ gmpls_switching_type_rvals, "Unknown (%d)"),
val_to_str(tvb_get_guint8(tvb,offset+tlv_off+6),
gmpls_sonet_signal_type_str, "Unknown (%d)"));
break;
@@ -4392,10 +4517,10 @@ dissect_rsvp_gen_uni (proto_tree *ti, proto_tree *rsvp_object_tree,
"Length: %u",
tvb_get_ntohs(tvb, offset2+l));
if (j==1)
- proto_tree_add_item(rsvp_gen_uni_subtree, rsvp_filter[RSVPF_GUNI_SRC_IPV4],
+ proto_tree_add_item(rsvp_gen_uni_subtree, hf_rsvp_filter[RSVPF_GUNI_SRC_IPV4],
tvb, offset2+l+4, 4, FALSE);
else
- proto_tree_add_item(rsvp_gen_uni_subtree, rsvp_filter[RSVPF_GUNI_DST_IPV4],
+ proto_tree_add_item(rsvp_gen_uni_subtree, hf_rsvp_filter[RSVPF_GUNI_DST_IPV4],
tvb, offset2+l+4, 4, FALSE);
if (i < 4) {
proto_item_append_text(ti, "%s IPv4 TNA: %s", c,
@@ -4417,10 +4542,10 @@ dissect_rsvp_gen_uni (proto_tree *ti, proto_tree *rsvp_object_tree,
"Length: %u",
tvb_get_ntohs(tvb, offset2+l));
if (j==1)
- proto_tree_add_item(rsvp_gen_uni_subtree, rsvp_filter[RSVPF_GUNI_SRC_IPV6],
+ proto_tree_add_item(rsvp_gen_uni_subtree, hf_rsvp_filter[RSVPF_GUNI_SRC_IPV6],
tvb, offset2+l+4, 16, FALSE);
else
- proto_tree_add_item(rsvp_gen_uni_subtree, rsvp_filter[RSVPF_GUNI_DST_IPV6],
+ proto_tree_add_item(rsvp_gen_uni_subtree, hf_rsvp_filter[RSVPF_GUNI_DST_IPV6],
tvb, offset2+l+4, 16, FALSE);
if (i < 4) {
proto_item_append_text(ti, "%s IPv6 %s", c,
@@ -4508,7 +4633,7 @@ dissect_rsvp_gen_uni (proto_tree *ti, proto_tree *rsvp_object_tree,
}
proto_tree_add_text(rsvp_session_subtree, tvb, offset2+l+8, 2,
"Length: %u", s_len);
- proto_tree_add_uint(rsvp_session_subtree, rsvp_filter[RSVPF_OBJECT], tvb,
+ proto_tree_add_uint(rsvp_session_subtree, hf_rsvp_filter[RSVPF_OBJECT], tvb,
offset2+8+l+10, 1, s_class);
dissect_rsvp_session(ti2, rsvp_session_subtree, tvb, offset2+l+8,
s_len, s_class, s_type, rsvph);
@@ -4527,7 +4652,7 @@ dissect_rsvp_gen_uni (proto_tree *ti, proto_tree *rsvp_object_tree,
}
proto_tree_add_text(rsvp_template_subtree, tvb, offset3+l+8, 2,
"Length: %u", s_len);
- proto_tree_add_uint(rsvp_template_subtree, rsvp_filter[RSVPF_OBJECT], tvb,
+ proto_tree_add_uint(rsvp_template_subtree, hf_rsvp_filter[RSVPF_OBJECT], tvb,
offset3+8+l+10, 1, s_class);
dissect_rsvp_template_filter(ti2, rsvp_template_subtree, tvb, offset3+l+8,
s_len, s_class, s_type, rsvph);
@@ -4727,14 +4852,14 @@ dissect_rsvp_call_id (proto_tree *ti, proto_tree *rsvp_object_tree,
switch(type) {
case 1:
offset4 = offset3 + 4;
- proto_tree_add_item(rsvp_object_tree, rsvp_filter[RSVPF_CALL_ID_SRC_ADDR_IPV4],
+ proto_tree_add_item(rsvp_object_tree, hf_rsvp_filter[RSVPF_CALL_ID_SRC_ADDR_IPV4],
tvb, offset3, 4, FALSE);
proto_item_append_text(ti, "Src: %s. ", ip_to_str(tvb_get_ptr(tvb, offset3, 4)));
break;
case 2:
offset4 = offset3 + 16;
- proto_tree_add_item(rsvp_object_tree, rsvp_filter[RSVPF_CALL_ID_SRC_ADDR_IPV6],
+ proto_tree_add_item(rsvp_object_tree, hf_rsvp_filter[RSVPF_CALL_ID_SRC_ADDR_IPV6],
tvb, offset3, 16, FALSE);
proto_item_append_text(ti, "Src: %s. ",
ip6_to_str((const struct e_in6_addr *) tvb_get_ptr(tvb, offset3, 16)));
@@ -5019,13 +5144,13 @@ dissect_rsvp_diffserv (proto_tree *ti, proto_tree *rsvp_object_tree,
{
int mapnb, count;
int *hfindexes[] = {
- &rsvp_filter[RSVPF_DIFFSERV_MAP],
- &rsvp_filter[RSVPF_DIFFSERV_MAP_EXP],
- &rsvp_filter[RSVPF_DIFFSERV_PHBID],
- &rsvp_filter[RSVPF_DIFFSERV_PHBID_DSCP],
- &rsvp_filter[RSVPF_DIFFSERV_PHBID_CODE],
- &rsvp_filter[RSVPF_DIFFSERV_PHBID_BIT14],
- &rsvp_filter[RSVPF_DIFFSERV_PHBID_BIT15]
+ &hf_rsvp_filter[RSVPF_DIFFSERV_MAP],
+ &hf_rsvp_filter[RSVPF_DIFFSERV_MAP_EXP],
+ &hf_rsvp_filter[RSVPF_DIFFSERV_PHBID],
+ &hf_rsvp_filter[RSVPF_DIFFSERV_PHBID_DSCP],
+ &hf_rsvp_filter[RSVPF_DIFFSERV_PHBID_CODE],
+ &hf_rsvp_filter[RSVPF_DIFFSERV_PHBID_BIT14],
+ &hf_rsvp_filter[RSVPF_DIFFSERV_PHBID_BIT15]
};
gint *etts[] = {
&TREE(TT_DIFFSERV_MAP),
@@ -5038,7 +5163,7 @@ dissect_rsvp_diffserv (proto_tree *ti, proto_tree *rsvp_object_tree,
case 1:
proto_tree_add_text(rsvp_object_tree, tvb, offset, 1,
"C-type: 1 - E-LSP");
- proto_tree_add_uint(rsvp_object_tree, rsvp_filter[RSVPF_DIFFSERV_MAPNB],
+ proto_tree_add_uint(rsvp_object_tree, hf_rsvp_filter[RSVPF_DIFFSERV_MAPNB],
tvb, offset + 4, 1,
mapnb = tvb_get_guint8(tvb, offset + 4) & 15);
proto_item_append_text(ti, "E-LSP, %u MAP%s", mapnb,
@@ -5080,7 +5205,7 @@ dissect_rsvp_diffserv_aware_te(proto_tree *ti, proto_tree *rsvp_object_tree,
guint8 ct = 0;
hidden_item = proto_tree_add_item(rsvp_object_tree,
- rsvp_filter[RSVPF_DSTE],
+ hf_rsvp_filter[RSVPF_DSTE],
tvb, offset, 8, FALSE);
PROTO_ITEM_SET_HIDDEN(hidden_item);
@@ -5089,7 +5214,7 @@ dissect_rsvp_diffserv_aware_te(proto_tree *ti, proto_tree *rsvp_object_tree,
ct = tvb_get_guint8(tvb, offset2+3);
proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 1");
proto_tree_add_item(rsvp_object_tree,
- rsvp_filter[RSVPF_DSTE_CLASSTYPE],
+ hf_rsvp_filter[RSVPF_DSTE_CLASSTYPE],
tvb, offset2+3, 1, FALSE);
proto_item_set_text(ti, "CLASSTYPE: CT %u", ct);
break;
@@ -5157,7 +5282,7 @@ dissect_rsvp_msg_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
(ver_flags & 0xf0)>>4);
proto_tree_add_text(rsvp_header_tree, tvb, offset, 1, "Flags: %02x",
ver_flags & 0xf);
- proto_tree_add_uint(rsvp_header_tree, rsvp_filter[RSVPF_MSG], tvb,
+ proto_tree_add_uint(rsvp_header_tree, hf_rsvp_filter[RSVPF_MSG], tvb,
offset+1, 1, message_type);
switch (RSVPF_MSG + message_type) {
@@ -5174,7 +5299,7 @@ dissect_rsvp_msg_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
case RSVPF_SREFRESH:
case RSVPF_HELLO:
case RSVPF_NOTIFY:
- hidden_item = proto_tree_add_boolean(rsvp_header_tree, rsvp_filter[RSVPF_MSG + message_type], tvb,
+ hidden_item = proto_tree_add_boolean(rsvp_header_tree, hf_rsvp_filter[RSVPF_MSG + message_type], tvb,
offset+1, 1, 1);
PROTO_ITEM_SET_HIDDEN(hidden_item);
break;
@@ -5242,7 +5367,7 @@ dissect_rsvp_msg_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
obj_length = tvb_get_ntohs(tvb, offset);
class = tvb_get_guint8(tvb, offset+2);
type = tvb_get_guint8(tvb, offset+3);
- ti = proto_tree_add_item(rsvp_tree, rsvp_filter[rsvp_class_to_filter_num(class)],
+ ti = proto_tree_add_item(rsvp_tree, hf_rsvp_filter[rsvp_class_to_filter_num(class)],
tvb, offset, obj_length, FALSE);
rsvp_object_tree = proto_item_add_subtree(ti, TREE(rsvp_class_to_tree_type(class)));
if (obj_length < 4) {
@@ -5252,7 +5377,7 @@ dissect_rsvp_msg_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
}
proto_tree_add_text(rsvp_object_tree, tvb, offset, 2,
"Length: %u", obj_length);
- proto_tree_add_uint(rsvp_object_tree, rsvp_filter[RSVPF_OBJECT], tvb,
+ proto_tree_add_uint(rsvp_object_tree, hf_rsvp_filter[RSVPF_OBJECT], tvb,
offset+2, 1, class);
offset2 = offset+4;
@@ -5436,7 +5561,6 @@ dissect_rsvp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
struct rsvp_request_key request_key, *new_request_key;
struct rsvp_request_val *request_val = NULL;
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
col_set_str(pinfo->cinfo, COL_PROTOCOL,
(pinfo->ipproto == IP_PROTO_RSVPE2EI) ? "RSVP-E2EI" : "RSVP");
col_clear(pinfo->cinfo, COL_INFO);
@@ -5451,17 +5575,15 @@ dissect_rsvp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
SET_ADDRESS(&rsvph->source, pinfo->src.type, pinfo->src.len, pinfo->src.data);
SET_ADDRESS(&rsvph->destination, pinfo->dst.type, pinfo->dst.len, pinfo->dst.data);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_str(pinfo->cinfo, COL_INFO,
- val_to_str(message_type, message_type_vals, "Unknown (%u). "));
+ col_add_str(pinfo->cinfo, COL_INFO,
+ val_to_str(message_type, message_type_vals, "Unknown (%u). "));
find_rsvp_session_tempfilt(tvb, 0, &session_off, &tempfilt_off);
if (session_off)
col_append_str(pinfo->cinfo, COL_INFO, summary_session(tvb, session_off));
if (tempfilt_off)
col_append_str(pinfo->cinfo, COL_INFO, summary_template(tvb, tempfilt_off));
- }
+
- if (check_col(pinfo->cinfo, COL_INFO)) {
col_add_str(pinfo->cinfo, COL_INFO,
val_to_str(message_type, message_type_vals, "Unknown (%u). "));
if (message_type == RSVP_MSG_BUNDLE) {
@@ -5472,14 +5594,13 @@ dissect_rsvp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
} else {
find_rsvp_session_tempfilt(tvb, 0, &session_off, &tempfilt_off);
if (session_off)
- col_append_str(pinfo->cinfo, COL_INFO, summary_session(tvb, session_off));
+ col_append_str(pinfo->cinfo, COL_INFO, summary_session(tvb, session_off));
if (tempfilt_off)
- col_append_str(pinfo->cinfo, COL_INFO, summary_template(tvb, tempfilt_off));
+ col_append_str(pinfo->cinfo, COL_INFO, summary_template(tvb, tempfilt_off));
}
- }
if (tree) {
- dissect_rsvp_msg_tree(tvb, pinfo, tree, TREE(TT_RSVP), rsvph);
+ dissect_rsvp_msg_tree(tvb, pinfo, tree, TREE(TT_RSVP), rsvph);
}
/* Find out what conversation this packet is part of. */
@@ -5561,12 +5682,12 @@ dissect_rsvp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* If not, insert the new request key into the hash table */
if (!request_val) {
- new_request_key = se_memdup(&request_key, sizeof(struct rsvp_request_key));
+ new_request_key = se_memdup(&request_key, sizeof(struct rsvp_request_key));
- request_val = se_alloc(sizeof(struct rsvp_request_val));
- request_val->value = conversation->index;
+ request_val = se_alloc(sizeof(struct rsvp_request_val));
+ request_val->value = conversation->index;
- g_hash_table_insert(rsvp_request_hash, new_request_key, request_val);
+ g_hash_table_insert(rsvp_request_hash, new_request_key, request_val);
}
tap_queue_packet(rsvp_tap, pinfo, rsvph);
@@ -5593,324 +5714,324 @@ proto_register_rsvp(void)
static hf_register_info rsvpf_info[] = {
/* Message type number */
- {&rsvp_filter[RSVPF_MSG],
+ {&hf_rsvp_filter[RSVPF_MSG],
{ "Message Type", "rsvp.msg", FT_UINT8, BASE_DEC, VALS(message_type_vals), 0x0,
NULL, HFILL }},
/* Message type shorthands */
- {&rsvp_filter[RSVPF_PATH],
+ {&hf_rsvp_filter[RSVPF_PATH],
{ "Path Message", "rsvp.path", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_RESV],
+ {&hf_rsvp_filter[RSVPF_RESV],
{ "Resv Message", "rsvp.resv", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_PATHERR],
+ {&hf_rsvp_filter[RSVPF_PATHERR],
{ "Path Error Message", "rsvp.perr", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_RESVERR],
+ {&hf_rsvp_filter[RSVPF_RESVERR],
{ "Resv Error Message", "rsvp.rerr", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_PATHTEAR],
+ {&hf_rsvp_filter[RSVPF_PATHTEAR],
{ "Path Tear Message", "rsvp.ptear", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_RESVTEAR],
+ {&hf_rsvp_filter[RSVPF_RESVTEAR],
{ "Resv Tear Message", "rsvp.rtear", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_RCONFIRM],
+ {&hf_rsvp_filter[RSVPF_RCONFIRM],
{ "Resv Confirm Message", "rsvp.resvconf", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_RTEARCONFIRM],
+ {&hf_rsvp_filter[RSVPF_RTEARCONFIRM],
{ "Resv Tear Confirm Message", "rsvp.rtearconf", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_BUNDLE],
+ {&hf_rsvp_filter[RSVPF_BUNDLE],
{ "Bundle Message", "rsvp.bundle", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_ACK],
+ {&hf_rsvp_filter[RSVPF_ACK],
{ "Ack Message", "rsvp.ack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_SREFRESH],
+ {&hf_rsvp_filter[RSVPF_SREFRESH],
{ "Srefresh Message", "rsvp.srefresh", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_HELLO],
+ {&hf_rsvp_filter[RSVPF_HELLO],
{ "HELLO Message", "rsvp.hello", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
/* Object class */
- {&rsvp_filter[RSVPF_OBJECT],
+ {&hf_rsvp_filter[RSVPF_OBJECT],
{ "Object class", "rsvp.object", FT_UINT8, BASE_DEC, VALS(rsvp_class_vals), 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_NOTIFY],
+ {&hf_rsvp_filter[RSVPF_NOTIFY],
{ "Notify Message", "rsvp.notify", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
/* Object present shorthands */
- {&rsvp_filter[RSVPF_SESSION],
+ {&hf_rsvp_filter[RSVPF_SESSION],
{ "SESSION", "rsvp.session", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_HOP],
+ {&hf_rsvp_filter[RSVPF_HOP],
{ "HOP", "rsvp.hop", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_HELLO_OBJ],
+ {&hf_rsvp_filter[RSVPF_HELLO_OBJ],
{ "HELLO Request/Ack", "rsvp.hello_obj", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_INTEGRITY],
+ {&hf_rsvp_filter[RSVPF_INTEGRITY],
{ "INTEGRITY", "rsvp.integrity", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_TIME_VALUES],
+ {&hf_rsvp_filter[RSVPF_TIME_VALUES],
{ "TIME VALUES", "rsvp.time", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_ERROR],
+ {&hf_rsvp_filter[RSVPF_ERROR],
{ "ERROR", "rsvp.error", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_SCOPE],
+ {&hf_rsvp_filter[RSVPF_SCOPE],
{ "SCOPE", "rsvp.scope", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_STYLE],
+ {&hf_rsvp_filter[RSVPF_STYLE],
{ "STYLE", "rsvp.style", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_FLOWSPEC],
+ {&hf_rsvp_filter[RSVPF_FLOWSPEC],
{ "FLOWSPEC", "rsvp.flowspec", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_FILTER_SPEC],
+ {&hf_rsvp_filter[RSVPF_FILTER_SPEC],
{ "FILTERSPEC", "rsvp.filter", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_SENDER],
+ {&hf_rsvp_filter[RSVPF_SENDER],
{ "SENDER TEMPLATE", "rsvp.sender", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_TSPEC],
+ {&hf_rsvp_filter[RSVPF_TSPEC],
{ "SENDER TSPEC", "rsvp.tspec", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_ADSPEC],
+ {&hf_rsvp_filter[RSVPF_ADSPEC],
{ "ADSPEC", "rsvp.adspec", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_POLICY],
+ {&hf_rsvp_filter[RSVPF_POLICY],
{ "POLICY", "rsvp.policy", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_CONFIRM],
+ {&hf_rsvp_filter[RSVPF_CONFIRM],
{ "CONFIRM", "rsvp.confirm", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_LABEL],
+ {&hf_rsvp_filter[RSVPF_LABEL],
{ "LABEL", "rsvp.label", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_RECOVERY_LABEL],
+ {&hf_rsvp_filter[RSVPF_RECOVERY_LABEL],
{ "RECOVERY LABEL", "rsvp.recovery_label", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_UPSTREAM_LABEL],
+ {&hf_rsvp_filter[RSVPF_UPSTREAM_LABEL],
{ "UPSTREAM LABEL", "rsvp.upstream_label", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_SUGGESTED_LABEL],
+ {&hf_rsvp_filter[RSVPF_SUGGESTED_LABEL],
{ "SUGGESTED LABEL", "rsvp.suggested_label", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_LABEL_SET],
+ {&hf_rsvp_filter[RSVPF_LABEL_SET],
{ "LABEL SET", "rsvp.label_set", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_ACCEPTABLE_LABEL_SET],
+ {&hf_rsvp_filter[RSVPF_ACCEPTABLE_LABEL_SET],
{ "ACCEPTABLE LABEL SET", "rsvp.acceptable_label_set", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_PROTECTION],
+ {&hf_rsvp_filter[RSVPF_PROTECTION],
{ "PROTECTION", "rsvp.protection", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_DIFFSERV],
+ {&hf_rsvp_filter[RSVPF_DIFFSERV],
{ "DIFFSERV", "rsvp.diffserv", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_DSTE],
+ {&hf_rsvp_filter[RSVPF_DSTE],
{ "CLASSTYPE", "rsvp.dste", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_RESTART_CAP],
+ {&hf_rsvp_filter[RSVPF_RESTART_CAP],
{ "RESTART CAPABILITY", "rsvp.restart", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_LABEL_REQUEST],
+ {&hf_rsvp_filter[RSVPF_LABEL_REQUEST],
{ "LABEL REQUEST", "rsvp.label_request", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_SESSION_ATTRIBUTE],
+ {&hf_rsvp_filter[RSVPF_SESSION_ATTRIBUTE],
{ "SESSION ATTRIBUTE", "rsvp.session_attribute", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_EXPLICIT_ROUTE],
+ {&hf_rsvp_filter[RSVPF_EXPLICIT_ROUTE],
{ "EXPLICIT ROUTE", "rsvp.explicit_route", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_RECORD_ROUTE],
+ {&hf_rsvp_filter[RSVPF_RECORD_ROUTE],
{ "RECORD ROUTE", "rsvp.record_route", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_MESSAGE_ID],
+ {&hf_rsvp_filter[RSVPF_MESSAGE_ID],
{ "MESSAGE-ID", "rsvp.msgid", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_MESSAGE_ID_ACK],
+ {&hf_rsvp_filter[RSVPF_MESSAGE_ID_ACK],
{ "MESSAGE-ID ACK", "rsvp.ack", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_MESSAGE_ID_LIST],
+ {&hf_rsvp_filter[RSVPF_MESSAGE_ID_LIST],
{ "MESSAGE-ID LIST", "rsvp.msgid_list", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_DCLASS],
+ {&hf_rsvp_filter[RSVPF_DCLASS],
{ "DCLASS", "rsvp.dclass", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_LSP_TUNNEL_IF_ID],
+ {&hf_rsvp_filter[RSVPF_LSP_TUNNEL_IF_ID],
{ "LSP INTERFACE-ID", "rsvp.lsp_tunnel_if_id", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_ADMIN_STATUS],
+ {&hf_rsvp_filter[RSVPF_ADMIN_STATUS],
{ "ADMIN STATUS", "rsvp.admin_status", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_ASSOCIATION],
+ {&hf_rsvp_filter[RSVPF_ASSOCIATION],
{ "ASSOCIATION", "rsvp.association", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_NOTIFY_REQUEST],
+ {&hf_rsvp_filter[RSVPF_NOTIFY_REQUEST],
{ "NOTIFY REQUEST", "rsvp.notify_request", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_GENERALIZED_UNI],
+ {&hf_rsvp_filter[RSVPF_GENERALIZED_UNI],
{ "GENERALIZED UNI", "rsvp.generalized_uni", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_CALL_ID],
+ {&hf_rsvp_filter[RSVPF_CALL_ID],
{ "CALL ID", "rsvp.call_id", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_UNKNOWN_OBJ],
+ {&hf_rsvp_filter[RSVPF_UNKNOWN_OBJ],
{ "Unknown object", "rsvp.obj_unknown", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
/* Session fields */
- {&rsvp_filter[RSVPF_SESSION_IP],
+ {&hf_rsvp_filter[RSVPF_SESSION_IP],
{ "Destination address", "rsvp.session.ip", FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_SESSION_PORT],
+ {&hf_rsvp_filter[RSVPF_SESSION_PORT],
{ "Port number", "rsvp.session.port", FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_SESSION_PROTO],
+ {&hf_rsvp_filter[RSVPF_SESSION_PROTO],
{ "Protocol", "rsvp.session.proto", FT_UINT8, BASE_DEC, VALS(proto_vals), 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_SESSION_TUNNEL_ID],
+ {&hf_rsvp_filter[RSVPF_SESSION_TUNNEL_ID],
{ "Tunnel ID", "rsvp.session.tunnel_id", FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_SESSION_EXT_TUNNEL_ID],
+ {&hf_rsvp_filter[RSVPF_SESSION_EXT_TUNNEL_ID],
{ "Extended tunnel ID", "rsvp.session.ext_tunnel_id", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
/* Sender template/Filterspec fields */
- {&rsvp_filter[RSVPF_SENDER_IP],
+ {&hf_rsvp_filter[RSVPF_SENDER_IP],
{ "Sender IPv4 address", "rsvp.sender.ip", FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_SENDER_PORT],
+ {&hf_rsvp_filter[RSVPF_SENDER_PORT],
{ "Sender port number", "rsvp.sender.port", FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_SENDER_LSP_ID],
+ {&hf_rsvp_filter[RSVPF_SENDER_LSP_ID],
{ "Sender LSP ID", "rsvp.sender.lsp_id", FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
/* Diffserv object fields */
- {&rsvp_filter[RSVPF_DIFFSERV_MAPNB],
+ {&hf_rsvp_filter[RSVPF_DIFFSERV_MAPNB],
{ "MAPnb", "rsvp.diffserv.mapnb", FT_UINT8, BASE_DEC, NULL, 0x0,
MAPNB_DESCRIPTION, HFILL }},
- {&rsvp_filter[RSVPF_DIFFSERV_MAP],
+ {&hf_rsvp_filter[RSVPF_DIFFSERV_MAP],
{ "MAP", "rsvp.diffserv.map", FT_NONE, BASE_NONE, NULL, 0x0,
MAP_DESCRIPTION, HFILL }},
- {&rsvp_filter[RSVPF_DIFFSERV_MAP_EXP],
+ {&hf_rsvp_filter[RSVPF_DIFFSERV_MAP_EXP],
{ "EXP", "rsvp.diffserv.map.exp", FT_UINT8, BASE_DEC, NULL, 0x0,
EXP_DESCRIPTION, HFILL }},
- {&rsvp_filter[RSVPF_DIFFSERV_PHBID],
+ {&hf_rsvp_filter[RSVPF_DIFFSERV_PHBID],
{ PHBID_DESCRIPTION, "rsvp.diffserv.phbid", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_DIFFSERV_PHBID_DSCP],
+ {&hf_rsvp_filter[RSVPF_DIFFSERV_PHBID_DSCP],
{ PHBID_DSCP_DESCRIPTION, "rsvp.diffserv.phbid.dscp", FT_UINT16,
BASE_DEC, NULL, PHBID_DSCP_MASK, NULL, HFILL }},
- {&rsvp_filter[RSVPF_DIFFSERV_PHBID_CODE],
+ {&hf_rsvp_filter[RSVPF_DIFFSERV_PHBID_CODE],
{ PHBID_CODE_DESCRIPTION, "rsvp.diffserv.phbid.code", FT_UINT16,
BASE_DEC, NULL, PHBID_CODE_MASK, NULL, HFILL }},
- {&rsvp_filter[RSVPF_DIFFSERV_PHBID_BIT14],
+ {&hf_rsvp_filter[RSVPF_DIFFSERV_PHBID_BIT14],
{ PHBID_BIT14_DESCRIPTION, "rsvp.diffserv.phbid.bit14", FT_UINT16,
BASE_DEC, VALS(phbid_bit14_vals), PHBID_BIT14_MASK, NULL, HFILL }},
- {&rsvp_filter[RSVPF_DIFFSERV_PHBID_BIT15],
+ {&hf_rsvp_filter[RSVPF_DIFFSERV_PHBID_BIT15],
{ PHBID_BIT15_DESCRIPTION, "rsvp.diffserv.phbid.bit15", FT_UINT16,
BASE_DEC, VALS(phbid_bit15_vals), PHBID_BIT15_MASK, NULL, HFILL }},
/* Diffserv-aware TE object field */
- {&rsvp_filter[RSVPF_DSTE_CLASSTYPE],
+ {&hf_rsvp_filter[RSVPF_DSTE_CLASSTYPE],
{ "CT", "rsvp.dste.classtype", FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
/* Generalized UNI object field */
- {&rsvp_filter[RSVPF_GUNI_SRC_IPV4],
+ {&hf_rsvp_filter[RSVPF_GUNI_SRC_IPV4],
{ "Source TNA", "rsvp.guni.srctna.ipv4", FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_GUNI_DST_IPV4],
+ {&hf_rsvp_filter[RSVPF_GUNI_DST_IPV4],
{ "Destination TNA", "rsvp.guni.dsttna.ipv4", FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_GUNI_SRC_IPV6],
+ {&hf_rsvp_filter[RSVPF_GUNI_SRC_IPV6],
{ "Source TNA", "rsvp.guni.srctna.ipv6", FT_IPv6, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
- {&rsvp_filter[RSVPF_GUNI_DST_IPV6],
+ {&hf_rsvp_filter[RSVPF_GUNI_DST_IPV6],
{ "Destination TNA", "rsvp.guni.dsttna.ipv6", FT_IPv6, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
/* Generalized UNI object field */
- {&rsvp_filter[RSVPF_CALL_ID_SRC_ADDR_IPV4],
+ {&hf_rsvp_filter[RSVPF_CALL_ID_SRC_ADDR_IPV4],
{ "Source Transport Network Address", "rsvp.callid.srcaddr.ipv4", FT_IPv4,
BASE_NONE, NULL, 0x0, NULL, HFILL }},
- {&rsvp_filter[RSVPF_CALL_ID_SRC_ADDR_IPV6],
+ {&hf_rsvp_filter[RSVPF_CALL_ID_SRC_ADDR_IPV6],
{ "Source Transport Network Address", "rsvp.callid.srcaddr.ipv6", FT_IPv6,
BASE_NONE, NULL, 0x0, NULL, HFILL }}
};
diff --git a/epan/dissectors/packet-rsvp.h b/epan/dissectors/packet-rsvp.h
index 8b49266138..48761a27ee 100644
--- a/epan/dissectors/packet-rsvp.h
+++ b/epan/dissectors/packet-rsvp.h
@@ -38,8 +38,8 @@ typedef struct rsvp_conversation_info
guint8 dscp;
} rsvp_conversation_info;
-extern const value_string gmpls_switching_type_str[];
-extern const value_string gmpls_lsp_enc_str[];
+extern const range_string gmpls_switching_type_rvals[];
+extern const range_string gmpls_lsp_enc_rvals[];
extern const value_string gmpls_protection_cap_str[];
extern const value_string gmpls_sonet_signal_type_str[];
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-05 22:41:22 +0000