From 9f5d640d67cf473ca1087b642e84483f8e77d147 Mon Sep 17 00:00:00 2001 From: Christoph Date: Wed, 2 Feb 2022 22:36:29 +0100 Subject: [PATCH] Fix some error concerning 'Microsoft Teams' management. --- conf/default_ports.conf | 17 ++++++++++++++++- conf/main_ipv4.conf.sample | 15 +++++++++++++++ conf/main_ipv6.conf.sample | 14 ++++++++++++++ conf/post_decalrations.conf | 4 ++-- 4 files changed, 47 insertions(+), 3 deletions(-) diff --git a/conf/default_ports.conf b/conf/default_ports.conf index 3ac262a..ac06f0f 100644 --- a/conf/default_ports.conf +++ b/conf/default_ports.conf @@ -216,7 +216,22 @@ standard_webex_tcp_fall_back_ports="5004" # - # - UDP 3478,3479,3480,3481 --> 13.107.64.0/18, 52.112.0.0/14, 52.120.0.0/14 # - -standard_ms_skype_teams_tcp_ports="80,443" +# - Example: +# - +# - standard_ms_skype_teams_tcp_ports="80,443" +# - standard_ms_skype_teams_udp4_ports="3478,3479,3480,3481" +# - standard_ms_skype_teams_udp4_hosts=" +# - 13.107.64.0/18 +# - 52.112.0.0/14 +# - 52.120.0.0/14 +# - " +# - standard_ms_skype_teams_udp6_ports="3478,3479,3480,3481" +# - standard_ms_skype_teams_udp6_hosts=" +# - 2a01:30:0:13:5054:ff:fe9f:422f/64 +# - 2a01:4f8:231:19a7::2/52 +# - " +# - +standard_ms_skype_teams_tcp_ports="80,443,4443" standard_ms_skype_teams_udp4_ports="3478,3479,3480,3481" standard_ms_skype_teams_udp4_hosts=" 13.107.64.0/18 diff --git a/conf/main_ipv4.conf.sample b/conf/main_ipv4.conf.sample index 986225c..02a29fd 100644 --- a/conf/main_ipv4.conf.sample +++ b/conf/main_ipv4.conf.sample @@ -930,6 +930,21 @@ bigbluebutton_udp_ports="$standard_bigbluebutton_udp_port_range" # - # - UDP 3478,3479,3480,3481 --> 13.107.64.0/18, 52.112.0.0/14, 52.120.0.0/14 # - +# - Example: +# - +# - standard_ms_skype_teams_tcp_ports="80,443" +# - standard_ms_skype_teams_udp4_ports="3478,3479,3480,3481" +# - standard_ms_skype_teams_udp4_hosts=" +# - 13.107.64.0/18 +# - 52.112.0.0/14 +# - 52.120.0.0/14 +# - " +# - +# - Set to default values: +# - ms_skype_teams_tcp_ports="$standard_ms_skype_teams_tcp_ports" +# - ms_skype_teams_udp4_ports="$standard_ms_skype_teams_udp4_ports" +# - ms_skype_teams_udp4_hosts="$standard_ms_skype_teams_udp4_hosts" +# - ms_skype_teams_tcp_ports="$standard_ms_skype_teams_tcp_ports" ms_skype_teams_udp4_ports="$standard_ms_skype_teams_udp4_ports" ms_skype_teams_udp4_hosts="$standard_ms_skype_teams_udp4_hosts" diff --git a/conf/main_ipv6.conf.sample b/conf/main_ipv6.conf.sample index 0554a03..0757603 100644 --- a/conf/main_ipv6.conf.sample +++ b/conf/main_ipv6.conf.sample @@ -899,6 +899,20 @@ bigbluebutton_udp_ports="$standard_bigbluebutton_udp_port_range" # - # - TCP 80,443 # - +# - Example: +# - +# - standard_ms_skype_teams_tcp_ports="80,443" +# - standard_ms_skype_teams_udp6_ports="3478,3479,3480,3481" +# - standard_ms_skype_teams_udp6_hosts=" +# - 2a01:30:0:13:5054:ff:fe9f:422f/64 +# - 2a01:4f8:231:19a7::2/52 +# - " +# - +# - Set to default values: +# - ms_skype_teams_tcp_ports="$standard_ms_skype_teams_tcp_ports" +# - ms_skype_teams_udp6_ports="$standard_ms_skype_teams_udp6_ports" +# - ms_skype_teams_udp6_hosts="$standard_ms_skype_teams_udp6_hosts" +# - ms_skype_teams_tcp_ports="$standard_ms_skype_teams_tcp_ports" ms_skype_teams_udp6_ports="$standard_ms_skype_teams_udp6_ports" ms_skype_teams_udp6_hosts="$standard_ms_skype_teams_udp6_hosts" diff --git a/conf/post_decalrations.conf b/conf/post_decalrations.conf index b03a8f9..4b0e104 100644 --- a/conf/post_decalrations.conf +++ b/conf/post_decalrations.conf @@ -668,14 +668,14 @@ IFS=',' ; for _port in $ms_skype_teams_udp4_ports ; do if containsElement "${_port}" "${standard_turn_service_port_arr[@]}" ; then continue fi - ms_skype_teams_udp_port4_arr+=("$_port") + ms_skype_teams_udp4_port_arr+=("$_port") done IFS="$CUR_IFS" IFS=',' ; for _port in $ms_skype_teams_udp6_ports ; do if containsElement "${_port}" "${standard_turn_service_port_arr[@]}" ; then continue fi - ms_skype_teams_udp_port6_arr+=("$_port") + ms_skype_teams_udp6_port_arr+=("$_port") done IFS="$CUR_IFS" IFS=',' ; for _port in $ms_skype_teams_tcp_ports ; do