diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2018-01-09 09:55:37 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-01-09 21:25:06 +0000 |
| commit | fc9af81a13ec53ca15cbd28ce1896d407ab2bf8a (patch) | |
| tree | 30ff801215a7f4b8133aa83e65fe22e98fb3fe90 /extcap | |
| parent | a7e29d8b66dd7c1cb691966938404dafc6b89689 (diff) | |
wiretap: add a parameter to wtap_init() indicating whether plugins must be loaded
g995812c5f1 moved wiretap plugins registration from applications to
wiretap library init function.
As we do not want to load plugins for all users of libwiretap, let's
make it configurable.
Bug: 14314
Change-Id: Id8fdcc484e2d0d31d3ab0bd357d3a6678570f700
Reviewed-on: https://code.wireshark.org/review/25194
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'extcap')
| -rw-r--r-- | extcap/androiddump.c | 2 | ||||
| -rw-r--r-- | extcap/randpktdump.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/extcap/androiddump.c b/extcap/androiddump.c index dd5617d081..04c838f6ad 100644 --- a/extcap/androiddump.c +++ b/extcap/androiddump.c @@ -432,7 +432,7 @@ static struct extcap_dumper extcap_dumper_open(char *fifo, int encap) { #else int err = 0; - wtap_init(); + wtap_init(FALSE); extcap_dumper.dumper.wtap = wtap_dump_open(fifo, WTAP_FILE_TYPE_SUBTYPE_PCAP_NSEC, encap, PACKET_LENGTH, FALSE, &err); if (!extcap_dumper.dumper.wtap) { diff --git a/extcap/randpktdump.c b/extcap/randpktdump.c index cbcab16170..b45ea75645 100644 --- a/extcap/randpktdump.c +++ b/extcap/randpktdump.c @@ -272,6 +272,8 @@ int main(int argc, char *argv[]) goto end; } + wtap_init(FALSE); + if (!all_random) { produce_type = randpkt_parse_type(type); |