Module Name: src
Committed By: christos
Date: Sun Oct 12 19:02:19 UTC 2014
Modified Files:
src/sys/netinet: in.h
src/sys/netinet6: in6.h
Log Message:
document that we depend on the option numbers matching.
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/sys/netinet/in.h
cvs rdiff -u -r1.78 -r1.79 src/sys/netinet6/in6.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/in.h
diff -u src/sys/netinet/in.h:1.92 src/sys/netinet/in.h:1.93
--- src/sys/netinet/in.h:1.92 Thu Jun 5 19:48:16 2014
+++ src/sys/netinet/in.h Sun Oct 12 15:02:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: in.h,v 1.92 2014/06/05 23:48:16 rmind Exp $ */
+/* $NetBSD: in.h,v 1.93 2014/10/12 19:02:18 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -276,6 +276,7 @@ struct ip_opts {
#define IP_MULTICAST_IF 9 /* in_addr; set/get IP multicast i/f */
#define IP_MULTICAST_TTL 10 /* u_char; set/get IP multicast ttl */
#define IP_MULTICAST_LOOP 11 /* u_char; set/get IP multicast loopback */
+/* The add and drop membership option numbers need to match with the v6 ones */
#define IP_ADD_MEMBERSHIP 12 /* ip_mreq; add an IP group membership */
#define IP_DROP_MEMBERSHIP 13 /* ip_mreq; drop an IP group membership */
#define IP_PORTALGO 18 /* int; port selection algo (rfc6056) */
Index: src/sys/netinet6/in6.h
diff -u src/sys/netinet6/in6.h:1.78 src/sys/netinet6/in6.h:1.79
--- src/sys/netinet6/in6.h:1.78 Thu Jun 5 19:48:16 2014
+++ src/sys/netinet6/in6.h Sun Oct 12 15:02:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: in6.h,v 1.78 2014/06/05 23:48:16 rmind Exp $ */
+/* $NetBSD: in6.h,v 1.79 2014/10/12 19:02:18 christos Exp $ */
/* $KAME: in6.h,v 1.83 2001/03/29 02:55:07 jinmei Exp $ */
/*
@@ -383,6 +383,7 @@ extern const struct in6_addr in6addr_lin
#define IPV6_MULTICAST_IF 9 /* u_int; set/get IP6 multicast i/f */
#define IPV6_MULTICAST_HOPS 10 /* int; set/get IP6 multicast hops */
#define IPV6_MULTICAST_LOOP 11 /* u_int; set/get IP6 multicast loopback */
+/* The join and leave membership option numbers need to match with the v4 ones */
#define IPV6_JOIN_GROUP 12 /* ip6_mreq; join a group membership */
#define IPV6_LEAVE_GROUP 13 /* ip6_mreq; leave a group membership */
#define IPV6_PORTRANGE 14 /* int; range to choose for unspec port */
