Alexandre Julliard : wpcap: Avoid deprecated pcap_lookupdev().
Alexandre Julliard
julliard at winehq.org
Tue Aug 6 17:41:59 CDT 2019
Module: wine
Branch: master
Commit: 732d0db63b5b494ce409e496cb77cf661eb7e6e1
URL: https://source.winehq.org/git/wine.git/?a=commit;h=732d0db63b5b494ce409e496cb77cf661eb7e6e1
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Aug 6 10:05:18 2019 +0200
wpcap: Avoid deprecated pcap_lookupdev().
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wpcap/wpcap.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c
index 6450a0e..d2f1be7 100644
--- a/dlls/wpcap/wpcap.c
+++ b/dlls/wpcap/wpcap.c
@@ -202,8 +202,18 @@ int CDECL wine_pcap_list_datalinks(pcap_t *p, int **dlt_buffer)
char* CDECL wine_pcap_lookupdev(char *errbuf)
{
+ static char *ret;
+ pcap_if_t *devs;
+
TRACE("(%p)\n", errbuf);
- return pcap_lookupdev(errbuf);
+ if (!ret)
+ {
+ if (pcap_findalldevs( &devs, errbuf ) == -1) return NULL;
+ if (!devs) return NULL;
+ if ((ret = heap_alloc( strlen(devs->name) + 1 ))) strcpy( ret, devs->name );
+ pcap_freealldevs( devs );
+ }
+ return ret;
}
int CDECL wine_pcap_lookupnet(const char *device, unsigned int *netp, unsigned int *maskp,
More information about the wine-cvs
mailing list