[radvd-devel-l] Change of the option code for more-specific routes

[Pekka Savola]

FYI,

Here's another change I committed, now that there's a formally 
assigned code value.  Different implementations have used different 
values (e.g, '9' or '200') in the past; we used 9.

IMHO, it would be best if all the implementations moved quickly to the 
new option value, and just changing the value seems to be the best way 
to achieve that.

-- 
Pekka Savola                 "You each name yourselves king, yet the
Netcore Oy                    kingdom bleeds."
Systems. Networks. Security. -- George R.R. Martin: A Clash of Kings
-------------- next part --------------
Index: CHANGES
===================================================================
RCS file: /work/cvsroot/radvd/CHANGES,v
retrieving revision 1.40
diff -u -r1.40 CHANGES
--- CHANGES	5 Jul 2005 07:07:45 -0000	1.40
+++ CHANGES	5 Jul 2005 08:09:40 -0000
@@ -1,5 +1,9 @@
 $Id: CHANGES,v 1.40 2005/07/05 07:07:45 psavola Exp $
 
+07/05/2005	Change the more-specific route ND option code
+		from de-facto '9' to the official '24'.  Change
+		back in defaults.h if you need old behaviour.
+
 07/05/2005	Fix wrongly calculated prefix with Base6to4Interface
                 on ppc and maybe other big endian arches, from
 		Debian #301543 by Sam Hathaway.
Index: defaults.h
===================================================================
RCS file: /work/cvsroot/radvd/defaults.h,v
retrieving revision 1.11
diff -u -r1.11 defaults.h
--- defaults.h	29 Mar 2005 15:15:20 -0000	1.11
+++ defaults.h	5 Jul 2005 08:09:40 -0000
@@ -128,10 +128,10 @@
 #define ND_OPT_HOME_AGENT_INFO          8
 #endif
 
-/* draft-ietf-ipv6-router-selection-02.txt */
-/* XXX: not formally assigned, this will be changed! */
-#ifndef ND_OPT_ROUTE_INFORMATION
-#define  ND_OPT_ROUTE_INFORMATION	9	
+/* de-facto codepoint used by many implementations was '9',
+   the official IANA assignment will be '24' */
+#undef ND_OPT_ROUTE_INFORMATION
+#define  ND_OPT_ROUTE_INFORMATION	24
 
 /* XXX: some libc's like KAME already had nd_opt_route_info! */
 struct nd_opt_route_info_local     /* route information */
@@ -146,9 +146,7 @@
 
 /* the reserved field is 8 bits and we're interested of the middle two: 000xx000 */
 #define ND_OPT_RI_PRF_SHIFT	3
-#define ND_OPT_RI_PRF_MASK	(3 << ND_OPT_RI_PRF_SHIFT)
-
-#endif
+#define ND_OPT_RI_PRF_MASK	(3 << ND_OPT_RI_PRF_SHIFT) /* 00011000 = 0x18 */
 
 /* Flags */