From 2b13fb969c6a05815c34295afeaffee4d60dc7fd Mon Sep 17 00:00:00 2001 From: Ludovic Pouzenc Date: Sun, 17 Jul 2016 19:13:35 +0200 Subject: Drop msock.h and socket portability. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit mcastseed/leech aren't really portable nor useful on M$ Windows™. --- mcastseed/src/mcastseed.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'mcastseed/src/mcastseed.c') diff --git a/mcastseed/src/mcastseed.c b/mcastseed/src/mcastseed.c index 6440fc6..796e159 100644 --- a/mcastseed/src/mcastseed.c +++ b/mcastseed/src/mcastseed.c @@ -11,7 +11,9 @@ #include /* close() */ #include /* fprintf(), stderr */ #include /* atoi(), EXIT_SUCCESS */ -#include "msock.h" +#include /* strlen() */ +#include /* select(), FD_ZERO(), FD_SET() */ +#include "sockets.h" #define READ_BUF_LEN 256 #define MAX_PENDING_CONNECTIONS 256 @@ -28,13 +30,13 @@ char *port = NULL; int mcast_ttl = 0; /* Sockets as global, used everywhere, even in die() */ -SOCKET mcast_sock = (SOCKET) -1; /* Multicast socket for sending data */ -SOCKET ucast_sock = (SOCKET) -1; /* Unicast socket for havee feedback from clients */ +int mcast_sock = -1; /* Multicast socket for sending data */ +int ucast_sock = -1; /* Unicast socket for havee feedback from clients */ /* Socket related data */ struct addrinfo *mcast_addr = NULL; struct client { - SOCKET sock; + int sock; struct sockaddr addr; int state; } clients[MAX_CLIENTS]; @@ -197,7 +199,7 @@ int start_job() { ssize_t nread, nwrite; int all_ready, all_non_dead_ready; int i, res; - SOCKET client_sock; + int client_sock; const char *payload = "start"; int paylen = strlen(payload); @@ -316,7 +318,7 @@ int wait_all_finalize_job() { ssize_t nread, nwrite; int all_non_dead_done; int i, res; - SOCKET client_sock; + int client_sock; char buf[] = "end:XXXX"; int paylen = strlen(buf); -- cgit v1.2.3