X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/460b9539a7c15580e41a71bbc0f47ae776238915..6d18d6806634eb730c416f45043e332a72c1f400:/lib/client-common.c

diff --git a/lib/client-common.c b/lib/client-common.c
index 1e8fbac..53da8ac 100644
--- a/lib/client-common.c
+++ b/lib/client-common.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder
- * Copyright (C) 2004, 2005, 2006 Richard Kettlewell
+ * Copyright (C) 2004, 2005, 2006, 2007 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
@@ -18,14 +18,10 @@
  * USA
  */
 
-#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 <string.h>
 #include <errno.h>
 #include <netdb.h>
 
@@ -33,46 +29,51 @@
 #include "configuration.h"
 #include "client-common.h"
 #include "addr.h"
+#include "mem.h"
 
-int with_sockaddr(void *c,
-		  int (*function)(void *c,
-				  const struct sockaddr *sa,
-				  socklen_t len,
-				  const char *ident)) {
-  const char *path;
+/** @brief Figure out what address to connect to
+ * @param sap Where to store pointer to sockaddr
+ * @param namep Where to store socket name
+ * @return Socket length, or (socklen_t)-1
+ */
+socklen_t find_server(struct sockaddr **sap, char **namep) {
+  struct sockaddr *sa;
   struct sockaddr_un su;
-  struct addrinfo *res;
+  struct addrinfo *res = 0;
   char *name;
-  int n;
+  socklen_t len;
    
   static const struct addrinfo pref = {
-    0,
-    PF_INET,
-    SOCK_STREAM,
-    IPPROTO_TCP,
-    0,
-    0,
-    0,
-    0
+    .ai_flags = 0,
+    .ai_family = PF_INET,
+    .ai_socktype = SOCK_STREAM,
+    .ai_protocol = IPPROTO_TCP,
   };
 
   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;
+    sa = res->ai_addr;
+    len = res->ai_addrlen;
   } else {
-    path = config_get_file("socket");
-    if(strlen(path) >= sizeof su.sun_path) {
+    name = config_get_file("socket");
+    if(strlen(name) >= sizeof su.sun_path) {
       error(errno, "socket path is too long");
       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;
   }
+  *sap = xmalloc_noptr(len);
+  memcpy(*sap, sa, len);
+  if(namep)
+    *namep = name;
+  if(res)
+    freeaddrinfo(res);
+  return len;
 }
 
 /*
@@ -83,4 +84,3 @@ fill-column:79
 indent-tabs-mode:nil
 End:
 */
-/* arch-tag:NhE5Xyy+Tzv6rhKtZ1jNlg */