diff --git a/src/freedombone b/src/freedombone index 52a5de19..325f9b0c 100755 --- a/src/freedombone +++ b/src/freedombone @@ -381,6 +381,7 @@ VOIP_SERVER_PASSWORD= VOIP_PORT=64738 SIP_SERVER_PASSWORD= SIP_PORT=5060 +SIP_TLS_PORT=5061 VOIP_TURN_PORT=3478 VOIP_TURN_TLS_PORT=5349 VOIP_TURN_NONCE= @@ -1320,6 +1321,9 @@ function read_configuration { if grep -q "SIP_PORT" $CONFIGURATION_FILE; then SIP_PORT=$(grep "SIP_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}') fi + if grep -q "SIP_TLS_PORT" $CONFIGURATION_FILE; then + SIP_TLS_PORT=$(grep "SIP_TLS_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}') + fi if grep -q "SIP_SERVER_PASSWORD" $CONFIGURATION_FILE; then SIP_SERVER_PASSWORD=$(grep "SIP_SERVER_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}') fi @@ -4032,11 +4036,11 @@ function configure_firewall_for_voip_turn { } -function configure_firewall_for_sip3 { +function configure_firewall_for_sip4 { if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" ]]; then return fi - if grep -Fxq "configure_firewall_for_sip3" $COMPLETION_FILE; then + if grep -Fxq "configure_firewall_for_sip4" $COMPLETION_FILE; then return fi if [[ $ONION_ONLY != "no" ]]; then @@ -4044,8 +4048,10 @@ function configure_firewall_for_sip3 { fi iptables -A INPUT -p udp --dport $SIP_PORT -j ACCEPT iptables -A INPUT -p tcp --dport $SIP_PORT -j ACCEPT + iptables -A INPUT -p udp --dport $SIP_TLS_PORT -j ACCEPT + iptables -A INPUT -p tcp --dport $SIP_TLS_PORT -j ACCEPT save_firewall_settings - echo 'configure_firewall_for_sip3' >> $COMPLETION_FILE + echo 'configure_firewall_for_sip4' >> $COMPLETION_FILE } function configure_firewall_for_ipfs { @@ -10352,7 +10358,7 @@ function install_sip { echo '' >> /etc/sipwitch.conf sed -i 's|#PLUGINS=|PLUGINS=|g' /etc/default/sipwitch - sed -i 's|PLUGINS=.*|PLUGINS="zeroconf subscriber forward"|g' /etc/default/sipwitch + sed -i 's|PLUGINS=.*|PLUGINS="zeroconf subscriber forward"|g' /etc/default/sipwitch groupadd sipwitch usermod -aG sipwitch $MY_USERNAME