fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Official Source

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2022-11-08 13:44:49 +08:00
commit a3656342f3
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
9 changed files with 95 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/network/services/dnsmasq/Makefile
View File

@ -85,7 +85,7 @@ define Package/dnsmasq-full/description
$(call Package/dnsmasq/description)
This is a fully configurable variant with DHCPv4, DHCPv6, DNSSEC, Authoritative DNS
and IPset, Conntrack support & NO_ID enabled by default.
and nftset, Conntrack support & NO_ID enabled by default.
endef
define Package/dnsmasq/conffiles

54
package/network/services/dnsmasq/files/dnsmasq.init
View File

@ -539,6 +539,15 @@ dhcp_add() {
# Override interface netmask with dhcp config if applicable
config_get netmask "$cfg" netmask "${subnet##*/}"
#check for an already active dhcp server on the interface, unless 'force' is set
config_get_bool force "$cfg" force 0
[ $force -gt 0 ] || dhcp_check "$ifname" || {
logger -t dnsmasq \
"found already running DHCP-server on interface '$ifname'" \
"refusing to start, use 'option force 1' to override"
return 0
}
config_get start "$cfg" start 100
config_get limit "$cfg" limit 150
config_get leasetime "$cfg" leasetime 12h
@ -795,14 +804,17 @@ dnsmasq_ipset_add() {
add_nftset() {
local IFS=,
for set in $1; do
local family=$(echo "$set" | sed -nre 's#^.*[^0-9]([46])$#\1#p')
[ -n "$family" ] || \
family=$(nft -t list set inet "$table" "$set" 2>&1 | sed -nre 's#^\t\ttype .*\bipv([46])_addr\b.*$#\1#p')
local fam="$family"
[ -n "$fam" ] || fam=$(echo "$set" | sed -nre \
's#^.*[^0-9]([46])$|^.*[-_]([46])[-_].*$|^([46])[^0-9].*$#\1\2\3#p')
[ -n "$fam" ] || \
fam=$(nft -t list set "$table_family" "$table" "$set" 2>&1 | sed -nre \
's#^\t\ttype .*\bipv([46])_addr\b.*$#\1#p')
[ -n "$family" ] || \
[ -n "$fam" ] || \
logger -t dnsmasq "Cannot infer address family from non-existent nftables set '$set'"
nftsets="${nftsets:+$nftsets,}${family:+$family#}inet#$table#$set"
nftsets="${nftsets:+$nftsets,}${fam:+$fam#}$table_family#$table#$set"
done
}
@ -810,7 +822,17 @@ dnsmasq_ipset_add() {
# leading '/' is expected
domains="$domains/$1"
}
config_get table "$cfg" table 'fw4'
config_get table_family "$cfg" table_family 'inet'
if [ "$table_family" = "ip" ] ; then
family="4"
elif [ "$table_family" = "ip6" ] ; then
family="6"
else
config_get family "$cfg" family
fi
config_list_foreach "$cfg" "name" add_ipset
config_list_foreach "$cfg" "name" add_nftset
config_list_foreach "$cfg" "domain" add_domain
@ -864,12 +886,6 @@ dnsmasq_start()
xappend "--conf-file=${dnsmasqconffile}"
}
config_get_bool boguspriv "$cfg" boguspriv 1
[ "$boguspriv" -gt 0 ] && {
xappend "--bogus-priv"
[ -r "$RFC6761FILE" ] && xappend "--conf-file=$RFC6761FILE"
}
$PROG --version | grep -osqE "^Compile time options:.* DHCPv6( |$)" && DHCPv6CAPABLE=1 || DHCPv6CAPABLE=0
@ -946,11 +962,9 @@ dnsmasq_start()
append_bool "$cfg" filter_a "--filter-A"
append_bool "$cfg" filter_aaaa "--filter-AAAA"
append_parm "$cfg" logfacility "--log-facility"
append_parm "$cfg" mini_ttl "--min-ttl"
append_parm "$cfg" logfacility "--log-facility"
config_get logfacility "$cfg" "logfacility"
append_parm "$cfg" cachesize "--cache-size"
append_parm "$cfg" dnsforwardmax "--dns-forward-max"
@ -983,8 +997,8 @@ dnsmasq_start()
xappend "--addn-hosts=$HOSTFILE"
append EXTRA_MOUNT "$HOSTFILE"
else
xappend "--addn-hosts=$(dirname $HOSTFILE)"
append EXTRA_MOUNT "$(dirname $HOSTFILE)"
xappend "--addn-hosts=$HOSTFILE_DIR"
append EXTRA_MOUNT "$HOSTFILE_DIR"
fi
config_list_foreach "$cfg" "addnhosts" append_addnhosts
config_list_foreach "$cfg" "bogusnxdomain" append_bogusnxdomain
@ -1088,6 +1102,7 @@ dnsmasq_start()
xappend "--dhcp-broadcast=tag:needs-broadcast"
config_get dnsmasqconfdir "$cfg" confdir "/tmp/dnsmasq.d"
xappend "--conf-dir=$dnsmasqconfdir"
dnsmasqconfdir="${dnsmasqconfdir%%,*}"
@ -1129,6 +1144,11 @@ dnsmasq_start()
config_foreach filter_dnsmasq mxhost dhcp_mx_add "$cfg"
echo >> $CONFIGFILE_TMP
config_get_bool boguspriv "$cfg" boguspriv 1
[ "$boguspriv" -gt 0 ] && {
xappend "--bogus-priv"
[ -r "$RFC6761FILE" ] && xappend "--conf-file=$RFC6761FILE"
}
if [ "$DNSMASQ_DHCP_VER" -gt 4 ] ; then
# Enable RA feature for when/if it is constructed,
@ -1152,7 +1172,6 @@ dnsmasq_start()
config_foreach filter_dnsmasq ipset dnsmasq_ipset_add "$cfg"
echo >> $CONFIGFILE_TMP
echo >> $CONFIGFILE_TMP
mv -f $CONFIGFILE_TMP $CONFIGFILE
mv -f $HOSTFILE_TMP $HOSTFILE
@ -1328,5 +1347,6 @@ stop_service() {
else
config_foreach dnsmasq_stop dnsmasq
fi
nftables_clear
}

3
target/linux/ramips/dts/mt7621_glinet_gl-mt1300.dts
View File

@ -67,8 +67,7 @@
flash@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <80000000>;
m25p,fast-read;
spi-max-frequency = <50000000>;
broken-flash-reset;
partitions {

16
target/linux/ramips/dts/mt7628an_tplink_re200-v2.dts
View File

@ -5,4 +5,20 @@
/ {
compatible = "tplink,re200-v2", "mediatek,mt7628an-soc";
model = "TP-Link RE200 v2";
leds {
wifi2g_red {
label = "red:wifi2g";
gpios = <&gpio 43 GPIO_ACTIVE_LOW>;
};
wifi5g_red {
label = "red:wifi5g";
gpios = <&gpio 40 GPIO_ACTIVE_LOW>;
};
};
};
&led_power {
gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
};

11
target/linux/ramips/dts/mt7628an_tplink_re200-v3.dts
View File

@ -5,4 +5,15 @@
/ {
compatible = "tplink,re200-v3", "mediatek,mt7628an-soc";
model = "TP-Link RE200 v3";
leds {
wifi_red {
label = "red:wifi";
gpios = <&gpio 40 GPIO_ACTIVE_LOW>;
};
};
};
&led_power {
gpios = <&gpio 43 GPIO_ACTIVE_LOW>;
};

11
target/linux/ramips/dts/mt7628an_tplink_re200-v4.dts
View File

@ -5,4 +5,15 @@
/ {
compatible = "tplink,re200-v4", "mediatek,mt7628an-soc";
model = "TP-Link RE200 v4";
leds {
wifi_red {
label = "red:wifi";
gpios = <&gpio 40 GPIO_ACTIVE_LOW>;
};
};
};
&led_power {
gpios = <&gpio 43 GPIO_ACTIVE_LOW>;
};

11
target/linux/ramips/dts/mt7628an_tplink_re200.dtsi
View File

@ -54,7 +54,6 @@
led_power: power {
label = "green:power";
gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
};
wifi2g_green {
@ -68,16 +67,6 @@
gpios = <&gpio 42 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy1tpt";
};
wifi2g_red {
label = "red:wifi2g";
gpios = <&gpio 43 GPIO_ACTIVE_LOW>;
};
wifi5g_red {
label = "red:wifi5g";
gpios = <&gpio 40 GPIO_ACTIVE_LOW>;
};
};
};

