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

Fix for packages updates and versions updates

Browse source
This commit is contained in:
Ycarus 2018-05-23 10:56:23 +02:00
parent 51ad144788
commit 4c781208a1
14 changed files with 145 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
6in4/Makefile
View file

@ -1,5 +1,7 @@
# #
# Copyright (C) 2010-2015 OpenWrt.org # Copyright (C) 2010-2015 OpenWrt.org
# Copyright (C) 2018 Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
# - Added gateway setting
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -8,7 +10,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=6in4 PKG_NAME:=6in4
PKG_VERSION:=26 PKG_VERSION:=27
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0

50
luci-app-glorytun/root/etc/uci-defaults/40_luci-glorytun
View file

@ -21,30 +21,32 @@ uci -q batch <<-EOF >/dev/null
set network.glorytun.leasetime=12h set network.glorytun.leasetime=12h
commit network commit network
EOF EOF
uci -q batch <<-EOF >/dev/null if [ "$(uci -q show firewall | grep vpn)" = "" ]; then
add firewall zone uci -q batch <<-EOF >/dev/null
set firewall.@zone[-1].name=vpn add firewall zone
set firewall.@zone[-1].network=glorytun set firewall.@zone[-1].name=vpn
set firewall.@zone[-1].masq=1 set firewall.@zone[-1].network=glorytun
set firewall.@zone[-1].input=REJECT set firewall.@zone[-1].masq=1
set firewall.@zone[-1].forward=REJECT set firewall.@zone[-1].input=REJECT
set firewall.@zone[-1].output=ACCEPT set firewall.@zone[-1].forward=REJECT
set firewall.allow_dhcp_request_vpn=rule set firewall.@zone[-1].output=ACCEPT
set firewall.allow_dhcp_request_vpn.name=Allow-DHCP-Request-VPN set firewall.allow_dhcp_request_vpn=rule
set firewall.allow_dhcp_request_vpn.src=glorytun set firewall.allow_dhcp_request_vpn.name=Allow-DHCP-Request-VPN
set firewall.allow_dhcp_request_vpn.proto=udp set firewall.allow_dhcp_request_vpn.src=glorytun
set firewall.allow_dhcp_request_vpn.dest_port=67 set firewall.allow_dhcp_request_vpn.proto=udp
set firewall.allow_dhcp_request_vpn.target=ACCEPT set firewall.allow_dhcp_request_vpn.dest_port=67
set firewall.allow_dhcp_request_vpn.family=ipv4 set firewall.allow_dhcp_request_vpn.target=ACCEPT
set firewall.redirect_vpn_to_lan=redirect set firewall.allow_dhcp_request_vpn.family=ipv4
set firewall.redirect_vpn_to_lan.name=Redirect-VPN-to-LAN set firewall.redirect_vpn_to_lan=redirect
set firewall.redirect_vpn_to_lan.src=vpn set firewall.redirect_vpn_to_lan.name=Redirect-VPN-to-LAN
set firewall.redirect_vpn_to_lan.dest=lan set firewall.redirect_vpn_to_lan.src=vpn
set firewall.redirect_vpn_to_lan.proto=all set firewall.redirect_vpn_to_lan.dest=lan
set firewall.redirect_vpn_to_lan.enabled=1 set firewall.redirect_vpn_to_lan.proto=all
set firewall.redirect_vpn_to_lan.src_dip=192.168.100.1 set firewall.redirect_vpn_to_lan.enabled=1
commit firewall set firewall.redirect_vpn_to_lan.src_dip=192.168.100.1
EOF commit firewall
EOF
fi
rm -f /tmp/luci-indexcache rm -f /tmp/luci-indexcache
exit 0 exit 0

2
luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua
View file

@ -1,4 +1,6 @@
-- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org> -- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
-- Copyright 2018 Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
-- - Add gateway setting
-- Licensed to the public under the Apache License 2.0. -- Licensed to the public under the Apache License 2.0.
local map, section, net = ... local map, section, net = ...

