diff --git a/mptcp/Makefile b/mptcp/Makefile index 5adc02b2f..ecfb24e82 100644 --- a/mptcp/Makefile +++ b/mptcp/Makefile @@ -29,6 +29,7 @@ define Package/mptcp CONFIG_MPTCP_NDIFFPORTS=y \ CONFIG_MPTCP_PM_ADVANCED=y \ CONFIG_MPTCP_REDUNDANT=y \ + CONFIG_MPTCP_ECF=y \ CONFIG_MPTCP_ROUNDROBIN=y \ CONFIG_MPTCP_SCHED_ADVANCED=y \ CONFIG_DEFAULT_FULLMESH=y \ diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps index 8a6cd8591..d9a9b7ac9 100755 --- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps +++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps @@ -940,9 +940,9 @@ _config_service() { _set_config_from_vps } _get_vps_config - if [ "$(uci -q get openmptcprouter.settings.firstboot)" != "0" ] && [ -n "$(cat /proc/cpuinfo | grep aes)" ]; then + if [ "$(uci -q get openmptcprouter.settings.firstboot)" != "0" ]; then [ -z "$vps_config" ] && vps_config=$(_get_json "config") - [ -n "$vps_config" ] && { + [ -n "$vps_config" ] && [ -n "$(cat /proc/cpuinfo | grep aes)" ] && { vps_aes="$(echo "$vps_config" | jsonfilter -q -e '@.vps.aes')" if [ "$vps_aes" != "false" ]; then logger -t "OMR-VPS" "CPU support AES, set it by default" @@ -954,8 +954,8 @@ _config_service() { EOF fi } + [ -n "$vps_config" ] && uci -q set openmptcprouter.settings.firstboot=0 fi - uci -q set openmptcprouter.settings.firstboot=0 config_load shadowsocks-libev config_foreach _set_ss_server_vps server [ -z "$(_set_glorytun_vps)" ] && error=1