-struct addrinfo *str2addrinfo(char *address, char *service, int socktype)
-{
- struct addrinfo hint, *ai;
- int err;
-cp
- memset(&hint, 0, sizeof(hint));
-
- hint.ai_family = addressfamily;
- hint.ai_socktype = socktype;
-
- if((err = getaddrinfo(address, service, &hint, &ai)))
- {
- if(debug_lvl >= DEBUG_ERROR)
- syslog(LOG_WARNING, _("Error looking up %s port %s: %s\n"), address, service, gai_strerror(err));
- cp_trace();
- return NULL;
- }
-
-cp
- return ai;
+struct addrinfo *str2addrinfo(const char *address, const char *service, int socktype) {
+ struct addrinfo *ai;
+ int err;
+
+ struct addrinfo hint = {
+ .ai_family = AF_UNSPEC,
+ .ai_socktype = socktype,
+ };
+
+ err = getaddrinfo(address, service, &hint, &ai);
+
+ if(err) {
+ logger(NULL, MESHLINK_WARNING, "Error looking up %s port %s: %s", address, service, err == EAI_SYSTEM ? strerror(errno) : gai_strerror(err));
+ return NULL;
+ }
+
+ return ai;
+}
+
+sockaddr_t str2sockaddr(const char *address, const char *port) {
+ struct addrinfo *ai;
+ sockaddr_t result;
+ int err;
+
+ memset(&result, 0, sizeof(result));
+
+ struct addrinfo hint = {
+ .ai_family = AF_UNSPEC,
+ .ai_flags = AI_NUMERICHOST,
+ .ai_socktype = SOCK_STREAM,
+ };
+
+ err = getaddrinfo(address, port, &hint, &ai);
+
+ if(err || !ai) {
+ logger(NULL, MESHLINK_DEBUG, "Unknown type address %s port %s", address, port);
+ result.sa.sa_family = AF_UNKNOWN;
+ result.unknown.address = xstrdup(address);
+ result.unknown.port = xstrdup(port);
+ return result;
+ }
+
+ memcpy(&result, ai->ai_addr, ai->ai_addrlen);
+ freeaddrinfo(ai);
+
+ return result;