From d13ecf8d200f4593a70fb36cd2ab4a13d5af592c Mon Sep 17 00:00:00 2001
From: brent s <bts@square-r00t.net>
Date: Thu, 18 Jun 2020 23:21:07 -0400
Subject: [PATCH] checking in some work

---
 utils/he_ipv6/config.py                |  2 +-
 utils/he_ipv6/example.tunnelbroker.xml | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/utils/he_ipv6/config.py b/utils/he_ipv6/config.py
index fb4df2b..51cb476 100644
--- a/utils/he_ipv6/config.py
+++ b/utils/he_ipv6/config.py
@@ -202,7 +202,7 @@ class BaseConfig(object):
 
 
 class Config(BaseConfig):
-    default_xsd = 'http://schema.xml.r00t2.io/projects/he_ipv6.xsd'
+    default_xsd = 'http://schema.xml.r00t2.io/projects/router/he_ipv6.xsd'
 
     def __init__(self, xml_path, *args, **kwargs):
         self.xml_path = os.path.abspath(os.path.expanduser(xml_path))
diff --git a/utils/he_ipv6/example.tunnelbroker.xml b/utils/he_ipv6/example.tunnelbroker.xml
index c00ea72..3673e83 100644
--- a/utils/he_ipv6/example.tunnelbroker.xml
+++ b/utils/he_ipv6/example.tunnelbroker.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <heIPv6 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xmlns="https://tunnelbroker.net/"
-        xsi:schemaLocation="https://tunnelbroker.net/ http://schema.xml.r00t2.io/projects/he_ipv6.xsd">
+        xsi:schemaLocation="https://tunnelbroker.net/ http://schema.xml.r00t2.io/projects/router/he_ipv6.xsd">
   <!--
   This is a sample XML configuration file to use with he_ipv6.py.
   If you do not yet have an IPv6 Tunnelbroker.net allocation, you can get one (for free!) at:
@@ -99,19 +99,20 @@
               <PREFIX>:dead:beef:cafe:[0000-FFFF]
               (65535 addresses per prefix assignment, a.k.a. a /112).
             Obviously your assignment's prefix length *must* be smaller than /112 (but should be at LEAST a /64 anyways
-            per RFC specification). Regardless of settings below, SLAAC *will* be offered if an "ra" element is defined.
+            per RFC specification). Regardless of settings below, SLAAC *will* be offered if an "ra" element is
+            defined ("A" bit). Since we entirely deal with local links, the L bit is also always set.
 
             It has an optional attribute, "advOther", which controls the "Other Configuration" bit.
             The default is "false".
             The "MO" bits (RFC 4861 § 4.2) are set accordingly:
-            ===================================================================================================
-            | Condition                         | M | O | Will addresses be assigned via DHCPv6 (if dnsmasq)? |
-            ===================================================================================================
-            | advOther="true", dhcpv6 is true   | 1 | 1 |                        Yes                          |
-            | advOther="true", dhcpv6 is false  | 0 | 1 |                        No                           |
-            | advOther="false", dhcpv6 is false | 0 | 0 |                        No                           |
-            | advOther="false", dhcpv6 is true  | 1 | 0 |                        Yes                          |
-            ===================================================================================================
+            ===========================================================================================================
+            | Condition                         | M | O | A | L | Will addresses be assigned via DHCPv6 (if dnsmasq)? |
+            ===========================================================================================================
+            | advOther="true", dhcpv6 is true   | 1 | 1 | 1 | 1 |                     Yes                             |
+            | advOther="true", dhcpv6 is false  | 0 | 1 | 1 | 1 |                     No                              |
+            | advOther="false", dhcpv6 is false | 0 | 0 | 1 | 1 |                     No                              |
+            | advOther="false", dhcpv6 is true  | 1 | 0 | 1 | 1 |                     Yes (but O = 0 is pointless)    |
+            ===========================================================================================================
             -->
             <dhcpv6 advOther="true">true</dhcpv6>
           </ra>