16
target/linux/ramips/dts/mt7628an_tplink_re220-v2.dts
View File

@ -5,4 +5,20 @@
/ {
compatible = "tplink,re220-v2", "mediatek,mt7628an-soc";
model = "TP-Link RE220 v2";
leds {
wifi2g_red {
label = "red:wifi2g";
gpios = <&gpio 43 GPIO_ACTIVE_LOW>;
};
wifi5g_red {
label = "red:wifi5g";
gpios = <&gpio 40 GPIO_ACTIVE_LOW>;
};
};
};
&led_power {
gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
};

4
target/sdk/Makefile
View File

@ -46,10 +46,10 @@ GIT_COMMIT:=$(shell git rev-parse HEAD 2>/dev/null)
GIT_BRANCH:=$(filter-out HEAD,$(shell git rev-parse --abbrev-ref HEAD 2>/dev/null))
GIT_TAGNAME:=$(shell git show-ref --tags --dereference 2>/dev/null | sed -ne '/^$(GIT_COMMIT) / { s|^.*/||; s|\^.*||; p }')
BASE_FEED:=$(if $(GIT_URL),src-git base $(GIT_URL)$(if $(GIT_BRANCH),;$(GIT_BRANCH),$(if $(GIT_TAGNAME),;$(GIT_TAGNAME))))
BASE_FEED:=$(if $(GIT_URL),src-git-full base $(GIT_URL)$(if $(GIT_BRANCH),;$(GIT_BRANCH),$(if $(GIT_TAGNAME),;$(GIT_TAGNAME))))
BASE_FEED:=$(if $(BASE_FEED),$(BASE_FEED),$(shell cd $(TOPDIR); LC_ALL=C git svn info 2>/dev/null | sed -ne 's/^URL: /src-gitsvn base /p'))
BASE_FEED:=$(if $(BASE_FEED),$(BASE_FEED),$(shell cd $(TOPDIR); LC_ALL=C svn info 2>/dev/null | sed -ne 's/^URL: /src-svn base /p'))
BASE_FEED:=$(if $(BASE_FEED),$(BASE_FEED),src-git base $(PROJECT_GIT)/openwrt/openwrt.git$(if $(GIT_BRANCH),;$(GIT_BRANCH),$(if $(GIT_TAGNAME),;$(GIT_TAGNAME))))
BASE_FEED:=$(if $(BASE_FEED),$(BASE_FEED),src-git-full base $(PROJECT_GIT)/openwrt/openwrt.git$(if $(GIT_BRANCH),;$(GIT_BRANCH),$(if $(GIT_TAGNAME),;$(GIT_TAGNAME))))
KDIR_BASE = $(patsubst $(TOPDIR)/%,%,$(LINUX_DIR))
KDIR_ARCHES = $(LINUX_KARCH)