From owner-freebsd-net@FreeBSD.ORG Tue Oct 16 11:51:32 2007 Return-Path: Delivered-To: freebsd-net@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3D63816A417 for ; Tue, 16 Oct 2007 11:51:32 +0000 (UTC) (envelope-from rpaulo@gmail.com) Received: from mu-out-0910.google.com (mu-out-0910.google.com [209.85.134.191]) by mx1.freebsd.org (Postfix) with ESMTP id CD40213C468 for ; Tue, 16 Oct 2007 11:51:31 +0000 (UTC) (envelope-from rpaulo@gmail.com) Received: by mu-out-0910.google.com with SMTP id w9so1897985mue for ; Tue, 16 Oct 2007 04:51:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:mime-version:to:message-id:content-type:from:subject:date:x-mailer:sender; bh=miXy3XfGQEBwKoNxTDEFZkzdtxDnYrGuO7TzuKVNw0w=; b=kwzCeuFLdRN1Z1D7o8OOJ6Mrac+2OoMadu08GtgMxCoWKdoM7PETbdC9vEXFpz8rlEVavDZFN4hELNrDAG7dFGhMAUESefi/eg5Ge/ZhxbGpRZBn5qNef2mSElAkcFloLq4cL///sPitCX670/SQWJ+neUiWhXbnMuCH00z8yQs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:mime-version:to:message-id:content-type:from:subject:date:x-mailer:sender; b=gVz3vVjVjPvCZ0rMFbkrPz0xL05dkayWqLitMAGQ9TeesMQWNGI3vu8OM6Gtw8MhYQ9J2MxY4dbIkBvfbercnJwvGOOpMqysd9jr5gnD4+5tkluERPl3dZeF5myvRyVXUfKkX+IXmGax4uBxoz821wDPifw5Tkgp7IFrD7OdJGY= Received: by 10.86.74.15 with SMTP id w15mr5817814fga.1192533984541; Tue, 16 Oct 2007 04:26:24 -0700 (PDT) Received: from ?172.17.9.157? ( [193.136.24.205]) by mx.google.com with ESMTPS id f19sm10037408fka.2007.10.16.04.26.22 (version=SSLv3 cipher=OTHER); Tue, 16 Oct 2007 04:26:23 -0700 (PDT) Mime-Version: 1.0 (Apple Message framework v752.3) To: Nate Lawson , freebsd-net@freebsd.org Message-Id: <9F253322-5944-4491-B621-11B4CFAC402A@fnop.net> Content-Type: multipart/mixed; boundary=Apple-Mail-4--521585451 From: Rui Paulo Date: Tue, 16 Oct 2007 12:26:19 +0100 X-Mailer: Apple Mail (2.752.3) Sender: Rui Paulo Cc: Subject: Killing IPTOS_CE and IPTOS_ECT 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, 16 Oct 2007 11:51:32 -0000 --Apple-Mail-4--521585451 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed Hi, I would like to commit the attached patch. Luigi has said in the past that he's okay with it. Any objections from the community? Nate, are you okay with it? Thanks in advance. Regards. -- Rui Paulo --Apple-Mail-4--521585451 Content-Transfer-Encoding: 7bit Content-Type: application/octet-stream; x-unix-mode=0644; name=kill-iptosecn.diff Content-Disposition: attachment; filename=kill-iptosecn.diff Index: sys/netinet/ip.h =================================================================== RCS file: /home/ncvs/src/sys/netinet/ip.h,v retrieving revision 1.31 diff -u -p -r1.31 ip.h --- sys/netinet/ip.h 11 May 2007 11:00:48 -0000 1.31 +++ sys/netinet/ip.h 18 Aug 2007 00:36:04 -0000 @@ -82,11 +82,6 @@ CTASSERT(sizeof (struct ip) == 20); #define IPTOS_THROUGHPUT 0x08 #define IPTOS_RELIABILITY 0x04 #define IPTOS_MINCOST 0x02 -#if 1 -/* ECN RFC3168 obsoletes RFC2481, and these will be deprecated soon. */ -#define IPTOS_CE 0x01 -#define IPTOS_ECT 0x02 -#endif /* * Definitions for IP precedence (also in ip_tos) (hopefully unused). Index: sbin/ipfw/ipfw2.c =================================================================== RCS file: /home/ncvs/src/sbin/ipfw/ipfw2.c,v retrieving revision 1.108 diff -u -p -r1.108 ipfw2.c --- sbin/ipfw/ipfw2.c 23 Sep 2007 16:29:22 -0000 1.108 +++ sbin/ipfw/ipfw2.c 26 Sep 2007 10:51:01 -0000 @@ -179,8 +179,8 @@ static struct _s_x f_iptos[] = { { "throughput", IPTOS_THROUGHPUT}, { "reliability", IPTOS_RELIABILITY}, { "mincost", IPTOS_MINCOST}, - { "congestion", IPTOS_CE}, - { "ecntransport", IPTOS_ECT}, + { "congestion", IPTOS_ECN_CE}, + { "ecntransport", IPTOS_ECN_ECT0}, { "ip tos option", 0}, { NULL, 0 } }; --Apple-Mail-4--521585451--