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

Merge branch 'test' into develop

Browse source
This commit is contained in:
suyuan 2023-06-24 13:08:41 +08:00
commit ff3aff6230
6 changed files with 12 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

2
luci-app-openmptcprouter/Makefile
View file

@ -6,7 +6,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
LUCI_TITLE:=LuCI Support for OpenMPTCProuter LUCI_TITLE:=LuCI Support for OpenMPTCProuter
LUCI_DEPENDS:=+luci-lib-json +rdisc6 +curl +bind-dig +tracebox LUCI_DEPENDS:=+luci-lib-json +curl +bind-dig +tracebox
PKG_LICENSE:=GPLv3 PKG_LICENSE:=GPLv3
#include ../luci/luci.mk #include ../luci/luci.mk

1
luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
View file

@ -948,6 +948,7 @@
</div> </div>
</div> </div>
</div> </div>
<!-- <div class="cbi-value" data-depends="[{&#34;cbid.sqm.<%=ifname%>.enabled&#34;:&#34;1&#34;}]" data-index="17"> -->
<div class="cbi-value" data-index="17"> <div class="cbi-value" data-index="17">
<label class="cbi-value-title"><%:Enable SQM autorate%></label> <label class="cbi-value-title"><%:Enable SQM autorate%></label>
<div class="cbi-value-field"> <div class="cbi-value-field">

99
ndisc6/Makefile
View file

@ -1,99 +0,0 @@
#
# Copyright (C) 2006-2012 OpenWrt.org
# Copyright (C) 2018-2022 Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=ndisc6
PKG_VERSION:=1.0.7
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://www.remlab.net/files/ndisc6/
PKG_HASH:=edc431d70510d7321a5a39d243de0d0f63846dc9145b3b549c7348cc2bc96609
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
define Package/ndisc
SECTION:=ipv6
CATEGORY:=IPv6
SUBMENU:=IPv6 discovery tools
TITLE:=IPv6 discovery tools
URL:=http://www.remlab.net/ndisc6/
DEPENDS:=+libpthread +librt
endef
define Package/ndisc/description
IPv6 discovery tools
endef
define Package/ndisc6
$(call Package/ndisc)
TITLE:=An ICMPv6 neighbour discovery tool
endef
define Package/ndisc6/description
An ICMPv6 neighbour discovery tools
endef
define Package/rdisc6
$(call Package/ndisc)
TITLE:=An ICMPv6 router discovery tool
endef
define Package/rdisc6/description
An ICMPv6 router discovery tool
endef
define Package/traceroute6
$(call Package/ndisc)
TITLE:=An IPv6-based traceroute implementation
endef
define Package/traceroute6/description
An IPv6-based traceroute implementation
endef
define Package/rdnssd
$(call Package/ndisc)
TITLE:=DNS server discovery daemon
endef
define Package/rdnssd/description
A recursive DNS server discovery daemon gathering
information through stateless IPv6 autoconfiguration (RFC5006)
endef
TARGET_CFLAGS += -std=c99
define Package/ndisc6/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ndisc6 $(1)/usr/bin/
endef
define Package/rdisc6/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rdisc6 $(1)/usr/bin/
endef
define Package/traceroute6/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{rl,tcp}traceroute6 $(1)/usr/bin/
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tracert6 $(1)/usr/bin/
endef
define Package/rdnssd/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/rdnssd $(1)/usr/sbin/
endef
$(eval $(call BuildPackage,ndisc6))
$(eval $(call BuildPackage,rdisc6))
$(eval $(call BuildPackage,traceroute6))
$(eval $(call BuildPackage,rdnssd))

4
openmptcprouter/files/etc/uci-defaults/1980-omr-firewall
View file

@ -241,9 +241,7 @@ done
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
set firewall.zone_lan.mtu_fix='1' set firewall.zone_lan.mtu_fix='1'
set firewall.zone_vpn.mtu_fix='1' set firewall.zone_vpn.mtu_fix='0'
EOF
uci -q batch <<-EOF >/dev/null
set firewall.@include[0].reload='1' set firewall.@include[0].reload='1'
commit firewall commit firewall
EOF EOF

9
openmptcprouter/files/etc/uci-defaults/2020-omr-vpn
View file

@ -12,7 +12,7 @@ if [ "$(uci -q get network.omrvpn)" = "" ]; then
set network.omrvpn.leasetime=12h set network.omrvpn.leasetime=12h
set network.omrvpn.type=tunnel set network.omrvpn.type=tunnel
set network.omrvpn.txqueuelen=100 set network.omrvpn.txqueuelen=100
set network.omrvpn.metric=1200 set network.omrvpn.metric=9000
commit network commit network
EOF EOF
fi fi
@ -146,7 +146,12 @@ if [ "$(uci -q get glorytun-udp.vpn.key)" = "" ] && [ "$(uci -q get glorytun.vpn
uci -q commit glorytun-udp uci -q commit glorytun-udp
fi fi
if [ "$(uci -q get network.omrvpn.metric)" = "1200" ]; then
uci -q batch <<-EOF >/dev/null
set network.omrvpn.metric=9000
commit network
EOF
fi
rm -f /tmp/luci-indexcache rm -f /tmp/luci-indexcache
exit 0 exit 0

4
v2ray-core/Makefile
View file

@ -5,12 +5,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=v2ray-core PKG_NAME:=v2ray-core
PKG_VERSION:=5.4.1 PKG_VERSION:=5.7.0
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=e208bca255c4689a30104e965039d73fa138a7a6e902f820cff94b5b772b042b PKG_HASH:=599fcd264537e39178b6008a11af68816dfd1609e19a9cf8adc8b2a4240ee370
PKG_LICENSE:=MIT PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE