From owner-freebsd-net@FreeBSD.ORG Tue Feb 13 11:53:57 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 C5B4916A400; Tue, 13 Feb 2007 11:53:57 +0000 (UTC) (envelope-from mav@alkar.net) Received: from cmail.optima.ua (cmail.optima.ua [195.248.191.121]) by mx1.freebsd.org (Postfix) with ESMTP id 180EF13C46B; Tue, 13 Feb 2007 11:53:56 +0000 (UTC) (envelope-from mav@alkar.net) Received: from [212.86.226.11] (account mav@alkar.net [212.86.226.11] verified) by cmail.optima.ua (CommuniGate Pro SMTP 5.0.11) with ESMTPA id 20772402; Tue, 13 Feb 2007 13:53:56 +0200 Message-ID: <45D1A6D3.8060301@alkar.net> Date: Tue, 13 Feb 2007 13:53:55 +0200 From: Alexander Motin User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.8b) Gecko/20051108 MIME-Version: 1.0 To: Andrew Bliznak References: <21be38170702130035n4ee69773mddc07a2b674fb81a@mail.gmail.com> <45D194EB.10008@alkar.net> <21be38170702130321t23345ce0pe298733be438d6b0@mail.gmail.com> In-Reply-To: <21be38170702130321t23345ce0pe298733be438d6b0@mail.gmail.com> Content-Type: multipart/mixed; boundary="------------050303050907060207080901" Cc: freebsd-net@freebsd.org 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 11:53:57 -0000 This is a multi-part message in MIME format. --------------050303050907060207080901 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Andrew Bliznak wrote: > One more questions. > a) Device type l2tp (copy pppoe config with changed device type) > produce INVARIANTS KASSERT in sys/netgraph/ng_l2tp.c on first packet > from nearest cisco :( I know about one KASSERT problem in ng_l2tp. I have already sent patches to the commiter and waiting for his reply. You can try patch from attachment. > b) Now on exit not cleaned only three nodes: > ... > Name: Type: pppoe ID: 00001843 Num hooks: 1 This is current normal behavior. It doesn't usually make any problems. > Name: ng0 Type: iface ID: 00001630 Num hooks: 0 > Name: ng2 Type: iface ID: 00000013 Num hooks: 0 This is strange. I think it can be result of using -i parameter at bundle creation. Try to not use it. -- Alexander Motin mav@alkar.net Optima Telecom --------------050303050907060207080901 Content-Type: text/plain; name="ng_l2tp.c.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="ng_l2tp.c.patch" --- 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 @@ hpriv->stats.xmitPackets++; hpriv->stats.xmitOctets += m->m_pkthdr.len; + /* And the global one. */ + priv->stats.xmitPackets++; + priv->stats.xmitOctets += m->m_pkthdr.len; + /* Send packet */ NG_FWD_NEW_DATA(error, item, priv->lower, m); return (error); @@ -1398,12 +1402,13 @@ const priv_p priv = NG_NODE_PRIVATE(node); struct l2tp_seq *const seq = &priv->seq; - /* Sanity check */ - L2TP_SEQ_CHECK(seq); - /* 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; + } /* Done */ L2TP_SEQ_CHECK(seq); @@ -1420,9 +1425,6 @@ struct l2tp_seq *const seq = &priv->seq; struct mbuf *m; u_int delay; - - /* Sanity check */ - L2TP_SEQ_CHECK(seq); /* Make sure peer's ack is still outstanding before doing anything */ if (seq->rack == seq->ns) --------------050303050907060207080901--