#include "IRCQueue.h"
#include "WHOHandler.h"
#include "HandleInfoHandler.h"
-#include "ssl.h"
#include "ConfigParser.h"
#include "version.h"
+#include "IOHandler.h"
struct socket_list {
struct ClientSocket *data;
static struct socket_list *sockets = NULL;
static char buffer[BUF_SIZ];
+static IOHANDLER_CALLBACK(socket_callback);
+
void init_sockets() {
THREAD_MUTEX_INIT(synchronized);
THREAD_MUTEX_INIT(synchronized_recv);
struct ClientSocket* create_socket(char *host, int port, char *bindto, char *pass, char *nick, char *ident, char *realname) {
struct ClientSocket *client = malloc(sizeof(*client));
- if (!client)
- {
- perror("malloc() failed");
+ if (!client) {
return NULL;
}
+ client->iofd = NULL;
client->host = strdup(host);
client->port = port;
client->bind = (bindto ? strdup(bindto) : NULL);
return client;
}
-static int _connect_socket(struct ClientSocket *client);
-
-int connect_socket(struct ClientSocket *client) {
- SYNCHRONIZE(synchronized);
- int ret = _connect_socket(client);
- DESYNCHRONIZE(synchronized);
- return ret;
-}
-
-#ifndef WIN32
-static int _connect_socket(struct ClientSocket *client) {
- if((client->flags & SOCKET_FLAG_CONNECTED)) return 1;
- client->connection_time = time(0);
- int sock;
-
- struct addrinfo hints, *res;
- struct sockaddr_in *ip4 = NULL;
- struct sockaddr_in6 *ip6 = NULL;
- memset (&hints, 0, sizeof (hints));
- hints.ai_family = PF_UNSPEC;
- hints.ai_socktype = SOCK_STREAM;
- hints.ai_flags |= AI_CANONNAME;
- if (getaddrinfo (client->host, NULL, &hints, &res)) {
- return 0;
- }
- while (res) {
- switch (res->ai_family) {
- case AF_INET:
- ip4 = (struct sockaddr_in *) res->ai_addr;
- break;
- case AF_INET6:
- ip6 = (struct sockaddr_in6 *) res->ai_addr;
- break;
- }
- res = res->ai_next;
- }
-
- if(ip6) {
- sock = socket(AF_INET6, SOCK_STREAM, 0);
- if(sock == -1) {
- perror("socket() failed");
- return 0;
- }
-
- ip6->sin6_family = AF_INET6;
- ip6->sin6_port = htons(client->port);
-
- struct sockaddr_in6 *ip6vhost = NULL;
- if (client->bind && !getaddrinfo(client->bind, NULL, &hints, &res)) {
- while (res) {
- switch (res->ai_family) {
- case AF_INET6:
- ip6vhost = (struct sockaddr_in6 *) res->ai_addr;
- break;
- }
- res = res->ai_next;
- }
- }
- if(ip6vhost) {
- ip6vhost->sin6_family = AF_INET6;
- ip6vhost->sin6_port = htons(0);
- bind(sock, (struct sockaddr*)ip6vhost, sizeof(*ip6vhost));
- }
-
- if (connect(sock, (struct sockaddr*)ip6, sizeof(*ip6)) == -1) {
- perror("connect() failed");
- return 0;
- }
-
- } else if(ip4) {
- sock = socket(AF_INET, SOCK_STREAM, 0);
- if(sock == -1) {
- perror("socket() failed");
- return 0;
- }
-
- ip4->sin_family = AF_INET;
- ip4->sin_port = htons(client->port);
-
- struct sockaddr_in *ip4vhost = NULL;
- if (client->bind && !getaddrinfo(client->bind, NULL, &hints, &res)) {
- while (res) {
- switch (res->ai_family) {
- case AF_INET:
- ip4vhost = (struct sockaddr_in *) res->ai_addr;
- break;
- }
- res = res->ai_next;
- }
- }
- if(ip4vhost) {
- ip4vhost->sin_family = AF_INET;
- ip4vhost->sin_port = htons(0);
- bind(sock, (struct sockaddr*)ip4vhost, sizeof(*ip4vhost));
- }
-
- if (connect(sock, (struct sockaddr*)ip4, sizeof(*ip4)) == -1) {
- perror("connect() failed");
- return 0;
- }
-
- } else
- return 0;
-
- if(get_int_field("Sockets.NoDelay")) {
- int flag = 1;
- if(setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (char *) &flag, sizeof(int)) == -1) {
- perror("setsockopt() failed");
- return 0;
- }
- }
-
- client->sock = sock;
- client->flags |= SOCKET_FLAG_CONNECTED | SOCKET_FLAG_RECONNECT;
-
- if(client->flags & SOCKET_FLAG_SSL) {
- ssl_connect(client);
- client->flags |= SOCKET_FLAG_HAVE_SSL;
- } else
- client->flags &= ~SOCKET_FLAG_HAVE_SSL;
-
- //send the IRC Headers
- char sendBuf[512];
- int len;
-
- if(client->pass && strcmp(client->pass, "")) {
- len = sprintf(sendBuf, "PASS :%s\n", client->pass);
- write_socket(client, sendBuf, len);
- }
- len = sprintf(sendBuf, "USER %s 0 0 :%s\n", client->ident, client->realname);
- write_socket(client, sendBuf, len);
- len = sprintf(sendBuf, "NICK %s\n", client->nick);
- write_socket(client, sendBuf, len);
-
- return 1;
-}
-#else
-static int _connect_socket(struct ClientSocket *client) {
- if((client->flags & SOCKET_FLAG_CONNECTED)) return 1;
- client->connection_time = time(0);
- struct hostent *host;
- struct sockaddr_in addr;
- int sock;
- addr.sin_addr.s_addr = inet_addr(client->host);
- if (addr.sin_addr.s_addr == INADDR_NONE) {
- host = gethostbyname(client->host);
- if(!host) {
- return SOCKET_ERROR;
- }
- memcpy(&(addr.sin_addr), host->h_addr_list[0], 4);
- }
- sock = socket(PF_INET, SOCK_STREAM, 0);
- if (sock == -1)
- {
- perror("socket() failed");
- return 0;
- }
-
- addr.sin_port = htons(client->port);
- addr.sin_family = AF_INET;
-
- if (connect(sock, (struct sockaddr*)&addr, sizeof(addr)) == -1)
- {
- perror("connect() failed");
- return 0;
- }
-
- client->sock = sock;
- client->flags |= SOCKET_FLAG_CONNECTED | SOCKET_FLAG_RECONNECT;
-
-
- if(client->flags & SOCKET_FLAG_SSL) {
- ssl_connect(client);
- client->flags |= SOCKET_FLAG_HAVE_SSL;
- } else
- client->flags &= ~SOCKET_FLAG_HAVE_SSL;
-
- //send the IRC Headers
- char sendBuf[512];
- int len;
-
- if(client->pass && strcmp(client->pass, "")) {
- len = sprintf(sendBuf, "PASS :%s\n", client->pass);
- write_socket(client, sendBuf, len);
- }
- len = sprintf(sendBuf, "USER %s 0 0 :%s\n", client->ident, client->realname);
- write_socket(client, sendBuf, len);
- len = sprintf(sendBuf, "NICK %s\n", client->nick);
- write_socket(client, sendBuf, len);
-
- return 1;
+void connect_socket(struct ClientSocket *client) {
+ client->iofd = iohandler_connect(client->host, client->port, ((client->flags & SOCKET_FLAG_SSL) ? 1 : 0), client->bind, socket_callback);
+ client->iofd->data = client;
}
-#endif
int close_socket(struct ClientSocket *client) {
if(client == NULL) return 0;
if((client->flags & SOCKET_FLAG_CONNECTED)) {
char quitbuf[MAXLEN];
int quitlen = sprintf(quitbuf, "QUIT :[NeonServ %s.%d] disconnect requested.\n", NEONSERV_VERSION, patchlevel);
- write_socket_force(client, quitbuf, quitlen);
- }
- client->flags &= ~(SOCKET_FLAG_READY | SOCKET_FLAG_RECONNECT);
- client->flags |= SOCKET_FLAG_QUITTED | SOCKET_FLAG_DEAD;
- return 1;
-}
-
-int disconnect_socket(struct ClientSocket *client) {
- if(client == NULL) return 0;
- if((client->flags & SOCKET_FLAG_CONNECTED)) {
- char quitbuf[MAXLEN];
- int quitlen = sprintf(quitbuf, "QUIT :[NeonServ %s.%d] disconnect requested.\n", NEONSERV_VERSION, patchlevel);
- write_socket_force(client, quitbuf, quitlen);
- }
- client->flags &= ~(SOCKET_FLAG_READY | SOCKET_FLAG_RECONNECT);
- client->flags |= SOCKET_FLAG_QUITTED;
- return 1;
-}
-
-static void destroy_socket(struct ClientSocket *client, int free_socket) {
- SYNCHRONIZE(synchronized);
- if((client->flags & SOCKET_FLAG_CONNECTED)) {
- close(client->sock);
+ iohandler_send(client, quitbuf, quitlen);
+
bot_disconnect(client);
+
+ iohandler_close(client->iofd);
+ client->iofd = NULL;
}
- if(client->flags & SOCKET_FLAG_HAVE_SSL)
- ssl_disconnect(client);
+ client->flags &= ~(SOCKET_FLAG_READY | SOCKET_FLAG_CONNECTED);
if(client->queue)
queue_destroy(client);
if(client->whoqueue_first)
clear_whoqueue(client);
if(client->handleinfo_first)
clear_handleinfoqueue(client);
- client->flags &= ~(SOCKET_FLAG_CONNECTED | SOCKET_FLAG_READY | SOCKET_FLAG_HAVE_SSL);
- if(free_socket) {
- struct ClientSocket *sock, *last_sock = NULL;
- for (sock = sockets->data; sock; sock = sock->next) {
- if(sock == client) {
- if(last_sock)
- last_sock->next = sock->next;
- else
- sockets->data = sock->next;
- sockets->count--;
- break;
- } else
- last_sock = sock;
- }
- free(client->host);
- if(client->bind)
- free(client->bind);
- if(client->pass)
- free(client->pass);
- if(client->network_name)
- free(client->network_name);
- free(client);
- } else if(client->flags & SOCKET_FLAG_FAST_JUMP) {
- client->flags &= ~SOCKET_FLAG_FAST_JUMP;
- connect_socket(client);
+ return 1;
+}
+
+int destroy_socket(struct ClientSocket *client) {
+ if(client == NULL) return 0;
+ close_socket(client);
+ SYNCHRONIZE(synchronized);
+ struct ClientSocket *sock, *last_sock = NULL;
+ for (sock = sockets->data; sock; sock = sock->next) {
+ if(sock == client) {
+ if(last_sock)
+ last_sock->next = sock->next;
+ else
+ sockets->data = sock->next;
+ sockets->count--;
+ break;
+ } else
+ last_sock = sock;
}
+ free(client->host);
+ if(client->bind)
+ free(client->bind);
+ if(client->pass)
+ free(client->pass);
+ if(client->network_name)
+ free(client->network_name);
+ if(client->iofd) //reconnect timer?
+ iohandler_close(client->iofd);
+ free(client);
DESYNCHRONIZE(synchronized);
+ return 1;
}
-int write_socket_force(struct ClientSocket *client, char* msg, int len) {
+static int write_socket_force(struct ClientSocket *client, char* msg, int len) {
+ if(!(client && (client->flags & SOCKET_FLAG_CONNECTED))) return 0;
SYNCHRONIZE(synchronized);
#ifdef HAVE_THREADS
putlog(LOGLEVEL_RAW, "[%d send %d] %s", getCurrentThreadID(), len, msg);
#else
putlog(LOGLEVEL_RAW, "[send %d] %s", len, msg);
#endif
- int ret = 1;
- if(!(client->flags & SOCKET_FLAG_HAVE_SSL) || ssl_write(client, msg, len) == -2) {
- #ifdef WIN32
- ret = send(client->sock, msg, len, 0);
- #else
- ret = write(client->sock, msg, len);
- #endif
- }
+ iohandler_send(client->iofd, msg, len)
client->traffic_out += len;
DESYNCHRONIZE(synchronized);
return ret;
}
#endif
-int socket_loop(int timeout_seconds) {
- if(sockets == NULL) return 0;
- int is_synchronized = 1;
- SYNCHRONIZE(synchronized_recv);
- fd_set fds;
- struct timeval timeout;
- struct ClientSocket *sock, *next;
- int ret = 0, bytes, i;
-
- FD_ZERO(&fds);
- for (sock = sockets->data; sock; sock = sock->next) {
- if(!(sock->flags & SOCKET_FLAG_CONNECTED)) continue; //skip disconnected sockets
- FD_SET(sock->sock, &fds);
- if(sock->sock > ret)
- ret = sock->sock;
- }
- timeout.tv_sec = timeout_seconds;
- timeout.tv_usec = 0;
- ret = select(ret + 1, &fds, NULL, NULL, &timeout);
- for (sock = sockets->data; sock; sock = next) {
- next = sock->next;
- 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
- bytes = recv(sock->sock, buffer, sizeof(buffer), 0);
- #else
- bytes = read(sock->sock, buffer, sizeof(buffer));
- #endif
- }
- if(bytes > 0) {
- for(i = 0; i < bytes; i++) {
- if(sock->bufferpos + i == BUF_SIZ*2) break; //buffer overflow
- sock->buffer[sock->bufferpos + i] = buffer[i];
- }
- sock->bufferpos += i;
- }
- } else {
- if(!(sock->flags & SOCKET_FLAG_HAVE_SSL) || (bytes = ssl_read(sock, sock->buffer, sizeof(sock->buffer))) == -2) {
- #ifdef WIN32
- bytes = recv(sock->sock, sock->buffer, sizeof(sock->buffer), 0);
- #else
- bytes = read(sock->sock, sock->buffer, sizeof(sock->buffer));
- #endif
- }
- if(bytes > 0)
- sock->bufferpos = bytes;
- }
- if(bytes <= 0) {
- //error
- sock->flags |= SOCKET_FLAG_QUITTED;
- } else {
- sock->traffic_in += bytes;
- #ifdef HAVE_THREADS
- char linesbuf[BUF_SIZ*2];
- strcpy(linesbuf, sock->buffer);
- int used = 0;
- for(i = 0; i < sock->bufferpos; i++) {
- if(sock->buffer[i] == '\n') {
- used = i+1;
- }
- }
- if(used == sock->bufferpos + 1) {
- //used all bytes so just reset the bufferpos
- sock->bufferpos = 0;
- } else {
- for(i = 0; i < sock->bufferpos - used; i++) {
- sock->buffer[i] = sock->buffer[i+used];
- }
- sock->bufferpos -= used;
- }
- is_synchronized = 0;
- unsigned int tid = (unsigned int) pthread_self_tid();
- clientsocket_start_of_recv(tid);
- DESYNCHRONIZE(synchronized_recv);
- parse_lines(sock, linesbuf, used);
- clientsocket_end_of_recv(tid);
- #else
- int used = parse_lines(sock, sock->buffer, sock->bufferpos);
- if(used == sock->bufferpos + 1) {
- //used all bytes so just reset the bufferpos
- sock->bufferpos = 0;
- } else {
- for(i = 0; i < sock->bufferpos - used; i++) {
- sock->buffer[i] = sock->buffer[i+used];
- }
- sock->bufferpos -= used;
- }
- is_synchronized = 0;
- DESYNCHRONIZE(synchronized_recv);
- #endif
- #ifdef HAVE_THREADS
- FD_ZERO(&fds); //zero out all other pending sockets here (we have other threads receiving from them)
- #endif
- }
- } 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);
- }
+static IOHANDLER_CALLBACK(socket_callback) {
+ struct ClientSocket *client = event->iofd->data;
+ switch(event->type) {
+ case IOEVENT_CONNECTED:
+ client->flags |= SOCKET_FLAG_CONNECTED;
+ if(client->pass && strcmp(client->pass, ""))
+ iohandler_printf(event->iofd, "PASS :%s", client->pass);
+ iohandler_printf(event->iofd, "USER %s 0 0 :%s", client->ident, client->realname);
+ iohandler_printf(event->iofd, "NICK %s", client->nick);
+ break;
+ case IOEVENT_NOTCONNECTED:
+ case IOEVENT_CLOSED:
+ close_socket(client);
+ if(client->flags & SOCKET_FLAG_RECONNECT) {
+ struct timeval timeout;
+ gettimeofday(&timeout, NULL);
+ timeout.tv_sec += SOCKET_RECONNECT_TIME;
+ client->iofd = iohandler_timer(timeout, socket_callback);
+ client->iofd->data = client;
}
- if((sock->flags & SOCKET_FLAG_QUITTED)) {
- sock->flags &= ~SOCKET_FLAG_QUITTED;
- destroy_socket(sock, (sock->flags & SOCKET_FLAG_DEAD));
- }
- }
- if(is_synchronized) {
- DESYNCHRONIZE(synchronized_recv);
+ break;
+ case IOEVENT_TIMEOUT: //reconnect timer
+ connect_socket(client);
+ break;
+ case IOEVENT_RECV:
+ #ifdef HAVE_THREADS
+ clientsocket_start_of_recv(tid);
+ #endif
+ parse_line(client, event->data.recv_str);
+ #ifdef HAVE_THREADS
+ clientsocket_end_of_recv(tid);
+ #endif
+ break;
+ default:
+ break;
}
- return 1;
}
-void
-putsock(struct ClientSocket *client, const char *text, ...)
-{
+void putsock(struct ClientSocket *client, const char *text, ...) {
va_list arg_list;
char sendBuf[MAXLEN];
int pos;
struct ClientSocket *client, *next;
for (client = sockets->data; client; client = next) {
next = client->next;
- if((client->flags & SOCKET_FLAG_CONNECTED))
- close(client->sock);
- if(client->flags & SOCKET_FLAG_HAVE_SSL)
- ssl_disconnect(client);
- if(client->queue)
- queue_destroy(client);
- free(client->host);
- if(client->bind)
- free(client->bind);
- if(client->pass)
- free(client->pass);
- if(client->network_name)
- free(client->network_name);
- free(client);
+ destroy_socket(client);
}
free(sockets);
sockets = NULL;
projects / NeonServV5.git / blobdiff