From owner-cvs-src@FreeBSD.ORG  Fri Nov 12 22:17:42 2004
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id CC42616A4CE; Fri, 12 Nov 2004 22:17:42 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id BBF4E43D41; Fri, 12 Nov 2004 22:17:42 +0000 (GMT)
	(envelope-from glebius@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iACMHg0t039320;
	Fri, 12 Nov 2004 22:17:42 GMT
	(envelope-from glebius@repoman.freebsd.org)
Received: (from glebius@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iACMHgKI039319;
	Fri, 12 Nov 2004 22:17:42 GMT
	(envelope-from glebius)
Message-Id: <200411122217.iACMHgKI039319@repoman.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 12 Nov 2004 22:17:42 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/netinet ip_divert.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Nov 2004 22:17:43 -0000

glebius     2004-11-12 22:17:42 UTC

  FreeBSD src repository

  Modified files:
    sys/netinet          ip_divert.c 
  Log:
  Fix ng_ksocket(4) operation as a divert socket, which is pretty useful
  and has been broken twice:
  
  - in the beginning of div_output() replace KASSERT with assignment, as
    it was in rev. 1.83. [1] [to be MFCed]
  - refactor changes introduced in rev. 1.100: do not prepend a new tag
    unconditionally. Before doing this check whether we have one. [2]
  
  A small note for all hacking in this area:
  when divert socket is not a real userland, but ng_ksocket(4), we receive
  _the same_ mbufs, that we transmitted to socket. These mbufs have rcvif,
  the tags we've put on them. And we should treat them correctly.
  
  Discussed with: mlaier [1]
  Silence from:   green [2]
  Reviewed by:    maxim
  Approved by:    julian (mentor)
  MFC after:      1 week
  
  Revision  Changes    Path
  1.109     +12 -11    src/sys/netinet/ip_divert.c