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 pull request #335 from Ysurac/develop

Browse source 
sync
This commit is contained in:
suyuan 2023-07-29 23:04:30 +08:00 • committed by GitHub
commit 529f8b34cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
View file

@ -150,6 +150,10 @@ return view.extend({
o.editable = true; o.editable = true;
o.depends('masq', '1'); o.depends('masq', '1');
o = s.taboption('general', form.Flag, 'fullcone6', _('Full Cone IPv6'));
o.editable = true;
o.depends('masq', '1');
o = s.taboption('general', form.Flag, 'mtu_fix', _('MSS clamping')); o = s.taboption('general', form.Flag, 'mtu_fix', _('MSS clamping'));
o.modalonly = true; o.modalonly = true;

8
luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
View file

@ -198,8 +198,8 @@ function wizard_add()
else else
ucic:set("sqm","wan" .. i,"interface",defif) ucic:set("sqm","wan" .. i,"interface",defif)
end end
ucic:set("sqm","wan" .. i,"qdisc","fq_codel") ucic:set("sqm","wan" .. i,"qdisc","cake")
ucic:set("sqm","wan" .. i,"script","simple.qos") ucic:set("sqm","wan" .. i,"script","piece_of_cake.qos")
ucic:set("sqm","wan" .. i,"qdisc_advanced","0") ucic:set("sqm","wan" .. i,"qdisc_advanced","0")
ucic:set("sqm","wan" .. i,"linklayer","none") ucic:set("sqm","wan" .. i,"linklayer","none")
ucic:set("sqm","wan" .. i,"enabled","1") ucic:set("sqm","wan" .. i,"enabled","1")
@ -434,8 +434,8 @@ function wizard_add()
end end
ucic:set("sqm",intf,"queue") ucic:set("sqm",intf,"queue")
ucic:set("sqm",intf,"interface",defif) ucic:set("sqm",intf,"interface",defif)
ucic:set("sqm",intf,"qdisc","fq_codel") ucic:set("sqm",intf,"qdisc","cake")
ucic:set("sqm",intf,"script","simple.qos") ucic:set("sqm",intf,"script","piece_of_cake.qos")
ucic:set("sqm",intf,"qdisc_advanced","0") ucic:set("sqm",intf,"qdisc_advanced","0")
ucic:set("sqm",intf,"linklayer","atm") ucic:set("sqm",intf,"linklayer","atm")
ucic:set("sqm",intf,"overhead","40") ucic:set("sqm",intf,"overhead","40")

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

@ -6,6 +6,7 @@
local fs = require "nixio.fs" local fs = require "nixio.fs"
local sys = require "luci.sys" local sys = require "luci.sys"
local ut = require "luci.util" local ut = require "luci.util"
local uname = nixio.uname()
local ifaces = sys.net:devices() local ifaces = sys.net:devices()
local ifttyu = nixio.fs.glob("/dev/ttyUSB*") local ifttyu = nixio.fs.glob("/dev/ttyUSB*")
local ifttyc = nixio.fs.glob("/dev/cdc-wdm*") local ifttyc = nixio.fs.glob("/dev/cdc-wdm*")
@ -239,6 +240,9 @@
<div class="cbi-value-description"> <div class="cbi-value-description">
<%:Set the default Proxy used for TCP when ShadowSocks is enabled, for TCP and UDP when V2Ray is enabled.%> <%:Set the default Proxy used for TCP when ShadowSocks is enabled, for TCP and UDP when V2Ray is enabled.%>
<%:Only ShadowSocks is supported with server multiple IPs for now.%> <%:Only ShadowSocks is supported with server multiple IPs for now.%>
<% if uname.release:sub(1,4) == "5.15" or uname.release:sub(1,1) == "6" then %>
<br /><b><%:V2Ray doesn't support aggregation on Kernel > 5.4 yet.%></b>
<% end %>
</div> </div>
</div> </div>
</div> </div>

2
luci-app-openmptcprouter/root/etc/init.d/openmptcprouter
View file

@ -2,7 +2,7 @@
# Copyright (C) 2018-2021 Ycarus (Yannick Chabanois) <ycarus@zugaina.org> for OpenMPTCProuter # Copyright (C) 2018-2021 Ycarus (Yannick Chabanois) <ycarus@zugaina.org> for OpenMPTCProuter
# Released under GPL 3. See LICENSE for the full terms. # Released under GPL 3. See LICENSE for the full terms.
START=5 START=05
USE_PROCD=1 USE_PROCD=1

2
macvlan/files/etc/init.d/macvlan
View file

@ -1,6 +1,6 @@
#!/bin/sh /etc/rc.common #!/bin/sh /etc/rc.common
START=4 START=04
USE_PROCD=1 USE_PROCD=1
_setup_macaddr() { _setup_macaddr() {

3
openmptcprouter-full/Makefile
View file

@ -82,7 +82,8 @@ MY_DEPENDS := \
luci-app-acl block-mount blockd fstools luci-app-shutdown libwebp luci-proto-gre tcptraceroute luci-proto-mbim kmod-rtl8xxxu kmod-ath9k-htc luci-app-ttyd luci-mod-dashboard (TARGET_x86||TARGET_x86_64):rtl8192eu-firmware kmod-usb2 libustream-openssl (TARGET_x86||TARGET_x86_64):kmod-ixgbevf (TARGET_x86||TARGET_x86_64):kmod-igbvf \ luci-app-acl block-mount blockd fstools luci-app-shutdown libwebp luci-proto-gre tcptraceroute luci-proto-mbim kmod-rtl8xxxu kmod-ath9k-htc luci-app-ttyd luci-mod-dashboard (TARGET_x86||TARGET_x86_64):rtl8192eu-firmware kmod-usb2 libustream-openssl (TARGET_x86||TARGET_x86_64):kmod-ixgbevf (TARGET_x86||TARGET_x86_64):kmod-igbvf \
hwinfo (TARGET_x86||TARGET_x86_64):dmidecode luci-app-packet-capture kmod-bonding luci-proto-bonding luci-app-sysupgrade \ hwinfo (TARGET_x86||TARGET_x86_64):dmidecode luci-app-packet-capture kmod-bonding luci-proto-bonding luci-app-sysupgrade \
luci-theme-openwrt-2020 luci-proto-wireguard luci-app-wireguard kmod-crypto-lib-blake2s (TARGET_x86||TARGET_x86_64):kmod-r8125 \ luci-theme-openwrt-2020 luci-proto-wireguard luci-app-wireguard kmod-crypto-lib-blake2s (TARGET_x86||TARGET_x86_64):kmod-r8125 \
(LINUX_5_15||LINUX_6_1):mptcpd (TARGET_x86||TARGET_x86_64):kmod-igc !TARGET_mvebu:kmod-mmc-spi kmod-macsec usbutils v2ray-core syslogd (LINUX_5_15||LINUX_6_1):mptcpd (TARGET_x86||TARGET_x86_64):kmod-igc !TARGET_mvebu:kmod-mmc-spi kmod-macsec usbutils v2ray-core syslogd \
(TARGET_x86||TARGET_x86_64):kmod-mlx4-core
# !TARGET_mvebu:kmod-usb-net-smsc75xx # !TARGET_mvebu:kmod-usb-net-smsc75xx
# libnetfilter-conntrack ebtables ebtables-utils ip-full nstat \ # libnetfilter-conntrack ebtables ebtables-utils ip-full nstat \