mesh: fixed / added missing mesh metrics

freifunk-berlin · Oct 16, 2024 · 14dd19e · 14dd19e
1 parent 2422fde
commit 14dd19e
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 7 deletions.
diff --git a/locations/ak36.yml b/locations/ak36.yml
@@ -87,7 +87,7 @@ mesh_links:
     ifname: eth1.11
     ipv4: 10.31.130.161/32
     ipv6: 2001:bf7:750:4001::2/128
-    metric: 1024
+    metric: 128
     ptp: true
 
   - name: mesh_dtmb
@@ -109,14 +109,14 @@ mesh_links:
     ifname: eth1.14
     ipv4: 10.31.130.165/32
     ipv6: 2001:bf7:750:4001::6/128
-    metric: 256
+    metric: 128
     ptp: true
 
   - name: mesh_teufel
     ifname: eth1.15
     ipv4: 10.31.130.166/32
     ipv6: 2001:bf7:750:4001::7/128
-    metric: 1024
+    metric: 128
     ptp: true
 
 # OLSR Announce SmartGateway

diff --git a/locations/gub37.yml b/locations/gub37.yml
@@ -65,6 +65,7 @@ networks:
     prefix: 10.31.157.98/32
     ipv6_subprefix: -11
     ptp: true
+    mesh_metric: 128
 
   - vid: 12
     role: mesh

diff --git a/locations/ilr.yml b/locations/ilr.yml
@@ -94,6 +94,7 @@ networks:
     prefix: 10.31.214.16/32
     ipv6_subprefix: -10
     # WARNING: Custom port config {1t,2u,3u,4u,5t}
+    mesh_metric: 128
 
   - vid: 11
     role: mesh

diff --git a/locations/kiehlufer.yml b/locations/kiehlufer.yml
@@ -101,7 +101,7 @@ networks:
     name: mesh_rhnk
     prefix: 10.31.151.112/32
     ipv6_subprefix: -1
-    mesh_metric: 1024
+    mesh_metric: 128
     ptp: true
   # hüttenroder weg - mikrotik 60ghz cube
   - vid: 11
@@ -110,6 +110,7 @@ networks:
     prefix: 10.31.151.113/32
     ipv6_subprefix: -2
     ptp: true
+    mesh_metric: 128
   # gateway - Rocket 5AC lite
   - vid: 12
     role: mesh

diff --git a/locations/klunker.yml b/locations/klunker.yml
@@ -60,6 +60,7 @@ networks:
     prefix: 10.31.71.152/32
     ipv6_subprefix: -1
     ptp: true
+    mesh_metric: 128
 
   # PtP mesh down south 60GHz
   # Airfiber 60LR Link to philmel church
@@ -69,6 +70,7 @@ networks:
     prefix: 10.31.71.153/32
     ipv6_subprefix: -2
     ptp: true
+    mesh_metric: 128
 
   # AP1 down Isarstrasse 5GHz
   # directing south-southeast

diff --git a/locations/ohlauer.yml b/locations/ohlauer.yml
@@ -46,7 +46,7 @@ mesh_links:
     ifname: lan3.10
     ipv4: 10.31.11.96/32
     ipv6: 2001:bf7:830:8301::/128
-    metric: 256
+    metric: 128
     ptp: true
 
 # Downlink IPv4 is in net announced by emma.

diff --git a/locations/radbahn.yml b/locations/radbahn.yml
@@ -58,6 +58,7 @@ networks:
     prefix: 10.31.248.248/32
     ipv6_subprefix: -10
     ptp: true
+    mesh_metric: 128
 
   - vid: 20
     name: mesh_o_nf2

diff --git a/locations/rhnk.yml b/locations/rhnk.yml
@@ -120,6 +120,7 @@ networks:
     name: mesh_klunker60
     prefix: 10.230.3.14/32
     ipv6_subprefix: -14
+    mesh_metric: 128
     ptp: true
 
   - vid: 15
@@ -147,6 +148,7 @@ networks:
     role: mesh
     name: mesh_wsw_60
     prefix: 10.230.3.22/32
+    mesh_metric: 128
     ipv6_subprefix: -22
 
   - vid: 23
@@ -159,6 +161,7 @@ networks:
     role: mesh
     name: mesh_oso_60
     prefix: 10.230.3.24/32
+    mesh_metric: 128
     ipv6_subprefix: -24
 
   - vid: 25
@@ -174,6 +177,7 @@ networks:
     role: mesh
     name: mesh_nno_60ghz
     prefix: 10.230.3.26/32
+    mesh_metric: 128
     ipv6_subprefix: -26
 
   - vid: 32

diff --git a/locations/sav.yml b/locations/sav.yml
@@ -84,6 +84,7 @@ networks:
     name: mesh_emma
     prefix: 10.31.174.244/32
     ipv6_subprefix: -10
+    mesh_metric: 128
 
   - vid: 40
     role: dhcp

diff --git a/locations/scharni.yml b/locations/scharni.yml
@@ -58,6 +58,7 @@ networks:
     prefix: 10.31.252.192/32
     ipv6_subprefix: -2
     ptp: true
+    mesh_metric: 128
 
   - vid: 11
     role: mesh

diff --git a/locations/teufelsberg.yml b/locations/teufelsberg.yml
@@ -100,12 +100,14 @@ networks:
     name: mesh_ak36
     prefix: 10.31.213.64/32
     ipv6_subprefix: -10
+    mesh_metric: 128
 
   - vid: 12
     role: mesh
     name: mesh_ilr
     prefix: 10.31.213.66/32
     ipv6_subprefix: -12
+    mesh_metric: 128
 
   - vid: 13
     role: mesh

diff --git a/locations/vaterhaus.yml b/locations/vaterhaus.yml
@@ -86,6 +86,7 @@ networks:
     prefix: 10.230.192.226/32
     ipv6_subprefix: -3
     ptp: true
+    mesh_metric: 128
 
   - vid: 13
     role: mesh

diff --git a/locations/w38b.yml b/locations/w38b.yml
@@ -50,7 +50,7 @@ networks:
     ipv6_subprefix: -10
     ptp: true
     # prefer routing via RHNK over SAMA
-    mesh_metric: 320
+    mesh_metric: 192
     mesh_metric_lqm: ['default 0.85']
 
   # MESH - RHNK

diff --git a/locations/wilgu10.yml b/locations/wilgu10.yml
@@ -58,6 +58,7 @@ networks:
     prefix: 10.230.210.104/32
     ipv6_subprefix: -1
     ptp: true
+    mesh_metric: 128
 
   - vid: 11
     role: mesh

diff --git a/locations/zwingli.yml b/locations/zwingli.yml
@@ -157,7 +157,7 @@ networks:
     prefix: 10.31.115.36/32
     ipv6_subprefix: -5
     # prefer routing via emma over sama to use ohlauer as gateway)
-    mesh_metric: 320
+    mesh_metric: 192
     mesh_metric_lqm: ['default 0.85']
     ptp: true