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

Consider a negociation timeout when retry_counter is <=0 instead of < 0

Browse Source
This commit is contained in:
vanhu 2007-03-15 10:37:44 +00:00
parent 46b0abdb74
commit 0fca99dc2f
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,7 @@
2007-03-15 Yvan Vanhullebus <vanhu@netasq.com>
* src/racoon/isakmp.c: Consider a negociation timeout when
retry_counter is <=0 instead of < 0.
2007-02-27 Matthew Grooms <mgrooms@shrew.net> 2007-02-27 Matthew Grooms <mgrooms@shrew.net>
* src/racoon/ipsec_doi.c: add logic to match ip address ids to * src/racoon/ipsec_doi.c: add logic to match ip address ids to
ip subnet ids when appropriate. reported by Yvan. ip subnet ids when appropriate. reported by Yvan.

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

@ -1,4 +1,4 @@
/* $NetBSD: isakmp.c,v 1.23 2007/02/20 09:11:30 vanhu Exp $ */ /* $NetBSD: isakmp.c,v 1.24 2007/03/15 10:37:44 vanhu Exp $ */
/* Id: isakmp.c,v 1.74 2006/05/07 21:32:59 manubsd Exp */ /* Id: isakmp.c,v 1.74 2006/05/07 21:32:59 manubsd Exp */
@ -1931,7 +1931,7 @@ isakmp_ph1resend(iph1)
{ {
/* Note: NEVER do the rem/del here, it will be done by the caller or by the _stub function /* Note: NEVER do the rem/del here, it will be done by the caller or by the _stub function
*/ */
if (iph1->retry_counter < 0) { if (iph1->retry_counter <= 0) {
plog(LLV_ERROR, LOCATION, NULL, plog(LLV_ERROR, LOCATION, NULL,
"phase1 negotiation failed due to time up. %s\n", "phase1 negotiation failed due to time up. %s\n",
isakmp_pindex(&iph1->index, iph1->msgid)); isakmp_pindex(&iph1->index, iph1->msgid));
@ -1991,7 +1991,7 @@ isakmp_ph2resend(iph2)
return -1; return -1;
} }
if (iph2->retry_counter < 0) { if (iph2->retry_counter <= 0) {
plog(LLV_ERROR, LOCATION, NULL, plog(LLV_ERROR, LOCATION, NULL,
"phase2 negotiation failed due to time up. %s\n", "phase2 negotiation failed due to time up. %s\n",
isakmp_pindex(&iph2->ph1->index, iph2->msgid)); isakmp_pindex(&iph2->ph1->index, iph2->msgid));