diff options
| author |   niklas <niklas@openbsd.org> | 1999-05-14 20:10:11 +0000 |
|---|---|---|
| committer | niklas <niklas@openbsd.org> | 1999-05-14 20:10:11 +0000 |
| commit | 29391d0fc68574fc9ad25a7c6c8749973d8edff0 (patch) | |
| tree | c3e99f63102570d49ff005838b4021ad7f675414 | |
| parent | Merge with EOM 1.92 (diff) | |
| download | wireguard-openbsd-29391d0fc68574fc9ad25a7c6c8749973d8edff0.tar.xz wireguard-openbsd-29391d0fc68574fc9ad25a7c6c8749973d8edff0.zip | |
Merge with EOM 1.134
author: niklas
We forgot to remove messages in-transit from the send queue when freeing it
due to the other side acknowledging it.
| -rw-r--r-- | sbin/isakmpd/message.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sbin/isakmpd/message.c b/sbin/isakmpd/message.c index 528bcf577ea..13932571e69 100644 --- a/sbin/isakmpd/message.c +++ b/sbin/isakmpd/message.c @@ -1,5 +1,5 @@ -/* $OpenBSD: message.c,v 1.20 1999/05/03 22:45:04 niklas Exp $ */ -/* $EOM: message.c,v 1.133 1999/05/03 07:58:37 niklas Exp $ */ +/* $OpenBSD: message.c,v 1.21 1999/05/14 20:10:11 niklas Exp $ */ +/* $EOM: message.c,v 1.134 1999/05/14 20:09:49 niklas Exp $ */ /* * Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved. @@ -1519,6 +1519,12 @@ message_check_duplicate (struct message *msg) if (exchange->last_sent) { message_free (exchange->last_sent); + if (exchange->last_sent == exchange->in_transit) + { + TAILQ_REMOVE (&exchange->in_transit->transport->sendq, + exchange->in_transit, link); + exchange->in_transit = 0; + } exchange->last_sent = 0; } |