From owner-freebsd-net@FreeBSD.ORG Tue Feb 13 13:40:19 2007 Return-Path: X-Original-To: freebsd-net@freebsd.org Delivered-To: freebsd-net@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8CEF716A41F for ; Tue, 13 Feb 2007 13:40:19 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from transport.cksoft.de (transport.cksoft.de [62.111.66.27]) by mx1.freebsd.org (Postfix) with ESMTP id 4D74213C474 for ; Tue, 13 Feb 2007 13:40:19 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from transport.cksoft.de (localhost [127.0.0.1]) by transport.cksoft.de (Postfix) with ESMTP id 3BB151FFE82; Tue, 13 Feb 2007 14:40:17 +0100 (CET) Received: by transport.cksoft.de (Postfix, from userid 66) id DD3421FFE79; Tue, 13 Feb 2007 14:40:06 +0100 (CET) Received: from maildrop.int.zabbadoz.net (maildrop.int.zabbadoz.net [10.111.66.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.int.zabbadoz.net (Postfix) with ESMTP id 11F0C444AFE; Tue, 13 Feb 2007 13:37:34 +0000 (UTC) Date: Tue, 13 Feb 2007 13:37:34 +0000 (UTC) From: "Bjoern A. Zeeb" X-X-Sender: bz@maildrop.int.zabbadoz.net To: Alexander Motin In-Reply-To: <45D1A6D3.8060301@alkar.net> Message-ID: <20070213133017.A47107@maildrop.int.zabbadoz.net> References: <21be38170702130035n4ee69773mddc07a2b674fb81a@mail.gmail.com> <45D194EB.10008@alkar.net> <21be38170702130321t23345ce0pe298733be438d6b0@mail.gmail.com> <45D1A6D3.8060301@alkar.net> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Virus-Scanned: by AMaViS cksoft-s20020300-20031204bz on transport.cksoft.de Cc: freebsd-net@freebsd.org, Andrew Bliznak Subject: Re: Mpd-4.1 released X-BeenThere: freebsd-net@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Networking and TCP/IP with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Feb 2007 13:40:19 -0000 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