- Tested and fixed resolve_hostbyname.

- Applied said function around most of the code where needed. Removed includes for the OS/network system pretty much from every file (our socket.c file should handle this)
- Added clif_getip_long, which returns the ip as a long. Prevents having to include the files to define the int_addr structure in all files that include clif.h
- Made the GM mute request bypass the manner_system setting.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7285 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 2 insertions, 30 deletions

diff --git a/src/map/irc.c b/src/map/irc.c
index 4c14d81d6..4cfe1fc7c 100644
--- a/src/map/irc.c
+++ b/src/map/irc.c
@@ -1,28 +1,7 @@
 #include <ctype.h>

 #include <string.h>

-

-#ifdef __WIN32

-#define __USE_W32_SOCKETS

-#include <windows.h>

-#include <io.h>

-typedef int socklen_t;

-#else

-#include <sys/socket.h>

-#include <netinet/in.h>

-#include <sys/time.h>

-#include <unistd.h>

-#include <sys/ioctl.h>

-#include <netdb.h>

-#include <arpa/inet.h>

-#include <ctype.h>

 #include <stdlib.h>

 

-#ifndef SIOCGIFCONF

-#include <sys/sockio.h> // SIOCGIFCONF on Solaris, maybe others? [Shinomori]

-#endif

-

-#endif

-

 #include "../common/core.h"

 #include "../common/socket.h"

 #include "../common/malloc.h"

@@ -357,24 +336,17 @@ void do_final_irc(void)
 

 void do_init_irc(void)

 {

-	struct hostent *irc_hostname;

-	

 	if(!use_irc)

 		return;

 	if (irc_ip_str[strlen(irc_ip_str)-1] == '\n') 

 		irc_ip_str[strlen(irc_ip_str)-1] = '\0'; 

-	irc_hostname=gethostbyname(irc_ip_str);

-	if (!irc_hostname)

+	irc_ip = resolve_hostbyname(irc_ip_str, NULL, irc_ip_str);

+	if (!irc_ip)

 	{

 		ShowError("Unable to resolve %s! Cannot connect to IRC server, disabling irc_bot.\n", irc_ip_str);

 		use_irc = 0;

 		return;

 	}

-	irc_ip_str[0]='\0';

-	sprintf(irc_ip_str, "%d.%d.%d.%d", (unsigned char)irc_hostname->h_addr[0], (unsigned char)irc_hostname->h_addr[1],

-					   (unsigned char)irc_hostname->h_addr[2], (unsigned char)irc_hostname->h_addr[3]);

-

-	irc_ip=inet_addr(irc_ip_str);

 

 	irc_connect_timer(0, 0, 0, 0);