StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Fix inet_pton/ntop on win32

Browse Source
This commit is contained in:
BtbN 2013-09-21 17:17:44 +02:00
parent 83c6e9dd35
commit a7eb9b2c34
2 changed files with 67 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
toxcore/network.c
View File

@ -32,6 +32,72 @@
#define IPV6_V6ONLY 27
#endif
#ifdef WIN32
static const char *inet_ntop(sa_family_t family, void *addr, char *buf, size_t bufsize)
{
if(family == AF_INET)
{
struct sockaddr_in saddr = { 0 };
saddr.sin_family = AF_INET;
saddr.sin_addr = *(struct in_addr*)addr;
DWORD len = bufsize;
if(WSAAddressToString((LPSOCKADDR)&saddr, sizeof(saddr), NULL, buf, &len))
return NULL;
return buf;
}
else if(family == AF_INET6)
{
struct sockaddr_in6 saddr = { 0 };
saddr.sin6_family = AF_INET6;
saddr.sin6_addr = *(struct in6_addr*)addr;
DWORD len = bufsize;
if(WSAAddressToString((LPSOCKADDR)&saddr, sizeof(saddr), NULL, buf, &len))
return NULL;
return buf;
}
return NULL;
}
static int inet_pton(sa_family_t family, const char *addrString, void *addrbuf)
{
if(family == AF_INET)
{
struct sockaddr_in saddr = { 0 };
INT len = sizeof(saddr);
if(WSAStringToAddress((LPTSTR)addrString, AF_INET, NULL, (LPSOCKADDR)&saddr, &len))
return 0;
*(struct in_addr*)addrbuf = saddr.sin_addr;
return 1;
}
else if(family == AF_INET6)
{
struct sockaddr_in6 saddr = { 0 };
INT len = sizeof(saddr);
if(WSAStringToAddress((LPTSTR)addrString, AF_INET6, NULL, (LPSOCKADDR)&saddr, &len))
return 0;
*(struct in6_addr*)addrbuf = saddr.sin6_addr;
return 1;
}
return 0;
}
#endif
/* return current UNIX time in microseconds (us). */
uint64_t current_time(void)
{

2
toxcore/network.h
View File

@ -40,7 +40,7 @@
#include <ws2tcpip.h>
typedef unsigned int sock_t;
typedef unsigned int sa_family_t;
typedef INT sa_family_t;
#ifndef IN6_ARE_ADDR_EQUAL
#define IN6_ARE_ADDR_EQUAL(a,b) \