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

Store the DPD main scheduler in ph1 handler, to be able to cancel it when removing the handler, and some minor cleanups in DPD code

This commit is contained in:
vanhu 2007-03-26 15:58:07 +00:00
parent 471f710a5a
commit 52c7a2891e
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,8 @@
2007-03-26 Yvan Vanhullebus <vanhu@netasq.com>
* src/racoon/isakmp_inf.c: Store the DPD main scheduler in ph1
handler, to be able to cancel it when removing the handler, and
some minor cleanups in DPD code.
2007-03-23 Yvan Vanhullebus <vanhu@netasq.com>
* src/racoon/{oakley.c|racoon.conf.5}: give more details about
what is checked when using certificates to authenticate. Patch

25
crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: isakmp_inf.c,v 1.19 2007/03/21 14:29:22 vanhu Exp $ */
/* $NetBSD: isakmp_inf.c,v 1.20 2007/03/26 15:58:07 vanhu Exp $ */
/* Id: isakmp_inf.c,v 1.44 2006/05/06 20:45:52 manubsd Exp */
@ -1589,7 +1589,7 @@ isakmp_info_recv_r_u_ack (iph1, ru, msgid)
/*
* send Delete payload (for ISAKMP SA) in Informational exchange.
* send DPD R-U-THERE payload in Informational exchange.
*/
static void
isakmp_info_send_r_u(arg)
@ -1619,21 +1619,6 @@ isakmp_info_send_r_u(arg)
/* TODO: check recent activity to avoid useless sends... */
/* XXX: why do we have a NULL LIST_FIRST even when a Phase2 exists ??? */
#if 0
if (LIST_FIRST(&iph1->ph2tree) == NULL){
/* XXX: No Ph2 => no need to test ph1 ?
*/
/* Reschedule the r_u_there....
XXX: reschedule when a new ph2 ?
*/
isakmp_sched_r_u(iph1, 0);
plog(LLV_DEBUG, LOCATION, iph1->remote,
"no phase2 handler, rescheduling send_r_u (%d).\n", iph1->rmconf->dpd_interval);
return 0;
}
#endif
tlen = sizeof(*ru);
payload = vmalloc(tlen);
if (payload == NULL) {
@ -1697,10 +1682,10 @@ isakmp_sched_r_u(iph1, retry)
if(retry)
iph1->dpd_r_u = sched_new(iph1->rmconf->dpd_retry,
isakmp_info_send_r_u, iph1);
isakmp_info_send_r_u, iph1);
else
sched_new(iph1->rmconf->dpd_interval,
isakmp_info_send_r_u, iph1);
iph1->dpd_r_u = sched_new(iph1->rmconf->dpd_interval,
isakmp_info_send_r_u, iph1);
return 0;
}