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.2 2002/02/20 19:31:15 guus Exp $
+ $Id: net_packet.c,v 1.1.2.13 2002/03/27 15:01:37 guus Exp $
*/
#include "config.h"
HMAC(myself->digest, myself->key, myself->keylength, (char *)&inpkt->seqno, inpkt->len, hmac, NULL);
if(memcmp(hmac, (char *)&inpkt->seqno + inpkt->len, myself->maclength))
{
- syslog(LOG_DEBUG, _("Got unauthenticated packet from %s (%s)"), n->name, n->hostname);
+ if(debug_lvl >= DEBUG_TRAFFIC)
+ syslog(LOG_DEBUG, _("Got unauthenticated packet from %s (%s)"), n->name, n->hostname);
return;
}
}
if(inpkt->seqno <= n->received_seqno)
{
- syslog(LOG_DEBUG, _("Got late or replayed packet from %s (%s), seqno %d"), n->name, n->hostname, inpkt->seqno);
+ if(debug_lvl >= DEBUG_TRAFFIC)
+ syslog(LOG_DEBUG, _("Got late or replayed packet from %s (%s), seqno %d"), n->name, n->hostname, inpkt->seqno);
return;
}
long int complen = MTU + 12;
EVP_CIPHER_CTX ctx;
vpn_packet_t *copy;
+ static int priority = 0;
+ int origpriority;
+ int sock;
cp
+ /* Make sure we have a valid key */
+
if(!n->status.validkey)
{
if(debug_lvl >= DEBUG_TRAFFIC)
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;
}
origlen = inpkt->len;
+ origpriority = inpkt->priority;
/* Compress the packet */
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((sendto(udp_socket, (char *)&inpkt->seqno, inpkt->len, 0, &(n->address.sa), sizeof(sockaddr_t))) < 0)
+#if defined(SOL_IP) && defined(IP_TOS)
+ 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(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(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));
cp
}
-void handle_incoming_vpn_data(void)
+void handle_incoming_vpn_data(int sock)
{
vpn_packet_t pkt;
int x, l = sizeof(x);
socklen_t fromlen = sizeof(from);
node_t *n;
cp
- if(getsockopt(udp_socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
+ if(getsockopt(sock, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
{
syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%s"),
- __FILE__, __LINE__, udp_socket, strerror(errno));
- return;
+ __FILE__, __LINE__, sock, strerror(errno));
+ cp_trace();
+ exit(1);
}
if(x)
{
return;
}
- if((pkt.len = recvfrom(udp_socket, (char *)&pkt.seqno, MAXSIZE, 0, &from.sa, &fromlen)) <= 0)
+ if((pkt.len = recvfrom(sock, (char *)&pkt.seqno, MAXSIZE, 0, &from.sa, &fromlen)) <= 0)
{
syslog(LOG_ERR, _("Receiving packet failed: %s"), strerror(errno));
return;
}
+ sockaddrunmap(&from); /* Some braindead IPv6 implementations do stupid things. */
+
n = lookup_node_udp(&from);
if(!n)
return;
}
-/*
if(n->connection)
- n->connection->last_ping_time = time(NULL);
-*/
+ n->connection->last_ping_time = now;
+
receive_udppacket(n, &pkt);
cp
}