diff --git a/install_easy.sh b/install_easy.sh index ba45e84..94897d9 100755 --- a/install_easy.sh +++ b/install_easy.sh @@ -244,7 +244,7 @@ select_getlist() GETLIST="get_reestr_hostlist.sh" [ "$GL_OLD" != "$GET_LIST" ] && write_config_var GETLIST else - GETLISTS="get_user.sh get_antifilter_ip.sh get_antifilter_ipsmart.sh get_antifilter_ipsum.sh get_reestr_ip.sh get_reestr_combined.sh get_reestr_resolve.sh" + GETLISTS="get_user.sh get_antifilter_ip.sh get_antifilter_ipsmart.sh get_antifilter_ipsum.sh get_antifilter_ipresolve.sh get_antifilter_allyouneed.sh get_reestr_ip.sh get_reestr_combined.sh get_reestr_resolve.sh" GETLIST_DEF="get_antifilter_ipsmart.sh" ask_list GETLIST "$GETLISTS" "$GETLIST_DEF" && write_config_var GETLIST fi @@ -291,25 +291,13 @@ ask_config_offload() [ "$FWTYPE" = nftables ] || is_ipt_flow_offload_avail && { echo echo flow offloading can greatly increase speed on slow devices and high speed links \(usually 150+ mbits\) - if [ "$SYSTEM" = openwrt ]; then - echo unfortuantely its not compatible with most nfqws options. nfqws traffic must be exempted from flow offloading. - echo donttouch = disable system flow offloading setting if nfqws mode was selected, dont touch it otherwise and dont configure selective flow offloading - echo none = always disable system flow offloading setting and dont configure selective flow offloading - echo software = always disable system flow offloading setting and configure selective software flow offloading - echo hardware = always disable system flow offloading setting and configure selective hardware flow offloading - else - echo offloading is applicable only to forwarded traffic. it has no effect on outgoing traffic - echo hardware flow offloading is available only on specific supporting hardware. most likely will not work on a generic system - fi - echo offloading breaks traffic shaper + echo unfortuantely its not compatible with most nfqws options. nfqws traffic must be exempted from flow offloading. + echo donttouch = disable system flow offloading setting if nfqws mode was selected, dont touch it otherwise and dont configure selective flow offloading + echo none = always disable system flow offloading setting and dont configure selective flow offloading + echo software = always disable system flow offloading setting and configure selective software flow offloading + echo hardware = always disable system flow offloading setting and configure selective hardware flow offloading echo select flow offloading : - local options="none software hardware" - local default="none" - [ "$SYSTEM" = openwrt ] && { - options="donttouch none software hardware" - default="donttouch" - } - ask_list FLOWOFFLOAD "$options" $default && write_config_var FLOWOFFLOAD + ask_list FLOWOFFLOAD "donttouch none software hardware" donttouch && write_config_var FLOWOFFLOAD } } @@ -331,11 +319,6 @@ ask_config_tmpdir() } } -nft_flow_offload() -{ - [ "$UNAME" = Linux -a "$FWTYPE" = nftables -a "$MODE" != "tpws-socks" ] && [ "$FLOWOFFLOAD" = software -o "$FLOWOFFLOAD" = hardware ] -} - ask_iface() { # $1 - var to ask @@ -363,16 +346,12 @@ ask_iface() ask_iface_lan() { echo LAN interface : - local opt - nft_flow_offload || opt=NONE - ask_iface IFACE_LAN $opt + ask_iface IFACE_LAN "NONE" } ask_iface_wan() { echo WAN interface : - local opt - nft_flow_offload || opt=ANY - ask_iface IFACE_WAN $opt + ask_iface IFACE_WAN "ANY" } select_mode_iface() @@ -387,6 +366,8 @@ select_mode_iface() if [ "$SYSTEM" = "openwrt" ] || [ "$MODE" = "filter" ]; then return; fi + echo + case "$MODE" in tpws-socks) echo "select LAN interface to allow socks access from your LAN. select NONE for localhost only." @@ -407,12 +388,6 @@ select_mode_iface() echo "select LAN interface for your custom script (how it works depends on your code)" ask_iface_lan ;; - *) - nft_flow_offload && { - echo "select LAN interface for nftables flow offloading" - ask_iface_lan - } - ;; esac case "$MODE" in @@ -429,12 +404,6 @@ select_mode_iface() echo "select WAN interface for your custom script (how it works depends on your code)" ask_iface_wan ;; - *) - nft_flow_offload && { - echo "select WAN interface for nftables flow offloading" - ask_iface_wan - } - ;; esac } @@ -690,7 +659,6 @@ install_systemd() check_prerequisites_linux install_binaries select_ipv6 - ask_config_offload ask_config service_install_systemd download_list @@ -715,7 +683,6 @@ _install_sysv() check_prerequisites_linux install_binaries select_ipv6 - ask_config_offload ask_config $1 download_list @@ -750,7 +717,6 @@ install_linux() check_prerequisites_linux install_binaries select_ipv6 - ask_config_offload ask_config download_list crontab_del_quiet