From owner-freebsd-net@FreeBSD.ORG Tue Feb 21 00:50:02 2006 Return-Path: X-Original-To: net@freebsd.org Delivered-To: freebsd-net@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D5E3216A444 for ; Tue, 21 Feb 2006 00:50:02 +0000 (GMT) (envelope-from elessar@bsdforen.de) Received: from postfix.bsdforen.de (bsdforen.de [212.204.60.79]) by mx1.FreeBSD.org (Postfix) with ESMTP id C275943D48 for ; Tue, 21 Feb 2006 00:50:01 +0000 (GMT) (envelope-from elessar@bsdforen.de) Received: by postfix.bsdforen.de (Postfix, from userid 20000) id 0CB4F6844BE; Tue, 21 Feb 2006 01:50:01 +0100 (CET) Received: from localhost (postfix [127.0.0.3]) by postfix.bsdforen.de (Postfix) with ESMTP id 98F3B6844BB; Tue, 21 Feb 2006 01:49:58 +0100 (CET) Received: from postfix.bsdforen.de ([127.0.0.3]) by localhost (postfix.bsdforen.de [127.0.0.3]) (amavisd-new, port 10024) with LMTP id 44813-06-2; Tue, 21 Feb 2006 01:49:58 +0100 (CET) Received: from loki (p549CE66C.dip.t-dialin.net [84.156.230.108]) by postfix.bsdforen.de (Postfix) with ESMTP id A86116844B6; Tue, 21 Feb 2006 01:49:57 +0100 (CET) Date: Tue, 21 Feb 2006 01:49:14 +0100 From: Joerg Pernfuss To: net@FreeBSD.org Message-ID: <20060221014914.7f8de7d1@loki> In-Reply-To: <20060210221415.GC33588@ip.net.ua> References: <20060210221415.GC33588@ip.net.ua> X-Mailer: Sylpheed-Claws 1.9.100 (GTK+ 2.8.9; i386-portbld-freebsd6.0) Mime-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_NYpEKZZ7JOGLaph/32jtkA/"; protocol="application/pgp-signature"; micalg=PGP-SHA1 X-Virus-Scanned: amavisd-new at bsdforen.de X-DSPAM-Result: Innocent X-DSPAM-Confidence: 0.9997 X-DSPAM-Probability: 0.0000 X-DSPAM-Signature: 43fa63b8475047983912264 X-DSPAM-User: global Cc: Andre Oppermann , Ruslan Ermilov Subject: Re: [FIX] dummynet breaks IP reassembly 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, 21 Feb 2006 00:50:03 -0000 --Sig_NYpEKZZ7JOGLaph/32jtkA/ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi, =20 on the german questions list someone encountered 'ip reassembly time exceeded' errors on his router running 5.4-RELEASE. Looking at the ip_id of the packets, it seemed like the same error. =20 Here is a naive RELENG_5 adaption of Ruslan's patch for RELENG_6 - sadly the user already started upgrading to FreeBSD6 by the time I had this patch ready, so it is untested (and I don't exactly know if one has to fix more than that). --- ip_dummynet.c Tue Feb 21 01:01:23 2006 +++ ip_dummynet.c Tue Feb 21 01:13:00 2006 @@ -453,7 +453,7 @@ DUMMYNET_UNLOCK(); switch (pkt->dn_dir) { case DN_TO_IP_OUT: - (void)ip_output(m, NULL, NULL, pkt->flags, NULL, NULL); + (void)ip_output(m, NULL, NULL, IP_FORWARDING, NULL, NULL); break ; case DN_TO_IP_IN : @@ -1128,7 +1128,6 @@ * NULL in ip_input, destination interface in ip_output, * real_dst in bdg_forward * rule matching rule, in case of multiple passes - * flags flags from the caller, only used in ip_output * */ static int @@ -1212,8 +1211,6 @@ pkt->dn_dir =3D dir ; pkt->ifp =3D fwa->oif; - if (dir =3D=3D DN_TO_IP_OUT) - pkt->flags =3D fwa->flags; if (q->head =3D=3D NULL) q->head =3D m; else --- ip_dummynet.h Tue Feb 21 01:24:10 2006 +++ ip_dummynet.h Tue Feb 21 01:28:26 2006 @@ -129,7 +129,6 @@ dn_key output_time; /* when the pkt is due for delivery= */ struct ifnet *ifp; /* interface, for ip_output */ - int flags ; /* flags, for ip_output (IPv6 ?) = */ }; #endif /* _KERNEL */ --- ip_fw.h Tue Feb 21 01:25:14 2006 +++ ip_fw.h Tue Feb 21 01:26:16 2006 @@ -435,8 +435,6 @@ struct ip_fw *rule; /* matching rule */ struct ether_header *eh; /* for bridged packets */ - int flags; /* for dummynet */ - struct ipfw_flow_id f_id; /* grabbed from IP header */ u_int32_t retval; struct inpcb *inp; Regards, Joerg --=20 | /"\ ASCII ribbon | GnuPG Key ID | e86d b753 3deb e749 6c3a | | \ / campaign against | 0xbbcaad24 | 5706 1f7d 6cfd bbca ad24 | | X HTML in email | Now featuring a brand new GPG-Key! | | / \ and news | Please update your keyring. | --Sig_NYpEKZZ7JOGLaph/32jtkA/ Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (FreeBSD) iD8DBQFD+mOTH31s/bvKrSQRAjLDAJsGyYM8K60YPher2tBCy1qAXSvpGgCfRgQB UzEt7oj47q/4rQn2x4p4RkM= =Xb7c -----END PGP SIGNATURE----- --Sig_NYpEKZZ7JOGLaph/32jtkA/--