diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-06-02 06:33:01 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-06-02 06:33:01 +0000 |
| commit | 471ea231a90fa3c791398822f426b7dc97bc810b (patch) | |
| tree | fac4ddab5704a7e0f1d7636bccf974ff76a3eaec /sbin | |
| parent | 81340676fd11f514f2ee69e011240e9bb45d1980 (diff) | |
exchange.c: Merge with EOM 1.106
timer.c: Merge with EOM 1.12
author: ho
Logging nitpicks
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/isakmpd/exchange.c | 8 | ||||
| -rw-r--r-- | sbin/isakmpd/timer.c | 16 |
2 files changed, 14 insertions, 10 deletions
diff --git a/sbin/isakmpd/exchange.c b/sbin/isakmpd/exchange.c index 9bb2fb510da..eb097b4b343 100644 --- a/sbin/isakmpd/exchange.c +++ b/sbin/isakmpd/exchange.c @@ -1,5 +1,5 @@ -/* $OpenBSD: exchange.c,v 1.20 1999/05/02 19:17:18 niklas Exp $ */ -/* $EOM: exchange.c,v 1.105 1999/05/02 18:17:42 niklas Exp $ */ +/* $OpenBSD: exchange.c,v 1.21 1999/06/02 06:33:00 niklas Exp $ */ +/* $EOM: exchange.c,v 1.106 1999/05/21 14:12:57 ho Exp $ */ /* * Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved. @@ -368,8 +368,8 @@ exchange_run (struct message *msg) } log_debug (LOG_EXCHANGE, 40, - "exchange_run: finished step %d, advancing...", - exchange->step); + "exchange_run: exchange %p finished step %d, advancing...", + exchange, exchange->step); exchange->step++; while (*exchange->exch_pc != EXCHANGE_SCRIPT_SWITCH && *exchange->exch_pc != EXCHANGE_SCRIPT_END) diff --git a/sbin/isakmpd/timer.c b/sbin/isakmpd/timer.c index bb7abbc09b6..b255216388b 100644 --- a/sbin/isakmpd/timer.c +++ b/sbin/isakmpd/timer.c @@ -1,5 +1,5 @@ -/* $OpenBSD: timer.c,v 1.5 1999/04/19 20:57:25 niklas Exp $ */ -/* $EOM: timer.c,v 1.11 1999/04/13 20:00:41 ho Exp $ */ +/* $OpenBSD: timer.c,v 1.6 1999/06/02 06:33:00 niklas Exp $ */ +/* $EOM: timer.c,v 1.12 1999/05/21 14:12:59 ho Exp $ */ /* * Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved. @@ -92,12 +92,14 @@ timer_add_event (char *name, void (*func) (void *), void *arg, { struct event *ev = (struct event *)malloc (sizeof *ev); struct event *n; + struct timeval now; if (!ev) return 0; ev->name = name; ev->func = func; ev->arg = arg; + gettimeofday (&now, 0); memcpy (&ev->expiration, expiration, sizeof *expiration); for (n = TAILQ_FIRST (&events); n && timercmp (expiration, &n->expiration, >=); @@ -106,14 +108,16 @@ timer_add_event (char *name, void (*func) (void *), void *arg, if (n) { log_debug (LOG_TIMER, 10, - "timer_add_event: event %s(%p) added before %s(%p)", name, - arg, n->name, n->arg); + "timer_add_event: event %s(%p) added before %s(%p), " + "expiration in %ds", name, + arg, n->name, n->arg, expiration->tv_sec - now.tv_sec); TAILQ_INSERT_BEFORE (n, ev, link); } else { - log_debug (LOG_TIMER, 10, "timer_add_event: event %s(%p) added last", - name, arg); + log_debug (LOG_TIMER, 10, "timer_add_event: event %s(%p) added last, " + "expiration in %ds", name, arg, + expiration->tv_sec - now.tv_sec); TAILQ_INSERT_TAIL (&events, ev, link); } return ev; |