From owner-svn-src-projects@FreeBSD.ORG  Mon Jan 24 16:39:20 2011
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 CF0FA106566C;
	Mon, 24 Jan 2011 16:39:20 +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 BECD18FC13;
	Mon, 24 Jan 2011 16:39:20 +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 p0OGdKeP098786;
	Mon, 24 Jan 2011 16:39:20 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0OGdKDe098784;
	Mon, 24 Jan 2011 16:39:20 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201101241639.p0OGdKDe098784@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Mon, 24 Jan 2011 16:39:20 +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: r217789 - 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: Mon, 24 Jan 2011 16:39:20 -0000

Author: attilio
Date: Mon Jan 24 16:39:20 2011
New Revision: 217789
URL: http://svn.freebsd.org/changeset/base/217789

Log:
  Ignore packets with IP options rather than stripping them off.
  
  Requested and reviewed by:	gnn

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

Modified: projects/sv/sys/netinet/netdump_client.c
==============================================================================
--- projects/sv/sys/netinet/netdump_client.c	Mon Jan 24 15:18:18 2011	(r217788)
+++ projects/sv/sys/netinet/netdump_client.c	Mon Jan 24 16:39:20 2011	(r217789)
@@ -706,11 +706,10 @@ nd_handle_ip(struct mbuf **mb)
 			m_adj(m, ip->ip_len - m->m_pkthdr.len);
 	}
 
-	/* We would process IP options here, but we'll ignore them instead. */
-	/* Strip IP options */
+	/* Ignore packets with IP options. */
 	if (hlen > sizeof(struct ip)) {
-		ip_stripoptions(m, NULL);
-		hlen = sizeof(struct ip);
+		NETDDEBUG("nd_handle_ip: Drop packet with IP options\n");
+		return;
 	}
 
 	/* Check that the source is the server's IP */