Green-Sky/libircclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix socket.c

Browse Source
This commit is contained in:
Green Sky 2023-11-22 23:11:45 +01:00
parent 9da166ea34
commit 3b3b50b7ec
No known key found for this signature in database
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libircclient/src/sockets.c
View File

@ -1,14 +1,14 @@
/* /*
* Copyright (C) 2004-2012 George Yunaev gyunaev@ulduzsoft.com * Copyright (C) 2004-2012 George Yunaev gyunaev@ulduzsoft.com
* *
* This library is free software; you can redistribute it and/or modify it * This library is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by * under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 3 of the License, or (at your * the Free Software Foundation; either version 3 of the License, or (at your
* option) any later version. * option) any later version.
* *
* This library is distributed in the hope that it will be useful, but WITHOUT * This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
* License for more details. * License for more details.
*/ */
@ -18,9 +18,11 @@
#if !defined (_WIN32) #if !defined (_WIN32)
#include <sys/socket.h> #include <sys/socket.h>
#include <netdb.h> #include <netdb.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <fcntl.h> #include <fcntl.h>
#include <errno.h>
#include <unistd.h>
#define IS_SOCKET_ERROR(a) ((a)<0) #define IS_SOCKET_ERROR(a) ((a)<0)
typedef int socket_t; typedef int socket_t;
@ -99,10 +101,10 @@ static int socket_connect (socket_t * sock, const struct sockaddr *saddr, sockle
{ {
while ( 1 ) while ( 1 )
{ {
if ( connect (*sock, saddr, len) < 0 ) if ( connect (*sock, saddr, len) < 0 )
{ {
if ( socket_error() == EINTR ) if ( socket_error() == EINTR )
continue; continue;
if ( socket_error() != EINPROGRESS && socket_error() != EWOULDBLOCK ) if ( socket_error() != EINPROGRESS && socket_error() != EWOULDBLOCK )
return 1; return 1;
@ -117,8 +119,8 @@ static int socket_accept (socket_t * sock, socket_t * newsock, struct sockaddr *
{ {
while ( IS_SOCKET_ERROR(*newsock = accept (*sock, saddr, len)) ) while ( IS_SOCKET_ERROR(*newsock = accept (*sock, saddr, len)) )
{ {
if ( socket_error() == EINTR ) if ( socket_error() == EINTR )
continue; continue;
return 1; return 1;
} }
@ -134,7 +136,7 @@ static int socket_recv (socket_t * sock, void * buf, size_t len)
while ( (length = recv (*sock, buf, len, 0)) < 0 ) while ( (length = recv (*sock, buf, len, 0)) < 0 )
{ {
int err = socket_error(); int err = socket_error();
if ( err != EINTR && err != EAGAIN ) if ( err != EINTR && err != EAGAIN )
break; break;
} }
@ -150,7 +152,7 @@ static int socket_send (socket_t * sock, const void *buf, size_t len)
while ( (length = send (*sock, buf, len, 0)) < 0 ) while ( (length = send (*sock, buf, len, 0)) < 0 )
{ {
int err = socket_error(); int err = socket_error();
if ( err != EINTR && err != EAGAIN ) if ( err != EINTR && err != EAGAIN )
break; break;
} }