RESTCOMM-1856: Add configurable param for inbound and outbound encoding. Modify test resource restcomm.xml. Modify Auto config doc.

Author: abdulazizali77

restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-restcomm.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
 }
@@ -880,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/restcomm.conf

@@ -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/restcomm.application/src/main/webapp/WEB-INF/conf/restcomm.xml

@@ -670,11 +670,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 UTF-8-->
-				<!--
-				<inboundencoding>UTF-8</inboundencoding>
-				<outboundencoding>UTF-8</outboundencoding>
-				 -->
+				<!-- when no values are set, default value from code is MODIFIED-UTF8 inbound, GSM7 for outbound-->
+				<inboundencoding/>
+				<outboundencoding/>
+
 			</connection>
 		</connections>
 	</smpp>

restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/configuration/Restcomm- Automatic Configuration Options.adoc

@@ -75,6 +75,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=''
 ----
 
 * Section *#Restcomm DID provider integration*.

restcomm/restcomm.testsuite/src/test/resources/restcomm-smpp.xml

@@ -297,6 +297,9 @@
 					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>UTF-8</inboundencoding>
+				<outboundencoding>UTF-8</outboundencoding>
 			</connection>
 		</connections>
 	</smpp>