aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2024-09-22 04:15:54 -04:00
Code

Add error == 0 to recoverable error numbers. Patch from Ricardo Galli.

Browse Source 
Minor style fixes.

svn path=/trunk/net/; revision=3174
This commit is contained in:
Jack Moffitt 2002-03-22 21:09:36 +00:00
parent 39635122a5
commit 06fb100e10
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/net/sock.c
View File

@ -118,7 +118,7 @@ int sock_error(void)
*/ */
int sock_recoverable(int error) int sock_recoverable(int error)
{ {
return (error == EAGAIN || error == EINTR || error == EINPROGRESS || error == EWOULDBLOCK); return (error == 0 || error == EAGAIN || error == EINTR || error == EINPROGRESS || error == EWOULDBLOCK);
} }
/* sock_valid_socket /* sock_valid_socket
@ -433,7 +433,7 @@ sock_t sock_get_server_socket(const int port, char *sinterface)
/* defaults */ /* defaults */
memset(&sa, 0, sizeof(sa)); memset(&sa, 0, sizeof(sa));
sa_family = AF_INET; sa_family = AF_INET;
sa_len = sizeof (struct sockaddr_in); sa_len = sizeof(struct sockaddr_in);
/* set the interface to bind to if specified */ /* set the interface to bind to if specified */
if (sinterface != NULL) { if (sinterface != NULL) {
@ -449,12 +449,13 @@ sock_t sock_get_server_socket(const int port, char *sinterface)
sa_len = sizeof (struct sockaddr_in6); sa_len = sizeof (struct sockaddr_in6);
((struct sockaddr_in6*)&sa)->sin6_family = AF_INET6; ((struct sockaddr_in6*)&sa)->sin6_family = AF_INET6;
((struct sockaddr_in6*)&sa)->sin6_port = htons(port); ((struct sockaddr_in6*)&sa)->sin6_port = htons(port);
} else } else {
return SOCK_ERROR; return SOCK_ERROR;
}
#else #else
if (!inet_aton(ip, &sa.sin_addr)) if (!inet_aton(ip, &sa.sin_addr)) {
return SOCK_ERROR; return SOCK_ERROR;
else { } else {
sa.sin_family = AF_INET; sa.sin_family = AF_INET;
sa.sin_port = htons(port); sa.sin_port = htons(port);
} }