mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00
Code Issues Releases Wiki Activity

fix

Browse source
This commit is contained in:
suyuan 2023-10-18 23:50:31 +08:00
parent ccc43d04e6
commit 9aa580a13f
3 changed files with 38 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
netifd/Makefile
View file

@ -5,9 +5,9 @@ PKG_RELEASE:=3
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git
PKG_SOURCE_DATE:=2023-09-15.1 PKG_SOURCE_DATE:=2023-08-31
PKG_SOURCE_VERSION:=afcd3825dad9b6a6712fbf6ed8e4434819a34009 PKG_SOURCE_VERSION:=1a07f1dff32b3af49e39533e33e8964b59535662
PKG_MIRROR_HASH:=d389db5dec7140fc12f69e8d679b9242c72d27b35c789b12adc6ebdf16913a85 PKG_MIRROR_HASH:=dc621dd04c3c9631002f929cf10a4620f57af8b0baf614c590bda17957fa6201
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name> PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0

1
netifd/files/lib/netifd/dhcp.script
View file

@ -27,6 +27,7 @@ setup_interface () {
eval "$(ipcalc.sh "$i/$mask")";gw_net="$NETWORK" eval "$(ipcalc.sh "$i/$mask")";gw_net="$NETWORK"
[ "$ip_net" != "$gw_net" ] && proto_add_ipv4_route "$i" 32 "" "$ip" [ "$ip_net" != "$gw_net" ] && proto_add_ipv4_route "$i" 32 "" "$ip"
#[ "$DEFAULTROUTE" = 0 ] || proto_add_ipv4_route 0.0.0.0 0 "$i" "$ip"
proto_add_ipv4_route 0.0.0.0 0 "$i" "$ip" proto_add_ipv4_route 0.0.0.0 0 "$i" "$ip"
local r local r

33
netifd/files/sbin/ifup
View file

@ -1,6 +1,7 @@
#!/bin/sh #!/bin/sh
ifup_all= ifup_all=
setup_wifi=
if_call() { if_call() {
local interface="$1" local interface="$1"
@ -13,6 +14,7 @@ case "$0" in
*ifdown) modes=down;; *ifdown) modes=down;;
*ifup) *ifup)
modes="down up" modes="down up"
setup_wifi=1
;; ;;
*) echo "Invalid command: $0";; *) echo "Invalid command: $0";;
esac esac
@ -23,6 +25,10 @@ while :; do
ifup_all=1 ifup_all=1
shift shift
;; ;;
-w)
setup_wifi=
shift
;;
*) *)
break break
;; ;;
@ -34,6 +40,7 @@ if [ -n "$ifup_all" ]; then
for interface in $(ubus -S list 'network.interface.*'); do for interface in $(ubus -S list 'network.interface.*'); do
if_call "${interface##network.interface.}" if_call "${interface##network.interface.}"
done done
[ -n "$setup_wifi" ] && /sbin/wifi up
exit exit
else else
ubus -S list "network.interface.$1" > /dev/null || { ubus -S list "network.interface.$1" > /dev/null || {
@ -42,3 +49,29 @@ else
} }
if_call "$1" if_call "$1"
fi fi
if [ -n "$setup_wifi" ] && grep -sq config /etc/config/wireless; then
. /lib/functions.sh
find_related_radios() {
local wdev wnet
config_get wdev "$1" device
config_get wnet "$1" network
if [ -n "$wdev" ]; then
for wnet in $wnet; do
if [ "$wnet" = "$network" ]; then
append radio_devs "$wdev" "$N"
fi
done
fi
}
network="$1"
config_load wireless
config_foreach find_related_radios wifi-iface
for dev in $(echo "$radio_devs" | sort -u); do
/sbin/wifi up "$dev"
done
fi