ffs-1.3: using new fastd-ports 102xx for MTU 1340

README.md

@@ -7,6 +7,7 @@ Freifunk Stuttgart specific Gluon configuration
 Doku: https://gluon.readthedocs.org/en/latest/user/site.html
 
 Gluon versions used for specific Stuttgart Freifunk Firmware builds:
+* ffs-1.3: v2016.2.7 + 1340 mtu
 * ffs-1.2: v2016.2.6 + ffs-set-segment dns fix + 1312 mtu
 * ffs-1.1: v2016.2.6 + ffs-set-segment dns fix
 * ffs-1.0: v2016.2.5

modules

 GLUON_SITE_FEEDS='ffs'
 
 PACKAGES_FFS_REPO=https://github.com/freifunk-stuttgart/Gluon-Packages
-PACKAGES_FFS_COMMIT=b936695c5566a4e358abc62ac9a35a8a87d3bfa5
+PACKAGES_FFS_COMMIT=cd7c63718c1c892853d899812b2526e9a5de321b

site.conf

@@ -25,6 +25,10 @@
         ap = {
             ssid = 'Freifunk',
         },
+        mesh = {
+            id = 'ffsmesh',
+            mcast_rate = 12000,
+        },
         ibss = {
             ssid = '02:04:08:16:32:64',
             bssid = '02:04:08:16:32:64',
@@ -37,6 +41,10 @@
         ap = {
             ssid = 'Freifunk',
         },
+        mesh = {
+            id = 'ffsmesh',
+            mcast_rate = 12000,
+        },
         ibss = {
             ssid = '02:04:08:16:32:64',
             bssid = '02:04:08:16:32:64',
@@ -53,7 +61,7 @@
 
     fastd_mesh_vpn = {
         methods = {'salsa2012+umac'},
-        mtu = 1312,
+        mtu = 1340,
         enabled = true,
         groups = {
             backbone = {
@@ -62,61 +70,61 @@
                     gw01 = {
                         key = 'd7b89d42b629bd5d419139b4c395e7b47ed7417112d3fcd232ba38137daa58e6',
                         remotes = {
-                            '"gw01.gw.freifunk-stuttgart.de" port 10099'
+                            '"gw01.gw.freifunk-stuttgart.de" port 10299'
                         },
                     },
                     gw02 = {
                         key = '31eaff2ce1c19d0c9af693c4500defc4e1b4979ad75133d779532f0572955875',
                         remotes = {
-                            '"gw02.gw.freifunk-stuttgart.de" port 10099'
+                            '"gw02.gw.freifunk-stuttgart.de" port 10299'
                         },
                     },
                     gw03 = {
                         key = '1e944f5f2dca02e1c1d2e006186417e76759c26f75da5e7850f6c1e5cddcb1c2',
                         remotes = {
-                            '"gw03.gw.freifunk-stuttgart.de" port 10099'
+                            '"gw03.gw.freifunk-stuttgart.de" port 10299'
 			},
                     },
                     gw04 = {
                         key = '5689b2fd14bd313de1e95406c17e783b78b9d6f8aa86f896df4f2d843ab642bf',
                         remotes = {
-                            '"gw04.gw.freifunk-stuttgart.de" port 10099'
+                            '"gw04.gw.freifunk-stuttgart.de" port 10299'
                         },
                     },
                     gw05 = {
                         key = '26cd067057e4fcf58fb68da66c75a360de56aa4c36094f1846f706824682a789',
                         remotes = {
-                            '"gw05.gw.freifunk-stuttgart.de" port 10099'
+                            '"gw05.gw.freifunk-stuttgart.de" port 10299'
                         },
                     },
                     gw06 = {
                         key = 'fdc1737906d7431763962f4daf6eb4d973c845aca7a96e40643d08a82159dff2',
                         remotes = {
-                            '"gw06.gw.freifunk-stuttgart.de" port 10099'
+                            '"gw06.gw.freifunk-stuttgart.de" port 10299'
                         },
                     },
                     gw07 = {
                         key = '23f6d70be861effe9b1a7bc812fd8c9e2e575bf0ea63ca4ffdc0a3998afb59a1',
                         remotes = {
-                            '"gw07.gw.freifunk-stuttgart.de" port 10099'
+                            '"gw07.gw.freifunk-stuttgart.de" port 10299'
                         },
                     },
                     gw08 = {
                         key = '1af6a5d41d866823e5712e8d9af42080397ad52bdd8664a11ca94225629398a3',
                         remotes = {
-                            '"gw08.gw.freifunk-stuttgart.de" port 10099'
+                            '"gw08.gw.freifunk-stuttgart.de" port 10299'
                         },
                     },
                     gw09 = {
                         key = 'bf7c1a62dbf61b8fda25be7e5e600c0ae745e6b6e90a419aeafaf85b6497e8f2',
                         remotes = {
-                            '"gw09.gw.freifunk-stuttgart.de" port 10099'
+                            '"gw09.gw.freifunk-stuttgart.de" port 10299'
                         },
                     },
                     gw10 = {
                         key = '4b89e1a8882b4d7cf50eabc0360ff28138d78ca0b63fd63ec9e4c8260121da00',
                         remotes = {
-                            '"gw10.gw.freifunk-stuttgart.de" port 10099'
+                            '"gw10.gw.freifunk-stuttgart.de" port 10299'
                         },
                     },
                 },

site.mk

@@ -46,7 +46,7 @@ GLUON_SITE_PACKAGES += \
 	kmod-igb
 endif
 
-DEFAULT_GLUON_RELEASE := 1.2+$(shell date '+%Y-%m-%d')-g.$(shell git -C $(GLUONDIR) log --pretty=format:'%h' -n 1)-s.$(shell git -C $(GLUONDIR)/site log --pretty=format:'%h' -n 1)
+DEFAULT_GLUON_RELEASE := 1.3+$(shell date '+%Y-%m-%d')-g.$(shell git -C $(GLUONDIR) log --pretty=format:'%h' -n 1)-s.$(shell git -C $(GLUONDIR)/site log --pretty=format:'%h' -n 1)
 
 GLUON_LANGS := de en
 
@@ -60,4 +60,4 @@ GLUON_REGION ?= eu
 GLUON_PRIORITY ?= 0.1
 
 #enable generation of images for ath10k devices with ibss mode
-GLUON_ATH10K_MESH=ibss
+GLUON_ATH10K_MESH ?= 11s