* This file is part of DisOrder
* Copyright (C) 2004, 2005, 2006, 2007 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
- * 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.
- *
- * 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
- * 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 <string.h>
#include <errno.h>
#include <netdb.h>
#include "mem.h"
/** @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
*/
-socklen_t find_server(struct sockaddr **sap, char **namep) {
+socklen_t find_server(struct config *c,
+ struct sockaddr **sap, char **namep) {
struct sockaddr *sa;
struct sockaddr_un su;
struct addrinfo *res = 0;
char *name;
socklen_t len;
-
- static const struct addrinfo pref = {
- 0,
- PF_INET,
- SOCK_STREAM,
- IPPROTO_TCP,
- 0,
- 0,
- 0,
- 0
- };
- if(config->connect.n) {
- res = get_address(&config->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 {
- name = config_get_file("socket");
+ name = config_get_file2(c, "socket");
if(strlen(name) >= sizeof su.sun_path) {
error(errno, "socket path is too long");
return -1;
*sap = xmalloc_noptr(len);
memcpy(*sap, sa, len);
if(namep)
- *namep = name;
+ *namep = format_sockaddr(sa);
if(res)
freeaddrinfo(res);
return len;