update data structure

diff --git a/sites/FFRG.json b/sites/FFRG.json
index 5e5bcc32e9012551a3566947102f49f093d92821..1fccd954e4e89bfe7edb3d30c118588bf22a2724 100644 (file)
--- a/sites/FFRG.json
+++ b/sites/FFRG.json
@@ -5,54 +5,72 @@
   "register": "http://register.freifunk-ruhrgebiet.de",
   "url": "http://www.freifunk-ruhrgebiet.de",
   "map": "http://map.freifunk-ruhrgebiet.de",
-  
+
   "supernodes": [
     {
+      "protocol": "fastd",
       "peer": "ruhrgebiet0",
       "key": "b99ecd9663126a8036d9e9990df7110318567b6cfa06652e55de853a6384fb6a",
       "remote": "ffrg0.freifunk-ruhrgebiet.de",
-      "port": 10000
-
+      "port": 10000,
+      "mtu": 1426,
+      "ciphers": ["aes128-gcm", "salsa2012+gmac", "xsalsa20-poly1305", "null"]
     },
     {
       "peer": "ruhrgebiet1",
       "key": "15e1601791c201e463ca404ae9174f937859346ef1b7311a3e9eebf02fe6ebbe",
       "remote": "ffrg1.freifunk-ruhrgebiet.de",
-      "port": 10000
+      "port": 10000,
+      "mtu": 1426,
+      "ciphers": ["aes128-gcm", "salsa2012+gmac", "xsalsa20-poly1305", "null"]
     },
     {
       "peer": "ruhrgebiet2",
       "key": "975e713ba967c20a8812a0f51d741a787b7258c5b58845d812cda845f825f6a1",
       "remote": "ffrg2.freifunk-ruhrgebiet.de",
-      "port": 10000
+      "port": 10000,
+      "mtu": 1426,
+      "ciphers": ["aes128-gcm", "salsa2012+gmac", "xsalsa20-poly1305", "null"]
     },
     {
       "peer": "ruhrgebiet3",
       "key": "f82b1d93c1719dc9cd5785437aebe004014c94820b2aa26759f2b1c0bd7b2f6c",
       "remote": "ffrg3.freifunk-ruhrgebiet.de",
-      "port": 10000
+      "port": 10000,
+      "mtu": 1426,
+      "ciphers": ["aes128-gcm", "salsa2012+gmac", "xsalsa20-poly1305", "null"]
     }
   ],
 
-  "ciphers": ["aes128-gcm", "salsa2012+gmac", "xsalsa20-poly1305", "null"],
-  "mtu-vpn": 1426,
   "batman-adv": "2013.4",
 
-  "wifi24": {
-    "ssid": "Freifunk",
-    "channel": 3,
-    "htmode": "HT40+",
-    "mesh_ssid": "wifimesh-ruhrgebiet",
-    "mesh_bssid": "02:ff:13:37:ff:01",
-    "mesh_mcast_rate": 12000
-  },
+  "adhoc" : [
+    {
+      "ssid": "wifimesh-ruhrgebiet",
+      "bssid": "02:ff:13:37:ff:01",
+      "channel": 3,
+      "htmode": "HT40+",
+      "mesh_mcast_rate": 12000
+    },
+    {
+      "ssid": "wifimesh-ruhrgebiet5",
+      "bssid": "02:ff:13:37:ff:02",
+      "channel": 44,
+      "htmode" : "HT40+",
+      "mesh_mcast_rate": 12000
+    }
+  ],
 
-  "wifi5": {
-    "ssid": "Freifunk (5GHz)",
-    "channel": 44,
-    "htmode": "HT40+",
-    "mesh_ssid": "wifimesh-ruhrgebiet5",
-    "mesh_bssid": "02:ff:13:37:ff:02",
-    "mesh_mcast_rate": 12000
-  }
+  "infrastructure" : [
+    { 
+      "ssid": "Freifunk",
+      "channel": 3,
+      "htmode": "HT40+"
+    },
+    { 
+      "ssid": "Freifunk (5GHz)",
+      "channel": 44,
+      "htmode": "HT40+"
+    }
+  ]
 }