<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
</head>
<body text="#000000" bgcolor="#FFFFFF">
<p>Hi</p>
<p>sieht gut aus<span class="reviewed-by"><br>
</span></p>
<p><span class="reviewed-by">Reviewed-by: Christian Dresel
<a class="moz-txt-link-rfc2396E" href="mailto:fff@chrisi01.de"><fff@chrisi01.de></a></span><span class="tested-by"><br>
</span></p>
<p><span class="tested-by">Tested-by: </span><span
class="reviewed-by">Christian Dresel <a class="moz-txt-link-rfc2396E" href="mailto:fff@chrisi01.de"><fff@chrisi01.de></a></span></p>
<p><span class="reviewed-by">Was mich ein klein wenig beim testen
gestört hat aber ich auch nicht weiß wie man es besser machen
kann, durch das network restart fliegt man immer per SSH vom
Router runter. Da dies aber nur passiert, wenn sowieso schon was
kaputt ist, kann ich persönlich mit leben.</span></p>
<p><span class="reviewed-by">mfg</span></p>
<p><span class="reviewed-by">Christian<br>
</span></p>
<br>
<div class="moz-cite-prefix">On 18.12.2017 15:03, Adrian Schmutzler
wrote:<br>
</div>
<blockquote type="cite"
cite="mid:1513605814-2464-1-git-send-email-freifunk@adrianschmutzler.de">
<pre wrap="">To prevent connecting hoods, this patch loads keyxchange files
from the local network (eth0.3/eth0) before it uses the gateway.
Thus, if other files are provided via wXconfigap, they are just
ignored. If a router is connected to two hoods by cable, it will
just disable the interfaces where a second hood file is detected
and wait until the next call of configurehood.
If cable and wXmesh are different, the cable has precedence.
If two hoods are present via cable on the same eth, wXmesh has
precedence.
If two hoods are present via cable on different eth, the first
eth has precedence and all others are disabled.
If cable has precedence, wXmesh is configured with the hood
file from cable.
Signed-off-by: Adrian Schmutzler <a class="moz-txt-link-rfc2396E" href="mailto:freifunk@adrianschmutzler.de"><freifunk@adrianschmutzler.de></a>
---
Changes in v2:
- ifconfig eth down instead of ifconfig br-mesh down
- networking restart to get up interfaces again
- Cycle over eths instead of assuming just one
Changes in v3:
- Replace eth by $eth in inner for loop
- Use continue 2 instead of exit to go through all eths
- Only set oldhood once
- Use separate ethfile first, because otherwise a second eth
would overwrite the file although disabled
Changes in v4:
- Reduced timeout and number of tries for wget
---
.../fff/fff-hoods/files/usr/sbin/configurehood | 37 +++++++++++++++++++++-
1 file changed, 36 insertions(+), 1 deletion(-)
diff --git a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
index 822e5fc..e6a47df 100755
--- a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
+++ b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
@@ -10,6 +10,7 @@ sectorlocal=/etc/sectorfile
sectortmp=/tmp/sectorfile
sectorcopy=/www/hood/sectorfile
hiddenapfile=/tmp/hiddenapflag
+resetnetworkfile=/tmp/resetnetwork
rm -f "$hoodfile"
@@ -65,6 +66,12 @@ fi
lat=$(uci -q get fff.system.latitude)
long=$(uci -q get fff.system.longitude)
+# reenable network interfaces in case we disabled them earlier
+if [ -f "$resetnetworkfile" ]; then
+ /etc/init.d/network restart
+ rm "$resetnetworkfile"
+fi
+
# if we have Internet, we download the Hoodfile from the keyxchangev2
if hasInternet ; then
wget -T15 -t5 <a class="moz-txt-link-rfc2396E" href="http://keyserver.freifunk-franken.de/v2/?lat=$lat&long=$long">"http://keyserver.freifunk-franken.de/v2/?lat=$lat&long=$long"</a> -O "$hoodfile"
@@ -119,7 +126,35 @@ else
fi
else
echo "We have a Gateway in Range, we load the keyxchangev2data from fe80::1"
- wget -T15 -t5 "http://[fe80::1%br-mesh]:2342/keyxchangev2data" -O "$hoodfile"
+ # check eth first
+ oldhood=""
+ ethfile="${hoodfile}eth"
+ for eth in $(batctl if | grep "eth" | sed -nE 's/.*(eth[^:]+):.*/\1/p'); do
+ for mac in $(batctl n | grep "$eth" | sed -nE 's/.*eth[0-9.]+\s+([^\s]+)\s.*/\1/p'); do
+ EUI="$(echo "$mac" | awk -F: '{ printf("%02x%s:%sff:fe%s:%s%s\n", xor(("0x"$1),2), $2, $3, $4, $5, $6) }')"
+ wget -T2 -t3 "http://[fe80::${EUI}%${eth}]:2342/keyxchangev2data" -O "$ethfile"
+ if [ -s "$ethfile" ]; then
+ json_load "$(cat "$ethfile")"
+ json_select hood
+ json_get_var newhood name
+ if [ -n "$oldhood" ] && [ -n "$newhood" ] && ( ! [ "$newhood" = "$oldhood" ] ) ; then
+ # 2nd hood found, kill interface and go on (next try in 5 min.)
+ echo "Two hoods detected. Remove cables to stay in just one."
+ ifconfig "$eth" down
+ touch "$resetnetworkfile"
+ continue 2 # go to the next interface
+ fi
+ mv "$ethfile" "$hoodfile" # Only use hoodfile if sane
+ [ -n "$oldhood" ] || oldhood="$newhood" # only set oldhood once
+ fi
+ done
+ done
+ if [ ! -s "$hoodfile" ]; then
+ # Only load hoodfile from gateway if not already present from local network
+ # - This gives local network a precedence (take the hood from local network)
+ # - This prevents file insertion from a third person, as I will only connect via LAN to who I trust
+ wget -T15 -t5 "http://[fe80::1%br-mesh]:2342/keyxchangev2data" -O "$hoodfile"
+ fi
#UPLINK: Do nothing
fi
fi
</pre>
</blockquote>
<br>
</body>
</html>