#include "utils.h"
#include "xalloc.h"
-bool hostnames = false;
-
/*
Turn a string into a struct addrinfo.
Return NULL on failure.
int err;
struct addrinfo hint = {
- .ai_family = addressfamily,
+ .ai_family = AF_UNSPEC,
.ai_socktype = socktype,
};
struct addrinfo hint = {
.ai_family = AF_UNSPEC,
- .ai_flags = AI_NUMERICHOST,
+ .ai_flags = NI_NUMERICHOST | NI_NUMERICSERV,
.ai_socktype = SOCK_STREAM,
};
return str;
}
- err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof(port),
- hostnames ? 0 : (NI_NUMERICHOST | NI_NUMERICSERV));
+ err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof(port), NI_NUMERICHOST | NI_NUMERICSERV);
if(err) {
logger(NULL, MESHLINK_ERROR, "Error while looking up hostname: %s", err == EAI_SYSTEM ? strerror(errno) : gai_strerror(err));
switch(b->sa.sa_family) {
case AF_INET:
- a->in.sin_port = port;
+ a->in.sin_port = htons(port);
break;
case AF_INET6:
- a->in6.sin6_port = port;
+ a->in6.sin6_port = htons(port);
break;
default:
}
sockaddr_t packmsg_get_sockaddr(packmsg_input_t *in) {
- sockaddr_t sa = {0};
+ sockaddr_t sa;
+ memset(&sa, 0, sizeof sa);
int8_t type;
const void *data;