Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Consume NAT-T packets that have already been seen through MSG_PEEK

This commit is contained in:
manu 2005-06-15 07:29:20 +00:00
parent 0da67fb4ba
commit 13ca728372
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/dist/ipsec-tools/ChangeLog vendored
View File

@ -1,3 +1,9 @@
2005-06-07 Emmanuel Dreyfus <manu@netbsd.org>
From Larry Baird <lab@gta.com>
* src/racoon/isakmp.c: consume NAT keepalive data already seen
with MSG_PEEK
2005-06-06 Emmanuel Dreyfus <manu@netbsd.org>
* src/racoon/isakmp_quick.c: endianness bug fix

14
crypto/dist/ipsec-tools/src/racoon/isakmp.c vendored
View File

@ -1,6 +1,6 @@
/* $NetBSD: isakmp.c,v 1.5 2005/05/13 14:09:44 manu Exp $ */
/* $NetBSD: isakmp.c,v 1.6 2005/06/15 07:29:20 manu Exp $ */
/* $Id: isakmp.c,v 1.5 2005/05/13 14:09:44 manu Exp $ */
/* $Id: isakmp.c,v 1.6 2005/06/15 07:29:20 manu Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@ -214,8 +214,16 @@ isakmp_handler(so_isakmp)
}
/* keep-alive packet - ignore */
if (len == 1 && (x.buf[0]&0xff) == 0xff)
if (len == 1 && (x.buf[0]&0xff) == 0xff) {
/* Pull the keep-alive packet */
if ((len = recvfrom(so_isakmp, (char *)x.buf, 1,
0, (struct sockaddr *)&remote, &remote_len)) != 1) {
plog(LLV_ERROR, LOCATION, NULL,
"failed to receive keep alive packet: %s\n",
strerror (errno));
}
goto end;
}
#ifdef ENABLE_NATT
/* we don't know about portchange yet,