IGMPv2 routines rewritten, to be more compact and to fully comply

with the IGMPv2 Internet Draft (including Router Alert IP option)

1 files changed, 22 insertions, 32 deletions

diff --git a/sys/netinet/igmp.h b/sys/netinet/igmp.h
index a7038f3..71df6ca 100644
--- a/sys/netinet/igmp.h
+++ b/sys/netinet/igmp.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)igmp.h	8.1 (Berkeley) 6/10/93
- *	$Id: igmp.h,v 1.4 1994/09/06 22:42:17 wollman Exp $
+ *	$Id: igmp.h,v 1.6 1995/06/13 17:51:06 wollman Exp $
  */
 
 #ifndef _NETINET_IGMP_H_
@@ -46,7 +46,7 @@
  *
  * Written by Steve Deering, Stanford, May 1988.
  *
- * MULTICAST Revision: 3.3.1.2
+ * MULTICAST Revision: 3.5.1.2
  */
 
 /*
@@ -64,43 +64,33 @@ struct igmp {
 /*
  * Message types, including version number.
  */
-#define IGMP_HOST_MEMBERSHIP_QUERY   0x11	/* Host membership query    */
-#define IGMP_HOST_MEMBERSHIP_REPORT  0x12	/* Old membership report    */
-#define IGMP_DVMRP		     0x13	/* DVMRP routing message    */
-#define IGMP_PIM		     0x14	/* PIM routing message	    */
+#define IGMP_MEMBERSHIP_QUERY   	0x11	/* membership query         */
+#define IGMP_V1_MEMBERSHIP_REPORT	0x12	/* Ver. 1 membership report */
+#define IGMP_V2_MEMBERSHIP_REPORT	0x16	/* Ver. 2 membership report */
+#define IGMP_V2_LEAVE_GROUP		0x17	/* Leave-group message	    */
 
-#define IGMP_HOST_NEW_MEMBERSHIP_REPORT 0x16	/* New membership report    */
+#define IGMP_DVMRP			0x13	/* DVMRP routing message    */
+#define IGMP_PIM			0x14	/* PIM routing message	    */
 
-#define IGMP_HOST_LEAVE_MESSAGE      0x17	/* Leave-group message	    */
+#define IGMP_MTRACE_RESP		0x1e  /* traceroute resp.(to sender)*/
+#define IGMP_MTRACE			0x1f  /* mcast traceroute messages  */
 
-#define IGMP_MTRACE_RESP	     0x1e   /* traceroute resp. (to sender) */
-#define IGMP_MTRACE		     0x1f   /* mcast traceroute messages    */
+#define IGMP_MAX_HOST_REPORT_DELAY   10    /* max delay for response to     */
+					   /*  query (in seconds) according */
+					   /*  to RFC1112                   */
 
-#define IGMP_MAX_HOST_REPORT_DELAY   10     /* max delay for response to    */
-					    /* query (in seconds)	    */
 
-#define IGMP_TIMER_SCALE     10	    /* denotes that the igmp->timer filed */
-				    /*specifies time in tenths of seconds */
+#define IGMP_TIMER_SCALE     10		/* denotes that the igmp code field */
+					/* specifies time in 10th of seconds*/
 
 /*
- * States for the IGMPv2 state table
+ * The following four defininitions are for backwards compatibility.
+ * They should be removed as soon as all applications are updated to
+ * use the new constant names.
  */
-#define IGMP_DELAYING_MEMBER                     1
-#define IGMP_IDLE_MEMBER                         2
-#define IGMP_LAZY_MEMBER                         3 
-#define IGMP_SLEEPING_MEMBER                     4 
-#define IGMP_AWAKENING_MEMBER                    5 
-
-/*
- * We must remember whether the querier is an old or a new router.
- */
-#define IGMP_OLD_ROUTER                          0
-#define IGMP_NEW_ROUTER                          1
-
-/*
- * Revert to new router if we haven't heard from an old router in
- * this amount of time.
- */
-#define IGMP_AGE_THRESHOLD		         540 
+#define IGMP_HOST_MEMBERSHIP_QUERY	IGMP_MEMBERSHIP_QUERY
+#define IGMP_HOST_MEMBERSHIP_REPORT	IGMP_V1_MEMBERSHIP_REPORT
+#define IGMP_HOST_NEW_MEMBERSHIP_REPORT	IGMP_V2_MEMBERSHIP_REPORT
+#define IGMP_HOST_LEAVE_MESSAGE		IGMP_V2_LEAVE_GROUP
 
 #endif /* _NETINET_IGMP_H_ */