/*
net.c -- most of the network code
- Copyright (C) 1998,1999,2000 Ivo Timmermans <zarq@iname.com>
+ Copyright (C) 1998,1999,2000 Ivo Timmermans <itimmermans@bigfoot.com>,
+ 2000 Guus Sliepen <guus@sliepen.warande.net>
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
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., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+ $Id: net.c,v 1.35.4.26 2000/08/09 14:02:16 guus Exp $
*/
#include "config.h"
#include "netutl.h"
#include "protocol.h"
+#include "system.h"
+
int tap_fd = -1;
int total_tap_in = 0;
int total_socket_in = 0;
int total_socket_out = 0;
+int upstreamindex = 0;
static int seconds_till_retry;
/* The global list of existing connections */
int xsend(conn_list_t *cl, void *packet)
{
- int r;
real_packet_t rp;
cp
do_encrypt((vpn_packet_t*)packet, &rp, cl->key);
rp.len = htons(rp.len);
if(debug_lvl > 3)
- syslog(LOG_ERR, "Sent %d bytes to %lx", ntohs(rp.len), cl->vpn_ip);
+ syslog(LOG_ERR, _("Sending packet of %d bytes to %s (%s)"),
+ ntohs(rp.len), cl->vpn_hostname, cl->real_hostname);
+
+ total_socket_out += ntohs(rp.len);
+
+ cl->want_ping = 1;
- if((r = send(cl->socket, (char*)&rp, ntohs(rp.len), 0)) < 0)
+ if((cl->flags | myself->flags) & TCPONLY)
+ return send_tcppacket(cl, (void*)&rp, ntohs(rp.len));
+
+ if((send(cl->socket, (char*)&rp, ntohs(rp.len), 0)) < 0)
{
- syslog(LOG_ERR, "Error sending data: %m");
+ syslog(LOG_ERR, _("Error sending packet to %s (%s): %m"),
+ cl->vpn_hostname, cl->real_hostname);
return -1;
}
-
- total_socket_out += r;
-
- cl->want_ping = 1;
cp
return 0;
}
do_decrypt((real_packet_t*)packet, &vp, cl->key);
add_mac_addresses(&vp);
+ if(debug_lvl > 3)
+ syslog(LOG_ERR, _("Receiving packet of %d bytes from %s (%s)"),
+ ((real_packet_t*)packet)->len, cl->vpn_hostname, cl->real_hostname);
+
if((lenin = write(tap_fd, &vp, vp.len + sizeof(vp.len))) < 0)
- syslog(LOG_ERR, "Can't write to tap device: %m");
+ syslog(LOG_ERR, _("Can't write to tap device: %m"));
else
total_tap_out += lenin;
return 0;
}
+int tcprecv(conn_list_t *cl, real_packet_t *rp)
+{
+ vpn_packet_t vp;
+ int lenin;
+ conn_list_t *f;
+cp
+ rp->data.len = ntohs(rp->data.len);
+ rp->len = ntohs(rp->len);
+ rp->from = ntohl(rp->from);
+
+ total_socket_in += rp->len;
+
+ if(rp->len >= 0)
+ {
+ f = lookup_conn(rp->from);
+ if(!f)
+ {
+ syslog(LOG_ERR, _("Got packet from %s (%s) with unknown origin %d.%d.%d.%d?"),
+ cl->vpn_hostname, cl->real_hostname, IP_ADDR_V(rp->from));
+ return -1;
+ }
+
+ if(f->status.validkey)
+ {
+ do_decrypt(rp, &vp, cl->key);
+ add_mac_addresses(&vp);
+
+ if(debug_lvl > 3)
+ syslog(LOG_ERR, _("Receiving packet of %d bytes from %s (%s)"),
+ rp->len, cl->vpn_hostname, cl->real_hostname);
+
+ if((lenin = write(tap_fd, &vp, vp.len + sizeof(vp.len))) < 0)
+ syslog(LOG_ERR, _("Can't write to tap device: %m"));
+ else
+ total_tap_out += lenin;
+ }
+ else
+ {
+ add_queue(&(cl->sq), rp, rp->len + 2);
+ if(!cl->status.waitingforkey)
+ send_key_request(rp->from);
+ }
+
+ if(my_key_expiry <= time(NULL))
+ regenerate_keys();
+ }
+
+ cl->want_ping = 0;
+ cl->last_ping_time = time(NULL);
+cp
+ return 0;
+}
+
/*
add the given packet of size s to the
queue q, be it the send or receive queue
{
queue_element_t *e;
cp
- if(debug_lvl > 3)
- syslog(LOG_DEBUG, "packet to queue: %d", s);
-
e = xmalloc(sizeof(*e));
e->packet = xmalloc(s);
memcpy(e->packet, packet, s);
}
if(debug_lvl > 3)
- syslog(LOG_DEBUG, "queue flushed");
+ syslog(LOG_DEBUG, _("Queue flushed"));
cp
}
cp
if(cl->sq)
{
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, "Flushing send queue for " IP_ADDR_S,
- IP_ADDR_V(cl->vpn_ip));
+ if(debug_lvl > 3)
+ syslog(LOG_DEBUG, _("Flushing send queue for %s (%s)"),
+ cl->vpn_hostname, cl->real_hostname);
flush_queue(cl, &(cl->sq), xsend);
}
if(cl->rq)
{
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, "Flushing receive queue for " IP_ADDR_S,
- IP_ADDR_V(cl->vpn_ip));
+ if(debug_lvl > 3)
+ syslog(LOG_DEBUG, _("Flushing receive queue for %s (%s)"),
+ cl->vpn_hostname, cl->real_hostname);
flush_queue(cl, &(cl->rq), xrecv);
}
cp
cp
if((cl = lookup_conn(to)) == NULL)
{
- if(debug_lvl > 2)
+ if(debug_lvl > 3)
{
- syslog(LOG_NOTICE, "trying to look up " IP_ADDR_S " in connection list failed.",
+ syslog(LOG_NOTICE, _("Trying to look up %d.%d.%d.%d in connection list failed!"),
IP_ADDR_V(to));
}
+
+ /* Is this really necessary? If we can't find "to", then neither should any uplink. (GS) */
+
+ return -1;
+
+ for(cl = conn_list; cl != NULL && !cl->status.outgoing; cl = cl->next);
+ if(!cl)
+ { /* No open outgoing connection has been found. */
+ if(debug_lvl > 3)
+ syslog(LOG_NOTICE, _("There is no remote host I can send this packet to!"));
+ return -1;
+ }
+ }
+
+ /* If we ourselves have indirectdata flag set, we should send only to our uplink! */
+
+ if(myself->flags & EXPORTINDIRECTDATA)
+ {
for(cl = conn_list; cl != NULL && !cl->status.outgoing; cl = cl->next);
if(!cl)
{ /* No open outgoing connection has been found. */
- if(debug_lvl > 2)
- syslog(LOG_NOTICE, "There is no remote host I can send this packet to.");
+ if(debug_lvl > 3)
+ syslog(LOG_NOTICE, _("There is no remote host I can send this packet to!"));
return -1;
}
}
+ else
+
+ /* If indirectdata flag is set for the destination we just looked up,
+ * then real_ip is actually the vpn_ip of the gateway tincd
+ * it is behind.
+ */
+
+ if(cl->flags & INDIRECTDATA)
+ {
+ if(debug_lvl > 3)
+ syslog(LOG_NOTICE, _("Indirect packet to %s via %s"),
+ cl->vpn_hostname, cl->real_hostname);
+ if((cl = lookup_conn(cl->real_ip)) == NULL)
+ {
+ if(debug_lvl > 3)
+ syslog(LOG_NOTICE, _("Indirect look up %d.%d.%d.%d in connection list failed!"),
+ IP_ADDR_V(to));
+
+ /* Gateway tincd dead? Should we kill it? (GS) */
+
+ return -1;
+ }
+ if(cl->flags & INDIRECTDATA) /* This should not happen */
+ {
+ if(debug_lvl > 3)
+ syslog(LOG_NOTICE, _("Double indirection for %d.%d.%d.%d"),
+ IP_ADDR_V(to));
+ return -1;
+ }
+ }
if(my_key_expiry <= time(NULL))
regenerate_keys();
if(!cl->status.dataopen)
if(setup_vpn_connection(cl) < 0)
- return -1;
-
+ {
+ syslog(LOG_ERR, _("Could not open UDP connection to %s (%s)"), cl->vpn_hostname, cl->real_hostname);
+ return -1;
+ }
+
if(!cl->status.validkey)
{
+ if(debug_lvl > 3)
+ syslog(LOG_INFO, _("%s (%s) has no valid key, queueing packet"), cl->vpn_hostname, cl->real_hostname);
add_queue(&(cl->sq), packet, packet->len + 2);
if(!cl->status.waitingforkey)
send_key_request(cl->vpn_ip); /* Keys should be sent to the host running the tincd */
if(!cl->status.active)
{
+ if(debug_lvl > 3)
+ syslog(LOG_INFO, _("%s (%s) is not ready, queueing packet"), cl->vpn_hostname, cl->real_hostname);
add_queue(&(cl->sq), packet, packet->len + 2);
- if(debug_lvl > 1)
- syslog(LOG_INFO, IP_ADDR_S " is not ready, queueing packet.", IP_ADDR_V(cl->vpn_ip));
return 0; /* We don't want to mess up, do we? */
}
if((nfd = open(tapfname, O_RDWR | O_NONBLOCK)) < 0)
{
- syslog(LOG_ERR, "Could not open %s: %m", tapfname);
+ syslog(LOG_ERR, _("Could not open %s: %m"), tapfname);
return -1;
}
int nfd, flags;
struct sockaddr_in a;
const int one = 1;
+ config_t const *cfg;
cp
if((nfd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
{
- syslog(LOG_ERR, "Creating metasocket failed: %m");
+ syslog(LOG_ERR, _("Creating metasocket failed: %m"));
return -1;
}
if(setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)))
{
- syslog(LOG_ERR, "setsockopt: %m");
+ syslog(LOG_ERR, _("setsockopt: %m"));
+ return -1;
+ }
+
+ if(setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, &one, sizeof(one)))
+ {
+ syslog(LOG_ERR, _("setsockopt: %m"));
return -1;
}
flags = fcntl(nfd, F_GETFL);
if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
{
- syslog(LOG_ERR, "fcntl: %m");
+ syslog(LOG_ERR, _("fcntl: %m"));
return -1;
}
+ if((cfg = get_config_val(interface)))
+ {
+ if(setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, cfg->data.ptr, strlen(cfg->data.ptr)))
+ {
+ syslog(LOG_ERR, _("Unable to bind listen socket to interface %s: %m"), cfg->data.ptr);
+ return -1;
+ }
+ }
+
memset(&a, 0, sizeof(a));
a.sin_family = AF_INET;
a.sin_port = htons(port);
- a.sin_addr.s_addr = htonl(INADDR_ANY);
+
+ if((cfg = get_config_val(interfaceip)))
+ a.sin_addr.s_addr = htonl(cfg->data.ip->ip);
+ else
+ a.sin_addr.s_addr = htonl(INADDR_ANY);
if(bind(nfd, (struct sockaddr *)&a, sizeof(struct sockaddr)))
{
- syslog(LOG_ERR, "Can't bind to port %hd/tcp: %m", port);
+ syslog(LOG_ERR, _("Can't bind to port %hd/tcp: %m"), port);
return -1;
}
if(listen(nfd, 3))
{
- syslog(LOG_ERR, "listen: %m");
+ syslog(LOG_ERR, _("listen: %m"));
return -1;
}
cp
cp
if((nfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
{
- syslog(LOG_ERR, "Creating socket failed: %m");
+ syslog(LOG_ERR, _("Creating socket failed: %m"));
return -1;
}
if(setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)))
{
- syslog(LOG_ERR, "setsockopt: %m");
+ syslog(LOG_ERR, _("setsockopt: %m"));
return -1;
}
flags = fcntl(nfd, F_GETFL);
if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
{
- syslog(LOG_ERR, "fcntl: %m");
+ syslog(LOG_ERR, _("fcntl: %m"));
return -1;
}
if(bind(nfd, (struct sockaddr *)&a, sizeof(struct sockaddr)))
{
- syslog(LOG_ERR, "Can't bind to port %hd/udp: %m", port);
+ syslog(LOG_ERR, _("Can't bind to port %hd/udp: %m"), port);
return -1;
}
cp
struct sockaddr_in a;
config_t const *cfg;
cp
+ if(debug_lvl > 0)
+ syslog(LOG_INFO, _("Trying to connect to %s"), cl->real_hostname);
+
if((cfg = get_config_val(upstreamport)) == NULL)
cl->port = 655;
else
cl->meta_socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
if(cl->meta_socket == -1)
{
- syslog(LOG_ERR, "Creating socket failed: %m");
+ syslog(LOG_ERR, _("Creating socket for %s port %d failed: %m"),
+ cl->real_hostname, cl->port);
return -1;
}
if(connect(cl->meta_socket, (struct sockaddr *)&a, sizeof(a)) == -1)
{
- syslog(LOG_ERR, IP_ADDR_S ":%d: %m", IP_ADDR_V(cl->real_ip), cl->port);
+ syslog(LOG_ERR, _("%s port %hd: %m"), cl->real_hostname, cl->port);
return -1;
}
flags = fcntl(cl->meta_socket, F_GETFL);
if(fcntl(cl->meta_socket, F_SETFL, flags | O_NONBLOCK) < 0)
{
- syslog(LOG_ERR, "fcntl: %m");
+ syslog(LOG_ERR, _("fcntl for %s port %d: %m"),
+ cl->real_hostname, cl->port);
return -1;
}
- cl->hostname = hostlookup(htonl(cl->real_ip));
-
- syslog(LOG_INFO, "Connected to %s:%hd" , cl->hostname, cl->port);
+ if(debug_lvl > 0)
+ syslog(LOG_INFO, _("Connected to %s port %hd"),
+ cl->real_hostname, cl->port);
cp
return 0;
}
an authentication sequence during which
we will do just that.
*/
-int setup_outgoing_connection(ip_t ip)
+int setup_outgoing_connection(char *hostname)
{
conn_list_t *ncn;
+ struct hostent *h;
cp
- ncn = new_conn_list();
- ncn->real_ip = ip;
+ if(!(h = gethostbyname(hostname)))
+ {
+ syslog(LOG_ERR, _("Error looking up `%s': %m"), hostname);
+ return -1;
+ }
+ ncn = new_conn_list();
+ ncn->real_ip = ntohl(*((ip_t*)(h->h_addr_list[0])));
+ ncn->real_hostname = hostlookup(htonl(ncn->real_ip));
+
if(setup_outgoing_meta_socket(ncn) < 0)
{
- syslog(LOG_ERR, "Could not set up a meta connection.");
+ syslog(LOG_ERR, _("Could not set up a meta connection to %s"),
+ ncn->real_hostname);
free_conn_element(ncn);
return -1;
}
if(!(cfg = get_config_val(myvpnip)))
{
- syslog(LOG_ERR, "No value for my VPN IP given");
+ syslog(LOG_ERR, _("No value for my VPN IP given"));
return -1;
}
myself->vpn_ip = cfg->data.ip->ip;
+ myself->vpn_hostname = hostlookup(htonl(myself->vpn_ip));
+ myself->real_hostname = hostlookup(htonl(myself->vpn_ip));
myself->vpn_mask = cfg->data.ip->mask;
+ myself->flags = 0;
if(!(cfg = get_config_val(listenport)))
myself->port = 655;
else
myself->port = cfg->data.val;
+ if((cfg = get_config_val(indirectdata)))
+ if(cfg->data.val == stupid_true)
+ myself->flags |= EXPORTINDIRECTDATA;
+
+ if((cfg = get_config_val(tcponly)))
+ if(cfg->data.val == stupid_true)
+ myself->flags |= TCPONLY;
+
if((myself->meta_socket = setup_listen_meta_socket(myself->port)) < 0)
{
- syslog(LOG_ERR, "Unable to set up a listening socket");
+ syslog(LOG_ERR, _("Unable to set up a listening socket"));
return -1;
}
if((myself->socket = setup_vpn_in_socket(myself->port)) < 0)
{
- syslog(LOG_ERR, "Unable to set up an incoming vpn data socket");
+ syslog(LOG_ERR, _("Unable to set up an incoming vpn data socket"));
close(myself->meta_socket);
return -1;
}
myself->status.active = 1;
- syslog(LOG_NOTICE, "Ready: listening on port %d.", myself->port);
+ syslog(LOG_NOTICE, _("Ready: listening on port %hd"), myself->port);
cp
return 0;
}
{
config_t const *cfg;
cp
- cfg = get_config_val(upstreamip);
+ cfg = get_next_config_val(upstreamip, upstreamindex++);
- if(!setup_outgoing_connection(cfg->data.ip->ip))
- {
- signal(SIGALRM, SIG_IGN);
- }
- else
+ while(cfg)
{
- signal(SIGALRM, sigalrm_handler);
- seconds_till_retry += 5;
- if(seconds_till_retry>300) /* Don't wait more than 5 minutes. */
- seconds_till_retry = 300;
- alarm(seconds_till_retry);
- syslog(LOG_ERR, "Still failed to connect to other. Will retry in %d seconds.",
- seconds_till_retry);
+ if(!setup_outgoing_connection(cfg->data.ptr)) /* function returns 0 when there are no problems */
+ {
+ signal(SIGALRM, SIG_IGN);
+ return;
+ }
+ cfg = get_next_config_val(upstreamip, upstreamindex++); /* Or else we try the next ConnectTo line */
}
+
+ signal(SIGALRM, sigalrm_handler);
+ upstreamindex = 0;
+ seconds_till_retry += 5;
+ if(seconds_till_retry > MAXTIMEOUT) /* Don't wait more than MAXTIMEOUT seconds. */
+ seconds_till_retry = MAXTIMEOUT;
+ syslog(LOG_ERR, _("Still failed to connect to other, will retry in %d seconds"),
+ seconds_till_retry);
+ alarm(seconds_till_retry);
cp
}
if(setup_myself() < 0)
return -1;
- if((cfg = get_config_val(upstreamip)) == NULL)
+ if((cfg = get_next_config_val(upstreamip, upstreamindex++)) == NULL)
/* No upstream IP given, we're listen only. */
return 0;
- if(setup_outgoing_connection(cfg->data.ip->ip))
+ while(cfg)
{
- signal(SIGALRM, sigalrm_handler);
- seconds_till_retry = 300;
- alarm(seconds_till_retry);
- syslog(LOG_NOTICE, "Try to re-establish outgoing connection in 5 minutes.");
+ if(!setup_outgoing_connection(cfg->data.ptr)) /* function returns 0 when there are no problems */
+ return 0;
+ cfg = get_next_config_val(upstreamip, upstreamindex++); /* Or else we try the next ConnectTo line */
}
+
+ signal(SIGALRM, sigalrm_handler);
+ upstreamindex = 0;
+ seconds_till_retry = MAXTIMEOUT;
+ syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in %d seconds"), seconds_till_retry);
+ alarm(seconds_till_retry);
cp
return 0;
}
close(tap_fd);
destroy_conn_list();
- syslog(LOG_NOTICE, "Terminating.");
+ syslog(LOG_NOTICE, _("Terminating"));
cp
return;
}
int nfd, flags;
struct sockaddr_in a;
cp
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, "Opening UDP socket to " IP_ADDR_S, IP_ADDR_V(cl->real_ip));
+ if(debug_lvl > 0)
+ syslog(LOG_DEBUG, _("Opening UDP socket to %s"), cl->real_hostname);
nfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
if(nfd == -1)
{
- syslog(LOG_ERR, "Creating data socket failed: %m");
+ syslog(LOG_ERR, _("Creating UDP socket failed: %m"));
return -1;
}
if(connect(nfd, (struct sockaddr *)&a, sizeof(a)) == -1)
{
- syslog(LOG_ERR, "Connecting to " IP_ADDR_S ":%d failed: %m",
- IP_ADDR_V(cl->real_ip), cl->port);
+ syslog(LOG_ERR, _("Connecting to %s port %d failed: %m"),
+ cl->real_hostname, cl->port);
return -1;
}
flags = fcntl(nfd, F_GETFL);
if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
{
- syslog(LOG_ERR, "This is a bug: %s:%d: %d:%m", __FILE__, __LINE__, nfd);
+ syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m %s (%s)"), __FILE__, __LINE__, nfd,
+ cl->vpn_hostname, cl->real_hostname);
return -1;
}
if(getpeername(sfd, &ci, &len) < 0)
{
- syslog(LOG_ERR, "Error: getpeername: %m");
+ syslog(LOG_ERR, _("Error: getpeername: %m"));
return NULL;
}
- p->hostname = hostlookup(ci.sin_addr.s_addr);
p->real_ip = ntohl(ci.sin_addr.s_addr);
+ p->real_hostname = hostlookup(ci.sin_addr.s_addr);
p->meta_socket = sfd;
p->status.meta = 1;
p->buflen = 0;
p->last_ping_time = time(NULL);
p->want_ping = 0;
- syslog(LOG_NOTICE, "Connection from %s:%d", p->hostname, htons(ci.sin_port));
+ if(debug_lvl > 0)
+ syslog(LOG_NOTICE, _("Connection from %s port %d"),
+ p->real_hostname, htons(ci.sin_port));
if(send_basic_info(p) < 0)
{
- free(p);
+ free_conn_element(p);
return NULL;
}
cp
cp
if(getsockopt(cl->socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
{
- syslog(LOG_ERR, "This is a bug: %s:%d: %d:%m", __FILE__, __LINE__, cl->socket);
+ syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m %s (%s)"), __FILE__, __LINE__, cl->socket,
+ cl->vpn_hostname, cl->real_hostname);
return -1;
}
if(x)
{
- syslog(LOG_ERR, "Incoming data socket error: %s", sys_errlist[x]);
+ syslog(LOG_ERR, _("Incoming data socket error for %s (%s): %s"),
+ cl->vpn_hostname, cl->real_hostname, sys_errlist[x]);
return -1;
}
lenin = recvfrom(cl->socket, &rp, MTU, 0, NULL, NULL);
if(lenin <= 0)
{
- syslog(LOG_ERR, "Receiving data failed: %m");
+ syslog(LOG_ERR, _("Receiving packet from %s (%s) failed: %m"), cl->vpn_hostname, cl->real_hostname);
return -1;
}
total_socket_in += lenin;
if(rp.len >= 0)
{
f = lookup_conn(rp.from);
- if(debug_lvl > 3)
- syslog(LOG_DEBUG, "packet from " IP_ADDR_S " (len %d)",
- IP_ADDR_V(rp.from), rp.len);
if(!f)
{
- syslog(LOG_ERR, "Got packet from unknown source " IP_ADDR_S,
- IP_ADDR_V(rp.from));
+ syslog(LOG_ERR, _("Got packet from %s (%s) with unknown origin %d.%d.%d.%d?"),
+ cl->vpn_hostname, cl->real_hostname, IP_ADDR_V(rp.from));
return -1;
}
*/
void terminate_connection(conn_list_t *cl)
{
+ conn_list_t *p;
+
cp
if(cl->status.remove)
return;
if(debug_lvl > 0)
- syslog(LOG_NOTICE, "Closing connection with %s.", cl->hostname);
+ syslog(LOG_NOTICE, _("Closing connection with %s (%s)"),
+ cl->vpn_hostname, cl->real_hostname);
if(cl->status.timeout)
send_timeout(cl);
- else if(!cl->status.termreq)
+/* else if(!cl->status.termreq)
send_termreq(cl);
-
- close(cl->socket);
+ */
+
+ if(cl->socket)
+ close(cl->socket);
if(cl->status.meta)
close(cl->meta_socket);
+ cl->status.remove = 1;
+
+ /* If this cl isn't active, don't send any DEL_HOSTs. */
+ if(cl->status.active)
+ notify_others(cl,NULL,send_del_host);
+
+cp
+ /* Find all connections that were lost because they were behind cl
+ (the connection that was dropped). */
+ if(cl->status.meta)
+ for(p = conn_list; p != NULL; p = p->next)
+ {
+ if((p->nexthop == cl) && (p != cl))
+ {
+ if(cl->status.active && p->status.active)
+ notify_others(p,cl,send_del_host);
+ if(cl->socket)
+ close(cl->socket);
+ p->status.active = 0;
+ p->status.remove = 1;
+ }
+ }
+
+ cl->status.active = 0;
+
if(cl->status.outgoing)
{
signal(SIGALRM, sigalrm_handler);
seconds_till_retry = 5;
alarm(seconds_till_retry);
- syslog(LOG_NOTICE, "Try to re-establish outgoing connection in 5 seconds.");
+ syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 seconds"));
}
-
- cl->status.active = 0;
- cl->status.remove = 1;
cp
}
{
if(p->status.pinged && !p->status.got_pong)
{
- syslog(LOG_INFO, "%s (" IP_ADDR_S ") didn't respond to ping",
- p->hostname, IP_ADDR_V(p->vpn_ip));
+ if(debug_lvl > 1)
+ syslog(LOG_INFO, _("%s (%s) didn't respond to PING"),
+ p->vpn_hostname, p->real_hostname);
p->status.timeout = 1;
terminate_connection(p);
}
cp
if((nfd = accept(cl->meta_socket, &client, &len)) < 0)
{
- syslog(LOG_ERR, "Accepting a new connection failed: %m");
+ syslog(LOG_ERR, _("Accepting a new connection failed: %m"));
return -1;
}
- if((ncn = create_new_connection(nfd)) == NULL)
+ if(!(ncn = create_new_connection(nfd)))
{
shutdown(nfd, 2);
close(nfd);
- syslog(LOG_NOTICE, "Closed attempted connection.");
+ syslog(LOG_NOTICE, _("Closed attempted connection"));
return 0;
}
cp
if(getsockopt(cl->meta_socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
{
- syslog(LOG_ERR, "This is a bug: %s:%d: %d:%m", __FILE__, __LINE__, cl->meta_socket);
+ syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m %s (%s)"), __FILE__, __LINE__, cl->meta_socket,
+ cl->vpn_hostname, cl->real_hostname);
return -1;
}
if(x)
{
- syslog(LOG_ERR, "Metadata socket error: %s", sys_errlist[x]);
+ syslog(LOG_ERR, _("Metadata socket error for %s (%s): %s"),
+ cl->vpn_hostname, cl->real_hostname, sys_errlist[x]);
return -1;
}
if(cl->buflen >= MAXBUFSIZE)
{
- syslog(LOG_ERR, "Metadata read buffer full! Discarding contents.");
- cl->buflen = 0;
+ syslog(LOG_ERR, _("Metadata read buffer overflow!"));
+ return -1;
}
- lenin = read(cl->meta_socket, cl->buffer, MAXBUFSIZE-cl->buflen);
+ lenin = read(cl->meta_socket, cl->buffer, MAXBUFSIZE - cl->buflen);
if(lenin<=0)
{
- syslog(LOG_ERR, "Metadata socket read error: %m");
+ if(errno==EINTR)
+ return 0;
+ if(errno==0)
+ {
+ if(debug_lvl>0)
+ syslog(LOG_NOTICE, _("Connection closed by %s (%s)"),
+ cl->vpn_hostname, cl->real_hostname);
+ }
+ else
+ syslog(LOG_ERR, _("Metadata socket read error for %s (%s): %m"),
+ cl->vpn_hostname, cl->real_hostname);
return -1;
}
for(;;)
{
- cl->reqlen = 0;
-
- for(i = oldlen; i < cl->buflen; i++)
+ if(cl->tcppacket)
{
- if(cl->buffer[i] == '\n')
+ if(cl->buflen >= cl->tcppacket)
+ {
+ tcprecv(cl, (real_packet_t *)cl->buffer);
+ cl->buflen -= cl->tcppacket;
+ memmove(cl->buffer, cl->buffer + cl->tcppacket, cl->buflen);
+ oldlen = 0;
+ cl->tcppacket=0;
+ }
+ else
{
- cl->buffer[i] = 0; /* replace end-of-line by end-of-string so we can use sscanf */
- cl->reqlen = i + 1;
break;
}
}
-
- if(cl->reqlen)
+ else
{
- if(sscanf(cl->buffer, "%d", &request) == 1)
+ cl->reqlen = 0;
+
+ for(i = oldlen; i < cl->buflen; i++)
{
- if(request_handlers[request] == NULL)
+ if(cl->buffer[i] == '\n')
{
- syslog(LOG_ERR, "Unknown request: %s", cl->buffer);
- return 0;
+ cl->buffer[i] = 0; /* replace end-of-line by end-of-string so we can use sscanf */
+ cl->reqlen = i + 1;
+ break;
}
+ }
- if(debug_lvl > 3)
- syslog(LOG_DEBUG, "Got request: %s", cl->buffer);
+ if(cl->reqlen)
+ {
+ if(debug_lvl > 2)
+ syslog(LOG_DEBUG, _("Got request from %s (%s): %s"),
+ cl->vpn_hostname, cl->real_hostname, cl->buffer);
+ if(sscanf(cl->buffer, "%d", &request) == 1)
+ {
+ if((request < 0) || (request > 255) || (request_handlers[request] == NULL))
+ {
+ syslog(LOG_ERR, _("Unknown request from %s (%s)"),
+ cl->vpn_hostname, cl->real_hostname);
+ return -1;
+ }
+
+ if(request_handlers[request](cl)) /* Something went wrong. Probably scriptkiddies. Terminate. */
+ {
+ syslog(LOG_ERR, _("Error while processing request from %s (%s)"),
+ cl->vpn_hostname, cl->real_hostname);
+ return -1;
+ }
+ }
+ else
+ {
+ syslog(LOG_ERR, _("Bogus data received from %s (%s)"),
+ cl->vpn_hostname, cl->real_hostname);
+ return -1;
+ }
- request_handlers[request](cl);
+ cl->buflen -= cl->reqlen;
+ memmove(cl->buffer, cl->buffer + cl->reqlen, cl->buflen);
+ oldlen = 0;
}
else
{
- syslog(LOG_ERR, "Bogus data received: %s", cl->buffer);
+ break;
}
-
- cl->buflen -= cl->reqlen;
- memmove(cl->buffer, cl->buffer + cl->reqlen, cl->buflen);
- oldlen = 0;
- }
- else
- {
- break;
}
}
I've once got here when it said `No route to host'.
*/
getsockopt(p->socket, SOL_SOCKET, SO_ERROR, &x, &l);
- syslog(LOG_ERR, "Outgoing data socket error: %s", sys_errlist[x]);
+ syslog(LOG_ERR, _("Outgoing data socket error for %s (%s): %s"),
+ p->vpn_hostname, p->real_hostname, sys_errlist[x]);
terminate_connection(p);
return;
}
memset(&vp, 0, sizeof(vp));
if((lenin = read(tap_fd, &vp, MTU)) <= 0)
{
- syslog(LOG_ERR, "Error while reading from tapdevice: %m");
+ syslog(LOG_ERR, _("Error while reading from tapdevice: %m"));
return;
}
ether_type = ntohs(*((unsigned short*)(&vp.data[12])));
if(ether_type != 0x0800)
{
- if(debug_lvl > 0)
- syslog(LOG_INFO, "Non-IP ethernet frame %04x from " MAC_ADDR_S,
+ if(debug_lvl > 3)
+ syslog(LOG_INFO, _("Non-IP ethernet frame %04x from " MAC_ADDR_S),
ether_type, MAC_ADDR_V(vp.data[6]));
return;
}
if(lenin < 32)
{
- if(debug_lvl > 0)
- syslog(LOG_INFO, "Dropping short packet");
+ if(debug_lvl > 3)
+ syslog(LOG_INFO, _("Dropping short packet"));
return;
}
from = ntohl(*((unsigned long*)(&vp.data[26])));
to = ntohl(*((unsigned long*)(&vp.data[30])));
- if(debug_lvl > 3)
- syslog(LOG_DEBUG, "An IP packet (%04x) for " IP_ADDR_S " from " IP_ADDR_S,
- ether_type, IP_ADDR_V(to), IP_ADDR_V(from));
- if(debug_lvl > 4)
- syslog(LOG_DEBUG, MAC_ADDR_S " to " MAC_ADDR_S,
- MAC_ADDR_V(vp.data[0]), MAC_ADDR_V(vp.data[6]));
-
vp.len = (length_t)lenin - 2;
strip_mac_addresses(&vp);
if((r = select(FD_SETSIZE, &fset, NULL, NULL, &tv)) < 0)
{
- if(errno == EINTR) /* because of alarm */
- continue;
- syslog(LOG_ERR, "Error while waiting for input: %m");
- return;
+ if(errno != EINTR) /* because of alarm */
+ {
+ syslog(LOG_ERR, _("Error while waiting for input: %m"));
+ return;
+ }
+ }
+
+ if(sighup)
+ {
+ sighup = 0;
+ close_network_connections();
+ clear_config();
+ if(read_config_file(configfilename))
+ {
+ syslog(LOG_ERR, _("Unable to reread configuration file, exiting"));
+ exit(0);
+ }
+ sleep(5);
+ setup_network_connections();
+ continue;
}
if(last_ping_check + timeout < time(NULL))
{
check_dead_connections();
last_ping_check = time(NULL);
- continue;
}
- check_network_activity(&fset);
+ if(r > 0)
+ {
+ check_network_activity(&fset);
- /* local tap data */
- if(FD_ISSET(tap_fd, &fset))
- handle_tap_input();
+ /* local tap data */
+ if(FD_ISSET(tap_fd, &fset))
+ handle_tap_input();
+ }
}
cp
}
projects / tinc / blobdiff