r00t2
/
routerbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

update some config stuff... not done

This commit is contained in:
brent s. 2020-05-14 04:05:32 -04:00
parent fb89feb046
commit c23c803a20
Signed by: bts
GPG Key ID: 8C004C2F93481F6B
2 changed files with 21 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
utils/he_ipv6/config.py
View File

@ -407,7 +407,7 @@ class HEConfig(BaseConfig):
self.subparse()

def subparse(self):
pass
pass # TODO. nativize blocks, etc. Move out of local config.

def _add_ns(self, raw_xml):
# https://mailman-mail5.webfaction.com/pipermail/lxml/20100323/013260.html

78
utils/he_ipv6/example.tunnelbroker.xml
View File

@ -37,41 +37,8 @@
-->
<tunnel id="12345" creds="ipv6user">
<!--
The "server" element is the remote SIT endpoint.
Section: IPv6 Tunnel Endpoints
Value Name: Server IPv4 Address
-->
<server>192.0.2.1</server>
<!--
The "client" element is the local SIT endpoint.
Section: IPv6 Tunnel Endpoints
Value Name: Client IPv6 Address
-->
<client prefix="64">2001:DB8:3::2</client>
<!--
Allocations that are handed to your tunnel.
Section: Routed IPv6 Prefixes
-->
<allocations>
<!--
Each alloc has the following attributes:
* "prefix" - the prefix size specified by your tunnelbroker.
* "id" - an identifier for each allocation to be used in assignments/assign items.
Value Name: Routed /64
-->
<alloc prefix="64" id="lan">2001:DB8:1:2::</alloc>
<!--
You may not have a /48 as it's opt-in. It's highly recommended, though, so you can provide global IPv6 addresses
to the rest of your LAN(s).
Value Name: Routed /48
-->
<alloc prefix="48" id="multilan">2001:DB8:2::</alloc>
</allocations>
<!--
Where to assign the allocations. The default allocation prefix is a /64 (prefix="64"), since that's what SLAAC
Where to assign your allocations. The default allocation prefix is a /64 (prefix="64"), since that's what SLAAC
recommends.
Note that if you use your /64 allocation, and don't specify a longer prefix to it, you can only have one
assignment.
It has two optional attributes:
* "radvd" - a boolean; if true, /etc/radvd.conf will be automatically.
* "radvdDns" - a boolean, only used if radvd is true; if true, will specify the server's IP as an RDSS.
@ -80,38 +47,33 @@
<assignments radvd="true" radvdDns="true">
<!--
Each assignment has the following required attributes:
* "prefix" - the size of the subnet, "64" (/64) by default since that's what SLAAC recommends. Note that if
you use your /64 allocation and don't specify a longer prefix, you can only have one assignment
for that allocation.
* "alloc" - this should match an "id" attribute of an allocations/alloc item.
* "iface" - which network interface on the machine that the allocation should be added to.
Sections of the alloc referenced in the "alloc" attribute will then be carved out. Make sure you don't exceed
your allocation size! (A /48 has 65536 /64s in it.)
* "prefix" - the size of the subnet to assign to an interface, "64" (/64) by default since that's what SLAAC
recommends. Note that if you use your /64 allocation and don't specify a longer prefix, you can
only have one assignment for that allocation.
* "alloc" - this should match the prefix of the allocation. Hurricane Electric only allows you one /64 and,
optionally, one /48. Use "alloc" to reference which allocation you want to use. Uses "64" (/64)
by default.
* "iface" - which network interface on this machine the allocation should be added to.
Make sure you don't exceed your allocation size! (A /48 has 65536 /64s in it.)
The interface will be assigned :1 (the first host in the subnet) as well, so it is recommended that you do not
assign a /128.
assign a /128 prefix.
-->
<assign prefix="64" alloc="lan" iface="eth0"/>
<assign prefix="64" alloc="multilan" iface="eth0"/>
<assign prefix="64" alloc="multilan" iface="eth1"/>
<assign prefix="64" alloc="multilan" iface="eth2"/>
<assign prefix="64" alloc="64" iface="eth0"/>
<assign prefix="64" alloc="48" iface="eth0"/>
<assign prefix="64" alloc="48" iface="eth1"/>
<assign prefix="64" alloc="48" iface="eth2"/>
</assignments>
</tunnel>
<!--
And you can, of course, specify multiple tunnels.
-->
<tunnel id="54321" creds="ipv6user">
<server>192.0.2.1</server>
<client prefix="64">2001:DB8:6::2</client>
<allocations>
<alloc prefix="64" id="lan">2001:DB8:4:2:</alloc>
<alloc prefix="48" id="biglan">2001:DB8:5::</alloc>
</allocations>
<tunnel id="54321" creds="anotheruser">
<assignments>
<!-- Uses the default prefix of /64 each. -->
<assign alloc="lan" iface="eth0"/>
<assign alloc="biglan" iface="eth1"/>
<assign alloc="biglan" iface="eth1"/>
<assign alloc="biglan" iface="eth1"/>
<!--
Uses the default prefix of /64 from your standard /64 allocation from Hurricane Electric.
Most users probably want this unless they're running an IPv6 router.
-->
<assign iface="eth0"/>
</assignments>
</tunnel>
</tunnels>