From 0f6350267ec603b223aa3b81d133c5f23a1c64a2 Mon Sep 17 00:00:00 2001
From: Leo Krueger <git@leokrueger.de>
Date: Fri, 2 May 2014 00:16:00 +0200
Subject: [PATCH] Enable chaosvpn route exchange

---
 bird.conf | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bird.conf b/bird.conf
index d66fd46..456ee16 100644
--- a/bird.conf
+++ b/bird.conf
@@ -69,7 +69,7 @@ function is_chaos() {
 # nothing in the other direction
 protocol kernel k_mast {
     scan time 10;
-    import none;
+    import where is_chaos();
     export filter {
         krt_prefsrc = 10.112.1.1; # REPLACE
         accept;
@@ -113,13 +113,13 @@ protocol pipe p_ibgptbl {
   export where !is_self_net();
 };
 
-# sync routes (freifunk and dn42) from ibgp to freifunk
+# sync routes (freifunk, dn42 and chaosvpn) from ibgp to freifunk
 # sync nothing from freifunk to ibgp
 protocol pipe p_freitbl {
   table ibgp;
   peer table freifunk;
   import none;
-  export where (is_freifunk() || is_dn42());
+  export where (is_freifunk() || is_dn42() || is_chaos());
 };
 
 ### static routes ###
@@ -162,8 +162,8 @@ template bgp peers {
   table ebgp;
   local as ownas;
   # ignore routes for our own network
-  import where ((is_freifunk() || is_dn42()) && !is_self_net());
-  export where (is_freifunk() || is_dn42());
+  import where ((is_freifunk() || is_dn42() || is_chaos()) && !is_self_net());
+  export where (is_freifunk() || is_dn42() || is_chaos());
   route limit 10000;
 };