Blame SOURCES/libreswan-3.25-1686991-ikev1-del.patch
|
 |
221bf6 |
diff -Naur libreswan-3.25-orig/programs/pluto/ikev1_main.c libreswan-3.25/programs/pluto/ikev1_main.c
|
|
|
221bf6 |
--- libreswan-3.25-orig/programs/pluto/ikev1_main.c 2019-05-07 15:41:26.366181612 -0400
|
|
|
221bf6 |
+++ libreswan-3.25/programs/pluto/ikev1_main.c 2019-05-07 15:45:41.780183599 -0400
|
|
|
221bf6 |
@@ -2727,30 +2727,11 @@
|
|
|
221bf6 |
* Useful if the other peer is
|
|
|
221bf6 |
* rebooting.
|
|
|
221bf6 |
*/
|
|
|
221bf6 |
- if (dst->st_event != NULL &&
|
|
|
221bf6 |
- dst->st_event->ev_type ==
|
|
|
221bf6 |
- EVENT_SA_REPLACE &&
|
|
|
221bf6 |
- !monobefore(monotimesum(mononow(),
|
|
|
221bf6 |
- deltatime(DELETE_SA_DELAY)),
|
|
|
221bf6 |
- dst->st_event->ev_time)) {
|
|
|
221bf6 |
- /*
|
|
|
221bf6 |
- * Patch from Angus Lees to
|
|
|
221bf6 |
- * ignore retransmitted
|
|
|
221bf6 |
- * Delete SA.
|
|
|
221bf6 |
- */
|
|
|
221bf6 |
- loglog(RC_LOG_SERIOUS,
|
|
|
221bf6 |
- "received Delete SA payload: already replacing IPSEC State #%lu in %ld seconds",
|
|
|
221bf6 |
- dst->st_serialno,
|
|
|
221bf6 |
- (long)deltasecs(monotimediff(
|
|
|
221bf6 |
- dst->st_event->ev_time,
|
|
|
221bf6 |
- mononow())));
|
|
|
221bf6 |
- } else {
|
|
|
221bf6 |
- loglog(RC_LOG_SERIOUS,
|
|
|
221bf6 |
- "received Delete SA payload: replace IPSEC State #%lu now",
|
|
|
221bf6 |
- dst->st_serialno);
|
|
|
221bf6 |
- dst->st_margin = deltatime(0);
|
|
|
221bf6 |
- event_force(EVENT_SA_REPLACE, dst);
|
|
|
221bf6 |
- }
|
|
|
221bf6 |
+ loglog(RC_LOG_SERIOUS,
|
|
|
221bf6 |
+ "received Delete SA payload: replace IPSEC State #%lu now",
|
|
|
221bf6 |
+ dst->st_serialno);
|
|
|
221bf6 |
+ dst->st_margin = deltatime(0);
|
|
|
221bf6 |
+ event_force(EVENT_SA_REPLACE, dst);
|
|
|
221bf6 |
} else {
|
|
|
221bf6 |
loglog(RC_LOG_SERIOUS,
|
|
|
221bf6 |
"received Delete SA(0x%08" PRIx32 ") payload: deleting IPSEC State #%lu",
|