#include "IRCQueue.h"
#include "WHOHandler.h"
#include "HandleInfoHandler.h"
+#include "ssl.h"
struct socket_list {
struct ClientSocket *data;
client->flags |= SOCKET_FLAG_CONNECTED | SOCKET_FLAG_RECONNECT;
client->connection_time = time(0);
+
+ if(client->flags & SOCKET_FLAG_SSL) {
+ ssl_connect(client);
+ }
+
+
//send the IRC Headers
char sendBuf[512];
int len;
client->flags |= SOCKET_FLAG_CONNECTED | SOCKET_FLAG_RECONNECT;
client->connection_time = time(0);
+ if(client->flags & SOCKET_FLAG_SSL) {
+ ssl_connect(client);
+ }
+
//send the IRC Headers
char sendBuf[512];
int len;
if(client == NULL) return 0;
if((client->flags & SOCKET_FLAG_CONNECTED))
close(client->sock);
+ if(client->flags & SOCKET_FLAG_SSL)
+ ssl_disconnect(client);
struct ClientSocket *sock, *last_sock = NULL;
for (sock = sockets->data; sock; sock = sock->next) {
if(sock == client) {
int write_socket_force(struct ClientSocket *client, char* msg, int len) {
printf("[send %d] %s", len, msg);
- #ifdef WIN32
- send(client->sock, msg, len, 0);
- #else
- write(client->sock, msg, len);
- #endif
+ if(!(client->flags & SOCKET_FLAG_SSL) || ssl_write(client, msg, len) == -2) {
+ #ifdef WIN32
+ send(client->sock, msg, len, 0);
+ #else
+ write(client->sock, msg, len);
+ #endif
+ }
client->traffic_out += len;
return 1;
}
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
for (sock = sockets->data; sock; sock = sock->next) {
if((sock->flags & SOCKET_FLAG_CONNECTED) && FD_ISSET(sock->sock, &fds)) {
if(sock->bufferpos != 0) {
- #ifdef WIN32
- bytes = recv(sock->sock, buffer, sizeof(buffer), 0);
- #else
- bytes = read(sock->sock, buffer, sizeof(buffer));
- #endif
+ if(!(sock->flags & SOCKET_FLAG_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->bufferpos += i;
}
} else {
- #ifdef WIN32
- bytes = recv(sock->sock, sock->buffer, sizeof(sock->buffer), 0);
- #else
- bytes = read(sock->sock, sock->buffer, sizeof(sock->buffer));
- #endif
+ if(!(sock->flags & SOCKET_FLAG_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;
}
bot_disconnect(sock);
if(sock->queue)
queue_destroy(sock);
+ close(sock->sock);
+ if(sock->flags & SOCKET_FLAG_SSL)
+ ssl_disconnect(sock);
} else {
sock->traffic_in += bytes;
int used = parse_lines(sock, sock->buffer, sock->bufferpos);
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);
next = client->next;
if((client->flags & SOCKET_FLAG_CONNECTED))
close(client->sock);
+ if(client->flags & SOCKET_FLAG_SSL)
+ ssl_disconnect(client);
if(client->queue)
queue_destroy(client);
free(client->host);