Skip to content

Commit c597b3d

Browse files
authored
Merge pull request #45 from openNDS/v3.1.0beta
V3.1.0beta
2 parents d636916 + bc343d3 commit c597b3d

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

ChangeLog

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
mesh11sd (3.1.0)
2+
* Add - send meaningful multipath warnings to syslog [bluewavenet]
23
* Fix - diplay warning message only if path_change_count changes [bluewavenet]
34
* Add - adjust bridge ruleset and do checks to ensure bridge ports all have different mac addresses [bluewavenet]
45
* Fix - remove ruleset on daemon stop [bluewavenet]
@@ -19,7 +20,7 @@ mesh11sd (3.1.0)
1920
* Fix - set procd parameters to respawn zombie nodes [bluewavenet]
2021
* Add - README examples of using copy/connect [bluewavenet]
2122

22-
-- Rob White <dot@blue-wave.net> Sat, 20 Mar 2024 11:38:51 +0000
23+
-- Rob White <dot@blue-wave.net> Thu, 21 Mar 2024 07:55:51 +0000
2324

2425
mesh11sd (3.0.0)
2526
* Add - startup check for ath10k-ct drivers and terminate if found [bluewavenet]

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ config mesh11sd 'setup'
184184
#
185185
# All mesh peer and mesh gate nodes will autonomously track the mesh portal channel
186186
# regardless of the configured auto_mesh_band
187-
#
187+
#
188188
#option portal_channel 'auto'
189189
# or
190190
#option portal_channel '4'
@@ -292,7 +292,7 @@ Access to the remote meshnode peers will not be possible using the ipv4 address
292292

293293
* interface_timeout - the time in seconds that mesh11sd will wait for a mesh interface to establish before continuing. Default 10 seconds
294294

295-
* mesh_path_cost - sets the STP cost of the mesh network. Default: 0. Can be set to any value from 0 to 65534. Setting to 0 disables STP
295+
* mesh_path_cost - sets the STP cost of the mesh network. Default: 10. Can be set to any value from 0 to 65534. Setting to 0 disables STP
296296

297297
* auto_config - (optional) - autonomously configures the mesh network. Default 1 (enabled). Set to 0 to disable
298298

src/mesh11sd

+11-6
Original file line numberDiff line numberDiff line change
@@ -1493,25 +1493,30 @@ check_path_changes() {
14931493

14941494
if [ "$is_connected" -eq 0 ]; then
14951495
debugtype="warn"
1496-
syslogmessage="[ $hop_count ] hops to station [ $peermac ], [ $path_change_count ] path_change(s) for station detected"
1496+
syslogmessage="Warning! Station [ $peermac ] is [ $hop_count ] hops away and [ $path_change_count ] path_change(s) for station have been detected"
14971497
write_to_syslog
1498-
debugtype="warn"
1499-
syslogmessage="There are multiple hops to station [ $peermac ], consider its location or adjust txpower and/or rssi_threshold"
1498+
syslogmessage="Warning! Station [ $peermac ], consider its location or adjust txpower and/or rssi_threshold"
15001499
write_to_syslog
15011500
# If we want to make reactive fixups, do them here, for example:
15021501
#iw dev $iface station del $peermac
15031502
#iw dev $iface mpath del $peermac
15041503
fi
15051504

15061505
elif [ "$hop_count" -eq 1 ] && [ "$path_change_count" -gt 1 ]; then
1507-
# If we want to make reactive fixups, do them here, for example:
1508-
#iw dev $iface mpath del $peermac
15091506
debugtype="warn"
1510-
syslogmessage="Station [ $peermac ] has [ $path_change_count ] path changes, consider its location or adjust txpower and/or rssi_threshold"
1507+
syslogmessage="Warning! Station [ $peermac ] is an immediate neighbour, but has had [ $path_change_count ] path_change(s) detected"
1508+
write_to_syslog
1509+
syslogmessage="Warning! Station [ $peermac ], consider its location or adjust txpower and/or rssi_threshold"
15111510
write_to_syslog
1511+
# If we want to make reactive fixups, do them here, for example:
1512+
#iw dev $iface mpath del $peermac
15121513
fi
15131514

15141515
echo "previous_path_change_count=$path_change_count" > /tmp/$peermac_id
1516+
else
1517+
debugtype="info"
1518+
syslogmessage="Path to station [ $peermac ] is stable"
1519+
write_to_syslog
15151520
fi
15161521
done
15171522
fi

0 commit comments

Comments
 (0)