diff options
author | Michael Mann <mmann78@netscape.net> | 2015-01-03 21:56:16 -0500 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2015-01-04 16:32:03 +0000 |
commit | 553da374461efb87436dbbed7d319d252d4fe2e6 (patch) | |
tree | 1f581449dc0a022f8feb4f2088aec6fb47fd023f /ui | |
parent | 2085bbec9d0e4661af77a6e9530cffd5df15ecc8 (diff) |
Create BASE_DOT, BASE_DASH, and BASE_SEMICOLON types for the FT_BYTES field type.
These "bases" will put a ".", "-", or ":" respectively between hexidecimal bytes in the field in packet view and display filter. FT_BYTES with BASE_NONE will have no separator in the packet view, but continue to have the ':' as a separator in the display filter.
Converted the "string" hf_ entries that used tvb_fc_to_str as a string to use proto_tree_add_item with FT_BYTES/BASE_DOT type.
Converted applicable tvb_bytes_to_ep_str_punct() calls to use the new BASE values.
Change-Id: I2442185bb314d04a3ff2ba57883652ecd738b5f9
Reviewed-on: https://code.wireshark.org/review/6098
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui')
-rw-r--r-- | ui/cli/tap-diameter-avp.c | 2 | ||||
-rw-r--r-- | ui/gtk/packet_panes.c | 2 | ||||
-rw-r--r-- | ui/qt/proto_tree.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ui/cli/tap-diameter-avp.c b/ui/cli/tap-diameter-avp.c index 1c6aff2bc4..16a3de0ffe 100644 --- a/ui/cli/tap-diameter-avp.c +++ b/ui/cli/tap-diameter-avp.c @@ -104,7 +104,7 @@ diam_tree_to_csv(proto_node *node, gpointer data) ftype = fvalue_type_ftenum(&fi->value); if (ftype != FT_NONE && ftype != FT_PROTOCOL) { /* convert value to string */ - val_tmp = fvalue_to_string_repr(&fi->value, FTREPR_DISPLAY, NULL); + val_tmp = fvalue_to_string_repr(&fi->value, FTREPR_DISPLAY, hfi->display, NULL); if (val_tmp) { val_str = ep_strdup(val_tmp); diff --git a/ui/gtk/packet_panes.c b/ui/gtk/packet_panes.c index af4afae044..091f3b9a84 100644 --- a/ui/gtk/packet_panes.c +++ b/ui/gtk/packet_panes.c @@ -1348,7 +1348,7 @@ tree_view_follow_link(field_info *fi) cf_goto_frame(&cfile, fi->value.value.uinteger); } if(FI_GET_FLAG(fi, FI_URL) && IS_FT_STRING(fi->hfinfo->type)) { - url = fvalue_to_string_repr(&fi->value, FTREPR_DISPLAY, NULL); + url = fvalue_to_string_repr(&fi->value, FTREPR_DISPLAY, fi->hfinfo->display, NULL); if(url){ browser_open_url(url); g_free(url); diff --git a/ui/qt/proto_tree.cpp b/ui/qt/proto_tree.cpp index ecef518e3b..7414f0691d 100644 --- a/ui/qt/proto_tree.cpp +++ b/ui/qt/proto_tree.cpp @@ -451,7 +451,7 @@ void ProtoTree::itemDoubleClick(QTreeWidgetItem *item, int column) { if(FI_GET_FLAG(fi, FI_URL) && IS_FT_STRING(fi->hfinfo->type)) { gchar *url; - url = fvalue_to_string_repr(&fi->value, FTREPR_DISPLAY, NULL); + url = fvalue_to_string_repr(&fi->value, FTREPR_DISPLAY, fi->hfinfo->display, NULL); if(url){ // browser_open_url(url); QDesktopServices::openUrl(QUrl(url)); |