diff --git a/netifd/Makefile b/netifd/Makefile index f28e5db0f..790bcfec6 100644 --- a/netifd/Makefile +++ b/netifd/Makefile @@ -5,12 +5,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git -#PKG_SOURCE_DATE:=2023-11-20 -#PKG_SOURCE_VERSION:=f3e06e81b347bbdec1c6c71603328b6e442728d4 -#PKG_MIRROR_HASH:=f16dd61aede5597fd7b5ee8e7752a916494281bc981b35c16e788ddb7409584a -PKG_SOURCE_DATE:=2024-01-04 -PKG_SOURCE_VERSION:=f01345ec13b9b27ffd314d8689fb2d3f9c81a47d -PKG_MIRROR_HASH:=58e92e9ce1a2c8ccb487e95dadf806f38b38abbe7cb3cde61ff880de5eb85c2f +PKG_SOURCE_DATE:=2023-12-19 +PKG_SOURCE_VERSION:=a2d32f0dcf16880226680d07b07b249f77a3af58 +PKG_MIRROR_HASH:=765f51335ffa0a143421efbe129d484a90d7c4a0f3e08cb7840cc85408f3e60c PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=GPL-2.0 @@ -24,8 +21,7 @@ include $(INCLUDE_DIR)/cmake.mk define Package/netifd SECTION:=base CATEGORY:=Base system -# DEPENDS:=+libuci +libnl-tiny +libubus +ubus +ubusd +jshn +libubox +libudebug - DEPENDS:=+libuci +libnl-tiny +libubus +ubus +ubusd +jshn +libubox + DEPENDS:=+libuci +libnl-tiny +libubus +ubus +ubusd +jshn +libubox +libudebug TITLE:=OpenWrt Network Interface Configuration Daemon endef diff --git a/netifd/files/lib/netifd/dhcp.script b/netifd/files/lib/netifd/dhcp.script index 053dd75b6..db8deac9e 100755 --- a/netifd/files/lib/netifd/dhcp.script +++ b/netifd/files/lib/netifd/dhcp.script @@ -13,12 +13,11 @@ set_classless_routes() { done } -setup_interface() { +setup_interface () { proto_init_update "*" 1 proto_add_ipv4_address "$ip" "${subnet:-255.255.255.0}" # TODO: apply $broadcast - local ip_net local ip_net IP PREFIX NETWORK NETMASK BROADCAST ipcalc "$ip/$mask" && ip_net="$NETWORK" @@ -28,7 +27,6 @@ setup_interface() { ipcalc "$i/$mask" && gw_net="$NETWORK" [ "$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" local r diff --git a/netifd/files/sbin/ifup b/netifd/files/sbin/ifup index 15be535bb..fbf2fd80c 100755 --- a/netifd/files/sbin/ifup +++ b/netifd/files/sbin/ifup @@ -1,7 +1,6 @@ #!/bin/sh ifup_all= -setup_wifi= if_call() { local interface="$1" @@ -14,7 +13,6 @@ case "$0" in *ifdown) modes=down;; *ifup) modes="down up" - setup_wifi=1 ;; *) echo "Invalid command: $0";; esac @@ -25,10 +23,6 @@ while :; do ifup_all=1 shift ;; - -w) - setup_wifi= - shift - ;; *) break ;; @@ -40,7 +34,6 @@ if [ -n "$ifup_all" ]; then for interface in $(ubus -S list 'network.interface.*'); do if_call "${interface##network.interface.}" done - [ -n "$setup_wifi" ] && /sbin/wifi up exit else ubus -S list "network.interface.$1" > /dev/null || { @@ -49,29 +42,3 @@ else } if_call "$1" 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 diff --git a/netifd/patches/001-defin-RTN_POLICY_FAILED.patch b/netifd/patches/001-defin-RTN_POLICY_FAILED.patch deleted file mode 100644 index d7b530393..000000000 --- a/netifd/patches/001-defin-RTN_POLICY_FAILED.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/system-linux.c 2023-11-24 16:49:37.715537192 +0100 -+++ b/system-linux.c 2023-11-24 16:50:23.002742488 +0100 -@@ -53,6 +53,9 @@ - #ifndef RTN_FAILED_POLICY - #define RTN_FAILED_POLICY 12 - #endif -+#ifndef RTN_POLICY_FAILED -+#define RTN_POLICY_FAILED 12 -+#endif - - #ifndef IFA_F_NOPREFIXROUTE - #define IFA_F_NOPREFIXROUTE 0x200