Merge IGMPv3 and Source-Specific Multicast (SSM) to the FreeBSD

IPv4 stack.

Diffs are minimized against p4.
PCS has been used for some protocol verification, more widespread
testing of recorded sources in Group-and-Source queries is needed.
sizeof(struct igmpstat) has changed.

__FreeBSD_version is bumped to 800070.

1 files changed, 0 insertions, 19 deletions

diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index f023051..b68f481 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -82,25 +82,6 @@ struct ipoption {
 };
 
 /*
- * Multicast source list entry.
- */
-struct in_msource {
-	TAILQ_ENTRY(in_msource) ims_next;	/* next source */
-	struct sockaddr_storage ims_addr;	/* address of this source */
-};
-
-/*
- * Multicast filter descriptor; there is one instance per group membership
- * on a socket, allocated as an expandable vector hung off ip_moptions.
- * struct in_multi contains separate IPv4-stack-wide state for IGMPv3.
- */
-struct in_mfilter {
-	uint16_t	imf_fmode;	/* filter mode for this socket/group */
-	uint16_t	imf_nsources;	/* # of sources for this socket/group */
-	TAILQ_HEAD(, in_msource) imf_sources;	/* source list */
-};
-
-/*
  * Structure attached to inpcb.ip_moptions and
  * passed to ip_output when IP multicast options are in use.
  * This structure is lazy-allocated.