aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2012-08-22 21:01:46 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2012-08-22 21:01:46 +0000
commitf2cb592d35ed86c69cc6a33fe65460a8cfcf2160 (patch)
treef7bcc4bf1615d00748abe7bbc2795ee740f83183 /epan/dissectors
parent3c483fd4e6e96194d90df3f5fbf87daf11610802 (diff)
Put the state of flags in the hop_flags field into the summary line.
Note in the introductory comment what "LISP" refers to, for the benefit of those of us who grew up thinking it stood for "LISt Processing". git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44617 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors')
-rw-r--r--epan/dissectors/packet-lisp.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/epan/dissectors/packet-lisp.c b/epan/dissectors/packet-lisp.c
index b5dbc74f3e..2a1ec05b25 100644
--- a/epan/dissectors/packet-lisp.c
+++ b/epan/dissectors/packet-lisp.c
@@ -1,5 +1,5 @@
/* packet-lisp.c
- * Routines for LISP Control Message dissection
+ * Routines for Locator/ID Separation Protocol (LISP) Control Message dissection
* Copyright 2011, Lorand Jakab <lj@lispmon.net>
*
* $Id$
@@ -319,11 +319,12 @@ dissect_lcaf_elp_hop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
{
guint16 addr_len = 0;
guint16 hop_afi;
+ guint16 hop_flags;
const gchar *hop_str;
+ proto_item *ti;
hop_afi = tvb_get_ntohs(tvb, offset); offset += 2;
- /* hop flags */
- offset += 2;
+ hop_flags = tvb_get_ntohs(tvb, offset); offset += 2;
hop_str = get_addr_str(tvb, offset, hop_afi, &addr_len);
if (hop_str == NULL) {
@@ -333,10 +334,16 @@ dissect_lcaf_elp_hop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
}
if (idx) {
- proto_tree_add_text(tree, tvb, offset - 4, addr_len + 4, "Reencap hop %d: %s", idx, hop_str);
+ ti = proto_tree_add_text(tree, tvb, offset - 4, addr_len + 4, "Reencap hop %d: %s", idx, hop_str);
} else {
- proto_tree_add_text(tree, tvb, offset - 4, addr_len + 4, "Reencap hop: %s", hop_str);
+ ti = proto_tree_add_text(tree, tvb, offset - 4, addr_len + 4, "Reencap hop: %s", hop_str);
}
+ if (hop_flags & 0x04)
+ proto_item_append_text(ti, ", Lookup");
+ if (hop_flags & 0x02)
+ proto_item_append_text(ti, ", RLOC-Probe");
+ if (hop_flags & 0x01)
+ proto_item_append_text(ti, ", Strict");
return addr_len + 4;
}