Revert "Merge branch 'bmx6'"

[feed/routing.git] / bmx6 / files / etc / config / bmx6

diff --git a/bmx6/files/etc/config/bmx6 b/bmx6/files/etc/config/bmx6
index 884fd126438bf0406242d2c28c5471d7a85a46fe..d593e7432bfcf61b4d773b3aec1ec97b44c9ff0d 100644 (file)
--- a/bmx6/files/etc/config/bmx6
+++ b/bmx6/files/etc/config/bmx6
@@ -1,32 +1,12 @@
-
-# for more information:
-# http://bmx6.net/projects/bmx6/wiki
-# options execute: bmx6 --help
+# for more options execute: bmx6 --help
 
 config 'bmx6' 'general'
-#       option 'runtimeDir' '/var/run/bmx6'
-#       option 'tun4Address' '10.202.0.116/32'
-#       option 'tun4Address' '10.254.10.0/32'
-#       option 'tun6Address' '2012:0:0:1000::1/64'
-
-#config 'ipVersion' 'ipVersion'
-#       option 'ipVersion' '6'   # default is 4
-#       option 'throwRules' '0'
-
-
-#config 'plugin'
-#        option 'plugin' 'bmx6_config.so'
-
-
-
-#config 'plugin'
-#        option 'plugin' 'bmx6_json.so'
-
-
-
-#config 'plugin'
-#        option 'plugin' 'bmx6_sms.so'
+#       option 'runtime_dir' '/var/run/bmx6'
+#       option 'niit_source' '10.202.0.116'
 
+#config 'ip_version' 'ip_version'
+#       option 'ip_version' '6'   # default is 4
+#       option 'throw_rules' '0'
 
 config 'dev' 'mesh_1'
         option 'dev' 'eth0.12'
@@ -34,49 +14,10 @@ config 'dev' 'mesh_1'
 config 'dev' 'mesh_2'
         option 'dev' 'ath0.12'
 
+#config 'unicast_hna' 'my_global_prefix'
+#       option 'unicast_hna' '2012:0:0:74:0:0:0:0/64'
 
-
-#config 'hna' 'my_global_prefix'
-#       option 'hna' '2012:0:0:74:0:0:0:0/64'
-
-
-#config 'tunOut'
-#        option 'tunOut' 'ip6'
-#        option 'network' '2012::/16'
-#        option 'exportDistance' '0'
-
-#config 'tunOut'
-#        option 'tunOut' 'ip4'
-#        option 'network' '10.254.0.0/16'
-#        option 'exportDistance' '0'  # requires quagga plugin !
-#        option 'minPrefixLen' '27'
-
-
-
-#config 'plugin'
-#        option 'plugin' 'bmx6_quagga.so'
-
-
-
-#config 'redistribute'
-#        option 'redistribute' 'ospf6'
-#        option 'network' '10.0.0.0/8'
-#        option 'minPrefixLen' '10'
-#        option 'bandwidth' '10000000'
-#        option 'ospf6' '1'
-#        option 'aggregatePrefixLen' '16'
-
-#config 'redistribute'
-#        option 'redistribute' 'bgp'
-#        option 'network' '0.0.0.0/0'
-#        option 'minPrefixLen' '0'
-#        option 'maxPrefixLen' '24'
-#        option 'bandwidth' '10000000'
-#        option 'bgp' '1'
-#        option 'aggregatePrefixLen' '8'
-
-
-
-
+#config 'unicast_hna' 'niit6to4'
+#       option 'unicast_hna' '0:0:0:0:0:ffff:10.202.0.116/128'