Commit 7054b095 authored by Marko Mikulicic's avatar Marko Mikulicic Committed by rojer

Use invalid socket

Socket type is unsigned int on windows.

PUBLISHED_FROM=fb406d7542ea4d7a529f87b8a3a5a8ba27f5f934
parent 2633628a
...@@ -3114,8 +3114,7 @@ void mg_if_connect_tcp(struct mg_connection *nc, ...@@ -3114,8 +3114,7 @@ void mg_if_connect_tcp(struct mg_connection *nc,
const union socket_address *sa) { const union socket_address *sa) {
int rc; int rc;
nc->sock = socket(AF_INET, SOCK_STREAM, 0); nc->sock = socket(AF_INET, SOCK_STREAM, 0);
if (nc->sock < 0) { if (nc->sock == INVALID_SOCKET) {
nc->sock = INVALID_SOCKET;
nc->err = errno ? errno : 1; nc->err = errno ? errno : 1;
return; return;
} }
...@@ -3129,8 +3128,7 @@ void mg_if_connect_tcp(struct mg_connection *nc, ...@@ -3129,8 +3128,7 @@ void mg_if_connect_tcp(struct mg_connection *nc,
void mg_if_connect_udp(struct mg_connection *nc) { void mg_if_connect_udp(struct mg_connection *nc) {
nc->sock = socket(AF_INET, SOCK_DGRAM, 0); nc->sock = socket(AF_INET, SOCK_DGRAM, 0);
if (nc->sock < 0) { if (nc->sock == INVALID_SOCKET) {
nc->sock = INVALID_SOCKET;
nc->err = errno ? errno : 1; nc->err = errno ? errno : 1;
return; return;
} }
...@@ -3148,7 +3146,7 @@ int mg_if_listen_tcp(struct mg_connection *nc, union socket_address *sa) { ...@@ -3148,7 +3146,7 @@ int mg_if_listen_tcp(struct mg_connection *nc, union socket_address *sa) {
int mg_if_listen_udp(struct mg_connection *nc, union socket_address *sa) { int mg_if_listen_udp(struct mg_connection *nc, union socket_address *sa) {
sock_t sock = mg_open_listening_socket(sa, SOCK_DGRAM); sock_t sock = mg_open_listening_socket(sa, SOCK_DGRAM);
if (sock < 0) return (errno ? errno : 1); if (sock == INVALID_SOCKET) return (errno ? errno : 1);
mg_sock_set(nc, sock); mg_sock_set(nc, sock);
return 0; return 0;
} }
...@@ -3195,7 +3193,7 @@ static void mg_accept_conn(struct mg_connection *lc) { ...@@ -3195,7 +3193,7 @@ static void mg_accept_conn(struct mg_connection *lc) {
socklen_t sa_len = sizeof(sa); socklen_t sa_len = sizeof(sa);
/* NOTE(lsm): on Windows, sock is always > FD_SETSIZE */ /* NOTE(lsm): on Windows, sock is always > FD_SETSIZE */
sock_t sock = accept(lc->sock, &sa.sa, &sa_len); sock_t sock = accept(lc->sock, &sa.sa, &sa_len);
if (sock < 0) { if (sock == INVALID_SOCKET) {
DBG(("%p: failed to accept: %d", lc, errno)); DBG(("%p: failed to accept: %d", lc, errno));
return; return;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment