ben
/
luci-app-easymesh
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Jason/main' into main

Browse Source
main
riley 1 year ago
parent 0101f3b680 ed801e2a37
commit 344ffd5002
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File

3
Makefile
Unescape Escape View File

@ -7,8 +7,7 @@ include $(TOPDIR)/rules.mk
LUCI_TITLE:=LuCI Support for easymesh LUCI_TITLE:=LuCI Support for easymesh
LUCI_DEPENDS:= +kmod-cfg80211 +batctl-default +kmod-batman-adv +dawn +bash LUCI_DEPENDS:= +kmod-cfg80211 +batctl-default +kmod-batman-adv +dawn +bash
PKG_VERSION:=2.8.5 PKG_VERSION:=2.8.6
PKG_RELEASE:=1
include $(TOPDIR)/feeds/luci/luci.mk include $(TOPDIR)/feeds/luci/luci.mk

40
root/easymesh/easymesh.sh
Unescape Escape View File

@ -73,9 +73,19 @@ create_bat0() {
echo "Old bat0 interface deleted from lan network." echo "Old bat0 interface deleted from lan network."
fi fi
# Add 'bat0' to the list of ports for 'br-lan' # # Add 'bat0' to the list of ports for 'br-lan'
uci add_list network.@device[0].ports='bat0' # uci add_list network.@device[0].ports='bat0'
echo "bat0 has been added to the lan network." # echo "bat0 has been added to the lan network."
# Get the LAN bridge name
LAN_NAME=$(uci -q get network.@device[0].name)
# Setup our Private Router Batman Interface
uci set network.private_router_batman=interface
uci set network.private_router_batman.proto='batadv_hardif'
uci set network.private_router_batman.master='bat0'
uci set network.private_router_batman.device="$LAN_NAME"
uci set network.private_router_batman.mtu='1536'
uci commit network uci commit network
fi fi
@ -126,18 +136,18 @@ setup_mesh_radio() {
# Commit changes to wireless # Commit changes to wireless
uci commit wireless uci commit wireless
uci set network.nwi_mesh_$CURRENT_RADIO=interface # uci set network.nwi_mesh_$CURRENT_RADIO=interface
uci set network.nwi_mesh_$CURRENT_RADIO.proto='batadv_hardif' # uci set network.nwi_mesh_$CURRENT_RADIO.proto='batadv_hardif'
uci set network.nwi_mesh_$CURRENT_RADIO.master='bat0' # uci set network.nwi_mesh_$CURRENT_RADIO.master='bat0'
uci set network.nwi_mesh_$CURRENT_RADIO.device='bat0' # uci set network.nwi_mesh_$CURRENT_RADIO.device='bat0'
uci set network.nwi_mesh_$CURRENT_RADIO.mtu='1536' # uci set network.nwi_mesh_$CURRENT_RADIO.mtu='1536'
uci set wireless.mesh_$CURRENT_RADIO=wifi-iface uci set wireless.mesh_$CURRENT_RADIO='wifi-iface'
uci set wireless.mesh_$CURRENT_RADIO.device=$CURRENT_RADIO uci set wireless.mesh_$CURRENT_RADIO.device="$CURRENT_RADIO"
uci set wireless.mesh_$CURRENT_RADIO.ifname=mesh_$CURRENT_RADIO uci set wireless.mesh_$CURRENT_RADIO.ifname="mesh_$CURRENT_RADIO"
uci set wireless.mesh_$CURRENT_RADIO.network=nwi_mesh_$CURRENT_RADIO uci set wireless.mesh_$CURRENT_RADIO.network='private_router_batman'
uci set wireless.mesh_$CURRENT_RADIO.mode='mesh' uci set wireless.mesh_$CURRENT_RADIO.mode='mesh'
uci set wireless.mesh_$CURRENT_RADIO.mesh_id=$MESH_NAME uci set wireless.mesh_$CURRENT_RADIO.mesh_id="$MESH_NAME"
uci set wireless.mesh_$CURRENT_RADIO.mesh_fwding='0' uci set wireless.mesh_$CURRENT_RADIO.mesh_fwding='0'
uci set wireless.mesh_$CURRENT_RADIO.mesh_rssi_threshold='0' uci set wireless.mesh_$CURRENT_RADIO.mesh_rssi_threshold='0'
uci set wireless.mesh_$CURRENT_RADIO.mesh_ttl='1' uci set wireless.mesh_$CURRENT_RADIO.mesh_ttl='1'
@ -288,8 +298,8 @@ disable_easymesh() {
# Loop through all the radios and delete the network interfaces # Loop through all the radios and delete the network interfaces
for CURRENT_RADIO in $WIFI_RADIOS; do for CURRENT_RADIO in $WIFI_RADIOS; do
echo "Handling removal of mesh networks for: $CURRENT_RADIO" echo "Handling removal of mesh networks for: $CURRENT_RADIO"
if [ "$(uci -q get network.nwi_mesh_$CURRENT_RADIO)" = "interface" ]; then if [ "$(uci -q get network.private_router_batman)" = "interface" ]; then
uci del network.nwi_mesh_$CURRENT_RADIO uci del network.private_router_batman
uci commit network uci commit network
fi fi
done done

Write Preview
Loading…
Cancel
Save