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.9 2000/06/27 15:08:58 guus Exp $
+ $Id: net.c,v 1.35.4.20 2000/07/02 13:40:57 guus Exp $
*/
#include "config.h"
int total_socket_in = 0;
int total_socket_out = 0;
+int upstreamindex = 0;
static int seconds_till_retry;
/* The global list of existing connections */
rp.len = htons(rp.len);
if(debug_lvl > 3)
- syslog(LOG_ERR, _("Sending packet of %d bytes to " IP_ADDR_S " (%s)"),
- ntohs(rp.len), IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ syslog(LOG_ERR, _("Sending packet of %d bytes to %s (%s)"),
+ ntohs(rp.len), cl->vpn_hostname, cl->real_hostname);
if((r = send(cl->socket, (char*)&rp, ntohs(rp.len), 0)) < 0)
{
- syslog(LOG_ERR, _("Error sending packet to " IP_ADDR_S " (%s): %m"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ syslog(LOG_ERR, _("Error sending packet to %s (%s): %m"),
+ cl->vpn_hostname, cl->real_hostname);
return -1;
}
add_mac_addresses(&vp);
if(debug_lvl > 3)
- syslog(LOG_ERR, _("Receiving packet of %d bytes from " IP_ADDR_S " (%s)"),
- ((real_packet_t*)packet)->len, IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ 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"));
if(cl->sq)
{
if(debug_lvl > 3)
- syslog(LOG_DEBUG, _("Flushing send queue for " IP_ADDR_S),
- IP_ADDR_V(cl->vpn_ip));
+ 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 > 3)
- syslog(LOG_DEBUG, _("Flushing receive queue for " IP_ADDR_S),
- IP_ADDR_V(cl->vpn_ip));
+ syslog(LOG_DEBUG, _("Flushing receive queue for %s (%s)"),
+ cl->vpn_hostname, cl->real_hostname);
flush_queue(cl, &(cl->rq), xrecv);
}
cp
{
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));
}
if(cl->flags & INDIRECTDATA)
{
if(debug_lvl > 3)
- syslog(LOG_NOTICE, _("Indirect packet to " IP_ADDR_S " via " IP_ADDR_S),
- IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+ 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 " IP_ADDR_S " in connection list failed!"),
+ 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) */
if(cl->flags & INDIRECTDATA) /* This should not happen */
{
if(debug_lvl > 3)
- syslog(LOG_NOTICE, _("Double indirection for " IP_ADDR_S),
+ syslog(LOG_NOTICE, _("Double indirection for %d.%d.%d.%d"),
IP_ADDR_V(to));
return -1;
}
if(!cl->status.dataopen)
if(setup_vpn_connection(cl) < 0)
{
- syslog(LOG_ERR, _("Could not open UDP connection to " IP_ADDR_S " (%s)"), IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ 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, _(IP_ADDR_S " (%s) has no valid key, queueing packet"), IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ 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, _(IP_ADDR_S " (%s) is not ready, queueing packet"), IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ syslog(LOG_INFO, _("%s (%s) is not ready, queueing packet"), cl->vpn_hostname, cl->real_hostname);
add_queue(&(cl->sq), packet, packet->len + 2);
return 0; /* We don't want to mess up, do we? */
}
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;
}
- syslog(LOG_INFO, _("Connected to " IP_ADDR_S ":%hd"),
- IP_ADDR_V(cl->real_ip), 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
+ if(!(h = gethostbyname(hostname)))
+ {
+ syslog(LOG_ERR, _("Error looking up `%s': %m"), hostname);
+ return -1;
+ }
+
ncn = new_conn_list();
- ncn->real_ip = ip;
- ncn->hostname = hostlookup(htonl(ip));
+ 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 to %s"),
- ncn->hostname);
+ ncn->real_hostname);
free_conn_element(ncn);
return -1;
}
}
myself->vpn_ip = cfg->data.ip->ip;
- myself->hostname = hostlookup(htonl(myself->vpn_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;
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;
}
sigalrm_handler(int a)
{
config_t const *cfg;
- int index = 1;
cp
- cfg = get_config_val(upstreamip);
+ cfg = get_next_config_val(upstreamip, upstreamindex++);
while(cfg)
{
- if(!setup_outgoing_connection(cfg->data.ip->ip)) /* function returns 0 when there are no problems */
+ 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, index++); /* Or else we try the next ConnectTo line */
+ 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>300) /* Don't wait more than 5 minutes. */
- seconds_till_retry = 300;
- alarm(seconds_till_retry);
+ 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
}
int setup_network_connections(void)
{
config_t const *cfg;
- int index = 1;
cp
if((cfg = get_config_val(pingtimeout)) == NULL)
timeout = 5;
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;
while(cfg)
{
- if(!setup_outgoing_connection(cfg->data.ip->ip)) /* function returns 0 when there are no problems */
+ if(!setup_outgoing_connection(cfg->data.ptr)) /* function returns 0 when there are no problems */
return 0;
- cfg = get_next_config_val(upstreamip, index++); /* Or else we try the next ConnectTo line */
+ cfg = get_next_config_val(upstreamip, upstreamindex++); /* Or else we try the next ConnectTo line */
}
signal(SIGALRM, sigalrm_handler);
- seconds_till_retry = 300;
+ 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);
- syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 minutes"));
cp
return 0;
}
struct sockaddr_in a;
cp
if(debug_lvl > 0)
- syslog(LOG_DEBUG, _("Opening UDP socket to %s"), cl->hostname);
+ syslog(LOG_DEBUG, _("Opening UDP socket to %s"), cl->real_hostname);
nfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
if(nfd == -1)
if(connect(nfd, (struct sockaddr *)&a, sizeof(a)) == -1)
{
syslog(LOG_ERR, _("Connecting to %s port %d failed: %m"),
- cl->hostname, cl->port);
+ 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;
}
}
p->real_ip = ntohl(ci.sin_addr.s_addr);
- p->hostname = hostlookup(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;
if(debug_lvl > 0)
syslog(LOG_NOTICE, _("Connection from %s port %d"),
- p->hostname, htons(ci.sin_port));
+ 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 packet from %s failed: %m"), cl->hostname);
+ syslog(LOG_ERR, _("Receiving packet from %s (%s) failed: %m"), cl->vpn_hostname, cl->real_hostname);
return -1;
}
total_socket_in += lenin;
f = lookup_conn(rp.from);
if(!f)
{
- syslog(LOG_ERR, _("Got packet from " IP_ADDR_S " (%s) with unknown origin " IP_ADDR_S "?"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname, 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;
}
return;
if(debug_lvl > 0)
- syslog(LOG_NOTICE, _("Closing connection with " IP_ADDR_S " (%s)"),
- IP_ADDR_V(cl->vpn_ip), 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);
- if(cl->status.outgoing)
- {
- signal(SIGALRM, sigalrm_handler);
- seconds_till_retry = 5;
- alarm(seconds_till_retry);
- syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 seconds"));
- }
-
cl->status.remove = 1;
- /* If this cl isn't active, don't send any DEL_HOSTs and don't bother
- checking for other lost connections. */
- if(!cl->status.active)
- return;
+ /* If this cl isn't active, don't send any DEL_HOSTs. */
+ if(cl->status.active)
+ notify_others(cl,NULL,send_del_host);
- cl->status.active = 0;
-
cp
/* Find all connections that were lost because they were behind cl
(the connection that was dropped). */
- for(p = conn_list; p != NULL; p = p->next)
- if(p->nexthop == cl)
+ if(cl->status.meta)
+ for(p = conn_list; p != NULL; p = p->next)
{
- p->status.active = 0;
- p->status.remove = 1;
+ 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;
+ }
}
-
-cp
- /* Then send a notification about all these connections to all hosts
- that are still connected to us. */
- for(p = conn_list; p != NULL; p = p->next)
- if(!p->status.remove && p->status.meta)
- for(q = conn_list; q != NULL; q = q->next)
- if(q->status.remove)
- send_del_host(p, q);
-
+
+ cl->status.active = 0;
+
+ if(cl->status.outgoing)
+ {
+ signal(SIGALRM, sigalrm_handler);
+ seconds_till_retry = 5;
+ alarm(seconds_till_retry);
+ syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 seconds"));
+ }
cp
}
if(p->status.pinged && !p->status.got_pong)
{
if(debug_lvl > 1)
- syslog(LOG_INFO, _(IP_ADDR_S " (%s) didn't respond to ping"),
- IP_ADDR_V(p->vpn_ip), p->hostname);
+ syslog(LOG_INFO, _("%s (%s) didn't respond to PING"),
+ p->vpn_hostname, p->real_hostname);
p->status.timeout = 1;
terminate_connection(p);
}
return -1;
}
- if((ncn = create_new_connection(nfd)) == NULL)
+ if(!(ncn = create_new_connection(nfd)))
{
shutdown(nfd, 2);
close(nfd);
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(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;
}
if(cl->reqlen)
{
if(debug_lvl > 2)
- syslog(LOG_DEBUG, _("Got request from " IP_ADDR_S " (%s): %s"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname, cl->buffer);
+ 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 " IP_ADDR_S " (%s)"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ 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 " IP_ADDR_S " (%s)"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ 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 " IP_ADDR_S " (%s)"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ syslog(LOG_ERR, _("Bogus data received from %s (%s)"),
+ cl->vpn_hostname, cl->real_hostname);
return -1;
}
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;
}
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