diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-07-28 00:07:49 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-07-28 00:07:49 +0000 |
| commit | a87f47c02c5d8d8723ebb39c7de3f0068434dc8f (patch) | |
| tree | 774aef015dcfc0708b3682b23fed04e11064af4d /epan/proto.c | |
| parent | b9870c0969491ab5e0989864bfb1760995aed627 (diff) | |
| download | wireshark-a87f47c02c5d8d8723ebb39c7de3f0068434dc8f.tar.gz | |
Make many items filterable for Vines dissectors.
Add support for FT_VINES type.
svn path=/trunk/; revision=50962
Diffstat (limited to 'epan/proto.c')
| -rw-r--r-- | epan/proto.c | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/epan/proto.c b/epan/proto.c index df3502553a..20ff85236c 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -190,6 +190,10 @@ proto_tree_set_ax25(field_info *fi, const guint8* value); static void proto_tree_set_ax25_tvb(field_info *fi, tvbuff_t *tvb, gint start); static void +proto_tree_set_vines(field_info *fi, const guint8* value); +static void +proto_tree_set_vines_tvb(field_info *fi, tvbuff_t *tvb, gint start); +static void proto_tree_set_ether(field_info *fi, const guint8* value); static void proto_tree_set_ether_tvb(field_info *fi, tvbuff_t *tvb, gint start); @@ -1354,6 +1358,14 @@ proto_tree_new_item(field_info *new_fi, proto_tree *tree, proto_tree_set_ax25_tvb(new_fi, tvb, start); break; + case FT_VINES: + if (length != VINES_ADDR_LEN) { + length_error = length < VINES_ADDR_LEN ? TRUE : FALSE; + report_type_length_mismatch(tree, "a Vines address", length, length_error); + } + proto_tree_set_vines_tvb(new_fi, tvb, start); + break; + case FT_ETHER: if (length != FT_ETHER_LEN) { length_error = length < FT_ETHER_LEN ? TRUE : FALSE; @@ -2647,6 +2659,18 @@ proto_tree_set_ax25_tvb(field_info *fi, tvbuff_t *tvb, gint start) proto_tree_set_ax25(fi, tvb_get_ptr(tvb, start, 7)); } +/* Set the FT_VINES value */ +static void +proto_tree_set_vines(field_info *fi, const guint8* value) +{ + fvalue_set(&fi->value, (gpointer) value, FALSE); +} + +static void +proto_tree_set_vines_tvb(field_info *fi, tvbuff_t *tvb, gint start) +{ + proto_tree_set_vines(fi, tvb_get_ptr(tvb, start, FT_VINES_ADDR_LEN)); +} /* Add a FT_ETHER to a proto_tree */ proto_item * @@ -5179,6 +5203,7 @@ proto_item_fill_label(field_info *fi, gchar *label_str) e_guid_t *guid; guint32 n_addr; /* network-order IPv4 address */ const gchar *name; + addres addr; if (!fi) { if (label_str) @@ -5281,6 +5306,16 @@ proto_item_fill_label(field_info *fi, gchar *label_str) ax25_to_str(bytes)); break; + case FT_VINES: + addr.type = AT_VINES; + addr.len = VINES_ADDR_LEN; + addr.data = (guint8 *)fvalue_get(&fi->value); + + g_snprintf(label_str, ITEM_LABEL_LENGTH, + "%s: %s", hfinfo->name, + address_to_str( &addr )); + break; + case FT_ETHER: bytes = (guint8 *)fvalue_get(&fi->value); label_fill_descr(label_str, 0, hfinfo, |