From owner-svn-src-all@FreeBSD.ORG  Sat Jun 16 13:53:15 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id AFCBB106566B;
	Sat, 16 Jun 2012 13:53:15 +0000 (UTC)
	(envelope-from melifaro@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9A4968FC17;
	Sat, 16 Jun 2012 13:53:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5GDrFfk047673;
	Sat, 16 Jun 2012 13:53:15 GMT
	(envelope-from melifaro@svn.freebsd.org)
Received: (from melifaro@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5GDrFu5047671;
	Sat, 16 Jun 2012 13:53:15 GMT
	(envelope-from melifaro@svn.freebsd.org)
Message-Id: <201206161353.q5GDrFu5047671@svn.freebsd.org>
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Sat, 16 Jun 2012 13:53:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237163 - head/sys/netgraph/netflow
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 16 Jun 2012 13:53:15 -0000

Author: melifaro
Date: Sat Jun 16 13:53:14 2012
New Revision: 237163
URL: http://svn.freebsd.org/changeset/base/237163

Log:
  Set netflow v9 observation domain value to fib number instead of node id.
  This fixes multi-fib netflow v9 export.
  
  Reviewed by:     glebius
  Approved by:     kib(mentor)
  MFC after:       1 week

Modified:
  head/sys/netgraph/netflow/netflow_v9.c

Modified: head/sys/netgraph/netflow/netflow_v9.c
==============================================================================
--- head/sys/netgraph/netflow/netflow_v9.c	Sat Jun 16 13:51:01 2012	(r237162)
+++ head/sys/netgraph/netflow/netflow_v9.c	Sat Jun 16 13:53:14 2012	(r237163)
@@ -222,7 +222,7 @@ export9_send(priv_p priv, fib_export_p f
 	header->unix_secs  = htonl(ts.tv_sec);
 	header->seq_num = htonl(atomic_fetchadd_32(&fe->flow9_seq, 1));
 	header->count = htons(t->count);
-	header->source_id = htonl(NG_NODE_ID(priv->node));
+	header->source_id = htonl(fe->domain_id);
 
 	if (priv->export9 != NULL)
 		NG_FWD_ITEM_HOOK_FLAGS(error, item, priv->export9, flags);