Adjustments to the JSON format.

[thirdparty/freifunk-ipfire.git] / sites / rheinufer.json

diff --git a/sites/rheinufer.json b/sites/rheinufer.json
index 07a58eea4fd586cf69b0a787488f2fe1b3fc3d3c..8a1213d3992610b99480308084d18fae4c53ae19 100644 (file)
--- a/sites/rheinufer.json
+++ b/sites/rheinufer.json
@@ -8,51 +8,71 @@
   
   "supernodes": [
     {
+      "protocol": "fastd",
       "peer": "rheinufer0",
       "key": "1f9ad5481a6773d963fa38980afbf7d296163070aecd8d600863d866bafddf32",
       "remote": "rheinufer0.freifunk-rheinland.net",
-      "port": 10040
-
+      "port": 10040,
+      "mtu": 1426,
+      "ciphers": ["salsa2012+umac", "salsa2012+gmac"]
     },
     {
+      "protocol": "fastd",
       "peer": "rheinufer1",
       "key": "ab8959c1f974fa24354734f5bbe8106f8980a1b33eff22be580d9bcd3052e357",
-      "remote": "rheinufer2.freifunk-rheinland.net",
-      "port": 10040
+      "remote": "rheinufer1.freifunk-rheinland.net",
+      "port": 10040,
+      "mtu": 1426,
+      "ciphers": ["salsa2012+umac", "salsa2012+gmac"]
     },
     {
+      "protocol": "fastd",
       "peer": "rheinufer2",
       "key": "4ab84305bad610bf8c8b76c7897aa97dd4740893f680ac486ee1ee0b7e4ec18b",
       "remote": "rheinufer2.freifunk-rheinland.net",
-      "port": 10040
+      "port": 10040,
+      "mtu": 1426,
+      "ciphers": ["salsa2012+umac", "salsa2012+gmac"]
     },
     {
+      "protocol": "fastd",
       "peer": "rheinufer3",
       "key": "052ff3cc4d383ce4797ef12f4dabe22b8fc62c76e24f9b7827fe14c11522c474",
       "remote": "rheinufer3.freifunk-rheinland.net",
-      "port": 10040
+      "port": 10040,
+      "mtu": 1426,
+      "ciphers": ["salsa2012+umac", "salsa2012+gmac"]
     }
   ],
 
-  "ciphers": ["salsa2012+gmac"],
-  "mtu-vpn": 1426,
   "batman-adv": "2013.4",
 
-  "wifi24": {
-    "ssid": "Freifunk",
-    "channel": 3,
-    "htmode": "HT40+",
-    "mesh_ssid": "wifimesh-rheinufer",
-    "mesh_bssid": "32:CA:FF:EE:BA:BE",
-    "mesh_mcast_rate": 12000
-  },
+  "adhoc" : [
+    {
+      "ssid": "wifimesh-rheinufer",
+      "bssid": "32:CA:FF:EE:BA:BE",
+      "channel": 3,
+      "htmode": "HT40+",
+      "mesh_mcast_rate": 12000
+    },
+    {
+      "ssid": "wifimesh-rheinufer5",
+      "bssid": "02:44:CA:FF:EE:EE",
+      "channel": 44,
+      "htmode" : "HT40+",
+      "mesh_mcast_rate": 12000
+    }
+  ],
 
-  "wifi5": {
-    "ssid": "Freifunk (5GHz)",
-    "channel": 44,
-    "htmode": "HT40+",
-    "mesh_ssid": "wifimesh-rheinufer5",
-    "mesh_bssid": "02:44:CA:FF:EE:EE",
-    "mesh_mcast_rate": 12000
-  }
-}
+  "infrastructure" : [
+    { 
+      "ssid": "Freifunk",
+      "channel": 3,
+      "htmode": "HT40+"
+    },
+    { 
+      "ssid": "Freifunk (5GHz)",
+      "channel": 44,
+      "htmode": "HT40+"
+    }
+  ]