Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 13 Feb 2007 13:37:34 +0000 (UTC)
From:      "Bjoern A. Zeeb" <bzeeb-lists@lists.zabbadoz.net>
To:        Alexander Motin <mav@alkar.net>
Cc:        freebsd-net@freebsd.org, Andrew Bliznak <andriko.b@gmail.com>
Subject:   Re: Mpd-4.1 released
Message-ID:  <20070213133017.A47107@maildrop.int.zabbadoz.net>
In-Reply-To: <45D1A6D3.8060301@alkar.net>
References:  <21be38170702130035n4ee69773mddc07a2b674fb81a@mail.gmail.com>  <45D194EB.10008@alkar.net> <21be38170702130321t23345ce0pe298733be438d6b0@mail.gmail.com> <45D1A6D3.8060301@alkar.net>

next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, 13 Feb 2007, Alexander Motin wrote:

Hi,

--- ng_l2tp.c.orig	Sat Feb 10 06:58:03 2007
+++ ng_l2tp.c	Sat Feb 10 06:58:00 2007
@@ -1121,6 +1121,10 @@

  	/* If ack is still outstanding, send a ZLB */
-	if (seq->xack != seq->nr)
+	if (seq->xack != seq->nr) {
  		ng_l2tp_xmit_ctrl(priv, NULL, seq->ns);
+		/* If there was memory error, ignore it.
+		   We must keep state consistent here. */
+		seq->xack = seq->nr;
+	}

This change is not needed. ng_l2tp_xmit_ctrl() does this already.

It's not a good idea to remove the L2TP_SEQ_CHECK()s.
Been there years ago but seems I missed to get this fixed
in the FreeBSD repo.
The problem is in ng_l2tp_seq_check(). Fix it there.

/bz

-- 
Bjoern A. Zeeb				bzeeb at Zabbadoz dot NeT



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070213133017.A47107>