-/* ClientSocket.c - NeonServ v5.3
- * Copyright (C) 2011 Philipp Kreil (pk910)
+/* ClientSocket.c - NeonServ v5.4
+ * 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
unsigned count;
};
+#ifdef HAVE_THREADS
+static pthread_mutex_t synchronized;
+static pthread_mutex_t synchronized_recv;
+
+struct ParseOrder {
+ unsigned int tid;
+ struct ParseOrder *next;
+};
+struct ParseOrder *parse_order = NULL;
+#endif
+
//the magic list :P
static struct socket_list *sockets = NULL;
static char buffer[BUF_SIZ];
-static void init_sockets() {
+void init_sockets() {
+ THREAD_MUTEX_INIT(synchronized);
+ THREAD_MUTEX_INIT(synchronized_recv);
+
sockets = malloc(sizeof(*sockets));
if (!sockets)
{
}
struct ClientSocket* create_socket(char *host, int port, char *bindto, char *pass, char *nick, char *ident, char *realname) {
- if(sockets == NULL) init_sockets();
struct ClientSocket *client = malloc(sizeof(*client));
if (!client)
{
client->ident = strdup(ident);
client->realname = strdup(realname);
client->user = NULL;
+ client->network_name = NULL;
client->flags = 0;
client->bufferpos = 0;
client->traffic_in = 0;
client->whoqueue_last = NULL;
client->handleinfo_first = NULL;
client->handleinfo_last = NULL;
+ SYNCHRONIZE(synchronized);
client->next = sockets->data;
sockets->data = client;
+ DESYNCHRONIZE(synchronized);
return client;
}
-#ifndef WIN32
+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;
int sock;
return 1;
}
#else
-int connect_socket(struct ClientSocket *client) {
+static int _connect_socket(struct ClientSocket *client) {
if((client->flags & SOCKET_FLAG_CONNECTED)) return 1;
struct hostent *host;
struct sockaddr_in addr;
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);
}
- if(client->flags & SOCKET_FLAG_HAVE_SSL)
- ssl_disconnect(client);
- 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--;
- } else
- last_sock = sock;
- }
- if(client->queue)
- queue_destroy(client);
- if(client->whoqueue_first)
- clear_whoqueue(client);
- if(client->handleinfo_first)
- clear_handleinfoqueue(client);
- free(client->host);
- if(client->bind)
- free(client->bind);
- if(client->pass)
- free(client->pass);
- free(client);
+ client->flags &= ~(SOCKET_FLAG_READY | SOCKET_FLAG_RECONNECT);
+ client->flags |= SOCKET_FLAG_QUITTED | SOCKET_FLAG_DEAD;
return 1;
}
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);
bot_disconnect(client);
}
clear_whoqueue(client);
if(client->handleinfo_first)
clear_handleinfoqueue(client);
- client->flags &= ~(SOCKET_FLAG_CONNECTED | SOCKET_FLAG_READY | SOCKET_FLAG_RECONNECT);
- return 1;
+ 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);
+ }
+ DESYNCHRONIZE(synchronized);
}
int write_socket_force(struct ClientSocket *client, char* msg, int len) {
- printf("[send %d] %s", len, msg);
+ 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
if(!(client->flags & SOCKET_FLAG_HAVE_SSL) || ssl_write(client, msg, len) == -2) {
#ifdef WIN32
send(client->sock, msg, len, 0);
#endif
}
client->traffic_out += len;
+ DESYNCHRONIZE(synchronized);
return 1;
}
return write_socket_force(client, msg, len);
}
-void socket_loop(int timeout_seconds) {
- if(sockets == NULL) return;
+#if HAVE_THREADS
+static void clientsocket_start_of_recv(unsigned int tid) {
+ SYNCHRONIZE(whohandler_sync);
+ struct ParseOrder *entry, *last;
+ for(last = parse_order; last; last = last->next) {
+ if(last->next == NULL)
+ break;
+ }
+ entry = malloc(sizeof(*entry));
+ entry->tid = tid;
+ entry->next = NULL;
+ if(last)
+ last->next = entry;
+ else
+ parse_order = entry;
+ DESYNCHRONIZE(whohandler_sync);
+}
+
+static void clientsocket_end_of_recv(unsigned int tid) {
+ SYNCHRONIZE(whohandler_sync);
+ struct ParseOrder *entry, *last = NULL;
+ for(entry = parse_order; entry; entry = entry->next) {
+ if(entry->tid == tid) {
+ if(last)
+ last->next = entry->next;
+ else
+ parse_order = entry->next;
+ free(entry);
+ break;
+ } else
+ last = entry;
+ }
+ DESYNCHRONIZE(whohandler_sync);
+}
+
+int clientsocket_parseorder_top(unsigned int tid) {
+ if(parse_order && parse_order->tid == tid)
+ return 1;
+ else
+ return 0;
+}
+#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;
+ struct ClientSocket *sock, *next;
int ret = 0, bytes, i;
FD_ZERO(&fds);
timeout.tv_sec = timeout_seconds;
timeout.tv_usec = 0;
ret = select(ret + 1, &fds, NULL, NULL, &timeout);
- if(ret == 0) return;
- for (sock = sockets->data; sock; sock = sock->next) {
- if((sock->flags & SOCKET_FLAG_CONNECTED) && FD_ISSET(sock->sock, &fds)) {
+ if(ret == 0) {
+ DESYNCHRONIZE(synchronized_recv);
+ return 1;
+ }
+ 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
}
if(bytes <= 0) {
//error
- sock->flags &= ~(SOCKET_FLAG_CONNECTED | SOCKET_FLAG_READY);
- bot_disconnect(sock);
- if(sock->queue)
- queue_destroy(sock);
- close(sock->sock);
- if(sock->flags & SOCKET_FLAG_HAVE_SSL)
- ssl_disconnect(sock);
- if(sock->whoqueue_first)
- clear_whoqueue(sock);
- if(sock->handleinfo_first)
- clear_handleinfoqueue(sock);
+ 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 -= 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) && (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((sock->flags & SOCKET_FLAG_QUITTED)) {
+ sock->flags &= ~SOCKET_FLAG_QUITTED;
+ destroy_socket(sock, (sock->flags & SOCKET_FLAG_DEAD));
+ }
+ }
+ if(is_synchronized) {
+ DESYNCHRONIZE(synchronized_recv);
}
+ return (ret + 1);
}
void
free(client->bind);
if(client->pass)
free(client->pass);
+ if(client->network_name)
+ free(client->network_name);
free(client);
}
free(sockets);
projects / NeonServV5.git / blobdiff