From owner-svn-src-projects@FreeBSD.ORG  Thu Sep 30 13:44:55 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D0132106566B;
	Thu, 30 Sep 2010 13:44:55 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C06D48FC19;
	Thu, 30 Sep 2010 13:44:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8UDituV071170;
	Thu, 30 Sep 2010 13:44:55 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8UDith7071168;
	Thu, 30 Sep 2010 13:44:55 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201009301344.o8UDith7071168@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Thu, 30 Sep 2010 13:44:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213299 - projects/sv/sys/netinet
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Sep 2010 13:44:55 -0000

Author: attilio
Date: Thu Sep 30 13:44:55 2010
New Revision: 213299
URL: http://svn.freebsd.org/changeset/base/213299

Log:
  nd_server_port may have switched since the first ack of the first
  call. Reset accordingly.
  
  Reported by:	Sergey Kandaurov <pluknet at gmail dot com>
  Submitted by:	rstone

Modified:
  projects/sv/sys/netinet/netdump_client.c

Modified: projects/sv/sys/netinet/netdump_client.c
==============================================================================
--- projects/sv/sys/netinet/netdump_client.c	Thu Sep 30 13:31:35 2010	(r213298)
+++ projects/sv/sys/netinet/netdump_client.c	Thu Sep 30 13:44:55 2010	(r213299)
@@ -1174,6 +1174,11 @@ netdump_trigger(void *arg, int howto)
 	dumptid = curthread->td_tid;
 	dumping++;
 
+	/*
+	 * nd_server_port could have switched after the first ack the
+	 * first time it gets called.  Adjust it accordingly.
+	 */
+	nd_server_port = NETDUMP_PORT;
 	if ((nd_nic->if_capenable & IFCAP_POLLING) == 0) {
 #if defined(KDB) && !defined(KDB_UNATTENDED)
 		if (panicstr == NULL)