diff options
| author | oy <Tom_Adams@web.de> | 2011-07-30 13:40:01 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-07-30 13:40:01 +0200 |
| commit | a0a62bcd70d1d8c0874d5ff52e443b5fb417854c (patch) | |
| tree | 00b0db83ea6bd25970b89bd465fa71d462e3cad2 /src/base | |
| parent | b0fdc4095988ed5bd8bda4b94ce35bc506f31653 (diff) | |
| download | zcatch-a0a62bcd70d1d8c0874d5ff52e443b5fb417854c.tar.gz zcatch-a0a62bcd70d1d8c0874d5ff52e443b5fb417854c.zip | |
fixed econ feature and tcp
Diffstat (limited to 'src/base')
| -rw-r--r-- | src/base/system.c | 44 |
1 files changed, 26 insertions, 18 deletions
diff --git a/src/base/system.c b/src/base/system.c index 551b3f1b..466e3ca6 100644 --- a/src/base/system.c +++ b/src/base/system.c @@ -42,10 +42,6 @@ #include <fcntl.h> #include <direct.h> #include <errno.h> - - #ifndef EWOULDBLOCK - #define EWOULDBLOCK WSAEWOULDBLOCK - #endif #else #error NOT IMPLEMENTED #endif @@ -1102,30 +1098,31 @@ int net_set_blocking(NETSOCKET sock) int net_tcp_listen(NETSOCKET sock, int backlog) { + int err = -1; if(sock.ipv4sock >= 0) - listen(sock.ipv4sock, backlog); + err = listen(sock.ipv4sock, backlog); if(sock.ipv6sock >= 0) - listen(sock.ipv6sock, backlog); - return 0; + err = listen(sock.ipv6sock, backlog); + return err; } int net_tcp_accept(NETSOCKET sock, NETSOCKET *new_sock, NETADDR *a) { int s; socklen_t sockaddr_len; - struct sockaddr addr; *new_sock = invalid_socket; - sockaddr_len = sizeof(addr); - if(sock.ipv4sock >= 0) { - s = accept(sock.ipv4sock, &addr, &sockaddr_len); + struct sockaddr_in addr; + sockaddr_len = sizeof(addr); + s = accept(sock.ipv4sock, (struct sockaddr *)&addr, &sockaddr_len); + if (s != -1) { - sockaddr_to_netaddr(&addr, a); + sockaddr_to_netaddr((const struct sockaddr *)&addr, a); new_sock->type = NETTYPE_IPV4; new_sock->ipv4sock = s; return s; @@ -1134,18 +1131,21 @@ int net_tcp_accept(NETSOCKET sock, NETSOCKET *new_sock, NETADDR *a) if(sock.ipv6sock >= 0) { - s = accept(sock.ipv6sock, &addr, &sockaddr_len); + struct sockaddr_in6 addr; + sockaddr_len = sizeof(addr); + s = accept(sock.ipv6sock, (struct sockaddr *)&addr, &sockaddr_len); + if (s != -1) { - sockaddr_to_netaddr(&addr, a); + sockaddr_to_netaddr((const struct sockaddr *)&addr, a); new_sock->type = NETTYPE_IPV6; new_sock->ipv6sock = s; return s; } } - return 0; + return -1; } int net_tcp_connect(NETSOCKET sock, const NETADDR *a) @@ -1164,7 +1164,7 @@ int net_tcp_connect(NETSOCKET sock, const NETADDR *a) return connect(sock.ipv6sock, (struct sockaddr *)&addr, sizeof(addr)); } - return 0; + return -1; } int net_tcp_connect_non_blocking(NETSOCKET sock, NETADDR bindaddr) @@ -1180,7 +1180,7 @@ int net_tcp_connect_non_blocking(NETSOCKET sock, NETADDR bindaddr) int net_tcp_send(NETSOCKET sock, const void *data, int size) { - int bytes = 0; + int bytes = -1; if(sock.ipv4sock >= 0) bytes = send((int)sock.ipv4sock, (const char*)data, size, 0); @@ -1192,7 +1192,7 @@ int net_tcp_send(NETSOCKET sock, const void *data, int size) int net_tcp_recv(NETSOCKET sock, void *data, int maxsize) { - int bytes = 0; + int bytes = -1; if(sock.ipv4sock >= 0) bytes = recv((int)sock.ipv4sock, (char*)data, maxsize, 0); @@ -1209,12 +1209,20 @@ int net_tcp_close(NETSOCKET sock) int net_errno() { +#if defined(CONF_FAMILY_WINDOWS) + return WSAGetLastError(); +#else return errno; +#endif } int net_would_block() { +#if defined(CONF_FAMILY_WINDOWS) + return net_errno() == WSAEWOULDBLOCK; +#else return net_errno() == EWOULDBLOCK; +#endif } int net_init() |