diff options
author | Ludovic Pouzenc <ludovic@pouzenc.fr> | 2016-07-17 19:13:35 +0200 |
---|---|---|
committer | Ludovic Pouzenc <ludovic@pouzenc.fr> | 2016-07-17 19:13:35 +0200 |
commit | 2b13fb969c6a05815c34295afeaffee4d60dc7fd (patch) | |
tree | b73aca948508ef4ea7a2042d4c81571b198f5aa3 /mcastseed/src/mcastseed.c | |
parent | 3f0a442799955f56b2c77aabd6bc7aa4458718b4 (diff) | |
download | eficast-2b13fb969c6a05815c34295afeaffee4d60dc7fd.tar.gz eficast-2b13fb969c6a05815c34295afeaffee4d60dc7fd.tar.bz2 eficast-2b13fb969c6a05815c34295afeaffee4d60dc7fd.zip |
Drop msock.h and socket portability.
mcastseed/leech aren't really portable nor useful on M$ Windows™.
Diffstat (limited to 'mcastseed/src/mcastseed.c')
-rw-r--r-- | mcastseed/src/mcastseed.c | 14 |
1 files changed, 8 insertions, 6 deletions
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 <unistd.h> /* close() */ #include <stdio.h> /* fprintf(), stderr */ #include <stdlib.h> /* atoi(), EXIT_SUCCESS */ -#include "msock.h" +#include <string.h> /* strlen() */ +#include <sys/select.h> /* 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); |