From owner-cvs-sys  Fri Jun  5 15:43:19 1998
Return-Path: <owner-cvs-sys>
Received: (from daemon@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id PAA03102
          for cvs-sys-outgoing; Fri, 5 Jun 1998 15:43:19 -0700 (PDT)
          (envelope-from owner-cvs-sys)
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id PAA02704;
          Fri, 5 Jun 1998 15:41:03 -0700 (PDT)
          (envelope-from julian@FreeBSD.org)
From: Julian Elischer <julian@FreeBSD.ORG>
Received: (from julian@localhost)
	by freefall.freebsd.org (8.8.8/8.8.5) id PAA05445;
	Fri, 5 Jun 1998 15:40:04 -0700 (PDT)
Date: Fri, 5 Jun 1998 15:40:04 -0700 (PDT)
Message-Id: <199806052240.PAA05445@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-sys@FreeBSD.ORG
Subject: cvs commit: src/sys/i386/conf LINT src/sys/conf options
         src/sys/netinet ip_divert.c ip_fw.c ip_input.c ip_output.c
         ip_var.h
Sender: owner-cvs-sys@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

julian      1998/06/05 15:40:03 PDT

  Modified files:
    sys/i386/conf        LINT 
    sys/conf             options 
    sys/netinet          ip_divert.c ip_fw.c ip_input.c 
                         ip_output.c ip_var.h 
  Log:
  Reverse the default sense of the IPFW/DIVERT reinjection code
  so that the new behaviour is now default.
  Solves the "infinite loop in diversion" problem when more than one diversion
  is active.
  Man page changes follow.
  
  The new code is in -stable as the NON default option.
  
  Revision  Changes    Path
  1.436     +2 -1      src/sys/i386/conf/LINT
  1.76      +2 -2      src/sys/conf/options
  1.27      +12 -12    src/sys/netinet/ip_divert.c
  1.85      +13 -13    src/sys/netinet/ip_fw.c
  1.86      +9 -9      src/sys/netinet/ip_input.c
  1.68      +3 -3      src/sys/netinet/ip_output.c
  1.39      +5 -5      src/sys/netinet/ip_var.h