diff options
Diffstat (limited to 'security/isakmpd/files/patch-sa.c')
| -rw-r--r-- | security/isakmpd/files/patch-sa.c | 52 |
1 files changed, 29 insertions, 23 deletions
diff --git a/security/isakmpd/files/patch-sa.c b/security/isakmpd/files/patch-sa.c index 95052dac11a1..06105110b0ab 100644 --- a/security/isakmpd/files/patch-sa.c +++ b/security/isakmpd/files/patch-sa.c @@ -1,25 +1,31 @@ ---- sa.c.orig Wed Nov 13 04:31:38 2002 -+++ sa.c Sat Feb 8 12:04:21 2003 -@@ -440,6 +440,6 @@ - LOG_DBG ((cls, level, "%s: msgid %08x refcnt %d", header, - decode_32 (sa->message_id), sa->refcnt)); -- LOG_DBG ((cls, level, "%s: life secs %llu kb %llu", header, sa->seconds, +--- sa.c.orig Tue Aug 10 17:59:10 2004 ++++ sa.c Sun Dec 12 02:40:45 2004 +@@ -427,8 +427,8 @@ + decode_32(sa->cookies + 8), decode_32(sa->cookies + 12))); + LOG_DBG((cls, level, "%s: msgid %08x refcnt %d", header, + decode_32(sa->message_id), sa->refcnt)); +- LOG_DBG((cls, level, "%s: life secs %llu kb %llu", header, sa->seconds, - sa->kilobytes)); -+ LOG_DBG ((cls, level, "%s: life secs %llu kb %llu", header, (long long unsigned) sa->seconds, ++ LOG_DBG((cls, level, "%s: life secs %llu kb %llu", header, (long long unsigned) sa->seconds, + (long long unsigned) sa->kilobytes)); - for (proto = TAILQ_FIRST (&sa->protos); proto; - proto = TAILQ_NEXT (proto, link)) -@@ -1040,5 +1040,5 @@ - LOG_DBG ((LOG_TIMER, 95, - "sa_setup_expirations: SA %p soft timeout in %llu seconds", -- sa, seconds)); -+ sa, (long long unsigned) seconds)); - expiration.tv_sec += seconds; - sa->soft_death -@@ -1058,5 +1058,5 @@ - LOG_DBG ((LOG_TIMER, 95, - "sa_setup_expirations: SA %p hard timeout in %llu seconds", -- sa, sa->seconds)); -+ sa, (long long unsigned) sa->seconds)); - expiration.tv_sec += sa->seconds; - sa->death + for (proto = TAILQ_FIRST(&sa->protos); proto; + proto = TAILQ_NEXT(proto, link)) { + LOG_DBG((cls, level, "%s: suite %d proto %d", header, +@@ -1217,7 +1217,7 @@ + seconds = sa->seconds * (850 + sysdep_random() % 100) / 1000; + LOG_DBG((LOG_TIMER, 95, + "sa_setup_expirations: SA %p soft timeout in %llu seconds", +- sa, seconds)); ++ sa, (long long unsigned) seconds)); + expiration.tv_sec += seconds; + sa->soft_death = timer_add_event("sa_soft_expire", + sa_soft_expire, sa, &expiration); +@@ -1232,7 +1232,7 @@ + gettimeofday(&expiration, 0); + LOG_DBG((LOG_TIMER, 95, + "sa_setup_expirations: SA %p hard timeout in %llu seconds", +- sa, sa->seconds)); ++ sa, (long long unsigned) sa->seconds)); + expiration.tv_sec += sa->seconds; + sa->death = timer_add_event("sa_hard_expire", sa_hard_expire, + sa, &expiration); |