projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ethernet protocol types.
[tinc]
/
src
/
net_packet.c
diff --git
a/src/net_packet.c
b/src/net_packet.c
index
0828525
..
a989b09
100644
(file)
--- a/
src/net_packet.c
+++ b/
src/net_packet.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.
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.
38 2003/08/16 12:40
:01 guus Exp $
+ $Id: net_packet.c,v 1.1.2.
41 2003/09/23 20:59
:01 guus Exp $
*/
#include "system.h"
*/
#include "system.h"
@@
-118,6
+118,14
@@
static void receive_udppacket(node_t *n, vpn_packet_t *inpkt)
cp();
cp();
+ /* Check packet length */
+
+ if(inpkt->len < sizeof(inpkt->seqno) + myself->maclength) {
+ ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Got too short packet from %s (%s)"),
+ n->name, n->hostname);
+ return;
+ }
+
/* Check the message authentication code */
if(myself->digest && myself->maclength) {
/* Check the message authentication code */
if(myself->digest && myself->maclength) {
@@
-189,6
+197,9
@@
static void receive_udppacket(node_t *n, vpn_packet_t *inpkt)
inpkt = outpkt;
}
inpkt = outpkt;
}
+ if(n->connection)
+ n->connection->last_ping_time = now;
+
receive_packet(n, inpkt);
}
receive_packet(n, inpkt);
}
@@
-367,7
+378,7
@@
void broadcast_packet(const node_t *from, vpn_packet_t *packet)
packet->len, from->name, from->hostname);
for(node = connection_tree->head; node; node = node->next) {
packet->len, from->name, from->hostname);
for(node = connection_tree->head; node; node = node->next) {
- c =
(connection_t *)
node->data;
+ c = node->data;
if(c->status.active && c->status.mst && c != from->nexthop->connection)
send_packet(c->node, packet);
if(c->status.active && c->status.mst && c != from->nexthop->connection)
send_packet(c->node, packet);
@@
-384,7
+395,7
@@
void flush_queue(node_t *n)
for(node = n->queue->head; node; node = next) {
next = node->next;
for(node = n->queue->head; node; node = next) {
next = node->next;
- send_udppacket(n,
(vpn_packet_t *)
node->data);
+ send_udppacket(n, node->data);
list_delete_node(n->queue, node);
}
}
list_delete_node(n->queue, node);
}
}
@@
-392,7
+403,6
@@
void flush_queue(node_t *n)
void handle_incoming_vpn_data(int sock)
{
vpn_packet_t pkt;
void handle_incoming_vpn_data(int sock)
{
vpn_packet_t pkt;
- int x, l = sizeof(x);
char *hostname;
sockaddr_t from;
socklen_t fromlen = sizeof(from);
char *hostname;
sockaddr_t from;
socklen_t fromlen = sizeof(from);
@@
-402,7
+412,7
@@
void handle_incoming_vpn_data(int sock)
pkt.len = recvfrom(sock, (char *) &pkt.seqno, MAXSIZE, 0, &from.sa, &fromlen);
pkt.len = recvfrom(sock, (char *) &pkt.seqno, MAXSIZE, 0, &from.sa, &fromlen);
- if(pkt.len <
=
0) {
+ if(pkt.len < 0) {
logger(LOG_ERR, _("Receiving packet failed: %s"), strerror(errno));
return;
}
logger(LOG_ERR, _("Receiving packet failed: %s"), strerror(errno));
return;
}
@@
-419,8
+429,5
@@
void handle_incoming_vpn_data(int sock)
return;
}
return;
}
- if(n->connection)
- n->connection->last_ping_time = now;
-
receive_udppacket(n, &pkt);
}
receive_udppacket(n, &pkt);
}