diff options
Diffstat (limited to 'src/ptunnel.c')
| -rw-r--r-- | src/ptunnel.c | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/src/ptunnel.c b/src/ptunnel.c index 4b3816d..bdf0a6f 100644 --- a/src/ptunnel.c +++ b/src/ptunnel.c @@ -54,6 +54,7 @@ #endif #ifdef WIN32 +#include <tchar.h> #include <winsock2.h> /* Map errno (which Winsock doesn't use) to GetLastError; include the code in the strerror */ #ifdef errno @@ -75,6 +76,25 @@ static char * print_last_windows_error() { #define strerror(x) print_last_windows_error() #endif /* WIN32 */ +#ifdef HAVE_NPCAP +static BOOL LoadNpcapDlls() +{ + TCHAR npcap_dir[512]; + UINT len; + len = GetSystemDirectory(npcap_dir, 480); + if (!len) { + pt_log(kLog_error, "Error in GetSystemDirectory: %x", GetLastError()); + return FALSE; + } + _tcscat_s(npcap_dir, 512, _T("\\Npcap")); + if (SetDllDirectory(npcap_dir) == 0) { + pt_log(kLog_error, "Error in SetDllDirectory: %x", GetLastError()); + return FALSE; + } + return TRUE; +} +#endif + /* globals */ /** Lock protecting the chain of connections */ pthread_mutex_t chain_lock; @@ -150,6 +170,11 @@ int main(int argc, char *argv[]) { } #endif /* WIN32 */ +#ifdef HAVE_NPCAP + if (!LoadNpcapDlls()) + return -1; +#endif + memset(opts.password_digest, 0, kMD5_digest_size); /* The seq_expiry_tbl is used to prevent the remote ends from prematurely @@ -181,9 +206,9 @@ int main(int argc, char *argv[]) { } #ifdef WIN32 if (!opts.pcap && !opts.udp) { - pt_log(kLog_info, "Running ptunnel-ng on Windows in ICMP mode without WinPcap enabled is not supported and may not work!\n"); - pt_log(kLog_info, "If you encounter problems, install WinPCAP from:\n"); - pt_log(kLog_info, "https://www.winpcap.org/install/default.htm or for WIN10: https://nmap.org/npcap/windows-10.html\n"); + pt_log(kLog_info, "Running ptunnel-ng on Windows in ICMP mode without WinPcap/Npcap enabled is not supported and may not work!\n"); + pt_log(kLog_info, "If you encounter problems, install WinPCAP/Npcap from:\n"); + pt_log(kLog_info, "https://www.winpcap.org/install/default.htm or Npcap for WIN10: https://nmap.org/npcap/windows-10.html\n"); pt_log(kLog_info, "After WinPCAP is installed, you can list pcap devices with: --list-pcap-devices\n"); } #endif |