-sockaddr_t str2sockaddr(char *address, char *port)
-{
- struct addrinfo hint, *ai;
- sockaddr_t result;
- int err;
-cp
- memset(&hint, 0, sizeof(hint));
-
- hint.ai_family = AF_UNSPEC;
- hint.ai_flags = AI_NUMERICHOST;
- hint.ai_socktype = SOCK_STREAM;
-
- if((err = getaddrinfo(address, port, &hint, &ai) || !ai))
- {
- syslog(LOG_ERR, _("Error looking up %s port %s: %s\n"), address, port, gai_strerror(err));
- cp_trace();
- raise(SIGFPE);
- exit(0);
- }
-
- result = *(sockaddr_t *)ai->ai_addr;
- freeaddrinfo(ai);
-cp
- return result;
+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;
+}
+
+void sockaddr2str(const sockaddr_t *sa, char **addrstr, char **portstr) {
+ char address[NI_MAXHOST];
+ char port[NI_MAXSERV];
+ char *scopeid;
+ int err;
+
+ if(sa->sa.sa_family == AF_UNKNOWN) {
+ if(addrstr) {
+ *addrstr = xstrdup(sa->unknown.address);
+ }
+
+ if(portstr) {
+ *portstr = xstrdup(sa->unknown.port);
+ }
+
+ return;
+ }
+
+ 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 translating addresses: %s", err == EAI_SYSTEM ? strerror(errno) : gai_strerror(err));
+ abort();
+ }
+
+ scopeid = strchr(address, '%');
+
+ if(scopeid) {
+ *scopeid = '\0'; /* Descope. */
+ }
+
+ if(addrstr) {
+ *addrstr = xstrdup(address);
+ }
+
+ if(portstr) {
+ *portstr = xstrdup(port);
+ }