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/mcastleech.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'mcastseed/src/mcastleech.c') diff --git a/mcastseed/src/mcastleech.c b/mcastseed/src/mcastleech.c index df069ac..263bac4 100644 --- a/mcastseed/src/mcastleech.c +++ b/mcastseed/src/mcastleech.c @@ -11,14 +11,14 @@ #include /* close() */ #include /* fprintf(), stderr */ #include /* EXIT_SUCCESS */ +#include /* strncmp() */ #include /* fcntl() */ -#include "msock.h" +#include "sockets.h" #include "dgrambuf.h" #define MTU 1500 #define MULTICAST_RECV_BUF (MTU-20-8) #define MULTICAST_SO_RCVBUF_WANTED 425984 -/*XXX Make it dynamic, with the effective value of so_rcvbuf */ #define MAX_IOVEC (MULTICAST_SO_RCVBUF_WANTED / MULTICAST_RECV_BUF) #define DGRAM_HEADER_SIZE 8 @@ -31,8 +31,8 @@ char *mcast_ip = NULL; char *port = NULL; /* Sockets as global, used everywhere, even in die() */ -SOCKET mcast_sock = (SOCKET) -1; /* Multicast socket for receiving data */ -SOCKET ucast_sock = (SOCKET) -1; /* Unicast socket for give feedback to server */ +int mcast_sock = -1; /* Multicast socket for receiving data */ +int ucast_sock = -1; /* Unicast socket for give feedback to server */ /* Buffer used for earch recvfrom() */ char recvbuf[MULTICAST_RECV_BUF]; @@ -100,7 +100,7 @@ int main(int argc, char* argv[]) { if ( mcast_sock > 0 ) { close(mcast_sock); - mcast_sock = (SOCKET) -1; + mcast_sock = -1; } dgrambuf_free(&dgrambuf); @@ -126,7 +126,7 @@ int wait_hello_and_connect_back() { /* Setup mcast_sock */ if ( mcast_sock > 0 ) { close(mcast_sock); - mcast_sock = (SOCKET) -1; + mcast_sock = -1; } mcast_sock = mcast_recv_socket(mcast_ip, port, MULTICAST_SO_RCVBUF_WANTED); if(mcast_sock < 0) { -- cgit v1.2.3