paradust7
/
webshims
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle IP addresses in emsocket_getaddrinfo

master
paradust7 2022-05-22 11:34:38 -07:00
parent d380e360ab
commit 01b29b520f
2 changed files with 46 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/emsocket/SocketAddr.h
View File

@ -124,6 +124,11 @@ public:
return sizeof(sin);
}
uint32_t addr32() const {
assert(sin.sin_family == AF_INET);
return sin.sin_addr.s_addr;
}
private:
sockaddr_in sin;
};

70
src/emsocket/emsocket.cpp
View File

@ -345,6 +345,35 @@ int emsocket_sockatmark(int fd);
int emsocket_isfdtype(int fd, int fdtype);
static void _proxy_dns_query(const char *name, uint32_t *addr) {
*addr = 0;
SocketAddr dnsAddr("10.0.0.1", 53);
size_t namelen = strlen(name);
int fd = emsocket_socket(AF_INET, SOCK_STREAM, 0);
if (fd < 0) {
std::cerr << "emsocket_getaddrinfo: emsocket_socket failed, errno = " << errno << std::endl;
goto cleanup;
}
DBG(std::cerr << "CONNECTING TO DNS=" << dnsAddr << std::endl;);
if (emsocket_connect(fd, dnsAddr.sockaddr_ptr(), dnsAddr.sockaddr_len()) != 0) {
std::cerr << "emsocket_getaddrinfo: emsocket_connect failed, errno = " << errno << std::endl;
goto cleanup;
}
if (emsocket_send(fd, name, namelen, 0) != namelen) {
std::cerr << "emsocket_getaddrinfo: emsocket_send failed, errno = " << errno << std::endl;
goto cleanup;
}
if (emsocket_read(fd, addr, 4) != 4) {
std::cerr << "emsocket_getaddrinfo: emsocket_read failed, errno = " << errno << std::endl;
goto cleanup;
}
cleanup:
if (fd >= 0 && emsocket_close(fd) != 0) {
std::cerr << "emsocket_getaddrinfo: emsocket_close failed, errno = " << errno << std::endl;
}
}
int emsocket_getaddrinfo(const char *node, const char *service, const struct addrinfo *hints, struct addrinfo **res) {
DBG(std::cerr << "emsocket_getaddrinfo: node=" << (node ? node : "NULL") << ", service=" << (service ? service : "NULL") << std::endl;);
if (service != NULL) {
@ -360,39 +389,22 @@ int emsocket_getaddrinfo(const char *node, const char *service, const struct add
if (hints && hints->ai_flags != 0) {
// Not supported
std::cerr << "emsocket_getaddrinfo: ai_flags not supported" << std::endl;
return EAI_FAIL;
return EAI_BADFLAGS;
}
// Query the proxy
int fd = emsocket_socket(AF_INET, SOCK_STREAM, 0);
if (fd < 0) {
std::cerr << "emsocket_getaddrinfo: emsocket_socket failed, errno = " << errno << std::endl;
return EAI_SYSTEM;
}
SocketAddr dnsAddr("10.0.0.1", 53);
DBG(std::cerr << "CONNECTING TO DNS=" << dnsAddr << std::endl;);
int rc = emsocket_connect(fd, dnsAddr.sockaddr_ptr(), dnsAddr.sockaddr_len());
if (rc != 0) {
std::cerr << "emsocket_getaddrinfo: emsocket_connect failed, errno = " << errno << std::endl;
emsocket_close(fd);
return EAI_SYSTEM;
}
size_t nodeLen = strlen(node);
if (emsocket_send(fd, node, nodeLen, 0) != nodeLen) {
std::cerr << "emsocket_getaddrinfo: emsocket_send failed, errno = " << errno << std::endl;
return EAI_SYSTEM;
}
uint32_t addr;
if (emsocket_read(fd, &addr, 4) != 4) {
std::cerr << "emsocket_getaddrinfo: emsocket_read failed, errno = " << errno << std::endl;
return EAI_SYSTEM;
uint32_t addr = 0;
// Check for IPv4 address
SocketAddr simpleAddr;
if (simpleAddr.setIP(node)) {
addr = simpleAddr.addr32();
} else {
_proxy_dns_query(node, &addr);
}
if (addr == 0) {
return EAI_FAIL;
}
if (emsocket_close(fd) != 0) {
std::cerr << "emsocket_getaddrinfo: emsocket_close failed, errno = " << errno << std::endl;
return EAI_SYSTEM;
return EAI_AGAIN;
}
struct addrinfo *result = (struct addrinfo*)malloc(sizeof(struct addrinfo));
memset(result, 0, sizeof(struct addrinfo));
result->ai_family = AF_INET;