From 0054b3ff4ff90be93e3427a96a66e2a608ddb8e6 Mon Sep 17 00:00:00 2001 From: henri Date: Tue, 13 Aug 2013 12:36:19 +0000 Subject: [PATCH] Windows compatibility fix. Initialize winsock in ncat addrset test. Initial patch from Gisle Vanem. --- ncat/test/addrset.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/ncat/test/addrset.c b/ncat/test/addrset.c index 1a729c214..612883f8e 100644 --- a/ncat/test/addrset.c +++ b/ncat/test/addrset.c @@ -22,6 +22,23 @@ #include "ncat_core.h" +#ifdef WIN32 +#include "../nsock/error.h" +#endif + + +#ifdef WIN32 +static void win_init(void) +{ + WSADATA data; + int rc; + + rc = WSAStartup(MAKEWORD(2,2), &data); + if (rc) + fatal("failed to start winsock: %s\n", socket_strerror(rc)); +} +#endif + static int resolve_name(const char *name, struct addrinfo **result) { struct addrinfo hints = { 0 }; @@ -38,6 +55,10 @@ int main(int argc, char *argv[]) char line[1024]; int i; +#ifdef WIN32 + win_init(); +#endif + addrset_init(&set); options_init();