From a49fb7c65c19fdd163601ed9ebe104cb8f915055 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 6 Nov 2015 00:59:55 +0100
Subject: [PATCH] Update site.conf of all segments

---
 extra/ffmuc.conf         | 38 ++++++++++++++++++++++++++++++--------
 extra/ffmuc_umland.conf  | 38 ++++++++++++++++++++++++++++++--------
 extra/ffmuc_welcome.conf | 38 ++++++++++++++++++++++++++++++--------
 3 files changed, 90 insertions(+), 24 deletions(-)

diff --git a/extra/ffmuc.conf b/extra/ffmuc.conf
index 7ccf490..162a72b 100644
--- a/extra/ffmuc.conf
+++ b/extra/ffmuc.conf
@@ -15,21 +15,43 @@
   regdom = 'DE',
 
   wifi24 = {
-    ssid = 'muenchen.freifunk.net',
     channel = 6,
     htmode = 'HT20',
-    mesh_ssid = 'mesh.ffmuc',
-    mesh_bssid = '02:0E:8E:1E:61:17',
-    mesh_mcast_rate = 12000,
+    ap = {
+      ssid = 'muenchen.freifunk.net',
+    },
+    --mesh = {
+    --  id = 'ffmuc-mesh',
+    --  mcast_rate = 12000,
+    --},
+    ibss = {
+      ssid = 'mesh.ffmuc',
+      bssid = '02:0E:8E:1E:61:17',
+      mcast_rate = 12000,
+    },
   },
 
   wifi5 = {
-    ssid = 'muenchen.freifunk.net',
     channel = 44,
     htmode = 'HT40+',
-    mesh_ssid = 'mesh.ffmuc',
-    mesh_bssid = '02:0E:8E:1E:61:17',
-    mesh_mcast_rate = 12000,
+    ap = {
+      ssid = 'muenchen.freifunk.net',
+    },
+    --mesh = {
+    --  id = 'ffmuc-mesh',
+    --  mcast_rate = 12000,
+    --},
+    ibss = {
+      ssid = 'mesh.ffmuc',
+      bssid = '02:0E:8E:1E:61:17',
+      mcast_rate = 12000,
+    },
+  },
+
+  mesh = {
+    batman_adv = {
+      gw_sel_class = 3,
+    },
   },
 
   next_node = {
diff --git a/extra/ffmuc_umland.conf b/extra/ffmuc_umland.conf
index 6778e4d..92832c6 100644
--- a/extra/ffmuc_umland.conf
+++ b/extra/ffmuc_umland.conf
@@ -15,21 +15,43 @@
   regdom = 'DE',
 
   wifi24 = {
-    ssid = 'muenchen.freifunk.net',
     channel = 6,
     htmode = 'HT20',
-    mesh_ssid = 'mesh.ffmuc.umland',
-    mesh_bssid = '02:0E:8E:1E:61:19',
-    mesh_mcast_rate = 12000,
+    ap = {
+      ssid = 'muenchen.freifunk.net',
+    },
+    --mesh = {
+    --  id = 'ffmuc-umland-mesh',
+    --  mcast_rate = 12000,
+    --},
+    ibss = {
+      ssid = 'mesh.ffmuc.umland',
+      bssid = '02:0E:8E:1E:61:19',
+      mcast_rate = 12000,
+    },
   },
 
   wifi5 = {
-    ssid = 'muenchen.freifunk.net',
     channel = 44,
     htmode = 'HT40+',
-    mesh_ssid = 'mesh.ffmuc.umland',
-    mesh_bssid = '02:0E:8E:1E:61:19',
-    mesh_mcast_rate = 12000,
+    ap = {
+      ssid = 'muenchen.freifunk.net',
+    },
+    --mesh = {
+    --  id = 'ffmuc-umland-mesh',
+    --  mcast_rate = 12000,
+    --},
+    ibss = {
+      ssid = 'mesh.ffmuc.umland',
+      bssid = '02:0E:8E:1E:61:19',
+      mcast_rate = 12000,
+    },
+  },
+
+  mesh = {
+    batman_adv = {
+      gw_sel_class = 3,
+    },
   },
 
   next_node = {
diff --git a/extra/ffmuc_welcome.conf b/extra/ffmuc_welcome.conf
index b4b84aa..e0568a9 100644
--- a/extra/ffmuc_welcome.conf
+++ b/extra/ffmuc_welcome.conf
@@ -15,21 +15,43 @@
   regdom = 'DE',
 
   wifi24 = {
-    ssid = 'muenchen.freifunk.net',
     channel = 6,
     htmode = 'HT20',
-    mesh_ssid = 'mesh.ffmuc.welcome',
-    mesh_bssid = '02:0E:8E:1E:61:18',
-    mesh_mcast_rate = 12000,
+    ap = {
+      ssid = 'muenchen.freifunk.net',
+    },
+    --mesh = {
+    --  id = 'ffmuc-welcome-mesh',
+    --  mcast_rate = 12000,
+    --},
+    ibss = {
+      ssid = 'mesh.ffmuc.welcome',
+      bssid = '02:0E:8E:1E:61:18',
+      mcast_rate = 12000,
+    },
   },
 
   wifi5 = {
-    ssid = 'muenchen.freifunk.net',
     channel = 44,
     htmode = 'HT40+',
-    mesh_ssid = 'mesh.ffmuc.welcome',
-    mesh_bssid = '02:0E:8E:1E:61:18',
-    mesh_mcast_rate = 12000,
+    ap = {
+      ssid = 'muenchen.freifunk.net',
+    },
+    --mesh = {
+    --  id = 'ffmuc-welcome-mesh',
+    --  mcast_rate = 12000,
+    --},
+    ibss = {
+      ssid = 'mesh.ffmuc.welcome',
+      bssid = '02:0E:8E:1E:61:18',
+      mcast_rate = 12000,
+    },
+  },
+
+  mesh = {
+    batman_adv = {
+      gw_sel_class = 3,
+    },
   },
 
   next_node = {