+ */
+
+ /* Optimize TCP settings?
+
+ option = 1;
+ setsockopt(c->socket, SOL_SOCKET, SO_KEEPALIVE, &option, sizeof(option));
+#ifdef HAVE_LINUX
+ setsockopt(c->socket, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
+
+ option = IPTOS_LOWDELAY;
+ setsockopt(c->socket, SOL_IP, IP_TOS, &option, sizeof(option));
+#endif
+
+ */
+
+ /* Connect */
+
+ if(connect(c->socket, c->address->ai_addr, c->address->ai_addrlen) == -1)
+ {
+ close(c->socket);
+ syslog(LOG_ERR, _("%s port %s: %m"), c->hostname, c->port);
+ return -1;
+ }
+
+ flags = fcntl(c->socket, F_GETFL);
+
+ if(fcntl(c->socket, F_SETFL, flags | O_NONBLOCK) < 0)
+ {
+ close(c->socket);
+ syslog(LOG_ERR, _("fcntl for %s port %s: %m"),
+ c->hostname, c->port);
+ return -1;
+ }
+
+ if(debug_lvl >= DEBUG_CONNECTIONS)
+ syslog(LOG_INFO, _("Connected to %s port %s"),
+ c->hostname, c->port);
+cp
+ return 0;
+}
+
+int setup_outgoing_connection(char *name)
+{
+ connection_t *c;
+ node_t *n;
+ struct addrinfo *ai, *aitop, hints;
+ int r, ipv6preferred;
+
+cp
+ n = lookup_node(name);
+
+ if(n)
+ if(n->connection)
+ {
+ if(debug_lvl >= DEBUG_CONNECTIONS)
+ syslog(LOG_INFO, _("Already connected to %s"), name);
+ return 0;
+ }
+
+ c = new_connection();
+ c->name = xstrdup(name);
+
+ init_configuration(&c->config_tree);
+ read_connection_config(c);
+
+ if(!get_config_string(lookup_config(c->config_tree, "Address"), &c->hostname))
+ {
+ syslog(LOG_ERR, _("No address specified for %s"), c->name);
+ free_connection(c);
+ return -1;
+ }
+
+ if(!get_config_string(lookup_config(c->config_tree, "Port"), &c->port))
+ {
+ syslog(LOG_ERR, _("No port specified for %s"), c->name);
+ free_connection(c);
+ return -1;
+ }
+
+ hints.ai_socktype = SOCK_STREAM;
+ hints.ai_family = AF_INET;
+ if(get_config_bool(lookup_config(c->config_tree, "IPv6Preferred"), &ipv6preferred))
+ {
+ if(ipv6preferred)
+ hints.ai_family = PF_UNSPEC;
+ }
+
+ if((r = getaddrinfo(c->hostname, c->port, &hints, &aitop)) != 0)
+ {
+ syslog(LOG_ERR, _("Looking up %s failed: %s\n"),
+ c->hostname, gai_strerror(r));
+ return -1;
+ }
+
+ for(ai = aitop; ai != NULL; ai = ai->ai_next)
+ {
+ if(setup_outgoing_socket(c) < 0)
+ continue;
+ }
+
+ if(ai == NULL)