From 780242616fa9db7a3f5f911f9c100d0cd9148afb Mon Sep 17 00:00:00 2001
From: Niklas Hallqvist <niklas@cvs.openbsd.org>
Date: Fri, 14 May 1999 20:10:12 +0000
Subject: 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.
---
 sbin/isakmpd/message.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'sbin/isakmpd')

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;
     }
 
-- 
cgit v1.2.3