-/*
- creates new conn_list element, and initializes it
-*/
-conn_list_t *new_conn_list(void)
-{
- conn_list_t *p = xmalloc(sizeof(conn_list_t));
-
- /* initialise all those stupid pointers at once */
- memset(p, '\0', sizeof(conn_list_t));
- p->nexthop = p;
- return p;
+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_UNSPEC) {
+ if(addrstr)
+ *addrstr = xstrdup("unspec");
+ if(portstr)
+ *portstr = xstrdup("unspec");
+ return;
+ } else 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(DEBUG_ALWAYS, LOG_ERR, "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);