Merge config aliasing bug fix.

[disorder] / lib / client-common.c

diff --git a/lib/client-common.c b/lib/client-common.c
index ced82e4fb6eaf71199dc79fd422cb9ae4cbca8d4..aa4312430a3ae837c83b4eabeb63ab92b323fd2b 100644 (file)
--- a/lib/client-common.c
+++ b/lib/client-common.c
@@ -45,17 +45,11 @@ socklen_t find_server(struct config *c,
   struct addrinfo *res = 0;
   char *name;
   socklen_t len;
   struct addrinfo *res = 0;
   char *name;
   socklen_t len;

-   
-  static const struct addrinfo pref = {
-    .ai_flags = 0,
-    .ai_family = PF_INET,
-    .ai_socktype = SOCK_STREAM,
-    .ai_protocol = IPPROTO_TCP,
-  };

 
 

-  if(c->connect.n) {
-    res = get_address(&c->connect, &pref, &name);
-    if(!res) return -1;
+  if(c->connect.af != -1) {
+    res = netaddress_resolve(&c->connect, 0, IPPROTO_TCP);
+    if(!res) 
+      return -1;

     sa = res->ai_addr;
     len = res->ai_addrlen;
   } else {
     sa = res->ai_addr;
     len = res->ai_addrlen;
   } else {


@@ -73,7 +67,7 @@ socklen_t find_server(struct config *c,
   *sap = xmalloc_noptr(len);
   memcpy(*sap, sa, len);
   if(namep)
   *sap = xmalloc_noptr(len);
   memcpy(*sap, sa, len);
   if(namep)

-    *namep = name;
+    *namep = format_sockaddr(sa);

   if(res)
     freeaddrinfo(res);
   return len;
   if(res)
     freeaddrinfo(res);
   return len;