forked from freifunk-franken/firmware
Compare commits
15 Commits
20220405-b
...
master
Author | SHA1 | Date | |
---|---|---|---|
e695b2a87a | |||
0d06be1749 | |||
bdfdbba76a | |||
baca28ece3 | |||
9bc3690cbd | |||
e6efc9671a | |||
a62f7cdf96 | |||
daf4467a8a | |||
b81c15d111 | |||
f8182af459 | |||
0dfa1140ff | |||
20d12f943e | |||
90c58d575b | |||
bc3c0b717d | |||
f3b1604ff3 |
|
@ -38,20 +38,20 @@ index ac11655904..147e159ea1 100755
|
|||
;;
|
||||
avm,fritzbox-7530 |\
|
||||
diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
|
||||
index 1d4c78833a..ea2cc60186 100755
|
||||
index 87c79db5e1..666be0d145 100755
|
||||
--- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
|
||||
+++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
|
||||
@@ -59,9 +59,8 @@ ipq40xx_setup_interfaces()
|
||||
@@ -58,9 +58,8 @@ ipq40xx_setup_interfaces()
|
||||
avm,fritzbox-4040|\
|
||||
linksys,ea6350v3|\
|
||||
linksys,ea8300|\
|
||||
linksys,mr8300)
|
||||
linksys,ea8300)
|
||||
- ucidef_set_interfaces_lan_wan "eth0" "eth1"
|
||||
ucidef_add_switch "switch0" \
|
||||
- "0u@eth0" "1:lan" "2:lan" "3:lan" "4:lan"
|
||||
+ "0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
|
||||
;;
|
||||
avm,fritzbox-7530)
|
||||
ucidef_add_switch "switch0" \
|
||||
linksys,mr8300)
|
||||
ucidef_set_interfaces_lan_wan "eth0" "eth1"
|
||||
diff --git a/target/linux/ipq40xx/files/drivers/net/ethernet/qualcomm/essedma/edma.h b/target/linux/ipq40xx/files/drivers/net/ethernet/qualcomm/essedma/edma.h
|
||||
index 015e5f5026..daa60639d1 100644
|
||||
--- a/target/linux/ipq40xx/files/drivers/net/ethernet/qualcomm/essedma/edma.h
|
||||
|
@ -80,10 +80,10 @@ index 015e5f5026..daa60639d1 100644
|
|||
/* Queues exposed to linux kernel */
|
||||
#define EDMA_NETDEV_TX_QUEUE 4
|
||||
diff --git a/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c b/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c
|
||||
index c35ba2799f..0517e4f29e 100644
|
||||
index 545e3985ae..28453c2363 100644
|
||||
--- a/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c
|
||||
+++ b/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c
|
||||
@@ -1481,6 +1481,7 @@ ar40xx_vlan_init(struct ar40xx_priv *priv)
|
||||
@@ -1483,6 +1483,7 @@ ar40xx_vlan_init(struct ar40xx_priv *priv)
|
||||
unsigned long bmp;
|
||||
|
||||
/* By default Enable VLAN */
|
||||
|
@ -91,7 +91,7 @@ index c35ba2799f..0517e4f29e 100644
|
|||
priv->vlan = 1;
|
||||
priv->vlan_table[AR40XX_LAN_VLAN] = priv->cpu_bmp | priv->lan_bmp;
|
||||
priv->vlan_table[AR40XX_WAN_VLAN] = priv->cpu_bmp | priv->wan_bmp;
|
||||
@@ -1492,6 +1493,7 @@ ar40xx_vlan_init(struct ar40xx_priv *priv)
|
||||
@@ -1494,6 +1495,7 @@ ar40xx_vlan_init(struct ar40xx_priv *priv)
|
||||
bmp = priv->wan_bmp;
|
||||
for_each_set_bit(port, &bmp, AR40XX_NUM_PORTS)
|
||||
priv->pvid[port] = AR40XX_WAN_VLAN;
|
||||
|
@ -100,7 +100,7 @@ index c35ba2799f..0517e4f29e 100644
|
|||
return 0;
|
||||
}
|
||||
diff --git a/target/linux/ipq40xx/patches-5.4/711-dts-ipq4019-add-ethernet-essedma-node.patch b/target/linux/ipq40xx/patches-5.4/711-dts-ipq4019-add-ethernet-essedma-node.patch
|
||||
index 7b2ddfe00d..1a01b08e41 100644
|
||||
index 3567eb7810..b13b312a91 100644
|
||||
--- a/target/linux/ipq40xx/patches-5.4/711-dts-ipq4019-add-ethernet-essedma-node.patch
|
||||
+++ b/target/linux/ipq40xx/patches-5.4/711-dts-ipq4019-add-ethernet-essedma-node.patch
|
||||
@@ -36,7 +36,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
|
||||
|
|
25
buildscript
25
buildscript
|
@ -7,9 +7,9 @@ set -o pipefail
|
|||
builddir=./build
|
||||
|
||||
# OpenWrt: package hashes correspond to core repo version
|
||||
OPENWRTREV="v21.02.2"
|
||||
PACKAGEREV="b0ccc356900f6e1e1dc613d0ea980d5572f553dd"
|
||||
ROUTINGREV="10d3ffd8b30186b49538167bac1fa1bf9c88f860"
|
||||
OPENWRTREV="v21.02.5"
|
||||
PACKAGEREV="0b16e3f359fe9d015861596d63c5bde4c56daa2e"
|
||||
ROUTINGREV="25e76489c83cfcee61e36a491896e1e9bfc3ec13"
|
||||
|
||||
# Gluon packages: master from 2020-02-04
|
||||
GLUONREV="12e41d0ff07ec54bbd67a31ab50d12ca04f2238c"
|
||||
|
@ -208,13 +208,19 @@ build() {
|
|||
|
||||
case "$1" in
|
||||
"debug")
|
||||
if [ -n "$2" ]; then
|
||||
make V=99 -j $2
|
||||
else
|
||||
make V=99
|
||||
fi
|
||||
;;
|
||||
"fast")
|
||||
ionice -c 2 -- nice -n 1 -- make -j $((cpus*2))
|
||||
[ -n "$2" ] && threads=$2 || threads=$((cpus*2))
|
||||
ionice -c 2 -- nice -n 1 -- make -j $threads
|
||||
;;
|
||||
*)
|
||||
ionice -c 3 -- nice -n 10 -- make -j $((cpus+1))
|
||||
[ -n "$2" ] && threads=$2 || threads=$((cpus+1))
|
||||
ionice -c 3 -- nice -n 10 -- make -j $threads
|
||||
;;
|
||||
esac
|
||||
|
||||
|
@ -312,8 +318,7 @@ buildrelease() {
|
|||
fi
|
||||
|
||||
cd bin/$variant
|
||||
for binary in *.bin *.img *.tar; do
|
||||
md5sum "$binary" > ./"$binary".md5
|
||||
for binary in *.bin *.img *.img.gz *.tar; do
|
||||
sha256sum "$binary" > ./"$binary".sha256
|
||||
done
|
||||
echo -e "VERSION:$version" > release.nfo
|
||||
|
@ -445,13 +450,13 @@ case "$1" in
|
|||
"build")
|
||||
if [ "$2" = "help" ] || [ "$2" = "x" ]; then
|
||||
echo "This option compiles the firmware"
|
||||
echo "Normaly the build uses lower IO and System priorities, "
|
||||
echo "Normally the build uses lower IO and System priorities, "
|
||||
echo "you can append \"fast\" option, to use normal user priorities"
|
||||
echo
|
||||
echo "Usage: $0 $1 [fast|debug]"
|
||||
echo "Usage: $0 $1 [fast|debug] [numthreads]"
|
||||
echo
|
||||
else
|
||||
build "$2"
|
||||
build "$2" "$3"
|
||||
fi
|
||||
;;
|
||||
"config")
|
||||
|
|
|
@ -45,7 +45,7 @@ protocol direct {
|
|||
}
|
||||
|
||||
# only import GUA + ULA addresses
|
||||
if net !~ 2000::/3 from ::/0 || net !~ fc00::/7 from ::/0 then {
|
||||
if net !~ 2000::/3 from ::/0 && net !~ fc00::/7 from ::/0 then {
|
||||
reject;
|
||||
}
|
||||
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
execute_subshell() {
|
||||
if [ $# -ne 1 ]; then
|
||||
echo "Usage:" "$0" "<function>"
|
||||
return 1
|
||||
fi
|
||||
|
||||
for script in /etc/layer3.d/*; do
|
||||
|
@ -23,7 +24,7 @@ execute_subshell() {
|
|||
if [ $? -ne 0 ]; then
|
||||
echo
|
||||
echo "Error when executing" "$1" "from" "$(basename "$script")"
|
||||
exit 1
|
||||
return 1
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
@ -32,29 +33,33 @@ configure() {
|
|||
echo "This script might remove existing vlans, interfaces, addresses, etc."
|
||||
read -r -p "Do you really want to continue? (y/n) " response
|
||||
if ! ( [ "$response" == "y" ] || [ "$response" == "Y" ] ); then
|
||||
exit 1
|
||||
return 1
|
||||
fi
|
||||
|
||||
echo
|
||||
execute_subshell configure
|
||||
execute_subshell configure || return $?
|
||||
|
||||
exit 0
|
||||
return 0
|
||||
}
|
||||
|
||||
reload_services() {
|
||||
execute_subshell reload
|
||||
reload_config
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
apply_changes() {
|
||||
execute_subshell apply
|
||||
reload_services
|
||||
exit 0
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
revert_changes() {
|
||||
execute_subshell revert
|
||||
exit 0
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
keep_changes() {
|
||||
|
|
|
@ -116,7 +116,7 @@ fi
|
|||
# Checks if fastd is running
|
||||
vpn_active=0
|
||||
pidof fastd >/dev/null && vpn_active=1
|
||||
bridge fdb show brport vxlan0 state permanent >/dev/null && vpn_active=1
|
||||
bridge fdb show brport vxlan0 state permanent &>/dev/null && vpn_active=1
|
||||
SYSTEM_DATA="$SYSTEM_DATA<vpn_active>$vpn_active</vpn_active>"
|
||||
|
||||
echo -n "<system_data>$SYSTEM_DATA</system_data>"
|
||||
|
|
|
@ -5,6 +5,12 @@ uci batch <<EOF
|
|||
set dhcp.client.ra_default='2'
|
||||
set dhcp.client.ra_management='0'
|
||||
set dhcp.client.ra_useleasetime='1'
|
||||
|
||||
# Work around unexpected behavior of odhcpd (see #238).
|
||||
#
|
||||
# This value has to be less then or equal to
|
||||
# dhcp.client.leasetime (set in fff-dhcp).
|
||||
set dhcp.client.preferred_lifetime='1h'
|
||||
EOF
|
||||
|
||||
exit 0
|
||||
|
|
|
@ -65,9 +65,12 @@ fi
|
|||
if [ -s /tmp/isupdate ] ; then
|
||||
VERSION=$(cat /tmp/isupdate)
|
||||
%>
|
||||
<table style="width: 100%;">
|
||||
<tr>
|
||||
<td><span style="font-size: 16pt; color:#FF0000">Es ist eine neue Firmware für deinen Freifunkrouter verfügbar.<br />Alte Version: <%= ${FIRMWARE_VERSION} %> - Neue Version: <%= ${VERSION} %> <br /><a href="upgrade.html">Firmware jetzt updaten</a></span></td>
|
||||
</tr>
|
||||
<div id="updatenotification" style="padding: 15px; margin: 4px; background-color: #cfcfcf; margin-bottom: 15px;">
|
||||
<h3 style="font-size: 14pt; font-weight: bold; margin-bottom: 10px;">Es ist eine neue Firmware für deinen Freifunkrouter verfügbar!</h3>
|
||||
<table style="margin-bottom: 10px;">
|
||||
<tr><td>Installierte Version: </td><td><b><%= ${FIRMWARE_VERSION} %></b></td></tr>
|
||||
<tr><td>Neue Version: </td><td><b><%= ${VERSION} %></b></td></tr>
|
||||
</table>
|
||||
<a href="https://dev.freifunk-franken.de" target="_blank">Zum Download</a> | <a href="upgrade.html">Zur Upgradeseite</a>
|
||||
</div>
|
||||
<% fi %>
|
||||
|
|
|
@ -61,8 +61,8 @@ contact="$(uci -q get "fff.system.contact")"
|
|||
<legend>Status</legend>
|
||||
<table>
|
||||
<tr><th>Hood:</th><td><% echo "$hood" %></td></tr>
|
||||
<tr><th>Bekannte Knoten:</th><td><% echo -n $(($(batctl tg -H | cut -b 40-56 | sort | uniq | wc -l 2> /dev/null)+1)) %></td></tr>
|
||||
<tr><th>Nachbarknoten:</th><td><% echo -n $(batctl o -H | cut -b 40-56 | sort | uniq | wc -l 2> /dev/null) %></td></tr>
|
||||
<tr><th>Bekannte Knoten:</th><td><% echo -n $(($(batctl tg -H 2>/dev/null | cut -b 40-56 | sort | uniq | wc -l)+1)) %></td></tr>
|
||||
<tr><th>Nachbarknoten:</th><td><% echo -n $(batctl o -H 2>/dev/null | cut -b 40-56 | sort | uniq | wc -l) %></td></tr>
|
||||
<tr><th>Lokale Clients:</th><td><% echo -n $(batctl tl -H 2> /dev/null | grep -c 'W') %></td></tr>
|
||||
</table>
|
||||
</fieldset>
|
||||
|
|
|
@ -59,8 +59,8 @@ fi
|
|||
<tr><th>Name:</th><td><%= ${HOSTNAME} %></td></tr>
|
||||
<tr><th>Modell:</th><td><% cat /tmp/sysinfo/model 2>/dev/null %></td></tr>
|
||||
<tr><th>MAC-Adresse:</th><td><%= $(cat /sys/class/net/br-client/address) %></td></tr>
|
||||
<tr><th>Bekannte Knoten:</th><td><%= $(($(batctl tg -H | cut -b 40-56 | sort | uniq | wc -l 2>/dev/null)+1)) %></td></tr>
|
||||
<tr><th>Nachbarknoten:</th><td><%= $(batctl o -H | cut -b 40-56 | sort | uniq | wc -l 2>/dev/null) %></td></tr>
|
||||
<tr><th>Bekannte Knoten:</th><td><%= $(($(batctl tg -H 2>/dev/null | cut -b 40-56 | sort | uniq | wc -l)+1)) %></td></tr>
|
||||
<tr><th>Nachbarknoten:</th><td><%= $(batctl o -H 2>/dev/null | cut -b 40-56 | sort | uniq | wc -l) %></td></tr>
|
||||
<tr><th>VPN via fastd:</th><td><%= ${vpn_active} %></td></tr>
|
||||
<tr><th>fastd public key:</th><td><%= ${fastd_pub} %></td></tr>
|
||||
<tr><th>Laufzeit:</th><td><%= ${uptime} %></td></tr>
|
||||
|
|
|
@ -9,8 +9,8 @@ if [ "$REQUEST_METHOD" = "POST" ] ; then
|
|||
echo "ETHMODE=\"${POST_mode}\" # set via WebUI" >> /etc/network.config
|
||||
sed -i '/^FORCEPARSE/d' /etc/network.config
|
||||
echo "FORCEPARSE='2'" >> /etc/network.config
|
||||
do_reboot=1
|
||||
MSG='<span class="green">Port Modus geändert! Router startet neu...</span>'
|
||||
do_reconfigure=1
|
||||
MSG='<span class="green">Port Modus wird geändert!</span>'
|
||||
fi
|
||||
if [ "$POST_change_twoport" != "" ] ; then
|
||||
sed -i '/^.*# set via WebUI/d' /etc/network.config
|
||||
|
@ -18,8 +18,8 @@ if [ "$REQUEST_METHOD" = "POST" ] ; then
|
|||
echo "LAN1MODE=\"${POST_mode1}\" # set via WebUI" >> /etc/network.config
|
||||
sed -i '/^FORCEPARSE/d' /etc/network.config
|
||||
echo "FORCEPARSE='2'" >> /etc/network.config
|
||||
do_reboot=1
|
||||
MSG='<span class="green">Port Modus geändert! Router startet neu...</span>'
|
||||
do_reconfigure=1
|
||||
MSG='<span class="green">Port Modus wird geändert!</span>'
|
||||
fi
|
||||
fi
|
||||
|
||||
|
@ -182,13 +182,12 @@ format_port() {
|
|||
|
||||
Wenn diese Einstellung verändert wird, wird eine evtl. vorhandene manuelle Netzwerkkonfiguration in der
|
||||
<tt>/etc/config/network</tt> überschrieben.<br />
|
||||
Anschließend wird der Router neugestartet.
|
||||
</td></tr>
|
||||
</table>
|
||||
</fieldset>
|
||||
</td></tr>
|
||||
<% fi %>
|
||||
<% if grep -q "LAN0PORT" "/etc/network.$board_name" || grep -q "LAN1PORT" "/etc/network.$board_name" ; then %>
|
||||
<% if grep -q "TWO_PORT" "/etc/network.$board_name" ; then %>
|
||||
<%
|
||||
# Device has two ports
|
||||
. /etc/network.mode
|
||||
|
@ -228,7 +227,6 @@ format_port() {
|
|||
|
||||
Wenn diese Einstellung verändert wird, wird eine evtl. vorhandene manuelle Netzwerkkonfiguration in der
|
||||
<tt>/etc/config/network</tt> überschrieben.<br />
|
||||
Anschließend wird der Router neugestartet.
|
||||
</td></tr>
|
||||
</table>
|
||||
</fieldset>
|
||||
|
@ -239,7 +237,7 @@ format_port() {
|
|||
<%in /www/include/footer %>
|
||||
<%
|
||||
# write
|
||||
if [ "$do_reboot" = "1" ] ; then
|
||||
reboot
|
||||
if [ "$do_reconfigure" = "1" ] ; then
|
||||
configurenetwork
|
||||
fi
|
||||
%>
|
||||
|
|
|
@ -61,7 +61,7 @@ if [ "$REQUEST_METHOD" = "POST" ] ; then
|
|||
|
||||
uci -q commit
|
||||
|
||||
MSG='<span class="green">Daten gespeichert! - Bitte Router neustarten.</span>'
|
||||
MSG='<span class="green">Daten gespeichert!</span>'
|
||||
fi
|
||||
fi
|
||||
%>
|
||||
|
|
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue
Block a user