svn commit: r253261 - head/sys/net

[Hiroki Sato]

Author: hrs
Date: Fri Jul 12 12:18:07 2013
New Revision: 253261
URL: http://svnweb.freebsd.org/changeset/base/253261

Log:
  - Drop GIF_ACCEPT_REVETHIP flag by default.
  - Add IFF_MONITOR support.

Modified:
  head/sys/net/if_gif.c

Modified: head/sys/net/if_gif.c
==============================================================================
--- head/sys/net/if_gif.c	Fri Jul 12 11:03:51 2013	(r253260)
+++ head/sys/net/if_gif.c	Fri Jul 12 12:18:07 2013	(r253261)
@@ -173,7 +173,7 @@ gif_clone_create(ifc, unit, params)
 	if_initname(GIF2IFP(sc), gifname, unit);
 
 	sc->encap_cookie4 = sc->encap_cookie6 = NULL;
-	sc->gif_options = GIF_ACCEPT_REVETHIP;
+	sc->gif_options = 0;
 
 	GIF2IFP(sc)->if_addrlen = 0;
 	GIF2IFP(sc)->if_mtu    = GIF_MTU;
@@ -437,6 +437,11 @@ gif_output(struct ifnet *ifp, struct mbu
 		goto end;
 	}
 #endif
+	if ((ifp->if_flags & IFF_MONITOR) != 0) {
+		error = ENETDOWN;
+		m_freem(m);
+		goto end;
+	}
 
 	/*
 	 * gif may cause infinite recursion calls when misconfigured.
@@ -551,6 +556,13 @@ gif_input(m, af, ifp)
 		bpf_mtap2(ifp->if_bpf, &af1, sizeof(af1), m);
 	}
 
+	if ((ifp->if_flags & IFF_MONITOR) != 0) {
+		ifp->if_ipackets++;
+		ifp->if_ibytes += m->m_pkthdr.len;
+		m_freem(m);
+		return;
+	}
+
 	if (ng_gif_input_p != NULL) {
 		(*ng_gif_input_p)(ifp, &m, af);
 		if (m == NULL)