80e911647c
The address size passed to network system calls now reflects the the actual IP type (v4 or v6). Fix Windows and OSX ipv6 sockets
71 lines
2.1 KiB
C++
71 lines
2.1 KiB
C++
#ifndef SOCKET_HELPERS_H
|
|
#define SOCKET_HELPERS_H
|
|
|
|
#include <string.h>
|
|
|
|
// helpers for sockaddr -> IP_Address and back, should work for posix and winsock. All implementations should use this
|
|
|
|
static size_t _set_sockaddr(struct sockaddr_storage* p_addr, const IP_Address& p_ip, int p_port) {
|
|
|
|
memset(p_addr, 0, sizeof(struct sockaddr_storage));
|
|
if (p_ip.type == IP_Address::TYPE_IPV6) {
|
|
|
|
struct sockaddr_in6* addr6 = (struct sockaddr_in6*)p_addr;
|
|
addr6->sin6_family = AF_INET6;
|
|
addr6->sin6_port = htons(p_port);
|
|
copymem(&addr6->sin6_addr.s6_addr, p_ip.field8, 16);
|
|
return sizeof(sockaddr_in6);
|
|
|
|
} else {
|
|
|
|
struct sockaddr_in* addr4 = (struct sockaddr_in*)p_addr;
|
|
addr4->sin_family = AF_INET; // host byte order
|
|
addr4->sin_port = htons(p_port); // short, network byte order
|
|
addr4->sin_addr = *((struct in_addr*)&p_ip.field32[0]);
|
|
return sizeof(sockaddr_in);
|
|
};
|
|
};
|
|
|
|
static size_t _set_listen_sockaddr(struct sockaddr_storage* p_addr, int p_port, IP_Address::AddrType p_address_type, const List<String> *p_accepted_hosts) {
|
|
|
|
memset(p_addr, 0, sizeof(struct sockaddr_storage));
|
|
if (p_address_type == IP_Address::TYPE_IPV4) {
|
|
struct sockaddr_in* addr4 = (struct sockaddr_in*)p_addr;
|
|
addr4->sin_family = AF_INET;
|
|
addr4->sin_port = htons(p_port);
|
|
addr4->sin_addr.s_addr = INADDR_ANY; // TODO: use accepted hosts list
|
|
return sizeof(sockaddr_in);
|
|
} else {
|
|
struct sockaddr_in6* addr6 = (struct sockaddr_in6*)p_addr;
|
|
|
|
addr6->sin6_family = AF_INET6;
|
|
addr6->sin6_port = htons(p_port);
|
|
addr6->sin6_addr = in6addr_any; // TODO: use accepted hosts list
|
|
return sizeof(sockaddr_in6);
|
|
};
|
|
};
|
|
|
|
static void _set_ip_addr_port(IP_Address& r_ip, int& r_port, struct sockaddr_storage* p_addr) {
|
|
|
|
if (p_addr->ss_family == AF_INET) {
|
|
r_ip.type = IP_Address::TYPE_IPV4;
|
|
|
|
struct sockaddr_in* addr4 = (struct sockaddr_in*)p_addr;
|
|
r_ip.field32[0] = (uint32_t)addr4->sin_addr.s_addr;
|
|
|
|
r_port = ntohs(addr4->sin_port);
|
|
|
|
} else if (p_addr->ss_family == AF_INET6) {
|
|
|
|
r_ip.type = IP_Address::TYPE_IPV6;
|
|
|
|
struct sockaddr_in6* addr6 = (struct sockaddr_in6*)p_addr;
|
|
copymem(&addr6->sin6_addr.s6_addr, r_ip.field8, 16);
|
|
|
|
r_port = ntohs(addr6->sin6_port);
|
|
};
|
|
};
|
|
|
|
|
|
#endif
|