1 files changed, 56 insertions, 56 deletions

diff --git a/src/map/irc-bot.c b/src/map/irc-bot.c
index d492ad9ca..f89bd2f1c 100644
--- a/src/map/irc-bot.c
+++ b/src/map/irc-bot.c
@@ -1,29 +1,30 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
-// Base Author: shennetsind @ http://hercules.ws
+// Base Author: shennetsind @ http://herc.ws
 
 #define HERCULES_CORE
 
 #include "irc-bot.h"
 
+#include "map/channel.h"
+#include "map/map.h"
+#include "map/pc.h"
+#include "common/cbasetypes.h"
+#include "common/malloc.h"
+#include "common/random.h"
+#include "common/showmsg.h"
+#include "common/socket.h"
+#include "common/strlib.h"
+#include "common/timer.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "channel.h"
-#include "map.h"
-#include "pc.h"
-#include "../common/cbasetypes.h"
-#include "../common/malloc.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/strlib.h"
-#include "../common/timer.h"
-
 //#define IRCBOT_DEBUG
 
 struct irc_bot_interface irc_bot_s;
+struct irc_bot_interface *ircbot;
 
 char send_string[IRC_MESSAGE_LENGTH];
 
@@ -35,15 +36,15 @@ int irc_connect_timer(int tid, int64 tick, int id, intptr_t data) {
 	struct hSockOpt opt;
 	if( ircbot->isOn || ++ircbot->fails >= 3 )
 		return 0;
-	
+
 	opt.silent = 1;
 	opt.setTimeo = 0;
-	
+
 	ircbot->last_try = timer->gettick();
 
-	if ((ircbot->fd = make_connection(ircbot->ip, channel->config->irc_server_port, &opt)) > 0) {
-		session[ircbot->fd]->func_parse = ircbot->parse;
-		session[ircbot->fd]->flag.server = 1;
+	if ((ircbot->fd = sockt->make_connection(ircbot->ip, channel->config->irc_server_port, &opt)) > 0) {
+		sockt->session[ircbot->fd]->func_parse = ircbot->parse;
+		sockt->session[ircbot->fd]->flag.server = 1;
 		timer->add(timer->gettick() + 3000, ircbot->identify_timer, 0, 0);
 		ircbot->isOn = true;
 	}
@@ -57,14 +58,14 @@ int irc_connect_timer(int tid, int64 tick, int id, intptr_t data) {
 int irc_identify_timer(int tid, int64 tick, int id, intptr_t data) {
 	if( !ircbot->isOn )
 		return 0;
-	
+
 	sprintf(send_string, "USER HerculesWS%d 8 * : Hercules IRC Bridge",rnd()%777);
 	ircbot->send(send_string);
 	sprintf(send_string, "NICK %s", channel->config->irc_nick);
 	ircbot->send(send_string);
 
 	timer->add(timer->gettick() + 3000, ircbot->join_timer, 0, 0);
-	
+
 	return 0;
 }
 
@@ -75,7 +76,7 @@ int irc_identify_timer(int tid, int64 tick, int id, intptr_t data) {
 int irc_join_timer(int tid, int64 tick, int id, intptr_t data) {
 	if( !ircbot->isOn )
 		return 0;
-	
+
 	if (channel->config->irc_nick_pw[0] != '\0') {
 		sprintf(send_string, "PRIVMSG NICKSERV : IDENTIFY %s", channel->config->irc_nick_pw);
 		ircbot->send(send_string);
@@ -83,7 +84,7 @@ int irc_join_timer(int tid, int64 tick, int id, intptr_t data) {
 			sprintf(send_string, "PRIVMSG NICKSERV : GHOST %s %s", channel->config->irc_nick, channel->config->irc_nick_pw);
 		}
 	}
-	
+
 	sprintf(send_string, "JOIN %s", channel->config->irc_channel);
 	ircbot->send(send_string);
 	ircbot->isIn = true;
@@ -114,30 +115,30 @@ struct irc_func* irc_func_search(char* function_name) {
 int irc_parse(int fd) {
 	char *parse_string = NULL, *str_safe = NULL;
 
-	if (session[fd]->flag.eof) {
-		do_close(fd);
+	if (sockt->session[fd]->flag.eof) {
+		sockt->close(fd);
 		ircbot->fd = 0;
 		ircbot->isOn = false;
 		ircbot->isIn = false;
 		ircbot->fails = 0;
-		ircbot->ip = host2ip(channel->config->irc_server);
+		ircbot->ip = sockt->host2ip(channel->config->irc_server);
 		timer->add(timer->gettick() + 120000, ircbot->connect_timer, 0, 0);
 		return 0;
 	}
-	
+
 	if( !RFIFOREST(fd) )
 		return 0;
-	
+
 	parse_string = (char*)RFIFOP(fd,0);
 	parse_string[ RFIFOREST(fd) - 1 ] = '\0';
-	
+
 	parse_string = strtok_r(parse_string,"\r\n",&str_safe);
-	
+
 	while (parse_string != NULL) {
 		ircbot->parse_sub(fd,parse_string);
 		parse_string = strtok_r(NULL,"\r\n",&str_safe);
 	}
-	
+
 	RFIFOSKIP(fd, RFIFOREST(fd));
 	RFIFOFLUSH(fd);
 	return 0;
@@ -157,7 +158,7 @@ void irc_parse_source(char *source, char *nick, char *ident, char *host) {
 	int i, pos = 0;
 	size_t len = strlen(source);
 	unsigned char stage = 0;
-	
+
 	for(i = 0; i < len; i++) {
 		if( stage == 0 && source[i] == '!' ) {
 			safestrncpy(nick, &source[0], min(i + 1, IRC_NICK_LENGTH));
@@ -181,29 +182,28 @@ void irc_parse_sub(int fd, char *str) {
 	char source[180], command[60], buf1[IRC_MESSAGE_LENGTH], buf2[IRC_MESSAGE_LENGTH];
 	char *target = buf1, *message = buf2;
 	struct irc_func *func;
-	
+
 	source[0] = command[0] = buf1[0] = buf2[0] = '\0';
-	
+
 	if( str[0] == ':' )
 		str++;
-	
+
 	if (sscanf(str, "%179s %59s %499s :%499[^\r\n]", source, command, buf1, buf2) == 3 && buf1[0] == ':') {
 		// source command :message (i.e. QUIT)
 		message = buf1+1;
 		target = buf2;
 	}
-		
+
 	if( command[0] == '\0' )
 		return;
-		
-	if( !(func = ircbot->func_search(command)) && !(func = ircbot->func_search(source)) ) {
+
+	if ((func = ircbot->func_search(command)) == NULL && (func = ircbot->func_search(source)) == NULL) {
 #ifdef IRCBOT_DEBUG
 		ShowWarning("Unknown command received %s from %s\n",command,source);
 #endif // IRCBOT_DEBUG
 		return;
 	}
 	func->func(fd,command,source,target,message);
-	
 }
 
 /**
@@ -300,7 +300,7 @@ void irc_privmsg(int fd, char *cmd, char *source, char *target, char *msg) {
 
 		if( source[0] != '\0' )
 			ircbot->parse_source(source,source_nick,source_ident,source_host);
-				
+
 		if( ircbot->channel ) {
 			size_t padding_len = strlen(ircbot->channel->name) + strlen(source_nick) + 13;
 			while (1) {
@@ -415,31 +415,31 @@ void irc_bot_init(bool minimal) {
 	if (!channel->config->irc)
 		return;
 
-	if (!(ircbot->ip = host2ip(channel->config->irc_server))) {
+	if (!(ircbot->ip = sockt->host2ip(channel->config->irc_server))) {
 		ShowError("Unable to resolve '%s' (irc server), disabling irc channel...\n", channel->config->irc_server);
 		channel->config->irc = false;
 		return;
 	}
-	
+
 	ircbot->funcs.size = ARRAYLENGTH(irc_func_base);
 
 	CREATE(ircbot->funcs.list,struct irc_func*,ircbot->funcs.size);
-	
+
 	for( i = 0; i < ircbot->funcs.size; i++ ) {
-		
+
 		CREATE(function, struct irc_func, 1);
-		
+
 		safestrncpy(function->name, irc_func_base[i].name, sizeof(function->name));
 		function->func = irc_func_base[i].func;
-		
+
 		ircbot->funcs.list[i] = function;
 	}
-	
+
 	ircbot->fails = 0;
 	ircbot->fd = 0;
 	ircbot->isIn = false;
 	ircbot->isOn = false;
-	
+
 	timer->add_func_list(ircbot->connect_timer, "irc_connect_timer");
 	timer->add(timer->gettick() + 7000, ircbot->connect_timer, 0, 0);
 }
@@ -449,14 +449,14 @@ void irc_bot_init(bool minimal) {
  */
 void irc_bot_final(void) {
 	int i;
-	
+
 	if (!channel->config->irc)
 		return;
 	if( ircbot->isOn ) {
 		ircbot->send("QUIT :Hercules is shutting down");
-		do_close(ircbot->fd);
+		sockt->close(ircbot->fd);
 	}
-	
+
 	for( i = 0; i < ircbot->funcs.size; i++ ) {
 		aFree(ircbot->funcs.list[i]);
 	}
@@ -468,25 +468,25 @@ void irc_bot_final(void) {
  */
 void ircbot_defaults(void) {
 	ircbot = &irc_bot_s;
-	
+
 	ircbot->channel = NULL;
-	
+
 	ircbot->init = irc_bot_init;
 	ircbot->final = irc_bot_final;
-	
+
 	ircbot->parse = irc_parse;
 	ircbot->parse_sub = irc_parse_sub;
 	ircbot->parse_source = irc_parse_source;
-	
+
 	ircbot->func_search = irc_func_search;
-	
+
 	ircbot->connect_timer = irc_connect_timer;
 	ircbot->identify_timer = irc_identify_timer;
 	ircbot->join_timer = irc_join_timer;
-	
+
 	ircbot->send = irc_send;
 	ircbot->relay = irc_relay;
-	
+
 	ircbot->pong = irc_pong;
 	ircbot->privmsg = irc_privmsg;