4
mptcp/Makefile
View file

@ -9,8 +9,8 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=mptcp PKG_NAME:=mptcp
PKG_VERSION:=4.0 PKG_VERSION:=5.0
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_MAINTAINER:=Ycarus (Yannick Chabanois) <ycarus@zugaina.org> PKG_MAINTAINER:=Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)

20
mptcp/files/etc/uci-defaults/mptcp-defaults
View file

@ -1,13 +1,15 @@
#!/bin/sh #!/bin/sh
uci -q batch <<-EOF if [ "$(uci -q show network.globals | grep multipath)" = "" ]; then
set network.globals.multipath='enable' uci -q batch <<-EOF
set network.globals.mptcp_path_manager='fullmesh' set network.globals.multipath='enable'
set network.globals.mptcp_scheduler='default' set network.globals.mptcp_path_manager='fullmesh'
set network.globals.congestion='olia' set network.globals.mptcp_scheduler='default'
set network.globals.mptcp_checksum=1 set network.globals.congestion='olia'
set network.globals.mptcp_syn_retries=4 set network.globals.mptcp_checksum=1
commit network set network.globals.mptcp_syn_retries=4
EOF commit network
EOF
fi
uci -q batch <<-EOF uci -q batch <<-EOF
delete ucitrack.@mptcp[-1] delete ucitrack.@mptcp[-1]
add ucitrack mptcp add ucitrack mptcp

2
openmptcprouter-full/Makefile
View file

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=openmptcprouter-full PKG_NAME:=openmptcprouter-full
PKG_VERSION:=0.4 PKG_VERSION:=0.5
PKG_RELEASE:=1 PKG_RELEASE:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
openmptcprouter/Makefile
View file

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=openmptcprouter PKG_NAME:=openmptcprouter
PKG_VERSION:=0.70 PKG_VERSION:=0.80
PKG_RELEASE:=1 PKG_RELEASE:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

27
openmptcprouter/files/etc/uci-defaults/1920-omr-network
View file

@ -49,14 +49,13 @@ _setup_wan_interface() {
[ -n "$4" ] && uci -q set network.$1.type=$4 [ -n "$4" ] && uci -q set network.$1.type=$4
} }
[ "$(uci -q get "network.lan.proto")" = static ] || \ uci -q batch <<EOF
uci -q batch <<-EOF set network.lan=interface
set network.lan=interface set network.lan.proto=static
set network.lan.proto=static set network.lan.ipaddr=192.168.100.1
set network.lan.ipaddr=192.168.100.1 set network.lan.netmask=255.255.255.0
set network.lan.netmask=255.255.255.0 set network.lan.ifname=eth0
set network.lan.ifname=eth0 EOF
EOF
uci -q batch <<EOF uci -q batch <<EOF
delete network.none delete network.none
@ -92,8 +91,16 @@ uci -q set network.lan.ip4table='lan'
#uci -q set "network.lan.ip6assign=64" #uci -q set "network.lan.ip6assign=64"
# Create WAN interfaces # Create WAN interfaces
if [ "$(uci -q show network | grep wan)" = "" ]; then if [ "$(uci -q show network | grep wan1)" = "" ]; then
if [ -d /sys/class/net/eth1 ]; then if [ -d /sys/class/net/wan ]; then
uci -q batch <<-EOF
delete network.wan
EOF
_setup_wan_interface wan1 wan master macvlan
_setup_wan_interface wan2 wan on macvlan
_setup_macvlan wan1
_setup_macvlan wan2
elif [ -d /sys/class/net/eth1 ]; then
if [ -d /sys/class/net/eth2 ]; then if [ -d /sys/class/net/eth2 ]; then
_setup_wan_interface wan1 eth1 master _setup_wan_interface wan1 eth1 master
_setup_wan_interface wan2 eth2 on _setup_wan_interface wan2 eth2 on

