/*
net_socket.c -- Handle various kinds of sockets.
Copyright (C) 1998-2005 Ivo Timmermans,
- 2000-2010 Guus Sliepen <guus@tinc-vpn.org>
+ 2000-2012 Guus Sliepen <guus@tinc-vpn.org>
2006 Scott Lamb <slamb@slamb.org>
2009 Florian Forster <octo@verplant.org>
#include "utils.h"
#include "xalloc.h"
-#include <assert.h>
-
/* Needed on Mac OS/X */
#ifndef SOL_TCP
#define SOL_TCP IPPROTO_TCP
return true;
}
-static bool bind_to_address(connection_t *c) {
- char *node;
- struct addrinfo *ai_list;
- struct addrinfo *ai_ptr;
- struct addrinfo ai_hints;
- int status;
-
- assert(c != NULL);
- assert(c->socket >= 0);
-
- node = NULL;
- if(!get_config_string(lookup_config(config_tree, "BindToAddress"),
- &node))
- return true;
-
- assert(node != NULL);
-
- memset(&ai_hints, 0, sizeof(ai_hints));
- ai_hints.ai_family = c->address.sa.sa_family;
- /* We're called from `do_outgoing_connection' only. */
- ai_hints.ai_socktype = SOCK_STREAM;
- ai_hints.ai_protocol = IPPROTO_TCP;
-
- ai_list = NULL;
-
- status = getaddrinfo(node, /* service = */ NULL,
- &ai_hints, &ai_list);
- if(status) {
- free(node);
- logger(LOG_WARNING, "Error looking up %s port %s: %s",
- node, "any", gai_strerror(status));
- return false;
- }
- assert(ai_list != NULL);
-
- status = -1;
- for(ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next) {
- status = bind(c->socket,
- ai_list->ai_addr, ai_list->ai_addrlen);
- if(!status)
- break;
- }
-
-
- if(status) {
- logger(LOG_ERR, "Can't bind to %s/tcp: %s", node, sockstrerror(sockerrno));
- } else ifdebug(CONNECTIONS) {
- logger(LOG_DEBUG, "Successfully bound outgoing "
- "TCP socket to %s", node);
- }
-
- free(node);
- freeaddrinfo(ai_list);
-
- return status ? false : true;
-}
-
int setup_listen_socket(const sockaddr_t *sa) {
int nfd;
char *addrstr;
return -1;
}
+#ifdef FD_CLOEXEC
+ fcntl(nfd, F_SETFD, FD_CLOEXEC);
+#endif
+
/* Optimize TCP settings */
option = 1;
return -1;
}
+#ifdef FD_CLOEXEC
+ fcntl(nfd, F_SETFD, FD_CLOEXEC);
+#endif
+
#ifdef O_NONBLOCK
{
int flags = fcntl(nfd, F_GETFL);
option = 1;
setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, (void *)&option, sizeof option);
+ setsockopt(nfd, SOL_SOCKET, SO_BROADCAST, (void *)&option, sizeof option);
if(udp_rcvbuf && setsockopt(nfd, SOL_SOCKET, SO_RCVBUF, (void *)&udp_rcvbuf, sizeof(udp_rcvbuf)))
logger(LOG_WARNING, "Can't set UDP SO_RCVBUF to %i: %s", udp_rcvbuf, strerror(errno));
send_id(c);
}
-void do_outgoing_connection(connection_t *c) {
+bool do_outgoing_connection(connection_t *c) {
char *address, *port, *space;
int result;
retry_outgoing(c->outgoing);
c->outgoing = NULL;
connection_del(c);
- return;
+ return false;
}
get_config_string(c->outgoing->cfg, &address);
c->socket = socket(c->address.sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
+#ifdef FD_CLOEXEC
+ fcntl(c->socket, F_SETFD, FD_CLOEXEC);
+#endif
+
if(c->socket == -1) {
ifdebug(CONNECTIONS) logger(LOG_ERR, "Creating socket for %s failed: %s", c->hostname, sockstrerror(sockerrno));
goto begin;
#endif
bind_to_interface(c->socket);
- bind_to_address(c);
/* Optimize TCP settings */
if(result == -1) {
if(sockinprogress(sockerrno)) {
c->status.connecting = true;
- return;
+ return true;
}
closesocket(c->socket);
finish_connecting(c);
- return;
-}
-
-void handle_meta_read(struct bufferevent *event, void *data) {
- logger(LOG_ERR, "handle_meta_read() called");
- abort();
+ return true;
}
-void handle_meta_write(struct bufferevent *event, void *data) {
+static void handle_meta_write(int sock, short events, void *data) {
ifdebug(META) logger(LOG_DEBUG, "handle_meta_write() called");
-}
-void handle_meta_connection_error(struct bufferevent *event, short what, void *data) {
connection_t *c = data;
- logger(LOG_ERR, "handle_meta_connection_error() called: %d: %s", what, strerror(errno));
- terminate_connection(c, c->status.active);
+
+ ssize_t outlen = send(c->socket, c->outbuf.data + c->outbuf.offset, c->outbuf.len - c->outbuf.offset, 0);
+ if(outlen <= 0) {
+ logger(LOG_ERR, "Onoes, outlen = %d (%s)", (int)outlen, strerror(errno));
+ terminate_connection(c, c->status.active);
+ return;
+ }
+
+ buffer_read(&c->outbuf, outlen);
+ if(!c->outbuf.len && event_initialized(&c->outevent))
+ event_del(&c->outevent);
}
void setup_outgoing_connection(outgoing_t *outgoing) {
connection_t *c;
node_t *n;
- event_del(&outgoing->ev);
+ if(event_initialized(&outgoing->ev))
+ event_del(&outgoing->ev);
n = lookup_node(outgoing->name);
connection_add(c);
- do_outgoing_connection(c);
-
- event_set(&c->inevent, c->socket, EV_READ | EV_PERSIST, handle_meta_connection_data, c);
- event_add(&c->inevent, NULL);
- c->buffer = bufferevent_new(c->socket, handle_meta_read, handle_meta_write, handle_meta_connection_error, c);
- if(!c->buffer) {
- logger(LOG_ERR, "bufferevent_new() failed: %s", strerror(errno));
- abort();
+ if (do_outgoing_connection(c)) {
+ event_set(&c->inevent, c->socket, EV_READ | EV_PERSIST, handle_meta_connection_data, c);
+ event_set(&c->outevent, c->socket, EV_WRITE | EV_PERSIST, handle_meta_write, c);
+ event_add(&c->inevent, NULL);
}
- bufferevent_disable(c->buffer, EV_READ);
}
/*
ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Connection from %s", c->hostname);
event_set(&c->inevent, c->socket, EV_READ | EV_PERSIST, handle_meta_connection_data, c);
+ event_set(&c->outevent, c->socket, EV_WRITE | EV_PERSIST, handle_meta_write, c);
event_add(&c->inevent, NULL);
- c->buffer = bufferevent_new(c->socket, NULL, handle_meta_write, handle_meta_connection_error, c);
- if(!c->buffer) {
- logger(LOG_ERR, "bufferevent_new() failed: %s", strerror(errno));
- abort();
- }
- bufferevent_disable(c->buffer, EV_READ);
configure_tcp(c);
send_id(c);
}
-void free_outgoing(outgoing_t *outgoing) {
+static void free_outgoing(outgoing_t *outgoing) {
if(outgoing->ai)
freeaddrinfo(outgoing->ai);