(svn r13988) -Codechange: move the to IP resolving functions to a separate file.
This commit is contained in:
rubidium
@@ -23,6 +23,7 @@
|
||||
#include "core/udp.h"
|
||||
#include "core/tcp.h"
|
||||
#include "core/core.h"
|
||||
#include "core/host.h"
|
||||
#include "network_gui.h"
|
||||
#include "../console_func.h"
|
||||
#include <stdarg.h> /* va_list */
|
||||
@@ -370,227 +371,6 @@ void CheckMinPlayers()
|
||||
}
|
||||
}
|
||||
|
||||
// Find all IP-aliases for this host
|
||||
static void NetworkFindIPs()
|
||||
{
|
||||
#if !defined(PSP)
|
||||
int i;
|
||||
|
||||
#if defined(BEOS_NET_SERVER) /* doesn't have neither getifaddrs or net/if.h */
|
||||
/* Based on Andrew Bachmann's netstat+.c. Big thanks to him! */
|
||||
int _netstat(int fd, char **output, int verbose);
|
||||
|
||||
int seek_past_header(char **pos, const char *header) {
|
||||
char *new_pos = strstr(*pos, header);
|
||||
if (new_pos == 0) {
|
||||
return B_ERROR;
|
||||
}
|
||||
*pos += strlen(header) + new_pos - *pos + 1;
|
||||
return B_OK;
|
||||
}
|
||||
|
||||
int output_length;
|
||||
char *output_pointer = NULL;
|
||||
char **output;
|
||||
int sock = socket(AF_INET, SOCK_DGRAM, 0);
|
||||
i = 0;
|
||||
|
||||
// If something fails, make sure the list is empty
|
||||
_broadcast_list[0] = 0;
|
||||
|
||||
if (sock < 0) {
|
||||
DEBUG(net, 0, "[core] error creating socket");
|
||||
return;
|
||||
}
|
||||
|
||||
output_length = _netstat(sock, &output_pointer, 1);
|
||||
if (output_length < 0) {
|
||||
DEBUG(net, 0, "[core] error running _netstat");
|
||||
return;
|
||||
}
|
||||
|
||||
output = &output_pointer;
|
||||
if (seek_past_header(output, "IP Interfaces:") == B_OK) {
|
||||
for (;;) {
|
||||
uint32 n, fields, read;
|
||||
uint8 i1, i2, i3, i4, j1, j2, j3, j4;
|
||||
struct in_addr inaddr;
|
||||
uint32 ip;
|
||||
uint32 netmask;
|
||||
|
||||
fields = sscanf(*output, "%u: %hhu.%hhu.%hhu.%hhu, netmask %hhu.%hhu.%hhu.%hhu%n",
|
||||
&n, &i1, &i2, &i3, &i4, &j1, &j2, &j3, &j4, &read);
|
||||
read += 1;
|
||||
if (fields != 9) {
|
||||
break;
|
||||
}
|
||||
|
||||
ip = (uint32)i1 << 24 | (uint32)i2 << 16 | (uint32)i3 << 8 | (uint32)i4;
|
||||
netmask = (uint32)j1 << 24 | (uint32)j2 << 16 | (uint32)j3 << 8 | (uint32)j4;
|
||||
|
||||
if (ip != INADDR_LOOPBACK && ip != INADDR_ANY) {
|
||||
inaddr.s_addr = htonl(ip | ~netmask);
|
||||
_broadcast_list[i] = inaddr.s_addr;
|
||||
i++;
|
||||
if (i == MAX_INTERFACES) break;
|
||||
}
|
||||
if (read < 0) {
|
||||
break;
|
||||
}
|
||||
*output += read;
|
||||
}
|
||||
/* XXX - Using either one of these crashes openttd heavily? - wber */
|
||||
/*free(output_pointer);*/
|
||||
/*free(output);*/
|
||||
closesocket(sock);
|
||||
}
|
||||
#elif defined(HAVE_GETIFADDRS)
|
||||
struct ifaddrs *ifap, *ifa;
|
||||
|
||||
// If something fails, make sure the list is empty
|
||||
_broadcast_list[0] = 0;
|
||||
|
||||
if (getifaddrs(&ifap) != 0)
|
||||
return;
|
||||
|
||||
i = 0;
|
||||
for (ifa = ifap; ifa != NULL; ifa = ifa->ifa_next) {
|
||||
if (!(ifa->ifa_flags & IFF_BROADCAST)) continue;
|
||||
if (ifa->ifa_broadaddr == NULL) continue;
|
||||
if (ifa->ifa_broadaddr->sa_family != AF_INET) continue;
|
||||
_broadcast_list[i] = ((struct sockaddr_in*)ifa->ifa_broadaddr)->sin_addr.s_addr;
|
||||
i++;
|
||||
if (i == MAX_INTERFACES) break;
|
||||
}
|
||||
freeifaddrs(ifap);
|
||||
|
||||
#else /* not HAVE_GETIFADDRS */
|
||||
SOCKET sock;
|
||||
#ifdef WIN32
|
||||
DWORD len = 0;
|
||||
INTERFACE_INFO ifo[MAX_INTERFACES];
|
||||
uint j;
|
||||
#else
|
||||
char buf[4 * 1024]; // Arbitrary buffer size
|
||||
struct ifconf ifconf;
|
||||
const char* buf_end;
|
||||
const char* p;
|
||||
#endif
|
||||
|
||||
// If something fails, make sure the list is empty
|
||||
_broadcast_list[0] = 0;
|
||||
|
||||
sock = socket(AF_INET, SOCK_DGRAM, 0);
|
||||
if (sock == INVALID_SOCKET) return;
|
||||
|
||||
#ifdef WIN32
|
||||
memset(&ifo[0], 0, sizeof(ifo));
|
||||
if ((WSAIoctl(sock, SIO_GET_INTERFACE_LIST, NULL, 0, &ifo[0], sizeof(ifo), &len, NULL, NULL)) != 0) {
|
||||
closesocket(sock);
|
||||
return;
|
||||
}
|
||||
|
||||
i = 0;
|
||||
for (j = 0; j < len / sizeof(*ifo); j++) {
|
||||
if (ifo[j].iiFlags & IFF_LOOPBACK) continue;
|
||||
if (!(ifo[j].iiFlags & IFF_BROADCAST)) continue;
|
||||
/* iiBroadcast is unusable, because it always seems to be set to
|
||||
* 255.255.255.255.
|
||||
*/
|
||||
_broadcast_list[i++] =
|
||||
ifo[j].iiAddress.AddressIn.sin_addr.s_addr |
|
||||
~ifo[j].iiNetmask.AddressIn.sin_addr.s_addr;
|
||||
if (i == MAX_INTERFACES) break;
|
||||
}
|
||||
#else
|
||||
ifconf.ifc_len = sizeof(buf);
|
||||
ifconf.ifc_buf = buf;
|
||||
if (ioctl(sock, SIOCGIFCONF, &ifconf) == -1) {
|
||||
closesocket(sock);
|
||||
return;
|
||||
}
|
||||
|
||||
i = 0;
|
||||
buf_end = buf + ifconf.ifc_len;
|
||||
for (p = buf; p < buf_end;) {
|
||||
const struct ifreq* req = (const struct ifreq*)p;
|
||||
|
||||
if (req->ifr_addr.sa_family == AF_INET) {
|
||||
struct ifreq r;
|
||||
|
||||
strncpy(r.ifr_name, req->ifr_name, lengthof(r.ifr_name));
|
||||
if (ioctl(sock, SIOCGIFFLAGS, &r) != -1 &&
|
||||
r.ifr_flags & IFF_BROADCAST &&
|
||||
ioctl(sock, SIOCGIFBRDADDR, &r) != -1) {
|
||||
_broadcast_list[i++] =
|
||||
((struct sockaddr_in*)&r.ifr_broadaddr)->sin_addr.s_addr;
|
||||
if (i == MAX_INTERFACES) break;
|
||||
}
|
||||
}
|
||||
|
||||
p += sizeof(struct ifreq);
|
||||
#if defined(AF_LINK) && !defined(SUNOS)
|
||||
p += req->ifr_addr.sa_len - sizeof(struct sockaddr);
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
closesocket(sock);
|
||||
#endif /* not HAVE_GETIFADDRS */
|
||||
|
||||
_broadcast_list[i] = 0;
|
||||
|
||||
DEBUG(net, 3, "Detected broadcast addresses:");
|
||||
// Now display to the debug all the detected ips
|
||||
for (i = 0; _broadcast_list[i] != 0; i++) {
|
||||
DEBUG(net, 3, "%d) %s", i, inet_ntoa(*(struct in_addr *)&_broadcast_list[i]));//inet_ntoa(inaddr));
|
||||
}
|
||||
#endif /* PSP */
|
||||
}
|
||||
|
||||
// Resolve a hostname to a inet_addr
|
||||
unsigned long NetworkResolveHost(const char *hostname)
|
||||
{
|
||||
in_addr_t ip;
|
||||
|
||||
// First try: is it an ip address?
|
||||
ip = inet_addr(hostname);
|
||||
|
||||
// If not try to resolve the name
|
||||
if (ip == INADDR_NONE) {
|
||||
struct in_addr addr;
|
||||
#if !defined(PSP)
|
||||
struct hostent *he = gethostbyname(hostname);
|
||||
if (he == NULL) {
|
||||
DEBUG(net, 0, "Cannot resolve '%s'", hostname);
|
||||
return ip;
|
||||
}
|
||||
addr = *(struct in_addr *)he->h_addr_list[0];
|
||||
#else
|
||||
int rid = -1;
|
||||
char buf[1024];
|
||||
|
||||
/* Create a resolver */
|
||||
if (sceNetResolverCreate(&rid, buf, sizeof(buf)) < 0) {
|
||||
DEBUG(net, 0, "[NET] Error connecting resolver");
|
||||
return ip;
|
||||
}
|
||||
|
||||
/* Try to resolve the name */
|
||||
if (sceNetResolverStartNtoA(rid, hostname, &addr, 2, 3) < 0) {
|
||||
DEBUG(net, 0, "[NET] Cannot resolve %s", hostname);
|
||||
sceNetResolverDelete(rid);
|
||||
return ip;
|
||||
}
|
||||
sceNetResolverDelete(rid);
|
||||
#endif /* PSP */
|
||||
|
||||
DEBUG(net, 1, "[NET] Resolved %s to %s", hostname, inet_ntoa(addr));
|
||||
ip = addr.s_addr;
|
||||
}
|
||||
return ip;
|
||||
}
|
||||
|
||||
/** Converts a string to ip/port/player
|
||||
* Format: IP#player:port
|
||||
*
|
||||
@@ -1431,7 +1211,7 @@ void NetworkStartUp()
|
||||
|
||||
NetworkInitialize();
|
||||
DEBUG(net, 3, "[core] network online, multiplayer available");
|
||||
NetworkFindIPs();
|
||||
NetworkFindBroadcastIPs(_broadcast_list, MAX_INTERFACES);
|
||||
}
|
||||
|
||||
/** This shuts the network down */
|
||||
|
||||
Reference in New Issue
Block a user