- Added function parse_hostbyname() which takes a hostname and a char[4]. The hostname is resolved to an ip, whose individual components are stored in char[], the return value of the function is the inet_addr result of the lookup (or returns 0 when failed). Meant to be used in the rest of the code without the need to do socket/network related includes.

- Applied use of parse_hostbyname() in chrif.c to fix compilation errors.
- status_percent_change will now account for when the target's max hp/sp is above INT_MAX.


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

2 files changed, 21 insertions, 1 deletions

diff --git a/src/common/socket.c b/src/common/socket.c
index 8fba86e0e..a9a9c628b 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -9,6 +9,7 @@
 #ifdef __WIN32

 #define __USE_W32_SOCKETS

 #include <windows.h>

+#include <winsock.h>

 #include <io.h>

 typedef int socklen_t;

 #else

@@ -16,9 +17,11 @@ typedef int socklen_t;
 #include <netinet/in.h>

 #include <netinet/tcp.h>

 #include <net/if.h>

-#include <sys/time.h>

 #include <unistd.h>

+#include <sys/time.h>

 #include <sys/ioctl.h>

+#include <netdb.h>

+#include <arpa/inet.h>

 

 #ifndef SIOCGIFCONF

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

@@ -1388,3 +1391,15 @@ bool session_isActive(int fd)
 {

 	return ( session_isValid(fd) && !session[fd]->eof );

 }

+

+in_addr_t resolve_hostbyname(char* hostname, char *ip) {

+	struct hostent *h = gethostbyname(hostname);

+	char ip_str[16];

+	if (!h) return 0;

+	ip[0] = (unsigned char) h->h_addr[0];

+	ip[1]	= (unsigned char) h->h_addr[1];

+	ip[2] = (unsigned char) h->h_addr[2];

+	ip[3] = (unsigned char) h->h_addr[3];

+	sprintf(ip_str, "%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);

+	return inet_addr(ip_str);

+}

diff --git a/src/common/socket.h b/src/common/socket.h
index a6a0fb191..01165126e 100644
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -154,6 +154,11 @@ int start_console(void);
 void set_defaultparse(int (*defaultparse)(int));

 void set_defaultconsoleparse(int (*defaultparse)(char*));

 

+//Resolves the hostname and stores the string representation of the string in ip.

+//Meant to simplify calls to gethostbyname without the need of all the

+//required network includes.

+int resolve_hostbyname(char* hostname, char *ip);

+

 extern unsigned int addr_[16];   // ip addresses of local host (host byte order)

 extern unsigned int naddr_;   // # of ip addresses