tnetHEADmaster

16 files changed, 49 insertions, 138 deletions

diff --git a/tnet/files/akili/bird-tnet-pre.conf b/tnet/files/akili/bird-tnet-pre.conf
new file mode 100644
index 0000000..7994dfe
--- /dev/null
+++ b/tnet/files/akili/bird-tnet-pre.conf
@@ -0,0 +1,7 @@
+define tnet = fdb1:4242:3538::/48;
+define tnet_router = fdb1:4242:3538:ffff::/64;
+
+function is_tnet() # -> bool
+{
+  return net ~ tnet && ! (net ~ tnet_router);
+}
diff --git a/tnet/files/akili/bird-tnet.conf b/tnet/files/akili/bird-tnet.conf
index 3c53d79..f9b9d08 100644
--- a/tnet/files/akili/bird-tnet.conf
+++ b/tnet/files/akili/bird-tnet.conf
@@ -1,11 +1,3 @@
-define tnet = fdb1:4242:3538::/48;
-define tnet_router = fdb1:4242:3538:ffff::/64;
-
-function is_tnet() -> bool
-{
-  return net ~ tnet && ! (net ~ tnet_router);
-}
-
 template bgp tnet_tpl {
   local    as 4242423538;
   neighbor internal;
diff --git a/tnet/files/astyanax/bird-tnet-pre.conf b/tnet/files/astyanax/bird-tnet-pre.conf
new file mode 100644
index 0000000..7994dfe
--- /dev/null
+++ b/tnet/files/astyanax/bird-tnet-pre.conf
@@ -0,0 +1,7 @@
+define tnet = fdb1:4242:3538::/48;
+define tnet_router = fdb1:4242:3538:ffff::/64;
+
+function is_tnet() # -> bool
+{
+  return net ~ tnet && ! (net ~ tnet_router);
+}
diff --git a/tnet/files/astyanax/bird-tnet.conf b/tnet/files/astyanax/bird-tnet.conf
index 8fa46b9..d697e54 100644
--- a/tnet/files/astyanax/bird-tnet.conf
+++ b/tnet/files/astyanax/bird-tnet.conf
@@ -1,11 +1,3 @@
-define tnet = fdb1:4242:3538::/48;
-define tnet_router = fdb1:4242:3538:ffff::/64;
-
-function is_tnet() -> bool
-{
-  return net ~ tnet && ! (net ~ tnet_router);
-}
-
 template bgp tnet_tpl {
   local    as 4242423538;
   neighbor internal;
diff --git a/tnet/files/hash/bird-tnet-pre.conf b/tnet/files/hash/bird-tnet-pre.conf
new file mode 100644
index 0000000..7994dfe
--- /dev/null
+++ b/tnet/files/hash/bird-tnet-pre.conf
@@ -0,0 +1,7 @@
+define tnet = fdb1:4242:3538::/48;
+define tnet_router = fdb1:4242:3538:ffff::/64;
+
+function is_tnet() # -> bool
+{
+  return net ~ tnet && ! (net ~ tnet_router);
+}
diff --git a/tnet/files/hash/bird-tnet.conf b/tnet/files/hash/bird-tnet.conf
index b2afdc8..16ce2cc 100644
--- a/tnet/files/hash/bird-tnet.conf
+++ b/tnet/files/hash/bird-tnet.conf
@@ -1,11 +1,3 @@
-define tnet = fdb1:4242:3538::/48;
-define tnet_router = fdb1:4242:3538:ffff::/64;
-
-function is_tnet() -> bool
-{
-  return net ~ tnet && ! (net ~ tnet_router);
-}
-
 template bgp tnet_tpl {
   local    as 4242423538;
   neighbor internal;
diff --git a/tnet/files/knot/bird-tnet-pre.conf b/tnet/files/knot/bird-tnet-pre.conf
new file mode 100644
index 0000000..7994dfe
--- /dev/null
+++ b/tnet/files/knot/bird-tnet-pre.conf
@@ -0,0 +1,7 @@
+define tnet = fdb1:4242:3538::/48;
+define tnet_router = fdb1:4242:3538:ffff::/64;
+
+function is_tnet() # -> bool
+{
+  return net ~ tnet && ! (net ~ tnet_router);
+}
diff --git a/tnet/files/knot/bird-tnet.conf b/tnet/files/knot/bird-tnet.conf
index 32f06cb..fcecc19 100644
--- a/tnet/files/knot/bird-tnet.conf
+++ b/tnet/files/knot/bird-tnet.conf
@@ -1,11 +1,3 @@
-define tnet = fdb1:4242:3538::/48;
-define tnet_router = fdb1:4242:3538:ffff::/64;
-
-function is_tnet() -> bool
-{
-  return net ~ tnet && ! (net ~ tnet_router);
-}
-
 template bgp tnet_tpl {
   local    as 4242423538;
   neighbor internal;
diff --git a/tnet/files/kv24ix/bird-tnet.conf b/tnet/files/kv24ix/bird-tnet.conf
deleted file mode 100644
index a8fb14c..0000000
--- a/tnet/files/kv24ix/bird-tnet.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-define tnet = fdb1:4242:3538::/48;
-define tnet_router = fdb1:4242:3538:ffff::/64;
-
-function is_tnet() -> bool
-{
-  return net ~ tnet && ! (net ~ tnet_router);
-}
-
-template bgp tnet_tpl {
-  local    as 4242423538;
-  neighbor internal;
-
-  direct;
-
-  password "trygvis";
-
-  ipv6 {
-    next hop self;
-    import filter {
-      if is_tnet() then {
-        print proto, ": import accept, net=", net, ", from=", from, ", gw=", gw;
-        accept;
-      }
-      print proto, ": import reject, reason=not tnet"; reject;
-    };
-    # newer bird's only
-    # import keep filtered;
-    export filter {
-      if is_tnet() then {
-        print proto, ": export accept, net=", net, ", from=", from, ", gw=", gw;
-        accept;
-      }
-      print proto, ": export reject, reason=not tnet"; reject;
-    };
-  };
-}
-
-protocol bgp tnet_knot from tnet_tpl {
-  neighbor fdb1:4242:3538:ffff:ea4:11cb:863:5252;
-  interface "tnet-knot";
-}
diff --git a/tnet/files/lhn2ix/bird-tnet.conf b/tnet/files/lhn2ix/bird-tnet.conf
deleted file mode 100644
index b020368..0000000
--- a/tnet/files/lhn2ix/bird-tnet.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-define tnet = fdb1:4242:3538::/48;
-define tnet_router = fdb1:4242:3538:ffff::/64;
-
-function is_tnet() -> bool
-{
-  return net ~ tnet && ! (net ~ tnet_router);
-}
-
-template bgp tnet_tpl {
-  local    as 4242423538;
-  neighbor internal;
-
-  direct;
-
-  password "trygvis";
-
-  ipv6 {
-    next hop self;
-    import filter {
-      if is_tnet() then {
-        print proto, ": import accept, net=", net, ", from=", from, ", gw=", gw;
-        accept;
-      }
-      print proto, ": import reject, reason=not tnet"; reject;
-    };
-    # newer bird's only
-    # import keep filtered;
-    export filter {
-      if is_tnet() then {
-        print proto, ": export accept, net=", net, ", from=", from, ", gw=", gw;
-        accept;
-      }
-      print proto, ": export reject, reason=not tnet"; reject;
-    };
-  };
-}
-
-protocol bgp tnet_knot from tnet_tpl {
-  neighbor fdb1:4242:3538:ffff:18b7:d3ec:5608:db9a;
-  interface "tnet-knot";
-}
diff --git a/tnet/files/lhn2pi/bird-tnet-pre.conf b/tnet/files/lhn2pi/bird-tnet-pre.conf
new file mode 100644
index 0000000..7994dfe
--- /dev/null
+++ b/tnet/files/lhn2pi/bird-tnet-pre.conf
@@ -0,0 +1,7 @@
+define tnet = fdb1:4242:3538::/48;
+define tnet_router = fdb1:4242:3538:ffff::/64;
+
+function is_tnet() # -> bool
+{
+  return net ~ tnet && ! (net ~ tnet_router);
+}
diff --git a/tnet/files/lhn2pi/bird-tnet.conf b/tnet/files/lhn2pi/bird-tnet.conf
index 5d5939b..864ad0b 100644
--- a/tnet/files/lhn2pi/bird-tnet.conf
+++ b/tnet/files/lhn2pi/bird-tnet.conf
@@ -1,11 +1,3 @@
-define tnet = fdb1:4242:3538::/48;
-define tnet_router = fdb1:4242:3538:ffff::/64;
-
-function is_tnet() -> bool
-{
-  return net ~ tnet && ! (net ~ tnet_router);
-}
-
 template bgp tnet_tpl {
   local    as 4242423538;
   neighbor internal;
diff --git a/tnet/files/node1/bird-tnet-pre.conf b/tnet/files/node1/bird-tnet-pre.conf
new file mode 100644
index 0000000..7994dfe
--- /dev/null
+++ b/tnet/files/node1/bird-tnet-pre.conf
@@ -0,0 +1,7 @@
+define tnet = fdb1:4242:3538::/48;
+define tnet_router = fdb1:4242:3538:ffff::/64;
+
+function is_tnet() # -> bool
+{
+  return net ~ tnet && ! (net ~ tnet_router);
+}
diff --git a/tnet/files/node1/bird-tnet.conf b/tnet/files/node1/bird-tnet.conf
index ebf0160..88bd6f8 100644
--- a/tnet/files/node1/bird-tnet.conf
+++ b/tnet/files/node1/bird-tnet.conf
@@ -1,11 +1,3 @@
-define tnet = fdb1:4242:3538::/48;
-define tnet_router = fdb1:4242:3538:ffff::/64;
-
-function is_tnet() -> bool
-{
-  return net ~ tnet && ! (net ~ tnet_router);
-}
-
 template bgp tnet_tpl {
   local    as 4242423538;
   neighbor internal;
diff --git a/tnet/files/node2/bird-tnet-pre.conf b/tnet/files/node2/bird-tnet-pre.conf
new file mode 100644
index 0000000..7994dfe
--- /dev/null
+++ b/tnet/files/node2/bird-tnet-pre.conf
@@ -0,0 +1,7 @@
+define tnet = fdb1:4242:3538::/48;
+define tnet_router = fdb1:4242:3538:ffff::/64;
+
+function is_tnet() # -> bool
+{
+  return net ~ tnet && ! (net ~ tnet_router);
+}
diff --git a/tnet/files/node2/bird-tnet.conf b/tnet/files/node2/bird-tnet.conf
index 813b0f5..99dfc5e 100644
--- a/tnet/files/node2/bird-tnet.conf
+++ b/tnet/files/node2/bird-tnet.conf
@@ -1,11 +1,3 @@
-define tnet = fdb1:4242:3538::/48;
-define tnet_router = fdb1:4242:3538:ffff::/64;
-
-function is_tnet() -> bool
-{
-  return net ~ tnet && ! (net ~ tnet_router);
-}
-
 template bgp tnet_tpl {
   local    as 4242423538;
   neighbor internal;