/* ClientSocket.c - NeonServ v5.3
- * Copyright (C) 2011 Philipp Kreil (pk910)
+ * Copyright (C) 2011-2012 Philipp Kreil (pk910)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
char quitbuf[MAXLEN];
int quitlen = sprintf(quitbuf, "QUIT :[NeonServ %s.%d] disconnect requested.\n", NEONSERV_VERSION, patchlevel);
write_socket_force(client, quitbuf, quitlen);
- close(client->sock);
- bot_disconnect(client);
}
client->flags &= ~(SOCKET_FLAG_READY | SOCKET_FLAG_RECONNECT);
client->flags |= SOCKET_FLAG_QUITTED | SOCKET_FLAG_DEAD;
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
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);
}