diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-06-26 00:35:11 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-06-26 00:35:11 -0700 |
| commit | 881a4063fb3c129e07e17e1ad96f2c0dec622014 (patch) | |
| tree | abfb96712a287b379a2581a228296e66585c114f /pcap-dlpi.c | |
| parent | 5bcab1bae53b572854287eca0282387ddb7fb37f (diff) | |
Have pcap_platform_finddevs() do all the "find local interfaces" work.
Have pcap_findalldevs() call it to find *all* the local interfaces.
pcap_platform_finddevs() might call pcap_findalldevs_interfaces() or
might do the work itself.
Further work to come.
Diffstat (limited to 'pcap-dlpi.c')
| -rw-r--r-- | pcap-dlpi.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pcap-dlpi.c b/pcap-dlpi.c index c7abdb65..201b2b2b 100644 --- a/pcap-dlpi.c +++ b/pcap-dlpi.c @@ -972,8 +972,16 @@ pcap_platform_finddevs(pcap_if_t **alldevsp, char *errbuf) } buf; char baname[2+1+1]; u_int i; +#endif /* + * Get the list of regular interfaces first. + */ + if (pcap_findalldevs_interfaces(alldevsp, errbuf) == -1) + return (-1); /* failure */ + +#ifdef HAVE_SOLARIS + /* * We may have to do special magic to get ATM devices. */ if ((fd = open("/dev/ba", O_RDWR)) < 0) { |