diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-02-08 16:36:07 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-02-09 03:48:53 +0000 |
| commit | 2875cd382fdc0efd5d949f674a0328ecf918b7e9 (patch) | |
| tree | 82d03e2b9ed1288dce651d3f1df3f930677f1fe4 /epan/column-utils.c | |
| parent | 2042385ac9eaa7e512b1a0b9af2f916324314e63 (diff) | |
Eliminate the hf member out of the address structure.
Using the new address type registration, dissectors can create their own address types with their own (column) filters attached to them, eliminating the need for an address to keep track of a hf_ field.
Change-Id: I2bbec256a056f403a7ac9880d5d76a0b2a21b221
Ping-Bug: 7728
Reviewed-on: https://code.wireshark.org/review/7037
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/column-utils.c')
| -rw-r--r-- | epan/column-utils.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/epan/column-utils.c b/epan/column-utils.c index 06e8fbee23..581f5e6078 100644 --- a/epan/column-utils.c +++ b/epan/column-utils.c @@ -1855,18 +1855,6 @@ col_set_addr(packet_info *pinfo, const int col, const address *addr, const gbool /* For address types that have a filter, create a string */ if (strlen(pinfo->cinfo->col_expr.col_expr[col]) > 0) address_to_str_buf(addr, pinfo->cinfo->col_expr.col_expr_val[col], COL_MAX_LEN); - - /* Some addresses (e.g. ieee80211) use a standard format like AT_ETHER but - * don't use the same hf_ value (and thus don't use the same filter string). - * Such address can use the SET_ADDRESS_HF macro to pass in the specific hf_ - * value they use. If they did so, we overwrite the default filter string - * with their specific one here. See bug #7728 for further discussion. - * https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7728 */ - /* XXX - can the new address types fix this and prevent the need for this logic? */ - if (addr->hf != -1) { - pinfo->cinfo->col_expr.col_expr[col] = proto_registrar_get_nth(addr->hf)->abbrev; - } - } /* ------------------------ */ |