projects
/
NeonServV5.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d598bb2
)
don't try to read from closing (SOCKET_FLAG_QUIT) sockets
author
pk910
<philipp@zoelle1.de>
Fri, 23 Dec 2011 11:32:30 +0000
(12:32 +0100)
committer
pk910
<philipp@zoelle1.de>
Fri, 23 Dec 2011 11:32:30 +0000
(12:32 +0100)
src/ClientSocket.c
patch
|
blob
|
history
diff --git
a/src/ClientSocket.c
b/src/ClientSocket.c
index 6b8b4fb815d5f4728414e9cf30f14998ad1c73d5..a108941c197685e5e0ca7f610b70d8f442dc25cd 100644
(file)
--- a/
src/ClientSocket.c
+++ b/
src/ClientSocket.c
@@
-369,7
+369,7
@@
void socket_loop(int timeout_seconds) {
if(ret == 0) return;
for (sock = sockets->data; sock; sock = next) {
next = sock->next;
if(ret == 0) return;
for (sock = sockets->data; sock; sock = next) {
next = sock->next;
- if((sock->flags &
SOCKET_FLAG_CONNECTED)
&& FD_ISSET(sock->sock, &fds)) {
+ if((sock->flags &
(SOCKET_FLAG_CONNECTED | SOCKET_FLAG_QUITTED)) == SOCKET_FLAG_CONNECTED
&& FD_ISSET(sock->sock, &fds)) {
if(sock->bufferpos != 0) {
if(!(sock->flags & SOCKET_FLAG_HAVE_SSL) || (bytes = ssl_read(sock, buffer, sizeof(buffer))) == -2) {
#ifdef WIN32
if(sock->bufferpos != 0) {
if(!(sock->flags & SOCKET_FLAG_HAVE_SSL) || (bytes = ssl_read(sock, buffer, sizeof(buffer))) == -2) {
#ifdef WIN32
@@
-412,7
+412,7
@@
void socket_loop(int timeout_seconds) {
sock->bufferpos -= used;
}
}
sock->bufferpos -= used;
}
}
- } else if(
!(sock->flags & SOCKET_FLAG_CONNECTED) && (sock->flags & SOCKET_FLAG_RECONNECT)
) {
+ } else if(
(sock->flags & (SOCKET_FLAG_CONNECTED | SOCKET_FLAG_RECONNECT)) == SOCKET_FLAG_RECONNECT
) {
if(time(0) - sock->connection_time >= SOCKET_RECONNECT_TIME) {
connect_socket(sock);
}
if(time(0) - sock->connection_time >= SOCKET_RECONNECT_TIME) {
connect_socket(sock);
}