-/* ClientSocket.c - NeonServ v5.1
+/* ClientSocket.c - NeonServ v5.2
* Copyright (C) 2011 Philipp Kreil (pk910)
*
* This program is free software: you can redistribute it and/or modify
#include "IRCParser.h"
#include "UserNode.h"
#include "IRCQueue.h"
+#include "WHOHandler.h"
+#include "HandleInfoHandler.h"
struct socket_list {
struct ClientSocket *data;
sockets->count = 0;
}
-struct ClientSocket* create_socket(char *host, int port, char *pass, struct UserNode *user) {
+struct ClientSocket* create_socket(char *host, int port, char *pass, char *nick, char *ident, char *realname) {
if(sockets == NULL) init_sockets();
struct ClientSocket *client = malloc(sizeof(*client));
if (!client)
client->port = port;
printf("Connect: %s:%d\n", client->host, client->port);
client->pass = (pass == NULL ? NULL : strdup(pass));
- client->user = user;
+ client->nick = strdup(nick);
+ client->ident = strdup(ident);
+ client->realname = strdup(realname);
+ client->user = NULL;
client->flags = 0;
client->bufferpos = 0;
client->traffic_in = 0;
client->botid = 0;
client->clientid = 0;
client->queue = NULL;
+ client->whoqueue_first = NULL;
+ client->whoqueue_last = NULL;
+ client->handleinfo_first = NULL;
+ client->handleinfo_last = NULL;
client->next = sockets->data;
sockets->data = client;
return client;
}
client->sock = sock;
- client->flags |= SOCKET_FLAG_CONNECTED;
+ client->flags |= SOCKET_FLAG_CONNECTED | SOCKET_FLAG_RECONNECT;
client->connection_time = time(0);
//send the IRC Headers
len = sprintf(sendBuf, "PASS :%s\n", client->pass);
write_socket(client, sendBuf, len);
}
- len = sprintf(sendBuf, "USER %s 0 0 :%s\n", client->user->ident, client->user->realname);
+ 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->user->nick);
+ len = sprintf(sendBuf, "NICK %s\n", client->nick);
write_socket(client, sendBuf, len);
return 1;
}
client->sock = sock;
- client->flags |= SOCKET_FLAG_CONNECTED;
+ client->flags |= SOCKET_FLAG_CONNECTED | SOCKET_FLAG_RECONNECT;
client->connection_time = time(0);
//send the IRC Headers
char sendBuf[512];
int len;
- if(client->pass) {
+ 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->user->ident, client->user->realname);
+ 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->user->nick);
+ len = sprintf(sendBuf, "NICK %s\n", client->nick);
write_socket(client, sendBuf, len);
-
+
return 1;
}
}
if(client->queue)
queue_destroy(client);
+ if(client->whoqueue_first)
+ clear_whoqueue(client);
+ if(client->handleinfo_first)
+ clear_handleinfoqueue(client);
free(client->host);
free(client->pass);
free(client);
}
int write_socket(struct ClientSocket *client, char* msg, int len) {
- if(!(client->flags & SOCKET_FLAG_CONNECTED)) return 0;
+ if(!(client && (client->flags & SOCKET_FLAG_CONNECTED))) return 0;
if(client->flags & SOCKET_FLAG_USE_QUEUE)
return queue_add(client, msg, len);
else
sock->bufferpos -= used;
}
}
+ } else if(!(sock->flags & SOCKET_FLAG_CONNECTED) && (sock->flags & SOCKET_FLAG_RECONNECT)) {
+ if(time(0) - sock->connection_time >= SOCKET_RECONNECT_TIME) {
+ connect_socket(sock);
+ }
}
}
}
va_list arg_list;
char sendBuf[MAXLEN];
int pos;
- if (!(client->flags & SOCKET_FLAG_CONNECTED)) return;
+ if (!(client && (client->flags & SOCKET_FLAG_CONNECTED))) return;
sendBuf[0] = '\0';
va_start(arg_list, text);
pos = vsnprintf(sendBuf, MAXLEN - 2, text, arg_list);