X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=df67a1ccbf257b391f353020fecd2e1ef73a83e3;hp=1fee46b80cdc3b3fee6cdfa1165bb17a3b883ad3;hb=4ee53e7dac93d1edad8664edffdfaf142438b85d;hpb=7f7e158aae8df5c65211bcfa82516e7c243cdd2e diff --git a/src/net.c b/src/net.c index 1fee46b8..df67a1cc 100644 --- a/src/net.c +++ b/src/net.c @@ -17,7 +17,7 @@ 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.3 2000/06/25 15:16:11 guus Exp $ + $Id: net.c,v 1.35.4.11 2000/06/27 21:05:07 guus Exp $ */ #include "config.h" @@ -56,6 +56,7 @@ int total_tap_out = 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 */ @@ -103,11 +104,13 @@ cp 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 " IP_ADDR_S " (%s)"), + ntohs(rp.len), IP_ADDR_V(cl->vpn_ip), cl->hostname); if((r = send(cl->socket, (char*)&rp, ntohs(rp.len), 0)) < 0) { - syslog(LOG_ERR, _("Error sending data: %m")); + syslog(LOG_ERR, _("Error sending packet to " IP_ADDR_S " (%s): %m"), + IP_ADDR_V(cl->vpn_ip), cl->hostname); return -1; } @@ -126,6 +129,10 @@ cp 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 " IP_ADDR_S " (%s)"), + ((real_packet_t*)packet)->len, IP_ADDR_V(cl->vpn_ip), cl->hostname); + if((lenin = write(tap_fd, &vp, vp.len + sizeof(vp.len))) < 0) syslog(LOG_ERR, _("Can't write to tap device: %m")); else @@ -145,9 +152,6 @@ void add_queue(packet_queue_t **q, void *packet, size_t s) { 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); @@ -233,7 +237,7 @@ cp } if(debug_lvl > 3) - syslog(LOG_DEBUG, _("queue flushed")); + syslog(LOG_DEBUG, _("Queue flushed")); cp } @@ -290,7 +294,7 @@ cp return -1; } } - + /* If we ourselves have indirectdata flag set, we should send only to our uplink! */ if(myself->flags & EXPORTINDIRECTDATA) @@ -312,25 +316,26 @@ cp if(cl->flags & INDIRECTDATA) { - if((cl = lookup_conn(cl->vpn_ip)) == NULL) + 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)); + 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!"), 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 " IP_ADDR_S), - IP_ADDR_V(to)); - } - return -1; + { + if(debug_lvl > 3) + syslog(LOG_NOTICE, _("Double indirection for " IP_ADDR_S), + IP_ADDR_V(to)); + return -1; + } } if(my_key_expiry <= time(NULL)) @@ -338,10 +343,15 @@ cp if(!cl->status.dataopen) if(setup_vpn_connection(cl) < 0) - return -1; - + { + syslog(LOG_ERR, _("Could not open UDP connection to " IP_ADDR_S " (%s)"), IP_ADDR_V(cl->vpn_ip), cl->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); 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 */ @@ -350,9 +360,9 @@ cp if(!cl->status.active) { - add_queue(&(cl->sq), packet, packet->len + 2); if(debug_lvl > 3) - syslog(LOG_INFO, _(IP_ADDR_S " is not ready, queueing packet"), IP_ADDR_V(cl->vpn_ip)); + syslog(LOG_INFO, _(IP_ADDR_S " (%s) is not ready, queueing packet"), IP_ADDR_V(cl->vpn_ip), cl->hostname); + add_queue(&(cl->sq), packet, packet->len + 2); return 0; /* We don't want to mess up, do we? */ } @@ -487,6 +497,9 @@ int setup_outgoing_meta_socket(conn_list_t *cl) struct sockaddr_in a; config_t const *cfg; cp + if(debug_lvl > 0) + syslog(LOG_INFO, _("Trying to connect to %s"), cl->hostname); + if((cfg = get_config_val(upstreamport)) == NULL) cl->port = 655; else @@ -535,10 +548,12 @@ int setup_outgoing_connection(ip_t ip) cp ncn = new_conn_list(); ncn->real_ip = ip; - + ncn->hostname = hostlookup(htonl(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->hostname); free_conn_element(ncn); return -1; } @@ -567,6 +582,7 @@ cp } myself->vpn_ip = cfg->data.ip->ip; + myself->hostname = hostlookup(htonl(myself->vpn_ip)); myself->vpn_mask = cfg->data.ip->mask; myself->flags = 0; @@ -576,7 +592,7 @@ cp myself->port = cfg->data.val; if(cfg = get_config_val(indirectdata)) - if(cfg->data.val) + if(cfg->data.val == stupid_true) myself->flags |= EXPORTINDIRECTDATA; if((myself->meta_socket = setup_listen_meta_socket(myself->port)) < 0) @@ -604,22 +620,26 @@ sigalrm_handler(int a) { 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.ip->ip)) /* 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>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); cp } @@ -641,17 +661,22 @@ 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, _("Trying to re-establish outgoing connection in 5 minutes")); + if(!setup_outgoing_connection(cfg->data.ip->ip)) /* 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 = 300; + alarm(seconds_till_retry); + syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 minutes")); cp return 0; } @@ -702,12 +727,12 @@ int setup_vpn_connection(conn_list_t *cl) struct sockaddr_in a; cp if(debug_lvl > 0) - syslog(LOG_DEBUG, _("Opening UDP socket to " IP_ADDR_S), IP_ADDR_V(cl->real_ip)); + syslog(LOG_DEBUG, _("Opening UDP socket to %s"), cl->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; } @@ -717,8 +742,8 @@ cp 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->hostname, cl->port); return -1; } @@ -754,14 +779,16 @@ cp } p->real_ip = ntohl(ci.sin_addr.s_addr); + p->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 " IP_ADDR_S ":%d"), - IP_ADDR_V(p->real_ip), htons(ci.sin_port)); + if(debug_lvl > 0) + syslog(LOG_NOTICE, _("Connection from %s port %d"), + p->hostname, htons(ci.sin_port)); if(send_basic_info(p) < 0) { @@ -822,7 +849,7 @@ cp 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 failed: %m"), cl->hostname); return -1; } total_socket_in += lenin; @@ -834,13 +861,10 @@ cp 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 " IP_ADDR_S " (%s) with unknown origin " IP_ADDR_S "?"), + IP_ADDR_V(cl->vpn_ip), cl->hostname, IP_ADDR_V(rp.from)); return -1; } @@ -873,8 +897,8 @@ cp return; if(debug_lvl > 0) - syslog(LOG_NOTICE, _("Closing connection with " IP_ADDR_S " (" IP_ADDR_S ")"), - IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip)); + syslog(LOG_NOTICE, _("Closing connection with " IP_ADDR_S " (%s)"), + IP_ADDR_V(cl->vpn_ip), cl->hostname); if(cl->status.timeout) send_timeout(cl); @@ -893,9 +917,15 @@ cp syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 seconds")); } - cl->status.active = 0; 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; + + cl->status.active = 0; + cp /* Find all connections that were lost because they were behind cl (the connection that was dropped). */ @@ -910,7 +940,7 @@ 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) + if(p->status.active && p->status.meta) for(q = conn_list; q != NULL; q = q->next) if(q->status.remove) send_del_host(p, q); @@ -943,8 +973,8 @@ cp if(p->status.pinged && !p->status.got_pong) { if(debug_lvl > 1) - syslog(LOG_INFO, _(IP_ADDR_S " (" IP_ADDR_S ") didn't respond to ping"), - IP_ADDR_V(p->vpn_ip), IP_ADDR_V(p->real_ip)); + syslog(LOG_INFO, _(IP_ADDR_S " (%s) didn't respond to ping"), + IP_ADDR_V(p->vpn_ip), p->hostname); p->status.timeout = 1; terminate_connection(p); } @@ -1047,28 +1077,28 @@ cp if(cl->reqlen) { if(debug_lvl > 2) - syslog(LOG_DEBUG, _("Got request from " IP_ADDR_S " (" IP_ADDR_S "): %s"), - IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip), cl->buffer); + syslog(LOG_DEBUG, _("Got request from " IP_ADDR_S " (%s): %s"), + IP_ADDR_V(cl->vpn_ip), cl->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 " (" IP_ADDR_S ")"), - IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip)); + syslog(LOG_ERR, _("Unknown request from " IP_ADDR_S " (%s)"), + IP_ADDR_V(cl->vpn_ip), cl->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 " (" IP_ADDR_S ")"), - IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip)); + syslog(LOG_ERR, _("Error while processing request from " IP_ADDR_S " (%s)"), + IP_ADDR_V(cl->vpn_ip), cl->hostname); return -1; } } else { - syslog(LOG_ERR, _("Bogus data received from " IP_ADDR_S " (" IP_ADDR_S ")"), - IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip)); + syslog(LOG_ERR, _("Bogus data received from " IP_ADDR_S " (%s)"), + IP_ADDR_V(cl->vpn_ip), cl->hostname); return -1; } @@ -1172,13 +1202,6 @@ cp 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 > 3) - 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);