Merge tag 'branchpoint-5.1' into release

[disorder] / lib / client-common.c

diff --git a/lib/client-common.c b/lib/client-common.c
index ced82e4fb6eaf71199dc79fd422cb9ae4cbca8d4..f88008ffe2e4b8a11e693d281f670d65585f1457 100644 (file)
--- a/lib/client-common.c
+++ b/lib/client-common.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder
 /*
  * This file is part of DisOrder

- * Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell
+ * Copyright (C) 2004, 2005, 2006, 2007, 2009 Richard Kettlewell

  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


@@ -25,6 +25,7 @@
 #include <sys/un.h>
 #include <errno.h>
 #include <netdb.h>
 #include <sys/un.h>
 #include <errno.h>
 #include <netdb.h>

+#include <unistd.h>

 
 #include "log.h"
 #include "configuration.h"
 
 #include "log.h"
 #include "configuration.h"


@@ -43,25 +44,26 @@ socklen_t find_server(struct config *c,
   struct sockaddr *sa;
   struct sockaddr_un su;
   struct addrinfo *res = 0;
   struct sockaddr *sa;
   struct sockaddr_un su;
   struct addrinfo *res = 0;

-  char *name;
+  char *name = NULL;

   socklen_t len;
   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 {

-    name = config_get_file2(c, "socket");
+    /* use the private socket if possible (which it should be) */
+    name = config_get_file2(c, "private/socket");
+    if(access(name, R_OK) != 0) {
+      xfree(name);
+      name = NULL;
+    }
+    if(!name)
+      name = config_get_file2(c, "socket");

     if(strlen(name) >= sizeof su.sun_path) {
     if(strlen(name) >= sizeof su.sun_path) {

-      error(errno, "socket path is too long");
+      disorder_error(errno, "socket path is too long");

       return -1;
     }
     memset(&su, 0, sizeof su);
       return -1;
     }
     memset(&su, 0, sizeof su);


@@ -69,16 +71,22 @@ socklen_t find_server(struct config *c,
     strcpy(su.sun_path, name);
     sa = (struct sockaddr *)&su;
     len = sizeof su;
     strcpy(su.sun_path, name);
     sa = (struct sockaddr *)&su;
     len = sizeof su;

+    xfree(name);

   }
   *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;
 }
 

+const char disorder__body[1];
+const char disorder__list[1];
+const char disorder__integer[1];
+const char disorder__time[1];
+

 /*
 Local Variables:
 c-basic-offset:2
 /*
 Local Variables:
 c-basic-offset:2