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

Add tls support in openmptcprouter vps script and small changes

Browse source
This commit is contained in:
Ycarus 2019-04-15 22:17:11 +02:00
parent d2e5a21df6
commit c30bc58e6a
3 changed files with 42 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -158,6 +158,13 @@ _get_vps_config() {
set openmptcprouter.${servername}.omr_version=$vps_omr_version set openmptcprouter.${servername}.omr_version=$vps_omr_version
EOF EOF
pihole="$(echo "$vps_config" | jsonfilter -q -e '@.pihole.state')"
if [ "$pihole" = "true" ]; then
uci -q set dhcp.@dnsmasq[0].server='10.255.255.1#53'
elif [ "$(uci -q get dhcp.@dnsmasq[0].server)" = "10.255.255.1#53" ]; then
uci -q set dhcp.@dnsmasq[0].server='127.0.0.1#5353'
fi
glorytun_state=0 glorytun_state=0
glorytun_change=0 glorytun_change=0
vpn="$(uci -q get openmptcprouter.settings.vpn)" vpn="$(uci -q get openmptcprouter.settings.vpn)"
@ -314,6 +321,8 @@ _set_config_from_vps() {
ss_fast_open="$(echo "$vps_config" | jsonfilter -q -e '@.shadowsocks.fast_open')" ss_fast_open="$(echo "$vps_config" | jsonfilter -q -e '@.shadowsocks.fast_open')"
ss_obfs="$(echo "$vps_config" | jsonfilter -q -e '@.shadowsocks.obfs')" ss_obfs="$(echo "$vps_config" | jsonfilter -q -e '@.shadowsocks.obfs')"
ss_obfs_plugin="$(echo "$vps_config" | jsonfilter -q -e '@.shadowsocks.obfs_plugin')" ss_obfs_plugin="$(echo "$vps_config" | jsonfilter -q -e '@.shadowsocks.obfs_plugin')"
ss_obfs_type="$(echo "$vps_config" | jsonfilter -q -e '@.shadowsocks.obfs_type')"
ss_obfs_host="$(echo "$vps_config" | jsonfilter -q -e '@.network.domain')"
#ss_reuse_port="$(echo "$vps_config" | jsonfilter -q -e '@.shadowsocks.reuse_port')" #ss_reuse_port="$(echo "$vps_config" | jsonfilter -q -e '@.shadowsocks.reuse_port')"
config_load shadowsocks-libev config_load shadowsocks-libev
config_foreach _set_ss_redir ss_redir "no_delay" $ss_no_delay config_foreach _set_ss_redir ss_redir "no_delay" $ss_no_delay
@ -321,11 +330,15 @@ _set_config_from_vps() {
config_foreach _set_ss_redir ss_redir "ebpf" $ss_ebpf config_foreach _set_ss_redir ss_redir "ebpf" $ss_ebpf
config_foreach _set_ss_redir ss_redir "obfs" $ss_obfs config_foreach _set_ss_redir ss_redir "obfs" $ss_obfs
config_foreach _set_ss_redir ss_redir "obfs_plugin" $ss_obfs_plugin config_foreach _set_ss_redir ss_redir "obfs_plugin" $ss_obfs_plugin
config_foreach _set_ss_redir ss_redir "obfs_type" $ss_obfs_type
config_foreach _set_ss_redir ss_redir "obfs_host" $ss_obfs_host
config_foreach _set_ss_redir ss_local "no_delay" $ss_no_delay config_foreach _set_ss_redir ss_local "no_delay" $ss_no_delay
config_foreach _set_ss_redir ss_local "fast_open" $ss_fast_open config_foreach _set_ss_redir ss_local "fast_open" $ss_fast_open
config_foreach _set_ss_redir ss_local "ebpf" $ss_ebpf config_foreach _set_ss_redir ss_local "ebpf" $ss_ebpf
config_foreach _set_ss_redir ss_local "obfs" $ss_obfs config_foreach _set_ss_redir ss_local "obfs" $ss_obfs
config_foreach _set_ss_redir ss_local "obfs_plugin" $ss_obfs_plugin config_foreach _set_ss_redir ss_local "obfs_plugin" $ss_obfs_plugin
config_foreach _set_ss_redir ss_local "obfs_type" $ss_obfs_type
config_foreach _set_ss_redir ss_local "obfs_host" $ss_obfs_host
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
set shadowsocks-libev.sss0.key=$ss_key set shadowsocks-libev.sss0.key=$ss_key
set shadowsocks-libev.sss0.server_port=$ss_port set shadowsocks-libev.sss0.server_port=$ss_port

26
openmptcprouter/files/etc/iproute2/rt_dsfield Normal file
View file

@ -0,0 +1,26 @@
# Differentiated field values
# These include the DSCP and unused bits
0x0 default
# Newer RFC2597 values
0x28 AF11
0x30 AF12
0x38 AF13
0x48 AF21
0x50 AF22
0x58 AF23
0x68 AF31
0x70 AF32
0x78 AF33
0x88 AF41
0x90 AF42
0x98 AF43
# Older values RFC2474
0x20 CS1
0x40 CS2
0x60 CS3
0x80 CS4
0xA0 CS5
0xC0 CS6
0xE0 CS7
# RFC 2598
0xB8 EF

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

@ -10,6 +10,9 @@ if [ "$(uci -q get network.omrvpn)" = "" ]; then
set network.omrvpn.ip4table=vpn set network.omrvpn.ip4table=vpn
set network.omrvpn.multipath=off set network.omrvpn.multipath=off
set network.omrvpn.leasetime=12h set network.omrvpn.leasetime=12h
set network.omrvpn.type=tunnel
set network.omrvpn.txqueuelen=1000
set network.omrvpn.metric=1200
commit network commit network
EOF EOF
fi fi