From b3f76ad3989b7c62614e5c72a95823cb118c3cc2 Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Fri, 10 Jan 2020 22:01:29 +0200 Subject: [PATCH] Do not check winpcap dll version. --- od-win32/win32_uaenet.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/od-win32/win32_uaenet.cpp b/od-win32/win32_uaenet.cpp index 982524c9..7c049c6b 100644 --- a/od-win32/win32_uaenet.cpp +++ b/od-win32/win32_uaenet.cpp @@ -382,14 +382,12 @@ struct netdriverdata *uaenet_enumerate (const TCHAR *name) } wpcap = LoadLibrary(_T("wpcap.dll")); packet = LoadLibrary(_T("packet.dll")); - isdll = isdllversion(_T("wpcap.dll"), 4, 0, 0, 0); SetDllDirectory(_T("")); if (wpcap == NULL) { FreeLibrary(packet); int err = GetLastError(); wpcap = LoadLibrary (_T("wpcap.dll")); packet = LoadLibrary(_T("packet.dll")); - isdll = isdllversion(_T("wpcap.dll"), 4, 0, 0, 0); if (wpcap == NULL) { write_log (_T("uaenet: npcap/winpcap not installed (wpcap.dll)\n")); return NULL; @@ -403,11 +401,6 @@ struct netdriverdata *uaenet_enumerate (const TCHAR *name) return NULL; } - if (!isdll) { - write_log (_T("uaenet: too old npcap/winpcap, v4 or newer required\n")); - return NULL; - } - ppcap_lib_version = (PCAP_LIB_VERSION)GetProcAddress(wpcap, "pcap_lib_version"); ppcap_findalldevs_ex = (PCAP_FINDALLDEVS_EX)GetProcAddress(wpcap, "pcap_findalldevs_ex"); ppcap_freealldevs = (PCAP_FREEALLDEVS)GetProcAddress(wpcap, "pcap_freealldevs"); @@ -422,6 +415,13 @@ struct netdriverdata *uaenet_enumerate (const TCHAR *name) pPacketCloseAdapter = (PACKETCLOSEADAPTER)GetProcAddress(packet, "PacketCloseAdapter"); pPacketRequest = (PACKETREQUEST)GetProcAddress(packet, "PacketRequest"); + if (!ppcap_lib_version || !ppcap_findalldevs_ex || !ppcap_freealldevs || + !ppcap_open || !ppcap_close || !ppcap_datalink || !ppcap_sendpacket || + !ppcap_next_ex || !pPacketOpenAdapter || !pPacketCloseAdapter || !pPacketRequest) { + write_log(_T("uaenet: too old npcap/winpcap, missing function(s).\n")); + return NULL; + } + ss = au (ppcap_lib_version()); if (!done) write_log (_T("uaenet: %s\n"), ss); -- 2.47.3