aboutsummaryrefslogtreecommitdiffstats
path: root/epan/column-utils.c
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2012-10-26 01:59:17 +0000
committerEvan Huus <eapache@gmail.com>2012-10-26 01:59:17 +0000
commit361aedec1f819365bd89143185892e2c7fa38efd (patch)
treea6ac4a3aa66e73b5673b988dc6a4e8ee7fd97979 /epan/column-utils.c
parentc6b522bc703bd91b5c473491a68e92b5319e819c (diff)
Create SET_ADDRESS_HF that takes an additional hf_ value that can be
used to override the filter generated from the address column. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7728 (again). svn path=/trunk/; revision=45792
Diffstat (limited to 'epan/column-utils.c')
-rw-r--r--epan/column-utils.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/epan/column-utils.c b/epan/column-utils.c
index 3fe7d16e4b..208af563b6 100644
--- a/epan/column-utils.c
+++ b/epan/column-utils.c
@@ -39,6 +39,7 @@
#include "osi-utils.h"
#include "value_string.h"
#include "column_info.h"
+#include "proto.h"
#include <epan/strutil.h>
#include <epan/epan.h>
@@ -1491,6 +1492,11 @@ col_set_addr(packet_info *pinfo, const int col, const address *addr, const gbool
default:
break;
}
+
+ if (addr->hf != -1) {
+ pinfo->cinfo->col_expr.col_expr[col] = proto_registrar_get_nth(addr->hf)->abbrev;
+ }
+
}
/* ------------------------ */