diff options
author | Guy Harris <guy@alum.mit.edu> | 2018-08-12 20:32:01 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2018-08-13 04:37:00 +0000 |
commit | 149e74b70d207228802a463214271c9e537476c9 (patch) | |
tree | 1deea5228d89492b4950735b99159bde6eba90b2 /capture_opts.h | |
parent | d48262753eecd46a5ba0fc13bbc8c336fa16c207 (diff) |
Put the interface descrptions into the IDB when capturing to pcapng.
capture_opts_add_iface_opt(), when called in a program acting as a
capture child, will fetch the description for the interface, and will
also generate a "display name" for the interface.
In the process, we clean up capture_opts_add_iface_opt() a bit,
combining duplicate code.
We rename console_display_name to just display_name, as it may also be
used in the title bar of Wireshark when capturing.
Change-Id: Ifd18955bb3cb41df4c0ed4362d4854068c825b96
Reviewed-on: https://code.wireshark.org/review/29117
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'capture_opts.h')
-rw-r--r-- | capture_opts.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/capture_opts.h b/capture_opts.h index 9bbd3e8599..d0b433706f 100644 --- a/capture_opts.h +++ b/capture_opts.h @@ -197,9 +197,9 @@ typedef struct link_row_tag { } link_row; typedef struct interface_options_tag { - gchar *name; /* the name of the interface provided to winpcap/libpcap to specify the interface */ - gchar *descr; - gchar *console_display_name; /* the name displayed in the console, also the basis for autonamed pcap filenames */ + gchar *name; /* the name of the interface supplied to libpcap/WinPcap/Npcap to specify the interface */ + gchar *descr; /* a more user-friendly description of the interface; may be NULL if none */ + gchar *display_name; /* the name displayed in the console and title bar */ gchar *cfilter; gboolean has_snaplen; int snaplen; |