URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=520a1b20660f6ce071d8b4e535f12c93a5699d6f
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
520a1b2 by Jim Young (jyoung@xxxxxxx):
Make the capture file's interface description filterable
This patch introduces the frame.interface_description field.
While testing this new functionality it became obvious that we have
a non-optimal interaction between the existing cfile.c's
cap_file_get_interface_name(), the recently added frame.interface_name
field and this new frame.interface_description field.
The string returned from cap_file_get_interface_name() may in fact
come from one of three different sources: the idb's interface name
(if it exists) or the idb's interface description (if that exists)
or a default text of "unknown". The string ultimately becomes the
rame.interface_name whether or not the idb had an interface name
option to begin with. This behavior does not allow one to test for
the simple presence of frame.interface_name. The new peer function
cap_file_get_interface_description() added by this patch returns
NULL instead of "unknown" if the idb does not have an interface
description. Should cap_file_get_interface_name() be similarly
modified to return NULL if the idb does not have an interface name?
Bug: 9781
Change-Id: Ie479f373c5080c004dd22bd88919838feca71e95
Reviewed-on: https://code.wireshark.org/review/19861
Petri-Dish: Stig Bjørlykke <stig@xxxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
Actions performed:
from 9e2366a Don't duplicate memory for key values when passing into wmem_tree_insert_string.
adds 520a1b2 Make the capture file's interface description filterable
Summary of changes:
cfile.c | 22 ++++++++++++++++++++++
cfile.h | 1 +
epan/dissectors/packet-frame.c | 21 ++++++++++++++++-----
epan/epan-int.h | 1 +
epan/epan.c | 9 +++++++++
epan/epan.h | 4 +++-
file.c | 1 +
rawshark.c | 1 +
sharkd.c | 1 +
tshark.c | 1 +
10 files changed, 56 insertions(+), 6 deletions(-)