diff --git a/conf/default_ports.conf b/conf/default_ports.conf index 695c2e5..377909b 100644 --- a/conf/default_ports.conf +++ b/conf/default_ports.conf @@ -283,7 +283,7 @@ standard_jitsi_udp_port_range="10000:20000" # - --max-port Upper bound of the UDP port range for relay endpoints # - allocation. Default value is 65535, according to RFC 5766. # - -standard_turn_service_ports="3478,5349" +standard_turn_service_ports="3478,3479,5349,5350" standard_turn_service_udp_ports="49152:65535" # - alfaview - Video Conferencing Systems @@ -337,11 +337,11 @@ standard_game_xbox_360_udp_ports="53,80,3074" standard_game_ps3_tcp_ports="80,443,3478,3479,3480,5223,8080" standard_game_ps3_udp_ports="3074,3478,3479,3658" -standard_game_ps4_tcp_ports="80,443,465,983,1935,3478,3479,3480,5223,10070-10080 " +standard_game_ps4_tcp_ports="80,443,465,983,1935,3478,3479,3480,5223,10070:10080" standard_game_ps4_udp_ports="3074,3478,3479" -standard_game_fifa21_tcp_ports="1935, 3478,3479,3480,3659,10000-10069,10070-10080,10081-10099,42127" -standard_game_fifa21_udp_ports="3074,3478-3479,3659,6000" +standard_game_fifa21_tcp_ports="1935,3478,3479,3480,3659,10000:10069,10070:10080,10081:10099,42127" +standard_game_fifa21_udp_ports="3074,3478,3479,3659,6000" # ------------- diff --git a/conf/post_decalrations.conf b/conf/post_decalrations.conf index 9fff191..319a564 100644 --- a/conf/post_decalrations.conf +++ b/conf/post_decalrations.conf @@ -16,6 +16,16 @@ IFS=',' ; for _port in $standard_http_ports ; do done IFS="$CUR_IFS" +# --- +# - Standard mail user prts +# --- +declare -a standard_mailuser_port_arr +CUR_IFS="$IFS" +IFS=',' ; for _port in $standard_mailuser_ports ; do + standard_mailuser_port_arr+=("${_port}") +done +IFS="$CUR_IFS" + # --- # - Masquerade TCP Connections @@ -784,70 +794,70 @@ fi declare -a game_ports_udp_arr if $allow_game_xbox_360_out ; then IFS=',' ; for _port in $standard_game_xbox_one_udp_ports ; do - if $allow_stun_turn_service_out && containsElement "${_port}" "${standard_turn_service_port_arr}" ; then + if $allow_stun_turn_service_out && containsElement "${_port}" "${standard_turn_service_port_arr[@]}" ; then continue elif [[ "$_port" = "$standard_dns_port" ]] ; then continue elif containsElement "${_port}" "${game_ports_udp_arr[@]}" ; then continue else - game_ports_udp_arr+==("$_port") + game_ports_udp_arr+=("$_port") fi done IFS="$CUR_IFS" fi -if $standard_game_xbox_one_udp_ports ; then +if $allow_game_xbox_one_out ; then IFS=',' ; for _port in $standard_game_xbox_one_udp_ports ; do - if $allow_stun_turn_service_out && containsElement "${_port}" "${standard_turn_service_port_arr}" ; then + if $allow_stun_turn_service_out && containsElement "${_port}" "${standard_turn_service_port_arr[@]}" ; then continue elif [[ "$_port" = "$standard_dns_port" ]] ; then continue elif containsElement "${_port}" "${game_ports_udp_arr[@]}" ; then continue else - game_ports_udp_arr+==("$_port") + game_ports_udp_arr+=("$_port") fi done IFS="$CUR_IFS" fi -if $standard_game_ps3_udp_ports ; then +if $allow_game_ps3_out ; then IFS=',' ; for _port in $standard_game_ps3_udp_ports ; do - if $allow_stun_turn_service_out && containsElement "${_port}" "${standard_turn_service_port_arr}" ; then + if $allow_stun_turn_service_out && containsElement "${_port}" "${standard_turn_service_port_arr[@]}" ; then continue elif [[ "$_port" = "$standard_dns_port" ]] ; then continue elif containsElement "${_port}" "${game_ports_udp_arr[@]}" ; then continue else - game_ports_udp_arr+==("$_port") + game_ports_udp_arr+=("$_port") fi done IFS="$CUR_IFS" fi -if $standard_game_ps4_udp_ports ; then +if $allow_game_ps4_out ; then IFS=',' ; for _port in $standard_game_ps4_udp_ports ; do - if $allow_stun_turn_service_out && containsElement "${_port}" "${standard_turn_service_port_arr}" ; then + if $allow_stun_turn_service_out && containsElement "${_port}" "${standard_turn_service_port_arr[@]}" ; then continue elif [[ "$_port" = "$standard_dns_port" ]] ; then continue elif containsElement "${_port}" "${game_ports_udp_arr[@]}" ; then continue else - game_ports_udp_arr+==("$_port") + game_ports_udp_arr+=("$_port") fi done IFS="$CUR_IFS" fi -if $standard_game_fifa21_udp_ports ; then +if $allow_game_fifa21_out ; then IFS=',' ; for _port in $standard_game_fifa21_udp_ports ; do - if $allow_stun_turn_service_out && containsElement "${_port}" "${standard_turn_service_port_arr}" ; then + if $allow_stun_turn_service_out && containsElement "${_port}" "${standard_turn_service_port_arr[@]}" ; then continue elif [[ "$_port" = "$standard_dns_port" ]] ; then continue elif containsElement "${_port}" "${game_ports_udp_arr[@]}" ; then continue else - game_ports_udp_arr+==("$_port") + game_ports_udp_arr+=("$_port") fi done IFS="$CUR_IFS" @@ -858,80 +868,90 @@ allow_stun_turn_service_out allow_stun_turn_service_out declare -a game_ports_tcp_arr if $allow_game_xbox_360_out ; then IFS=',' ; for _port in $standard_game_xbox_one_tcp_ports ; do - if $allow_stun_turn_service_out && containsElement "${_port}" "${standard_turn_service_port_arr}" ; then + if $allow_stun_turn_service_out && containsElement "${_port}" "${standard_turn_service_port_arr[@]}" ; then continue elif [[ "$_port" = "$standard_dns_port" ]] ; then continue elif $allow_http_request_out && containsElement "${_port}" "${standard_http_port_arr[@]}" ; then continue + elif $allow_mail_request_out && containsElement "${_port}" "${standard_mailuser_port_arr[@]}" ; then + continue elif containsElement "${_port}" "${game_ports_tcp_arr[@]}" ; then continue else - game_ports_tcp_arr+==("$_port") + game_ports_tcp_arr+=("$_port") fi done IFS="$CUR_IFS" fi -if $standard_game_xbox_one_tcp_ports ; then +if $allow_game_xbox_one_out ; then IFS=',' ; for _port in $standard_game_xbox_one_tcp_ports ; do - if $allow_stun_turn_service_out && containsElement "${_port}" "${standard_turn_service_port_arr}" ; then + if $allow_stun_turn_service_out && containsElement "${_port}" "${standard_turn_service_port_arr[@]}" ; then continue elif [[ "$_port" = "$standard_dns_port" ]] ; then continue elif $allow_http_request_out && containsElement "${_port}" "${standard_http_port_arr[@]}" ; then continue + elif $allow_mail_request_out && containsElement "${_port}" "${standard_mailuser_port_arr[@]}" ; then + continue elif containsElement "${_port}" "${game_ports_tcp_arr[@]}" ; then continue else - game_ports_tcp_arr+==("$_port") + game_ports_tcp_arr+=("$_port") fi done IFS="$CUR_IFS" fi -if $standard_game_ps3_tcp_ports ; then +if $allow_game_ps3_out ; then IFS=',' ; for _port in $standard_game_ps3_tcp_ports ; do - if $allow_stun_turn_service_out && containsElement "${_port}" "${standard_turn_service_port_arr}" ; then + if $allow_stun_turn_service_out && containsElement "${_port}" "${standard_turn_service_port_arr[@]}" ; then continue elif [[ "$_port" = "$standard_dns_port" ]] ; then continue elif $allow_http_request_out && containsElement "${_port}" "${standard_http_port_arr[@]}" ; then continue + elif $allow_mail_request_out && containsElement "${_port}" "${standard_mailuser_port_arr[@]}" ; then + continue elif containsElement "${_port}" "${game_ports_tcp_arr[@]}" ; then continue else - game_ports_tcp_arr+==("$_port") + game_ports_tcp_arr+=("$_port") fi done IFS="$CUR_IFS" fi -if $standard_game_ps4_tcp_ports ; then +if $allow_game_ps4_out ; then IFS=',' ; for _port in $standard_game_ps4_tcp_ports ; do - if $allow_stun_turn_service_out && containsElement "${_port}" "${standard_turn_service_port_arr}" ; then + if $allow_stun_turn_service_out && containsElement "${_port}" "${standard_turn_service_port_arr[@]}" ; then continue elif [[ "$_port" = "$standard_dns_port" ]] ; then continue elif $allow_http_request_out && containsElement "${_port}" "${standard_http_port_arr[@]}" ; then continue + elif $allow_mail_request_out && containsElement "${_port}" "${standard_mailuser_port_arr[@]}" ; then + continue elif containsElement "${_port}" "${game_ports_tcp_arr[@]}" ; then continue else - game_ports_tcp_arr+==("$_port") + game_ports_tcp_arr+=("$_port") fi done IFS="$CUR_IFS" fi -if $standard_game_fifa21_tcp_ports ; then +if $allow_game_fifa21_out ; then IFS=',' ; for _port in $standard_game_fifa21_tcp_ports ; do - if $allow_stun_turn_service_out && containsElement "${_port}" "${standard_turn_service_port_arr}" ; then + if $allow_stun_turn_service_out && containsElement "${_port}" "${standard_turn_service_port_arr[@]}" ; then continue elif [[ "$_port" = "$standard_dns_port" ]] ; then continue elif $allow_http_request_out && containsElement "${_port}" "${standard_http_port_arr[@]}" ; then continue + elif $allow_mail_request_out && containsElement "${_port}" "${standard_mailuser_port_arr[@]}" ; then + continue elif containsElement "${_port}" "${game_ports_tcp_arr[@]}" ; then continue else - game_ports_tcp_arr+==("$_port") + game_ports_tcp_arr+=("$_port") fi done IFS="$CUR_IFS"