Merge branch 'restcomm1657' of github.com:RestComm/Restcomm-Connect into restcomm1657

Author: gvagenas

LICENSE

@@ -56,7 +56,10 @@ Continuous Integration and Delivery
 
 Acknowledgements
 ========
-Java Profiler sponsored by YourKit 
-[![YourKit The Industry Leader in .NET & Java Profiling](https://www.yourkit.com/images/yk_logo.png)](https://www.yourkit.com/)
 
-[See who has been contributing to RestComm](http://www.telestax.com/opensource/acknowledgments/)
+* [![YourKit The Industry Leader in .NET & Java Profiling](https://www.yourkit.com/images/yk_logo.png)](https://www.yourkit.com/) Java Profiler sponsored by YourKit
+
+* [![JProfiler](https://www.ej-technologies.com/images/product_banners/jprofiler_large.png)](https://www.ej-technologies.com/products/jprofiler/overview.html) JProfiler Open Source License
+
+---
+We also maintain a list of [all Restcomm contributors](http://www.telestax.com/opensource/acknowledgments/) on the Restcomm website, to acknowledge contributions by the broad open source community.

README.md

@@ -33,7 +33,7 @@
   <property name="restcomm-media.distro.zip.path" value="${checkout.dir}/${restcomm-media.download.distro.file}"/>
 
   <!-- <property name="restcomm-olympus.download.url" value="https://mobicents.ci.cloudbees.com/job/Olympus/${olympus.build}/artifact/target/olympus.war"/> -->
-  <property name="restcomm-olympus.download.url" value="https://app.box.com/shared/static/xd8enx5wjxy3ofy8movo2gske7ofx6bp.war"/>
+  <property name="restcomm-olympus.download.url" value="https://app.box.com/shared/static/0rf2w3q7r0g2b4p4rtptc24wauxegfsf.war"/>
   <property name="restcomm-olympus.path" value="${configuration.directory}/olympus.war"/>
 
   <!-- Determine RVD retrieval URL

release/build.xml

@@ -18,6 +18,10 @@ SECURESSL=FALSE
 TRUSTSTORE_FILE='restcomm-crt.jks' #File should be located at $RESTCOMM_HOME/standalone/configuration folder. Provide just the name of the trustore file.
 TRUSTSTORE_PASSWORD='changeme' #Password for the trustore file
 TRUSTSTORE_ALIAS='restcomm' #The certificate alias
+#comma separated protocols to set on SSLEngine, if empty use stack defaults
+SSL_PROTOCOLS=''
+#comma separated cipher suites to set on SSLEngine, if empty use stack defaults
+SSL_CIPHER_SUITES=''
 
 #HTTPS Settings
 DISABLE_HTTP='false' #Control HTTP connector behavior. Values, TRUE=HTTP connector will be disable, FALSE=HTTP Connector will be active, REDIRECT= http -> https redirection will be enabled (For CLI RestAPI requests when redirect is active https needs to be used).
@@ -148,3 +152,8 @@ CACHE_NO_WAV=false
 
 #MSS Configuration
 TLS_CLIENT_AUTH_TYPE="Disabled" #Possible values Enabled, Want, Disabled,DisabledAll
+
+#USESBC: Option to disable all patch for NAT (Includes patch-for-nat-b2bua-sessions,disable-sdp-patching-on-updating-mediasession)
+RCUSESBC=false
+#Domain to be used in the SIP URI <user>@<domain>. If not defined, it will default to the webapp host name.
+WebOlympusDomain=""

restcomm/configuration/config-scripts/as7-config-scripts/restcomm/advanced.conf

@@ -147,6 +147,25 @@ MssStackConf(){
    		sed -i '/gov.nist.javax.sip.TLS_CLIENT_AUTH_TYPE='"$TLS_CLIENT_AUTH_TYPE"'/,+5d' $FILE
  	fi
 
+        if [ -n "$SSL_PROTOCOLS" ]; then
+            if  grep -q "gov.nist.javax.sip.TLS_CLIENT_PROTOCOLS" "$FILE"; then
+                 sed -i "s|gov.nist.javax.sip.TLS_CLIENT_PROTOCOLS=.*|gov.nist.javax.sip.TLS_CLIENT_PROTOCOLS=$SSL_PROTOCOLS|" $FILE
+            else
+                echo "gov.nist.javax.sip.TLS_CLIENT_PROTOCOLS=$SSL_PROTOCOLS"'' >> $FILE
+            fi
+
+        fi
+
+        if [ -n "$SSL_CIPHER_SUITES" ]; then
+            if  grep -q "gov.nist.javax.sip.ENABLED_CIPHER_SUITES" "$FILE"; then
+                sed -i "s|gov.nist.javax.sip.ENABLED_CIPHER_SUITES=.*|gov.nist.javax.sip.ENABLED_CIPHER_SUITES=$SSL_CIPHER_SUITES|" $FILE
+            else
+                echo 'gov.nist.javax.sip.ENABLED_CIPHER_SUITES='"$SSL_CIPHER_SUITES"'' >> $FILE
+            fi
+
+        fi
+
+
 	if [[ "$TRUSTSTORE_FILE" = /* ]]; then
 		TRUSTSTORE_LOCATION=$TRUSTSTORE_FILE
 	else

restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-SecureSSL.sh

@@ -38,9 +38,18 @@ FILE=$BASEDIR/standalone/deployments/olympus.war/resources/xml/olympus.xml
 }
 
 
+DomainConf(){
+#Configure Web Olympus Domain.
+FILE=$BASEDIR/standalone/deployments/olympus.war/resources/xml/olympus.xml
+    echo "WebOlympusDomain: $WebOlympusDomain"
+    if [ ! -z "${WebOlympusDomain}" ]; then
+        xmlstarlet ed -L -P -u  "/olympus/server/address" -v ${WebOlympusDomain} $FILE
+    fi
+}
 
 
 # MAIN
 echo 'Configuring Olympus...'
 #Reload Variables
 olympusPortConf
+DomainConf

restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-olympus.sh

@@ -492,6 +492,8 @@ configSMPPAccount() {
 	peerPort="$6"
 	sourceMap="$7"
 	destinationMap="$8"
+	inboundEncoding="$9"
+	outboundEncoding="${10}"
 
 
 	sed -i "s|<smpp class=\"org.restcomm.connect.sms.smpp.SmppService\" activateSmppConnection =\".*\">|<smpp class=\"org.restcomm.connect.sms.smpp.SmppService\" activateSmppConnection =\"$activate\">|g" $FILE
@@ -528,6 +530,13 @@ configSMPPAccount() {
 		}" $FILE
 
         sed -i "s|<connection activateAddressMapping=\"false\" sourceAddressMap=\"\" destinationAddressMap=\"\" tonNpiValue=\"1\">|<connection activateAddressMapping=\"false\" sourceAddressMap=\"${sourceMap}\" destinationAddressMap=\"${destinationMap}\" tonNpiValue=\"1\">|" $FILE
+
+        if [ ! -z "${inboundEncoding}" ]; then
+            xmlstarlet ed -L -P -u  "/restcomm/smpp/connections/connection/inboundencoding" -v $inboundEncoding $FILE
+        fi
+        if [ ! -z "${outboundEncoding}" ]; then
+            xmlstarlet ed -L -P -u  "/restcomm/smpp/connections/connection/outboundencoding" -v $outboundEncoding $FILE
+        fi
 		echo 'Configured SMPP Account Details'
 
 	else
@@ -560,6 +569,10 @@ configSMPPAccount() {
 		}" $FILE
 
         sed -i "s|<connection activateAddressMapping=\"false\" sourceAddressMap=\"\" destinationAddressMap=\"\" tonNpiValue=\"1\">|<connection activateAddressMapping=\"false\" sourceAddressMap=\"\" destinationAddressMap=\"\" tonNpiValue=\"1\">|" $FILE
+
+        xmlstarlet ed -L -P -u  "/restcomm/smpp/connections/connection/inboundencoding" -v "" $FILE
+        xmlstarlet ed -L -P -u  "/restcomm/smpp/connections/connection/outboundencoding" -v "" $FILE
+
 		echo 'Configured SMPP Account Details'
 	fi
 }
@@ -687,6 +700,10 @@ otherRestCommConf(){
     echo "CACHE_NO_WAV $CACHE_NO_WAV"
     sed -i "s|<cache-no-wav>.*</cache-no-wav>|<cache-no-wav>${CACHE_NO_WAV}</cache-no-wav>|" $FILE
 
+    #Configure USESBC
+    echo "USESBC: $RCUSESBC"
+    sed -i "s|<use-sbc>.*</use-sbc>|<use-sbc>${RCUSESBC}</use-sbc>|" $FILE
+
     echo "End Rest RestComm configuration"
 }
 
@@ -876,7 +893,7 @@ configSpeechRecognizer "$ISPEECH_KEY"
 configSpeechSynthesizers
 configTelestaxProxy "$ACTIVE_PROXY" "$TP_LOGIN" "$TP_PASSWORD" "$INSTANCE_ID" "$PROXY_IP" "$SITE_ID"
 configMediaServerManager "$BIND_ADDRESS" "$MS_ADDRESS" "$MEDIASERVER_EXTERNAL_ADDRESS"
-configSMPPAccount "$SMPP_ACTIVATE" "$SMPP_SYSTEM_ID" "$SMPP_PASSWORD" "$SMPP_SYSTEM_TYPE" "$SMPP_PEER_IP" "$SMPP_PEER_PORT" "$SMPP_SOURCE_MAP" "$SMPP_DEST_MAP"
+configSMPPAccount "$SMPP_ACTIVATE" "$SMPP_SYSTEM_ID" "$SMPP_PASSWORD" "$SMPP_SYSTEM_TYPE" "$SMPP_PEER_IP" "$SMPP_PEER_PORT" "$SMPP_SOURCE_MAP" "$SMPP_DEST_MAP" "$SMPP_INBOUND_ENCODING" "$SMPP_OUTBOUND_ENCODING"
 configRestCommURIs
 updateRecordingsPath
 configHypertextPort

restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-restcomm.sh

@@ -55,6 +55,8 @@ SMPP_PEER_IP=''	        #use IP or DNS name of peer SMPP server
 SMPP_PEER_PORT=''
 SMPP_SOURCE_MAP=''
 SMPP_DEST_MAP=''
+SMPP_INBOUND_ENCODING=''
+SMPP_OUTBOUND_ENCODING=''
 
 # DID Provision provider variable declarations
 PROVISION_PROVIDER=''               # values: VI (VoipInnovation), BW (Bandwidth), NX (Nexmo), VB (Voxbone)

restcomm/configuration/config-scripts/as7-config-scripts/restcomm/restcomm.conf

@@ -174,7 +174,7 @@
         <module>restcomm.monitoring.service</module>
         <module>restcomm.tts.awspolly</module>
         <module>restcomm.sdr.api</module>
-        <module>restcomm-connect.core</module>
+        <module>restcomm.core</module>
     </modules>
 
     <dependencyManagement>

restcomm/pom.xml

@@ -11,7 +11,9 @@
 	MA 02110-1301 USA, or see the FSF site: http://www.fsf.org. -->
 <restcomm>
 	<runtime-settings>
-		<!-- The API version that will be used. -->
+        <client-algorithm>MD5</client-algorithm>
+        <client-qop>auth</client-qop>
+        <!-- The API version that will be used. -->
 		<api-version>2012-04-24</api-version>
 
 		<!-- Try to run RVD workspace projects migration to apply new naming
@@ -173,6 +175,10 @@
 			If set to false RestComm will use the Request URI to determine the destination. -->
 		<use-to>true</use-to>
 
+		<!-- if this flag is set to true, it will disable all patching done for NAT
+		 even if they are enabled in the configuration file-->
+		<use-sbc>false</use-sbc>
+
 		<!-- If set to true Restcomm will use the Local Address (or external address
 			if available) in the host part of the From header for calls to the outbound
 			proxy. Default is False, which means that Restcomm will use outbound proxy
@@ -666,6 +672,10 @@
 					If no response received for 3 consecutive requests, connection will be killed
 					and attempted to connect again -->
 				<enquirelinkdelay>30000</enquirelinkdelay>
+				<!-- when no values are set, default value from code is MODIFIED-UTF8 inbound, GSM7 for outbound-->
+				<inboundencoding/>
+				<outboundencoding/>
+
 			</connection>
 		</connections>
 	</smpp>