diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | src/ivysocket.c | 22 |
2 files changed, 17 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog index 1d0d2d3..692d2f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ivy-c (3.10.0-3) unstable; urgency=low + + * revert accidentally commited modif + + -- Alexandre Bustico <bustico@cena.fr> Wed, 08 Feb 2008 10:32:54 +0100 + ivy-c (3.10.0-2) unstable; urgency=low * fix makefile for non omp target diff --git a/src/ivysocket.c b/src/ivysocket.c index 1cc12e6..f9f5bd1 100644 --- a/src/ivysocket.c +++ b/src/ivysocket.c @@ -26,7 +26,7 @@ #include <stdio.h> #include <stdarg.h> #include <string.h> -#include <fcntl.h> +//#include <fcntl.h> #ifdef WIN32 #define close closesocket @@ -187,7 +187,7 @@ static void HandleServer(Channel channel, HANDLE fd, void *data) HANDLE ns; socklen_t addrlen; struct sockaddr_in remote2; - long socketFlag; + // long socketFlag; TRACE( "Accepting Connection...\n"); @@ -213,10 +213,10 @@ static void HandleServer(Channel channel, HANDLE fd, void *data) client->from = remote2; client->fd = ns; - socketFlag = fcntl (client->fd, F_GETFD); - if (fcntl (client->fd, F_SETFD, socketFlag|O_NONBLOCK)) { - fprintf(stderr,"Warning : Setting socket in nonblock mode FAILED\n"); - } +/* socketFlag = fcntl (client->fd, F_GETFD); */ +/* if (fcntl (client->fd, F_SETFD, socketFlag|O_NONBLOCK)) { */ +/* fprintf(stderr,"Warning : Setting socket in nonblock mode FAILED\n"); */ +/* } */ client->channel = IvyChannelAdd (ns, client, DeleteSocket, HandleSocket ); @@ -544,7 +544,7 @@ Client SocketConnectAddr (struct in_addr * addr, unsigned short port, HANDLE handle; Client client; struct sockaddr_in remote; - long socketFlag; + // long socketFlag; remote.sin_family = AF_INET; remote.sin_addr = *addr; @@ -559,10 +559,10 @@ Client SocketConnectAddr (struct in_addr * addr, unsigned short port, perror ("*** client connect ***"); return NULL; }; - socketFlag = fcntl (handle, F_GETFD); - if (fcntl (handle, F_SETFD, socketFlag|O_NONBLOCK)) { - fprintf(stderr,"Warning : Setting socket in nonblock mode FAILED\n"); - } +/* socketFlag = fcntl (handle, F_GETFD); */ +/* if (fcntl (handle, F_SETFD, socketFlag|O_NONBLOCK)) { */ +/* fprintf(stderr,"Warning : Setting socket in nonblock mode FAILED\n"); */ +/* } */ IVY_LIST_ADD_START(clients_list, client ); |