win32 support
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310
diff --git a/README.md b/README.md
index 61dff23..ea7cbc2 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,5 @@ cd examples/
# ./listen tcp 127.0.0.1:9999 # ./dial tcp 127.0.0.1:9999
```
-##### P.S. It would be great to have Windows support, but it seems like an impossible task due to how the operating system handles sockets and files internally. I tried, but nothing came of it. Perhaps it's still possible, though.
-
## License
MIT
diff --git a/fnet.c b/fnet.c
index 32b28e8..66642d9 100644
--- a/fnet.c
+++ b/fnet.c
@@ -2,10 +2,31 @@
#define nil ((void*)0)
+#ifndef _WIN32
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <unistd.h>
+
+typedef int sockt;
+#else
+#define _CRT_SECURE_NO_WARNINGS
+#define _WINSOCK_DEPRECATED_NO_WARNINGS
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <afunix.h>
+#include <fcntl.h>
+#include <io.h>
+#pragma comment(lib, "ws2_32.lib")
+
+typedef SOCKET sockt;
+#define close closesocket
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
#include "fnet.h"
typedef unsigned char uchar;
@@ -78,6 +99,7 @@ static int setremaddr(NetConn *c);
static FILE* fdfile(int fd);
static int parsev4v6(char *addr, ParsedV4V6 *result);
static int setfneterr(char *fmt, ...);
+static char* sockerrstr();
static char* errnostr();
static
@@ -229,11 +251,6 @@ fnetremaddr(NetConn *c)
}
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
typedef struct sockaddr_in SockaddrIn;
typedef struct sockaddr_in6 SockaddrIn6;
typedef struct sockaddr_un SockaddrUnix;
@@ -264,11 +281,19 @@ sockdial(NetConn *c)
default: setfneterr("bad socket type (%d)", c->socktype); return -1;
}
+#ifndef _WIN32
fd = socket(domain, type, 0);
if(fd < 0){
- setfneterr("socket creation failed (%s)", errnostr());
+ setfneterr("socket creation failed (%s)", sockerrstr());
return -1;
}
+#else
+ fd = WSASocketA(domain, type, 0, 0, 0, 0);
+ if(fd == INVALID_SOCKET){
+ setfneterr("socket creation failed (%s)", sockerrstr());
+ return -1;
+ }
+#endif
if(c->socktype == DgRam){
int b=1;
setsockopt(fd, SOL_SOCKET, SO_BROADCAST, &b, sizeof(b));
@@ -307,7 +332,7 @@ sockdial(NetConn *c)
if(connect(fd, paddr, addrlen) < 0){
close(fd);
- setfneterr("connection failed (%s)", errnostr());
+ setfneterr("connection failed (%s)", sockerrstr());
return -1;
}
return fd;
@@ -338,11 +363,19 @@ socklisten(NetConn *c)
default: setfneterr("bad socket type (%d)", c->socktype); return -1;
}
+#ifndef _WIN32
fd = socket(domain, type, 0);
if(fd < 0){
- setfneterr("socket creation failed (%s)", errnostr());
+ setfneterr("socket creation failed (%s)", sockerrstr());
+ return -1;
+ }
+#else
+ fd = WSASocketA(domain, type, 0, 0, 0, 0);
+ if(fd == INVALID_SOCKET){
+ setfneterr("socket creation failed (%s)", sockerrstr());
return -1;
}
+#endif
switch(c->sockdomain)
{
@@ -377,14 +410,14 @@ socklisten(NetConn *c)
if(bind(fd, paddr, addrlen) < 0){
close(fd);
- setfneterr("bind failed (%s)", errnostr());
+ setfneterr("bind failed (%s)", sockerrstr());
return -1;
}
if(c->socktype == Stream){
if(listen(fd, 128) < 0){
close(fd);
- setfneterr("listen failed (%s)", errnostr());
+ setfneterr("listen failed (%s)", sockerrstr());
return -1;
}
}
@@ -396,7 +429,7 @@ sockaccept(NetConn *c)
{
int cfd = accept(c->fd, nil, nil);
if(cfd < 0){
- setfneterr("accept failed (%s)", errnostr());
+ setfneterr("accept failed (%s)", sockerrstr());
return -1;
}
return cfd;
@@ -430,19 +463,19 @@ setlocaddr(NetConn *c)
}
if(getsockname(c->fd, paddr, &addrlen) < 0){
- setfneterr("getsockname failed (%s)", errnostr());
+ setfneterr("getsockname failed (%s)", sockerrstr());
return -1;
}
if(c->sockdomain == IPv4){
if(inet_ntop(AF_INET, &addrV4.sin_addr, buf, sizeof(buf)) == nil){
- setfneterr("inet_ntop failed (%s)", errnostr());
+ setfneterr("inet_ntop failed (%s)", sockerrstr());
return -1;
}
snprintf(c->local.addr, AddrStrMaxLen, "%s:%d", buf, ntohs(addrV4.sin_port));
}
if(c->sockdomain == IPv6){
if(inet_ntop(AF_INET6, &addrV6.sin6_addr, buf, sizeof(buf)) == nil){
- setfneterr("inet_ntop failed (%s)", errnostr());
+ setfneterr("inet_ntop failed (%s)", sockerrstr());
return -1;
}
snprintf(c->local.addr, AddrStrMaxLen, "%s:%d", buf, ntohs(addrV6.sin6_port));
@@ -479,27 +512,27 @@ setremaddr(NetConn *c)
if(c->socktype == Stream){
if(getpeername(c->fd, paddr, &addrlen) < 0){
- setfneterr("getpeername failed (%s)", errnostr());
+ setfneterr("getpeername failed (%s)", sockerrstr());
return -1;
}
}else{
char b[1];
if(recvfrom(c->fd, b, 1, MSG_PEEK, paddr, &addrlen) < 0){
- setfneterr("recvfrom failed (%s)", errnostr());
+ setfneterr("recvfrom failed (%s)", sockerrstr());
return -1;
}
}
if(c->sockdomain == IPv4){
if(inet_ntop(AF_INET, &addrV4.sin_addr, buf, sizeof(buf)) == nil){
- setfneterr("inet_ntop failed (%s)", errnostr());
+ setfneterr("inet_ntop failed (%s)", sockerrstr());
return -1;
}
snprintf(c->remote.addr, AddrStrMaxLen, "%s:%d", buf, ntohs(addrV4.sin_port));
}
if(c->sockdomain == IPv6){
if(inet_ntop(AF_INET6, &addrV6.sin6_addr, buf, sizeof(buf)) == nil){
- setfneterr("inet_ntop failed (%s)", errnostr());
+ setfneterr("inet_ntop failed (%s)", sockerrstr());
return -1;
}
snprintf(c->remote.addr, AddrStrMaxLen, "%s:%d", buf, ntohs(addrV6.sin6_port));
@@ -507,6 +540,7 @@ setremaddr(NetConn *c)
return 0;
}
+#ifndef _WIN32
static
FILE*
fdfile(int fd)
@@ -518,6 +552,30 @@ fdfile(int fd)
}
return f;
}
+#else
+static
+FILE*
+fdfile(sockt sock)
+{
+ int fd;
+ FILE *f;
+
+ fd = _open_osfhandle((intptr_t)sock, _O_RDWR);
+ if(fd == -1){
+ setfneterr("open_osfhandle failed (%s)", errnostr());
+ return nil;
+ }
+
+ f = _fdopen(fd, "r+");
+ if(f == nil){
+ setfneterr("fdopen failed (%s)", errnostr());
+ _close(fd);
+ return nil;
+ }
+
+ return f;
+}
+#endif
static
int
@@ -623,6 +681,31 @@ static thread_local char estr[256];
char* fneterr(void) {return estr;}
char* errnostr(void) {return strerror(errno);}
+char*
+sockerrstr(void)
+{
+#ifndef _WIN32
+ return strerror(errno);
+#else
+ int err;
+ static thread_local char msgbuf[256];
+
+ msgbuf[0] = '\0';
+ err = WSAGetLastError();
+ FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+ nil, err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+ msgbuf, sizeof(msgbuf), nil);
+
+ size_t len = strlen(msgbuf);
+ while(len > 0 && (msgbuf[len - 1] == '\r' || msgbuf[len - 1] == '\n')){
+ msgbuf[--len] = '\0';
+ }
+
+ return msgbuf;
+#endif
+}
+
+
int
setfneterr(char *fmt, ...)
{
@@ -635,3 +718,25 @@ setfneterr(char *fmt, ...)
va_end(args);
return 0;
}
+
+int
+fnetinit(void)
+{
+#ifdef _WIN32
+ WSADATA wsaData;
+ if(WSAStartup(MAKEWORD(2, 2), &wsaData) != 0){
+ setfneterr("WSAStartup failed (%s)", sockerrstr());
+ return -1;
+ }
+#endif
+ return 0;
+}
+
+int
+fnetcleanup(void)
+{
+#ifdef _WIN32
+ return WSACleanup();
+#endif
+ return 0;
+}
diff --git a/fnet.h b/fnet.h
index 7f92c6b..9fa2cda 100644
--- a/fnet.h
+++ b/fnet.h
@@ -10,3 +10,7 @@ FILE* fnetf(NetConn*);
char* fnetlocaddr(NetConn*);
char* fnetremaddr(NetConn*);
void fnetclose(NetConn*);
+
+/* needed for windows */
+int fnetinit(void);
+int fnetcleanup(void);