X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_packet.c;h=db31b770aec2c41b624a2957f83429313fdb328c;hp=61ec20457812837ceed63e52b50d949dfc652cf5;hb=5fc1ed17f41f0c535cf57a4b7e00cd6d45759503;hpb=8b84c44175fedb81ca38107e0067ddea750add00 diff --git a/src/net_packet.c b/src/net_packet.c index 61ec2045..db31b770 100644 --- a/src/net_packet.c +++ b/src/net_packet.c @@ -1,7 +1,7 @@ /* net_packet.c -- Handles in- and outgoing VPN packets - Copyright (C) 1998-2002 Ivo Timmermans , - 2000-2002 Guus Sliepen + Copyright (C) 1998-2002 Ivo Timmermans , + 2000-2002 Guus Sliepen 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 @@ -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_packet.c,v 1.1.2.10 2002/03/17 15:59:29 guus Exp $ + $Id: net_packet.c,v 1.1.2.21 2002/09/09 19:39:58 guus Exp $ */ #include "config.h" @@ -26,8 +26,13 @@ #include #include #include -#ifdef HAVE_LINUX +#ifdef HAVE_NETINET_IN_SYSTM_H + #include +#endif +#ifdef HAVE_NETINET_IP_H #include +#endif +#ifdef HAVE_NETINET_TCP_H #include #endif #include @@ -50,10 +55,6 @@ #include #include -#ifndef HAVE_RAND_PSEUDO_BYTES -#define RAND_pseudo_bytes RAND_bytes -#endif - #include #include @@ -94,7 +95,7 @@ void receive_udppacket(node_t *n, vpn_packet_t *inpkt) long int complen = MTU + 12; EVP_CIPHER_CTX ctx; char hmac[EVP_MAX_MD_SIZE]; -cp + cp(); /* Check the message authentication code */ if(myself->digest && myself->maclength) @@ -157,28 +158,28 @@ cp } receive_packet(n, inpkt); -cp + cp(); } void receive_tcppacket(connection_t *c, char *buffer, int len) { vpn_packet_t outpkt; -cp + cp(); outpkt.len = len; memcpy(outpkt.data, buffer, len); receive_packet(c->node, &outpkt); -cp + cp(); } void receive_packet(node_t *n, vpn_packet_t *packet) { -cp + cp(); if(debug_lvl >= DEBUG_TRAFFIC) syslog(LOG_DEBUG, _("Received packet of %d bytes from %s (%s)"), packet->len, n->name, n->hostname); route_incoming(n, packet); -cp + cp(); } void send_udppacket(node_t *n, vpn_packet_t *inpkt) @@ -194,7 +195,10 @@ void send_udppacket(node_t *n, vpn_packet_t *inpkt) vpn_packet_t *copy; static int priority = 0; int origpriority; -cp + int sock; + cp(); + /* Make sure we have a valid key */ + if(!n->status.validkey) { if(debug_lvl >= DEBUG_TRAFFIC) @@ -209,9 +213,14 @@ cp list_insert_tail(n->queue, copy); + if(n->queue->count > MAXQUEUELENGTH) + list_delete_head(n->queue); + if(!n->status.waitingforkey) send_req_key(n->nexthop->connection, myself, n); + n->status.waitingforkey = 1; + return; } @@ -261,20 +270,29 @@ cp inpkt->len += n->maclength; } + /* Determine which socket we have to use */ + + for(sock = 0; sock < listen_sockets; sock++) + if(n->address.sa.sa_family == listen_socket[sock].sa.sa.sa_family) + break; + + if(sock >= listen_sockets) + sock = 0; /* If none is available, just use the first and hope for the best. */ + /* Send the packet */ #if defined(SOL_IP) && defined(IP_TOS) - if(priorityinheritance && origpriority != priority) + if(priorityinheritance && origpriority != priority && listen_socket[sock].sa.sa.sa_family == AF_INET) { priority = origpriority; if(debug_lvl >= DEBUG_TRAFFIC) syslog(LOG_DEBUG, _("Setting outgoing packet priority to %d"), priority); - if(setsockopt(udp_socket[0], SOL_IP, IP_TOS, &priority, sizeof(priority))) /* SO_PRIORITY doesn't seem to work */ + if(setsockopt(sock, SOL_IP, IP_TOS, &priority, sizeof(priority))) /* SO_PRIORITY doesn't seem to work */ syslog(LOG_ERR, _("System call `%s' failed: %s"), "setsockopt", strerror(errno)); } #endif - if((sendto(udp_socket[0], (char *)&inpkt->seqno, inpkt->len, 0, &(n->address.sa), SALEN(n->address.sa))) < 0) + if((sendto(listen_socket[sock].udp, (char *)&inpkt->seqno, inpkt->len, 0, &(n->address.sa), SALEN(n->address.sa))) < 0) { syslog(LOG_ERR, _("Error sending packet to %s (%s): %s"), n->name, n->hostname, strerror(errno)); @@ -282,7 +300,7 @@ cp } inpkt->len = origlen; -cp + cp(); } /* @@ -291,7 +309,7 @@ cp void send_packet(node_t *n, vpn_packet_t *packet) { node_t *via; -cp + cp(); if(debug_lvl >= DEBUG_TRAFFIC) syslog(LOG_ERR, _("Sending packet of %d bytes to %s (%s)"), packet->len, n->name, n->hostname); @@ -335,7 +353,7 @@ void broadcast_packet(node_t *from, vpn_packet_t *packet) { avl_node_t *node; connection_t *c; -cp + cp(); if(debug_lvl >= DEBUG_TRAFFIC) syslog(LOG_INFO, _("Broadcasting packet of %d bytes from %s (%s)"), packet->len, from->name, from->hostname); @@ -346,13 +364,13 @@ cp if(c->status.active && c->status.mst && c != from->nexthop->connection) send_packet(c->node, packet); } -cp + cp(); } void flush_queue(node_t *n) { list_node_t *node, *next; -cp + cp(); if(debug_lvl >= DEBUG_TRAFFIC) syslog(LOG_INFO, _("Flushing queue for %s (%s)"), n->name, n->hostname); @@ -362,7 +380,7 @@ cp send_udppacket(n, (vpn_packet_t *)node->data); list_delete_node(n->queue, node); } -cp + cp(); } void handle_incoming_vpn_data(int sock) @@ -373,7 +391,7 @@ void handle_incoming_vpn_data(int sock) sockaddr_t from; socklen_t fromlen = sizeof(from); node_t *n; -cp + cp(); if(getsockopt(sock, SOL_SOCKET, SO_ERROR, &x, &l) < 0) { syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%s"), @@ -387,7 +405,9 @@ cp return; } - if((pkt.len = recvfrom(sock, (char *)&pkt.seqno, MAXSIZE, 0, &from.sa, &fromlen)) <= 0) + pkt.len = recvfrom(sock, (char *)&pkt.seqno, MAXSIZE, 0, &from.sa, &fromlen); + + if(pkt.len <= 0) { syslog(LOG_ERR, _("Receiving packet failed: %s"), strerror(errno)); return; @@ -409,6 +429,5 @@ cp n->connection->last_ping_time = now; receive_udppacket(n, &pkt); -cp + cp(); } -