checking in some work
This commit is contained in:
parent
cd422fc7d6
commit
d13ecf8d20
@ -202,7 +202,7 @@ class BaseConfig(object):
|
|||||||
|
|
||||||
|
|
||||||
class Config(BaseConfig):
|
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):
|
def __init__(self, xml_path, *args, **kwargs):
|
||||||
self.xml_path = os.path.abspath(os.path.expanduser(xml_path))
|
self.xml_path = os.path.abspath(os.path.expanduser(xml_path))
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
<heIPv6 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<heIPv6 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xmlns="https://tunnelbroker.net/"
|
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.
|
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:
|
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]
|
<PREFIX>:dead:beef:cafe:[0000-FFFF]
|
||||||
(65535 addresses per prefix assignment, a.k.a. a /112).
|
(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
|
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.
|
It has an optional attribute, "advOther", which controls the "Other Configuration" bit.
|
||||||
The default is "false".
|
The default is "false".
|
||||||
The "MO" bits (RFC 4861 § 4.2) are set accordingly:
|
The "MO" bits (RFC 4861 § 4.2) are set accordingly:
|
||||||
===================================================================================================
|
===========================================================================================================
|
||||||
| Condition | M | O | Will addresses be assigned via DHCPv6 (if dnsmasq)? |
|
| Condition | M | O | A | L | Will addresses be assigned via DHCPv6 (if dnsmasq)? |
|
||||||
===================================================================================================
|
===========================================================================================================
|
||||||
| advOther="true", dhcpv6 is true | 1 | 1 | Yes |
|
| advOther="true", dhcpv6 is true | 1 | 1 | 1 | 1 | Yes |
|
||||||
| advOther="true", dhcpv6 is false | 0 | 1 | No |
|
| advOther="true", dhcpv6 is false | 0 | 1 | 1 | 1 | No |
|
||||||
| advOther="false", dhcpv6 is false | 0 | 0 | No |
|
| advOther="false", dhcpv6 is false | 0 | 0 | 1 | 1 | No |
|
||||||
| advOther="false", dhcpv6 is true | 1 | 0 | Yes |
|
| advOther="false", dhcpv6 is true | 1 | 0 | 1 | 1 | Yes (but O = 0 is pointless) |
|
||||||
===================================================================================================
|
===========================================================================================================
|
||||||
-->
|
-->
|
||||||
<dhcpv6 advOther="true">true</dhcpv6>
|
<dhcpv6 advOther="true">true</dhcpv6>
|
||||||
</ra>
|
</ra>
|
||||||
|
Loading…
Reference in New Issue
Block a user