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 e1fcce9eb59dba1d820ddcb2ef1c1ba3e358269e..f88008ffe2e4b8a11e693d281f670d65585f1457 100644 (file)
--- a/lib/client-common.c
+++ b/lib/client-common.c
@@ -1,86 +1,92 @@
 /*
  * This file is part of DisOrder
 /*
  * This file is part of DisOrder

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

  *
  *

- * This program is free software; you can redistribute it and/or modify
+ * 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
  * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or

  * (at your option) any later version.
  * (at your option) any later version.

- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 

  * You should have received a copy of the GNU General Public License
  * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+/** @file lib/client-common.c
+ * @brief Common code to client APIs

  */
 
  */
 

-#include <config.h>
-#include "types.h"
+#include "common.h"

 
 

-#include <sys/types.h>
-#include <sys/socket.h>

 #include <netinet/in.h>
 #include <sys/un.h>
 #include <netinet/in.h>
 #include <sys/un.h>

-#include <string.h>

 #include <errno.h>
 #include <netdb.h>
 #include <errno.h>
 #include <netdb.h>

+#include <unistd.h>

 
 #include "log.h"
 #include "configuration.h"
 #include "client-common.h"
 #include "addr.h"
 
 #include "log.h"
 #include "configuration.h"
 #include "client-common.h"
 #include "addr.h"

+#include "mem.h"

 
 

-/** @brief Invoke a function with the connect address
- * @param c Passed to callback
- * @param function Function to call
- *
- * Calls @p function with the result of looking up the connect address.
+/** @brief Figure out what address to connect to
+ * @param c Configuration to honor
+ * @param sap Where to store pointer to sockaddr
+ * @param namep Where to store socket name
+ * @return Socket length, or (socklen_t)-1

  */
  */

-int with_sockaddr(void *c,
-                 int (*function)(void *c,
-                                 const struct sockaddr *sa,
-                                 socklen_t len,
-                                 const char *ident)) {
-  const char *path;
+socklen_t find_server(struct config *c,
+                      struct sockaddr **sap, char **namep) {
+  struct sockaddr *sa;

   struct sockaddr_un su;
   struct sockaddr_un su;

-  struct addrinfo *res;
-  char *name;
-  int n;
-   
-  static const struct addrinfo pref = {
-    0,
-    PF_INET,
-    SOCK_STREAM,
-    IPPROTO_TCP,
-    0,
-    0,
-    0,
-    0
-  };
+  struct addrinfo *res = 0;
+  char *name = NULL;
+  socklen_t len;

 
 

-  if(config->connect.n) {
-    res = get_address(&config->connect, &pref, &name);
-    if(!res) return -1;
-    n = function(c, res->ai_addr, res->ai_addrlen, name);
-    freeaddrinfo(res);
-    return n;
+  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 {
   } else {

-    path = config_get_file("socket");
-    if(strlen(path) >= sizeof su.sun_path) {
-      error(errno, "socket path is too long");
+    /* 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) {
+      disorder_error(errno, "socket path is too long");

       return -1;
     }
     memset(&su, 0, sizeof su);
     su.sun_family = AF_UNIX;
       return -1;
     }
     memset(&su, 0, sizeof su);
     su.sun_family = AF_UNIX;

-    strcpy(su.sun_path, path);
-    return function(c, (struct sockaddr *)&su, sizeof su, path);
+    strcpy(su.sun_path, name);
+    sa = (struct sockaddr *)&su;
+    len = sizeof su;
+    xfree(name);

   }
   }

+  *sap = xmalloc_noptr(len);
+  memcpy(*sap, sa, len);
+  if(namep)
+    *namep = format_sockaddr(sa);
+  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