34
openmptcprouter/files/etc/uci-defaults/1930-omr-shadowsocks
View file

@ -2,22 +2,24 @@
NBCPU=$(grep -c '^processor' /proc/cpuinfo | tr -d "\n") NBCPU=$(grep -c '^processor' /proc/cpuinfo | tr -d "\n")
if [ "$NBCPU" -gt 2 ]; then if [ "$NBCPU" -gt 2 ]; then
for c in $(seq 3 $NBCPU); do if [ "$(uci -q get shadowsocks-libev.hi2)" = "" ]; then
uci -q batch <<-EOF >/dev/null for c in $(seq 3 $NBCPU); do
set shadowsocks-libev.hi$c=ss_redir uci -q batch <<-EOF >/dev/null
set shadowsocks-libev.hi$c.server=sss0 set shadowsocks-libev.hi$c=ss_redir
set shadowsocks-libev.hi$c.local_address="0.0.0.0" set shadowsocks-libev.hi$c.server=sss0
set shadowsocks-libev.hi$c.local_port=1100 set shadowsocks-libev.hi$c.local_address="0.0.0.0"
set shadowsocks-libev.hi$c.mode=tcp_and_udp set shadowsocks-libev.hi$c.local_port=1100
set shadowsocks-libev.hi$c.timeout=60 set shadowsocks-libev.hi$c.mode=tcp_and_udp
set shadowsocks-libev.hi$c.fast_open=1 set shadowsocks-libev.hi$c.timeout=60
set shadowsocks-libev.hi$c.reuse_port=1 set shadowsocks-libev.hi$c.fast_open=1
set shadowsocks-libev.hi$c.mptcp=1 set shadowsocks-libev.hi$c.reuse_port=1
set shadowsocks-libev.hi$c.verbose=0 set shadowsocks-libev.hi$c.mptcp=1
commit shadowsocks-libev set shadowsocks-libev.hi$c.verbose=0
EOF commit shadowsocks-libev
rm -f /tmp/luci-indexcache EOF
done rm -f /tmp/luci-indexcache
done
fi
fi fi
exit 0 exit 0

22
openmptcprouter/files/etc/uci-defaults/1940-omr-dns
View file

@ -1,13 +1,19 @@
#!/bin/sh #!/bin/sh
uci -q batch <<-EOF >/dev/null if [ "$(uci -q get unbound.@unbound[0].listen_port | grep 5353)" = "" ]; then
set unbound.@unbound[-1].listen_port=5353 uci -q batch <<-EOF >/dev/null
set unbound.@unbound[-1].protocol="ip4_only" set unbound.@unbound[-1].listen_port=5353
set unbound.@unbound[-1].enabled=1 set unbound.@unbound[-1].protocol="ip4_only"
commit unbound set unbound.@unbound[-1].enabled=1
add_list dhcp.@dnsmasq[-1].server="127.0.0.1#5353" commit unbound
commit dhcp EOF
EOF fi
if [ "$(uci -q show dhcp | grep 127.0.0.1#5353)" = "" ]; then
uci -q batch <<-EOF >/dev/null
add_list dhcp.@dnsmasq[-1].server="127.0.0.1#5353"
commit dhcp
EOF
fi
rm -f /tmp/luci-indexcache rm -f /tmp/luci-indexcache
exit 0 exit 0

50
openmptcprouter/files/etc/uci-defaults/1960-omr-qos
View file

