Update site.conf of all segments

extra/ffmuc.conf

@@ -15,21 +15,43 @@
   regdom = 'DE',
 
   wifi24 = {
-    ssid = 'muenchen.freifunk.net',
     channel = 6,
     htmode = 'HT20',
-    mesh_ssid = 'mesh.ffmuc',
+    ap = {
-    mesh_bssid = '02:0E:8E:1E:61:17',
+      ssid = 'muenchen.freifunk.net',
-    mesh_mcast_rate = 12000,
+    },
+    --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',
+    ap = {
-    mesh_bssid = '02:0E:8E:1E:61:17',
+      ssid = 'muenchen.freifunk.net',
-    mesh_mcast_rate = 12000,
+    },
+    --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 = {

extra/ffmuc_umland.conf

@@ -15,21 +15,43 @@
   regdom = 'DE',
 
   wifi24 = {
-    ssid = 'muenchen.freifunk.net',
     channel = 6,
     htmode = 'HT20',
-    mesh_ssid = 'mesh.ffmuc.umland',
+    ap = {
-    mesh_bssid = '02:0E:8E:1E:61:19',
+      ssid = 'muenchen.freifunk.net',
-    mesh_mcast_rate = 12000,
+    },
+    --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',
+    ap = {
-    mesh_bssid = '02:0E:8E:1E:61:19',
+      ssid = 'muenchen.freifunk.net',
-    mesh_mcast_rate = 12000,
+    },
+    --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 = {

extra/ffmuc_welcome.conf

@@ -15,21 +15,43 @@
   regdom = 'DE',
 
   wifi24 = {
-    ssid = 'muenchen.freifunk.net',
     channel = 6,
     htmode = 'HT20',
-    mesh_ssid = 'mesh.ffmuc.welcome',
+    ap = {
-    mesh_bssid = '02:0E:8E:1E:61:18',
+      ssid = 'muenchen.freifunk.net',
-    mesh_mcast_rate = 12000,
+    },
+    --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',
+    ap = {
-    mesh_bssid = '02:0E:8E:1E:61:18',
+      ssid = 'muenchen.freifunk.net',
-    mesh_mcast_rate = 12000,
+    },
+    --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 = {