From: pberndro Date: Sun, 11 Jan 2015 15:04:24 +0000 (+0100) Subject: Adjustments to the JSON format. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=44289799b815e7bef0c08976f3bca9ddccaf8eeb;p=thirdparty%2Ffreifunk-ipfire.git Adjustments to the JSON format. --- diff --git a/sites/FFHH.json b/sites/FFHH.json index 93c3123..54044ba 100644 --- a/sites/FFHH.json +++ b/sites/FFHH.json @@ -8,104 +8,142 @@ "supernodes": [ { + "protocol": "fastd", "peer": "gateway01", "key": "cb09c68e2d2f7d374d47035cd532e0a60b8b3a7447aa5a7f76f4f15c8ffa9e58", "remote": "gw01.hamburg.freifunk.net", - "port": 10000 + "port": 10000, + "mtu": 1426, + "ciphers": ["salsa2012+gmac", "salsa2012+umac"] }, { "peer": "gateway02", "key": "462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0", "remote": "gw02.hamburg.freifunk.net", - "port": 10000 + "port": 10000, + "mtu": 1426, + "ciphers": ["salsa2012+gmac", "salsa2012+umac"] }, { "peer": "gateway03", "key": "e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546", "remote": "gw03.hamburg.freifunk.net", - "port": 10000 + "port": 10000, + "mtu": 1426, + "ciphers": ["salsa2012+gmac", "salsa2012+umac"] }, { "peer": "gateway04", "key": "fca88dd58316f4ab50d2a697123dddf4d0ba3aad52ddeb0ba7835cdbbeb60dbf", "remote": "gw04.hamburg.freifunk.net", - "port": 10000 + "port": 10000, + "mtu": 1426, + "ciphers": ["salsa2012+gmac", "salsa2012+umac"] }, { "peer": "gateway05", "key": "84986658775167dff6918dc8e0529c4a4524cb1782849a80933ddb6d8c6bd3f5", "remote": "gw05.hamburg.freifunk.net", - "port": 10000 + "port": 10000, + "mtu": 1426, + "ciphers": ["salsa2012+gmac", "salsa2012+umac"] }, { "peer": "gateway06", "key": "fb608aa75180ba88b4a3399a6498e68796d200afc1bfd275a0dcb903a31f39b6", "remote": "gw06.hamburg.freifunk.net", - "port": 10000 + "port": 10000, + "mtu": 1426, + "ciphers": ["salsa2012+gmac", "salsa2012+umac"] }, { "peer": "gateway07", "key": "62ea83b5fbb0fd8cf205f1398698cb29180039b8246b1f69778e8f52cd423612", "remote": "gw07.hamburg.freifunk.net", - "port": 10000 + "port": 10000, + "mtu": 1426, + "ciphers": ["salsa2012+gmac", "salsa2012+umac"] }, { "peer": "gateway08", "key": "67e9b215248ada3f4ffcc9db0bdf897128f6236a0d4e8d660762b77bebc914d4", "remote": "gw08.hamburg.freifunk.net", - "port": 10000 + "port": 10000, + "mtu": 1426, + "ciphers": ["salsa2012+gmac", "salsa2012+umac"] }, { "peer": "gateway09", "key": "5f483f6d26ac9106d86c0edcd08cf92c18caf67933719a394915ab809d1fb2bc", "remote": "gw09.hamburg.freifunk.net", - "port": 10000 + "port": 10000, + "mtu": 1426, + "ciphers": ["salsa2012+gmac", "salsa2012+umac"] }, { "peer": "gateway10", "key": "69c0bafd5c08d4277b339483cf137fe7e732b5bc87c8fbdb636ff7767426b94b", "remote": "gw10.hamburg.freifunk.net", - "port": 10000 + "port": 10000, + "mtu": 1426, + "ciphers": ["salsa2012+gmac", "salsa2012+umac"] }, { "peer": "gateway11", "key": "ee7719551bdba725c27a60a031f2faeb44588162c8065a1c651d35b3c9ebc347", "remote": "gw11.hamburg.freifunk.net", - "port": 10000 + "port": 10000, + "mtu": 1426, + "ciphers": ["salsa2012+gmac", "salsa2012+umac"] }, { "peer": "gateway12", "key": "facbbfb07525782fcde22b929f36ea508a295619eca35782003d9ca2dd3cc524", "remote": "gw12.hamburg.freifunk.net", - "port": 10000 + "port": 10000, + "mtu": 1426, + "ciphers": ["salsa2012+gmac", "salsa2012+umac"] }, { "peer": "gateway13", "key": "d5556881159c7bc649caabf0a72ba7c33ca8bb5fd0c7f21d52f8cbd071185e28", "remote": "gw13.hamburg.freifunk.net", - "port": 10000 + "port": 10000, + "mtu": 1426, + "ciphers": ["salsa2012+gmac", "salsa2012+umac"] } ], - - "ciphers": ["salsa2012+gmac", "salsa2012+umac"], - "mtu-vpn": 1426, + "batman-adv": "2013.4", - "wifi24": { - "ssid": "hamburg.freifunk.net", - "channel": 1, - "htmode": "HT20", - "mesh_ssid": "f8:d1:11:87:52:2e", - "mesh_bssid": "f8:d1:11:87:52:2e", - "mesh_mcast_rate": 6000 - }, + "adhoc" : [ + { + "ssid": "f8:d1:11:87:52:2e", + "bssid": "f8:d1:11:87:52:2e", + "channel": 1, + "htmode": "HT20+", + "mesh_mcast_rate": 6000 + }, + { + "ssid": "f8:d1:11:87:52:2e", + "bssid": "f8:d1:11:87:52:2e", + "channel": 44, + "htmode" : "HT40+", + "mesh_mcast_rate": 6000 + } + ], - "wifi5": { - "ssid": "hamburg.freifunk.net", - "channel": 44, - "htmode": "HT40+", - "mesh_ssid": "f8:d1:11:87:52:2e", - "mesh_bssid": "f8:d1:11:87:52:2e", - "mesh_mcast_rate": 6000 - } + "infrastructure" : [ + { + "ssid": "hamburg.freifunk.net", + "channel": 1, + "htmode": "HT20+" + }, + { + "ssid": "hamburg.freifunk.net", + "channel": 44, + "htmode": "HT40+" + } + ] + } diff --git a/sites/FFHL.json b/sites/FFHL.json index 9d21a59..01fe5cd 100644 --- a/sites/FFHL.json +++ b/sites/FFHL.json @@ -8,51 +8,73 @@ "supernodes": [ { + "protocol": "fastd", "peer": "burgtor", "key": "657af03e36ff1b8bbe5a5134982a4f110c8523a9a63293870caf548916a95a03", "remote": "burgtor.mesh.ffhl.chaotikum.org", - "port": 10000 - + "port": 10000, + "mtu": 1426, + "ciphers": ["salsa2012+umac", "salsa2012+gmac"] }, { + "protocol": "fastd", "peer": "holstentor", "key": "8c660f7511bf101ea1b599fe53af20e1146cd923c9e9d2a3a0d534ee75af9067", "remote": "holstentor.mesh.ffhl.chaotikum.org", - "port": 10000 + "port": 10000, + "mtu": 1426, + "ciphers": ["salsa2012+umac", "salsa2012+gmac"] }, { + "protocol": "fastd", "peer": "huextertor", "key": "a1b124f43eae4f5929850c09cda825ef35d659e3db4d7746e3d97627e9fa7238", "remote": "huextertor.mesh.ffhl.chaotikum.org", - "port": 10000 + "port": 10000, + "mtu": 1426, + "ciphers": ["salsa2012+umac", "salsa2012+gmac"] }, { + "protocol": "fastd", "peer": "muehlentor", "key": "bd4ec3cf87bb0042eed2fa121fbc402154d28fb1ae9dff9cdb71bb21892f401a", "remote": "muehlentor.mesh.ffhl.chaotikum.org", - "port": 10000 + "port": 10000, + "mtu": 1426, + "ciphers": ["salsa2012+umac", "salsa2012+gmac"] } ], - "ciphers": ["salsa2012+umac", "salsa2012+gmac"], - "mtu-vpn": 1426, "batman-adv": "2013.4", - "wifi24": { - "ssid": "luebeck.freifunk.net", - "channel": 1, - "htmode": "HT40+", - "mesh_ssid": "02:d1:11:37:fc:38", - "mesh_bssid": "02:d1:11:37:fc:38", - "mesh_mcast_rate": 12000 - }, + "adhoc" : [ + { + "ssid": "02:d1:11:37:fc:38", + "bssid": "02:d1:11:37:fc:38", + "channel": 1, + "htmode": "HT40+", + "mesh_mcast_rate": 12000 + }, + { + "ssid": "02:d1:11:37:fc:38", + "bssid": "02:d1:11:37:fc:38", + "channel": 44, + "htmode" : "HT40+", + "mesh_mcast_rate": 12000 + } + ], + + "infrastructure" : [ + { + "ssid": "luebeck.freifunk.net", + "channel": 1, + "htmode": "HT40+" + }, + { + "ssid": "luebeck.freifunk.net", + "channel": 44, + "htmode": "HT40+" + } + ] - "wifi5": { - "ssid": "luebeck.freifunk.net", - "channel": 44, - "htmode": "HT40+", - "mesh_ssid": "02:d1:11:37:fc:38", - "mesh_bssid": "02:d1:11:37:fc:38", - "mesh_mcast_rate": 12000 - } } diff --git a/sites/FFMS.json b/sites/FFMS.json index af32729..eec86f9 100644 --- a/sites/FFMS.json +++ b/sites/FFMS.json @@ -11,42 +11,57 @@ "peer": "fusselkater", "key": "071576a93dd3e7dcdd6e566024879dd01a118cddbc4258247dd825ad42351394", "remote": "fusselkater.gw.freifunk-muenster.de", - "port": 14242 - + "port": 14242, + "mtu-vpn": 1406, + "ciphers": ["aes128-gcm", "salsa2012+gmac", "salsa2012+umac"] }, { "peer": "commander1024", "key": "9bf14cf6faa8bc0bc87e45b109f065339551cf4ab63a668c1a90897f05eceb36", "remote": "commander1024.gw.freifunk-muenster.de", - "port": 14242 + "port": 14242, + "mtu-vpn": 1406, + "ciphers": ["aes128-gcm", "salsa2012+gmac", "salsa2012+umac"] }, { "peer": "fanlin", "key": "346234ecf552727233b406131c214b5b58ceb4b72b9503276aff419a02fc3137", "remote": "fanlin.gw.freifunk-muenster.de", - "port": 14242 + "port": 14242, + "ciphers": ["aes128-gcm", "salsa2012+gmac", "salsa2012+umac"] } ], - - "ciphers": ["aes128-gcm", "salsa2012+gmac", "salsa2012+umac"], - "mtu-vpn": 1406, + "batman-adv": "2013.4", - "wifi24": { - "ssid": "muenster.freifunk.net", - "channel": 1, - "htmode": "HT40+", - "mesh_ssid": "02:d1:11:37:fc:38", - "mesh_bssid": "02:d1:11:37:fc:38", - "mesh_mcast_rate": 12000 - }, + "adhoc" : [ + { + "ssid": "02:d1:11:37:fc:38", + "bssid": "02:d1:11:37:fc:38", + "channel": 1, + "htmode": "HT40+", + "mesh_mcast_rate": 12000 + }, + { + "ssid": "02:d1:11:37:fc:38", + "bssid": "02:d1:11:37:fc:38", + "channel": 44, + "htmode" : "HT40+", + "mesh_mcast_rate": 12000 + } + ], + + "infrastructure" : [ + { + "ssid": "muenster.freifunk.net", + "channel": 1, + "htmode": "HT40+" + }, + { + "ssid": "muenster.freifunk.net (5GHz)", + "channel": 44, + "htmode": "HT40+" + } + ] - "wifi5": { - "ssid": "muenster.freifunk.net (5GHz)", - "channel": 44, - "htmode": "HT40+", - "mesh_ssid": "02:d1:11:37:fc:38", - "mesh_bssid": "02:d1:11:37:fc:38", - "mesh_mcast_rate": 12000 - } } diff --git a/sites/FFRG.json b/sites/FFRG.json index 247dfcd..807fbb8 100644 --- a/sites/FFRG.json +++ b/sites/FFRG.json @@ -76,4 +76,5 @@ "htmode": "HT40+" } ] + } diff --git a/sites/rheinufer.json b/sites/rheinufer.json index 07a58ee..8a1213d 100644 --- 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+" + } + ]