From owner-cvs-all@FreeBSD.ORG Wed May 11 10:45:32 2005 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4060916A4CE; Wed, 11 May 2005 10:45:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3001B43D76; Wed, 11 May 2005 10:45:32 +0000 (GMT) (envelope-from glebius@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4BAjWOe060819; Wed, 11 May 2005 10:45:32 GMT (envelope-from glebius@repoman.freebsd.org) Received: (from glebius@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4BAjWIq060818; Wed, 11 May 2005 10:45:32 GMT (envelope-from glebius) Message-Id: <200505111045.j4BAjWIq060818@repoman.freebsd.org> From: Gleb Smirnoff Date: Wed, 11 May 2005 10:45:32 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_5 Subject: cvs commit: src/sys/netgraph/netflow netflow.c ng_netflow.c ng_netflow.h X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 May 2005 10:45:32 -0000 glebius 2005-05-11 10:45:32 UTC FreeBSD src repository Modified files: (Branch: RELENG_5) sys/netgraph/netflow netflow.c ng_netflow.c ng_netflow.h Log: MFC the following changes: Add a possibility to bypass unmodified accounted data to special hook(s). Data received on these hook(s) is sent back to ifaceX hook(s). Refactor node so that it does not modify mbuf contents: - In ng_netflow_rcvdata() do all necessary pulluping: Ethernet header, IP header, and TCP/UDP header. - Pass only pointer to struct ip to ng_netflow_flow_add(). Any TCP/UDP headers are guaranteed to by after it. - Merge make_flow_rec() function into ng_netflow_flow_add(). Revision Changes Path 1.3.2.8 +56 -92 src/sys/netgraph/netflow/netflow.c 1.2.2.5 +118 -22 src/sys/netgraph/netflow/ng_netflow.c 1.2.2.3 +4 -7 src/sys/netgraph/netflow/ng_netflow.h