From owner-cvs-src-old@FreeBSD.ORG Sun Jun 7 23:04:37 2009 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BA47E1065670 for ; Sun, 7 Jun 2009 23:04:37 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8A94C8FC0C for ; Sun, 7 Jun 2009 23:04:37 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n57N4bmv006246 for ; Sun, 7 Jun 2009 23:04:37 GMT (envelope-from hrs@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n57N4bPo006245 for cvs-src-old@freebsd.org; Sun, 7 Jun 2009 23:04:37 GMT (envelope-from hrs@repoman.freebsd.org) Message-Id: <200906072304.n57N4bPo006245@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to hrs@repoman.freebsd.org using -f From: Hiroki Sato Date: Sun, 7 Jun 2009 23:00:40 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sbin/ifconfig Makefile ifgif.c src/share/man/man4 gif.4 if_bridge.4 src/sys/net if_gif.c if_gif.h src/sys/netinet in_gif.c src/sys/netinet6 in6_gif.c src/sys/sys priv.h X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Jun 2009 23:04:38 -0000 hrs 2009-06-07 23:00:40 UTC FreeBSD src repository Modified files: sbin/ifconfig Makefile share/man/man4 gif.4 if_bridge.4 sys/net if_gif.c if_gif.h sys/netinet in_gif.c sys/netinet6 in6_gif.c sys/sys priv.h Added files: sbin/ifconfig ifgif.c Log: SVN rev 193664 on 2009-06-07 23:00:40Z by hrs Fix and add a workaround on an issue of EtherIP packet with reversed version field sent via gif(4)+if_bridge(4). The EtherIP implementation found on FreeBSD 6.1, 6.2, 6.3, 7.0, 7.1, and 7.2 had an interoperability issue because it sent the incorrect EtherIP packets and discarded the correct ones. This change introduces the following two flags to gif(4): accept_rev_ethip_ver: accepts both correct EtherIP packets and ones with reversed version field, if enabled. If disabled, the gif accepts the correct packets only. This flag is enabled by default. send_rev_ethip_ver: sends EtherIP packets with reversed version field intentionally, if enabled. If disabled, the gif sends the correct packets only. This flag is disabled by default. These flags are stored in struct gif_softc and can be set by ifconfig(8) on per-interface basis. Note that this is an incompatible change of EtherIP with the older FreeBSD releases. If you need to interoperate older FreeBSD boxes and new versions after this commit, setting "send_rev_ethip_ver" is needed. Reviewed by: thompsa and rwatson Spotted by: Shunsuke SHINOMIYA PR: kern/125003 MFC after: 2 weeks Revision Changes Path 1.36 +1 -0 src/sbin/ifconfig/Makefile 1.1 +132 -0 src/sbin/ifconfig/ifgif.c (new) 1.27 +30 -1 src/share/man/man4/gif.4 1.35 +7 -1 src/share/man/man4/if_bridge.4 1.80 +41 -5 src/sys/net/if_gif.c 1.26 +20 -6 src/sys/net/if_gif.h 1.46 +16 -2 src/sys/netinet/in_gif.c 1.39 +16 -2 src/sys/netinet6/in6_gif.c 1.31 +1 -0 src/sys/sys/priv.h