From owner-cvs-sys  Mon Feb  3 01:20:56 1997
Return-Path: <owner-cvs-sys>
Received: (from root@localhost)
          by freefall.freebsd.org (8.8.5/8.8.5) id BAA17090
          for cvs-sys-outgoing; Mon, 3 Feb 1997 01:20:56 -0800 (PST)
Received: from nasu.utsunomiya-u.ac.jp (nasu.utsunomiya-u.ac.jp [160.12.128.3])
          by freefall.freebsd.org (8.8.5/8.8.5) with ESMTP id BAA16934;
          Mon, 3 Feb 1997 01:18:46 -0800 (PST)
Received: from outmail.utsunomiya-u.ac.jp by nasu.utsunomiya-u.ac.jp; (8.8.4+2.7Wbeta4/1.1.8.2/21Jan97-0917PM)
	id SAA03826; Mon, 3 Feb 1997 18:18:29 +0900 (JST)
Received: from zodiac.mech.utsunomiya-u.ac.jp by outmail.utsunomiya-u.ac.jp; (8.8.4+2.7Wbeta4/1.1.8.2/21Jan97-0900PM)
	id SAA08702; Mon, 3 Feb 1997 18:18:29 +0900 (JST)
Received: from zodiac.mech.utsunomiya-u.ac.jp (zenith.mech.utsunomiya-u.ac.jp [160.12.33.60]) by zodiac.mech.utsunomiya-u.ac.jp (8.7.6+2.6Wbeta7/3.4W/zodiac-May96) with ESMTP
	id SAA04701; Mon, 3 Feb 1997 18:22:15 +0900 (JST)
Message-Id: <199702030922.SAA04701@zodiac.mech.utsunomiya-u.ac.jp>
To: Brian Somers <brian@freefall.freebsd.org>
cc: CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org,
        cvs-sys@freefall.freebsd.org, yokota@zodiac.mech.utsunomiya-u.ac.jp
Subject: Re: cvs commit: src/sys/netinet ip_divert.c ip_input.c ip_output.c 
In-reply-to: Your message of "Sun, 02 Feb 1997 08:33:14 PST."
             <199702021633.IAA24390@freefall.freebsd.org> 
References: <199702021633.IAA24390@freefall.freebsd.org> 
Date: Mon, 03 Feb 1997 18:22:13 +0900
From: Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
Sender: owner-cvs-sys@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk


>brian       97/02/02 08:33:14
>
>  Modified:    sys/netinet  ip_divert.c ip_input.c ip_output.c
>  Log:
>  Reset ip_divert_ignore to zero immediately after use - also,
>  set it in the first place, independent of whether sin->sin_port
>  is set.

`ip_divert_ignore' is reset outside #ifdef IPDIVERT in `ip_input.c', 
causing kernel compilation fail if the option IPDIVERT is not specified.

Kazu

PS: I found this not in the -current, but in RELENG_2_2, which now
has the same code...

>  The result is that diverted packets that are being forwarded
>  will be diverted once and only once on the way in (ip_input())
>  and again, once and only once on the way out (ip_output()) -
>  twice in total.  ICMP packets that don't contain a port will
>  now also be diverted.
>  
>  Revision  Changes    Path
>  1.4       +1 -2      src/sys/netinet/ip_divert.c
>  1.56      +1 -0      src/sys/netinet/ip_input.c
>  1.48      +1 -0      src/sys/netinet/ip_output.c