@ -1,29 +1,31 @@
#!/bin/sh #!/bin/sh
uci -q batch <<-EOF >/dev/null if [ "$(uci -q get qos.wan1)" = "" ]; then
delete qos.wan uci -q batch <<-EOF >/dev/null
set qos.wan1=interface delete qos.wan
set qos.wan1.classgroup="Default" set qos.wan1=interface
set qos.wan1.enabled="0" set qos.wan1.classgroup="Default"
set qos.wan1.upload="256" set qos.wan1.enabled="0"
set qos.wan1.download="2048" set qos.wan1.upload="256"
set qos.wan2=interface set qos.wan1.download="2048"
set qos.wan2.classgroup="Default" set qos.wan2=interface
set qos.wan2.enabled="0" set qos.wan2.classgroup="Default"
set qos.wan2.upload="256" set qos.wan2.enabled="0"
set qos.wan2.download="2048" set qos.wan2.upload="256"
delete qos.@classify[-1] set qos.wan2.download="2048"
add qos classify delete qos.@classify[-1]
set qos.@classify[-1].target='Express' add qos classify
set qos.@classify[-1].ports='5600' set qos.@classify[-1].target='Express'
set qos.@classify[-1].comments='SIP' set qos.@classify[-1].ports='5600'
add qos classify set qos.@classify[-1].comments='SIP'
set qos.@classify[-1].target='Express' add qos classify
set qos.@classify[-1].portrange='27000-27050' set qos.@classify[-1].target='Express'
set qos.@classify[1].proto='udp' set qos.@classify[-1].portrange='27000-27050'
set qos.@classify[-1].comments='Steam' set qos.@classify[1].proto='udp'
commit qos set qos.@classify[-1].comments='Steam'
EOF commit qos
EOF
fi
rm -f /tmp/luci-indexcache rm -f /tmp/luci-indexcache
exit 0 exit 0

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

@ -1,16 +1,18 @@
#!/bin/sh #!/bin/sh
uci -q batch <<-EOF >/dev/null if [ "$(uci -q show firewall | grep Allow-All-Ping)" = "" ]; then
add firewall rule uci -q batch <<-EOF >/dev/null
set firewall.@rule[-1].enabled='1' add firewall rule
set firewall.@rule[-1].target='ACCEPT' set firewall.@rule[-1].enabled='1'
set firewall.@rule[-1].name='Allow-All-Ping' set firewall.@rule[-1].target='ACCEPT'
set firewall.@rule[-1].proto='icmp' set firewall.@rule[-1].name='Allow-All-Ping'
set firewall.@rule[-1].dest='*' set firewall.@rule[-1].proto='icmp'
set firewall.@rule[-1].src='*' set firewall.@rule[-1].dest='*'
set firewall.@rule[-1].icmp_type='echo-request' set firewall.@rule[-1].src='*'
commit firewall set firewall.@rule[-1].icmp_type='echo-request'
EOF commit firewall
EOF
fi
rm -f /tmp/luci-indexcache rm -f /tmp/luci-indexcache
exit 0 exit 0

18
openmptcprouter/files/etc/uci-defaults/1990-omr-tracker
View file

@ -1,13 +1,15 @@
#!/bin/sh #!/bin/sh
uci -q batch <<-EOF >/dev/null if [ "$(uci -q get omr-tracker.tun0)" = "" ]; then
set omr-tracker.tun0=interface uci -q batch <<-EOF >/dev/null
set omr-tracker.tun0.type="none" set omr-tracker.tun0=interface
set omr-tracker.tun0.timeout=1 set omr-tracker.tun0.type="none"
set omr-tracker.tun0.tries=4 set omr-tracker.tun0.timeout=1
set omr-tracker.tun0.interval=2 set omr-tracker.tun0.tries=4
commit omr-tracker set omr-tracker.tun0.interval=2
EOF commit omr-tracker
EOF
fi
rm -f /tmp/luci-indexcache rm -f /tmp/luci-indexcache
exit 0 exit 0

2
shadowsocks-libev/Makefile
View file

@ -15,7 +15,7 @@ include $(TOPDIR)/rules.mk
# #
PKG_NAME:=shadowsocks-libev PKG_NAME:=shadowsocks-libev
PKG_VERSION:=3.1.3 PKG_VERSION:=3.1.3
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/shadowsocks/shadowsocks-libev/releases/download/v$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/shadowsocks/shadowsocks-libev/releases/download/v$(PKG_VERSION)