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

sync (#451)

Browse source
This commit is contained in:
suyuan 2024-03-11 22:15:15 +08:00 committed by GitHub
commit 5b0c276e6e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
netxen-nic/Makefile
View file

@ -34,6 +34,6 @@ define KernelPackage/netxen-nic
KCONFIG := CONFIG_NETXEN_NIC=m
FILES := $(PKG_BUILD_DIR)/drivers/net/ethernet/qlogic/netxen/netxen_nic.ko
AUTOLOAD := $(call AutoProbe,netxen_nic)
DEPENDS := @PCI_SUPPORT
DEPENDS := @PCI_SUPPORT +netxen-firmware
endef
$(eval $(call KernelPackage,netxen-nic))

19
omr-bypass/files/etc/init.d/omr-bypass-nft
View file

@ -59,11 +59,11 @@ _bypass_ip() {
valid_ip4=$( valid_subnet4 $ip)
valid_ip6=$( valid_subnet6 $ip)
if [ "$valid_ip4" = "ok" ]; then
uci -q add_list firewall.omr_dst_bypass_${type}_4.entry=$ip
uci -q add_list firewall.omr_dst_bypass_${type}_4.entry="$ip"
uci -q set firewall.omr_dst_bypass_${type}_4.enabled='1'
uci -q set firewall.omr_dst_bypass_${type}_dstip_4.enabled='1'
elif [ "$valid_ip6" = "ok" ]; then
uci -q add_list firewall.omr_dst_bypass_${type}_6.entry=$ip
uci -q add_list firewall.omr_dst_bypass_${type}_6.entry="$ip"
uci -q set firewall.omr_dst_bypass_${type}_6.enabled='1'
uci -q set firewall.omr_dst_bypass_${type}_dstip_6.enabled='1'
fi
@ -141,7 +141,7 @@ _bypass_domain() {
fi
fi
if [ "$(uci -q get dhcp.omr_dst_bypass_$intf | grep /$domain/)" = "" ]; then
uci -q add_list dhcp.omr_dst_bypass_$intf.domain=$domain
uci -q add_list dhcp.omr_dst_bypass_$intf.domain="$domain"
add_domains="true"
fi
if [ "$(uci -q get dhcp.@dnsmasq[0].noipv6 | grep /$domain/)" = "" ] && [ "$noipv6" = "1" ]; then
@ -420,6 +420,7 @@ _bypass_proto_without_ndpi() {
set firewall.bypass_$proto=ipset
set firewall.bypass_$proto.name="bypass_$proto"
set firewall.bypass_$proto.match='dest_ip'
set firewall.bypass_$proto.family='ipv4'
set firewall.bypass_$proto_rule=rule
set firewall.bypass_$proto_rule.name="bypass_$proto"
set firewall.bypass_$proto_rule.src='lan'
@ -432,6 +433,7 @@ _bypass_proto_without_ndpi() {
set firewall.bypass6_$proto=ipset
set firewall.bypass6_$proto.name="bypas6s_$proto"
set firewall.bypass6_$proto.match='dest_ip'
set firewall.bypass6_$proto.family='ipv6'
set firewall.bypass6_$proto_rule=rule
set firewall.bypass6_$proto_rule.name="bypass6_$proto"
set firewall.bypass6_$proto_rule.src='lan'
@ -469,10 +471,10 @@ _bypass_proto_without_ndpi() {
if [ "$valid_ip4" = "ok" ]; then
if [ "$vpn" != "1" ]; then
#ipset -q add bypass_$proto $ip
uci -q add_list firewall.bypass_$proto.entry=$ip
uci -q add_list firewall.bypass_$proto.entry="$ip"
else
#ipset -q add omr_dst_bypass_$intf $ip
uci -q add_list firewall.omr_dst_bypass_${intf}_4.entry=$ip
uci -q add_list firewall.omr_dst_bypass_${intf}_4.entry="$ip"
fi
elif [ "$valid_ip6" = "ok" ]; then
if [ "$vpn" != "1" ]; then
@ -480,7 +482,7 @@ _bypass_proto_without_ndpi() {
uci -q add_list firewall.bypass6_$proto.entry=$ip
else
#ipset -q add omr6_dst_bypass_$intf $ip
uci -q add_list firewall.omr_dst_bypass_${intf}_6.entry=$ip
uci -q add_list firewall.omr_dst_bypass_${intf}_6.entry="$ip"
fi
fi
done
@ -593,10 +595,12 @@ _intf_rule() {
set firewall.omr_dst_bypass_${intf}_4=ipset
set firewall.omr_dst_bypass_${intf}_4.name="omr_dst_bypass_${intf}_4"
set firewall.omr_dst_bypass_${intf}_4.match='dest_ip'
set firewall.omr_dst_bypass_${intf}_4.family='ipv4'
set firewall.omr_dst_bypass_${intf}_4.enabled='1'
set firewall.omr_dst_bypass_${intf}_6=ipset
set firewall.omr_dst_bypass_${intf}_6.name="omr_dst_bypass_${intf}_6"
set firewall.omr_dst_bypass_${intf}_6.match='dest_ip'
set firewall.omr_dst_bypass_${intf}_6.family='ipv6'
set firewall.omr_dst_bypass_${intf}_6.enabled='1'
EOF
#echo "firewall omr_dst_bypass rules"
@ -614,12 +618,14 @@ _intf_rule() {
set firewall.omr_dst_bypass_${intf}_dstip_${ipv46}.target='MARK'
set firewall.omr_dst_bypass_${intf}_dstip_${ipv46}.src='lan'
set firewall.omr_dst_bypass_${intf}_dstip_${ipv46}.dest='*'
set firewall.omr_dst_bypass_${intf}_dstip_${ipv46}.family="ipv${ipv46}"
set firewall.omr_dst_bypass_${intf}_dstip_${ipv46}.enabled='0'
set firewall.omr_dst_bypass_${intf}_dstip_${ipv46}.set_mark="0x${ipv46}539${count}"
set firewall.omr_dst_bypass_${intf}_dstip_${ipv46}_accept=rule
set firewall.omr_dst_bypass_${intf}_dstip_${ipv46}_accept.name="omr_dst_bypass_${intf}_rule_accept"
set firewall.omr_dst_bypass_${intf}_dstip_${ipv46}_accept.target='ACCEPT'
set firewall.omr_dst_bypass_${intf}_dstip_${ipv46}_accept.dest='*'
set firewall.omr_dst_bypass_${intf}_dstip_${ipv46}_accept.family="ipv${ipv46}"
set firewall.omr_dst_bypass_${intf}_dstip_${ipv46}_accept.enabled='0'
set firewall.omr_dst_bypass_${intf}_dstip_${ipv46}_accept.mark="0x${ipv46}539${count}"
set firewall.omr_dst_bypass_${intf}_srcip_${ipv46}=rule
@ -627,6 +633,7 @@ _intf_rule() {
set firewall.omr_dst_bypass_${intf}_srcip_${ipv46}.ipset="omr_dst_bypass_${intf}_${ipv46}"
set firewall.omr_dst_bypass_${intf}_srcip_${ipv46}.src='lan'
set firewall.omr_dst_bypass_${intf}_srcip_${ipv46}.dest='*'
set firewall.omr_dst_bypass_${intf}_srcip_${ipv46}.family="ipv${ipv46}"
set firewall.omr_dst_bypass_${intf}_srcip_${ipv46}.target='MARK'
set firewall.omr_dst_bypass_${intf}_srcip_${ipv46}.enabled='0'
set firewall.omr_dst_bypass_${intf}_srcip_${ipv46}.set_xmark="0x${ipv46}539${count}"

14
openmptcprouter/files/etc/init.d/openmptcprouter-vps
View file

@ -2261,13 +2261,13 @@ _config_service() {
if [ "$user_permission" != "ro" ]; then
#config_load shadowsocks-libev
#config_foreach _set_ss_server_vps server
[ -n "$(uci -q get shadowsocks-libev)" ] && _set_ss_server_vps
[ -n "$(uci -q get shadowsocks-rust)" ] && _set_ssgo_server_vps
[ -n "$(uci -q get v2ray)" ] && _set_v2ray_server_vps
[ -n "$(uci -q get xray)" ] && _set_xray_server_vps
([ -n "$(uci -q get glorytun)" ] || [ -n "$(uci -q get glorytun-udp)" ]) && [ -z "$(_set_glorytun_vps)" ] && error=1
[ -n "$(uci -q get openvpn)" ] && [ -z "$(_set_openvpn_vps)" ] && error=1
[ -n "$(uci -q get mlvpn)" ] && [ -z "$(_set_mlvpn_vps)" ] && error=1
[ -n "$(uci -q get shadowsocks-libev.sss0)" ] && _set_ss_server_vps
[ -n "$(uci -q get shadowsocks-rust.sss0)" ] && _set_ssgo_server_vps
[ -n "$(uci -q get v2ray.omr)" ] && _set_v2ray_server_vps
[ -n "$(uci -q get xray.omr)" ] && _set_xray_server_vps
([ -n "$(uci -q get glorytun.vpn)" ] || [ -n "$(uci -q get glorytun-udp.vpn)" ]) && [ -z "$(_set_glorytun_vps)" ] && error=1
[ -n "$(uci -q get openvpn.omr)" ] && [ -z "$(_set_openvpn_vps)" ] && error=1
[ -n "$(uci -q get mlvpn.general)" ] && [ -z "$(_set_mlvpn_vps)" ] && error=1
_set_vps_firewall
[ -n "$(uci -q get wireguard)" ] && [ -z "$(_set_wireguard_vps)" ] && error=1
fi