X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=94c0e4456f60e087a576eaab8f5d414daf294e32;hp=72c1b5e115ea56fcfcd69f97925d301b1e039683;hb=c78a204f06182f50b0812c8e4fef6163e82097bf;hpb=4dde583bc91985c3ff19ac1d1f1bc791b50658ff diff --git a/src/net.c b/src/net.c index 72c1b5e1..94c0e445 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.27 2000/09/06 11:49:03 guus Exp $ + $Id: net.c,v 1.35.4.32 2000/09/26 14:06:04 guus Exp $ */ #include "config.h" @@ -46,6 +46,7 @@ #include "net.h" #include "netutl.h" #include "protocol.h" +#include "meta.h" #include "system.h" @@ -97,14 +98,14 @@ int xsend(conn_list_t *cl, void *packet) { real_packet_t rp; cp - do_encrypt((vpn_packet_t*)packet, &rp, cl->key); + do_encrypt((vpn_packet_t*)packet, &rp, cl->datakey); rp.from = htonl(myself->vpn_ip); rp.data.len = htons(rp.data.len); rp.len = htons(rp.len); if(debug_lvl > 3) syslog(LOG_ERR, _("Sending packet of %d bytes to %s (%s)"), - ntohs(rp.len), cl->vpn_hostname, cl->real_hostname); + ntohs(rp.len), cl->name, cl->hostname); total_socket_out += ntohs(rp.len); @@ -116,7 +117,7 @@ cp if((send(cl->socket, (char*)&rp, ntohs(rp.len), 0)) < 0) { syslog(LOG_ERR, _("Error sending packet to %s (%s): %m"), - cl->vpn_hostname, cl->real_hostname); + cl->name, cl->hostname); return -1; } cp @@ -128,12 +129,12 @@ int xrecv(conn_list_t *cl, void *packet) vpn_packet_t vp; int lenin; cp - do_decrypt((real_packet_t*)packet, &vp, cl->key); + do_decrypt((real_packet_t*)packet, &vp, cl->datakey); 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); + ((real_packet_t*)packet)->len, cl->name, cl->hostname); if((lenin = write(tap_fd, &vp, vp.len + sizeof(vp.len))) < 0) syslog(LOG_ERR, _("Can't write to tap device: %m")); @@ -146,59 +147,6 @@ cp 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 @@ -308,7 +256,7 @@ cp { if(debug_lvl > 3) syslog(LOG_DEBUG, _("Flushing send queue for %s (%s)"), - cl->vpn_hostname, cl->real_hostname); + cl->name, cl->hostname); flush_queue(cl, &(cl->sq), xsend); } @@ -316,7 +264,7 @@ cp { if(debug_lvl > 3) syslog(LOG_DEBUG, _("Flushing receive queue for %s (%s)"), - cl->vpn_hostname, cl->real_hostname); + cl->name, cl->hostname); flush_queue(cl, &(cl->rq), xrecv); } cp @@ -336,22 +284,16 @@ cp 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! */ + /* The next few lines will be obsoleted, if we are going indirect, matching subnet_t + should point to only our uplink as the recepient + */ + if(myself->flags & EXPORTINDIRECTDATA) { for(cl = conn_list; cl != NULL && !cl->status.outgoing; cl = cl->next); @@ -373,12 +315,11 @@ cp { if(debug_lvl > 3) syslog(LOG_NOTICE, _("Indirect packet to %s via %s"), - cl->vpn_hostname, cl->real_hostname); + cl->name, cl->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)); + 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) */ @@ -387,8 +328,7 @@ cp 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)); + syslog(LOG_NOTICE, _("Double indirection for %d.%d.%d.%d"), IP_ADDR_V(to)); return -1; } } @@ -399,14 +339,16 @@ cp if(!cl->status.dataopen) if(setup_vpn_connection(cl) < 0) { - syslog(LOG_ERR, _("Could not open UDP connection to %s (%s)"), cl->vpn_hostname, cl->real_hostname); + syslog(LOG_ERR, _("Could not open UDP connection to %s (%s)"), + cl->name, cl->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); + syslog(LOG_INFO, _("%s (%s) has no valid key, queueing packet"), + cl->name, 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 */ @@ -416,7 +358,8 @@ cp if(!cl->status.active) { if(debug_lvl > 3) - syslog(LOG_INFO, _("%s (%s) is not ready, queueing packet"), cl->vpn_hostname, cl->real_hostname); + syslog(LOG_INFO, _("%s (%s) is not ready, queueing packet"), + cl->name, cl->hostname); add_queue(&(cl->sq), packet, packet->len + 2); return 0; /* We don't want to mess up, do we? */ } @@ -573,7 +516,7 @@ int setup_outgoing_meta_socket(conn_list_t *cl) config_t const *cfg; cp if(debug_lvl > 0) - syslog(LOG_INFO, _("Trying to connect to %s"), cl->real_hostname); + syslog(LOG_INFO, _("Trying to connect to %s"), cl->hostname); if((cfg = get_config_val(upstreamport)) == NULL) cl->port = 655; @@ -584,7 +527,7 @@ cp if(cl->meta_socket == -1) { syslog(LOG_ERR, _("Creating socket for %s port %d failed: %m"), - cl->real_hostname, cl->port); + cl->hostname, cl->port); return -1; } @@ -594,7 +537,7 @@ cp if(connect(cl->meta_socket, (struct sockaddr *)&a, sizeof(a)) == -1) { - syslog(LOG_ERR, _("%s port %hd: %m"), cl->real_hostname, cl->port); + syslog(LOG_ERR, _("%s port %hd: %m"), cl->hostname, cl->port); return -1; } @@ -602,13 +545,13 @@ cp if(fcntl(cl->meta_socket, F_SETFL, flags | O_NONBLOCK) < 0) { syslog(LOG_ERR, _("fcntl for %s port %d: %m"), - cl->real_hostname, cl->port); + cl->hostname, cl->port); return -1; } if(debug_lvl > 0) syslog(LOG_INFO, _("Connected to %s port %hd"), - cl->real_hostname, cl->port); + cl->hostname, cl->port); cp return 0; } @@ -633,12 +576,12 @@ cp ncn = new_conn_list(); ncn->real_ip = ntohl(*((ip_t*)(h->h_addr_list[0]))); - ncn->real_hostname = hostlookup(htonl(ncn->real_ip)); + ncn->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->real_hostname); + ncn->hostname); free_conn_element(ncn); return -1; } @@ -667,11 +610,15 @@ cp } myself->vpn_ip = cfg->data.ip->ip; - myself->vpn_hostname = hostlookup(htonl(myself->vpn_ip)); - myself->real_hostname = hostlookup(htonl(myself->vpn_ip)); + myself->hostname = hostlookup(htonl(myself->vpn_ip)); myself->vpn_mask = cfg->data.ip->mask; myself->flags = 0; + if(!(cfg = get_config_val(tincname))) + asprintf(&(myself->name), IP_ADDR_S, IP_ADDR_V(myself->vpn_ip)); + else + myself->name = (char*)cfg->data.val; + if(!(cfg = get_config_val(listenport))) myself->port = 655; else @@ -817,7 +764,7 @@ int setup_vpn_connection(conn_list_t *cl) struct sockaddr_in a; cp if(debug_lvl > 0) - syslog(LOG_DEBUG, _("Opening UDP socket to %s"), cl->real_hostname); + syslog(LOG_DEBUG, _("Opening UDP socket to %s"), cl->hostname); nfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); if(nfd == -1) @@ -833,7 +780,7 @@ cp if(connect(nfd, (struct sockaddr *)&a, sizeof(a)) == -1) { syslog(LOG_ERR, _("Connecting to %s port %d failed: %m"), - cl->real_hostname, cl->port); + cl->hostname, cl->port); return -1; } @@ -841,7 +788,7 @@ cp if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) { syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m %s (%s)"), __FILE__, __LINE__, nfd, - cl->vpn_hostname, cl->real_hostname); + cl->name, cl->hostname); return -1; } @@ -870,7 +817,7 @@ cp } p->real_ip = ntohl(ci.sin_addr.s_addr); - p->real_hostname = hostlookup(ci.sin_addr.s_addr); + p->hostname = hostlookup(ci.sin_addr.s_addr); p->meta_socket = sfd; p->status.meta = 1; p->buflen = 0; @@ -879,7 +826,7 @@ cp if(debug_lvl > 0) syslog(LOG_NOTICE, _("Connection from %s port %d"), - p->real_hostname, htons(ci.sin_port)); + p->hostname, htons(ci.sin_port)); if(send_basic_info(p) < 0) { @@ -927,14 +874,15 @@ int handle_incoming_vpn_data(conn_list_t *cl) cp if(getsockopt(cl->socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0) { - syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m %s (%s)"), __FILE__, __LINE__, cl->socket, - cl->vpn_hostname, cl->real_hostname); + syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m %s (%s)"), + __FILE__, __LINE__, cl->socket, + cl->name, cl->hostname); return -1; } if(x) { syslog(LOG_ERR, _("Incoming data socket error for %s (%s): %s"), - cl->vpn_hostname, cl->real_hostname, strerror(x)); + cl->name, cl->hostname, strerror(x)); return -1; } @@ -942,7 +890,8 @@ cp lenin = recvfrom(cl->socket, &rp, MTU, 0, NULL, NULL); if(lenin <= 0) { - syslog(LOG_ERR, _("Receiving packet from %s (%s) failed: %m"), cl->vpn_hostname, cl->real_hostname); + syslog(LOG_ERR, _("Receiving packet from %s (%s) failed: %m"), + cl->name, cl->hostname); return -1; } total_socket_in += lenin; @@ -957,7 +906,7 @@ cp 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)); + cl->name, cl->hostname, IP_ADDR_V(rp.from)); return -1; } @@ -991,7 +940,7 @@ cp if(debug_lvl > 0) syslog(LOG_NOTICE, _("Closing connection with %s (%s)"), - cl->vpn_hostname, cl->real_hostname); + cl->name, cl->hostname); if(cl->status.timeout) send_timeout(cl); @@ -1065,7 +1014,7 @@ cp { if(debug_lvl > 1) syslog(LOG_INFO, _("%s (%s) didn't respond to PING"), - p->vpn_hostname, p->real_hostname); + p->name, p->hostname); p->status.timeout = 1; terminate_connection(p); } @@ -1114,131 +1063,6 @@ cp return 0; } -/* - dispatch any incoming meta requests -*/ -int handle_incoming_meta_data(conn_list_t *cl) -{ - int x, l = sizeof(x); - int request, oldlen, i; - int lenin = 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 %s (%s)"), __FILE__, __LINE__, cl->meta_socket, - cl->vpn_hostname, cl->real_hostname); - return -1; - } - if(x) - { - syslog(LOG_ERR, _("Metadata socket error for %s (%s): %s"), - cl->vpn_hostname, cl->real_hostname, strerror(x)); - return -1; - } - - lenin = read(cl->meta_socket, cl->buffer, MAXBUFSIZE - cl->buflen); - - if(lenin<=0) - { - 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; - } - - oldlen = cl->buflen; - cl->buflen += lenin; - - for(;;) - { - if(cl->tcppacket) - { - 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 - { - break; - } - } - else - { - cl->reqlen = 0; - - for(i = oldlen; i < cl->buflen; i++) - { - if(cl->buffer[i] == '\n') - { - 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) - { - 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; - } - - cl->buflen -= cl->reqlen; - memmove(cl->buffer, cl->buffer + cl->reqlen, cl->buflen); - oldlen = 0; - } - else - { - break; - } - } - } - - if(cl->buflen >= MAXBUFSIZE) - { - syslog(LOG_ERR, _("Metadata read buffer overflow!")); - return -1; - } - - cl->last_ping_time = time(NULL); - cl->want_ping = 0; -cp - return 0; -} - /* check all connections to see if anything happened on their sockets @@ -1264,14 +1088,14 @@ cp */ getsockopt(p->socket, SOL_SOCKET, SO_ERROR, &x, &l); syslog(LOG_ERR, _("Outgoing data socket error for %s (%s): %s"), - p->vpn_hostname, p->real_hostname, strerror(x)); + p->name, p->hostname, strerror(x)); terminate_connection(p); return; } if(p->status.meta) if(FD_ISSET(p->meta_socket, f)) - if(handle_incoming_meta_data(p) < 0) + if(receive_meta(p) < 0) { terminate_connection(p); return; @@ -1309,15 +1133,14 @@ cp if(ether_type != 0x0800) { if(debug_lvl > 3) - syslog(LOG_INFO, _("Non-IP ethernet frame %04x from " MAC_ADDR_S), - ether_type, MAC_ADDR_V(vp.data[6])); + syslog(LOG_INFO, _("Non-IP ethernet frame %04x from %02x:%02x:%02x:%02x:%02x:%02x"), ether_type, MAC_ADDR_V(vp.data[6])); return; } if(lenin < 32) { if(debug_lvl > 3) - syslog(LOG_INFO, _("Dropping short packet")); + syslog(LOG_INFO, _("Dropping short packet from %02x:%02x:%02x:%02x:%02x:%02x"), MAC_ADDR_V(vp.data[6])); return; } @@ -1364,6 +1187,8 @@ cp if(sighup) { sighup = 0; + if(debug_lvl > 1) + syslog(LOG_INFO, _("Rereading configuration file")); close_network_connections(); clear_config(); if(read_config_file(configfilename))