svn commit: r217789 - projects/sv/sys/netinet

[Attilio Rao]

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 */