Skip to content

Commit cf33562

Browse files
author
Maria Farooq
committed
Merge branch 'master' into restcomm1657
* master: (79 commits) updated doc with latest profile enhacements RESTCOMM-1856: Change default SMPP outbond to GSM (GSM8) Show error information on console state change fail Fix PublicConfig service and use rvdUrl for Designer allow undefined properties at profile doc level RESTCOMM-1856: Add configurable param for inbound and outbound encoding. Modify test resource restcomm.xml. Modify Auto config doc. RESTCOMM-1856: Add logging for Charset failure fixed the sbc tests client password secured RESTCOMM-1856: Fix restcomm.xml smpp property names RESTCOMM-1856: Modify MockSmppserver to decode messages correctly. Add UTF-8 and UCS-2 tests. Add special chars in test RESTCOMM-1856 Motivation: -Fix inbound and outbound smpp encoding Modifications: -Add default inbound and outbound configs for Smpp object -Decode and encode with default encoding when DCS==DEFAULT -Decode content string in Downloader with encoding header or default RVD encoding (UTF-8) Results: -Inbound and outbound smpp connection can be configured with specific character encodings -Any inbound and outbound default and UCS2 messages will be decoded and encoded correctly RESTCOMM-2000: check WebOlympusDomain before modifying olympus.xml added testing categories updated comment fixed RESTCOMM-1993 Added JProfiler to acknowledgements Minor fix for log statement This refer to RESTCOMM-1932 Improved log statements and test case to reproduce issue This refer to RESTCOMM-1932 inherit MockMediaGateway to reduce dullpicated code ... Conflicts: restcomm/pom.xml restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialActionOrganizationTest.java
2 parents ab54ab3 + 5a216b7 commit cf33562

165 files changed

Lines changed: 6398 additions & 624 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎LICENSE‎

Lines changed: 661 additions & 0 deletions
Large diffs are not rendered by default.

‎README.md‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,10 @@ Continuous Integration and Delivery
5656

5757
Acknowledgements
5858
========
59-
Java Profiler sponsored by YourKit
60-
[![YourKit The Industry Leader in .NET & Java Profiling](https://www.yourkit.com/images/yk_logo.png)](https://www.yourkit.com/)
6159

62-
[See who has been contributing to RestComm](http://www.telestax.com/opensource/acknowledgments/)
60+
* [![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
61+
62+
* [![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
63+
64+
---
65+
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.

‎release/build.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<property name="restcomm-media.distro.zip.path" value="${checkout.dir}/${restcomm-media.download.distro.file}"/>
3434

3535
<!-- <property name="restcomm-olympus.download.url" value="https://mobicents.ci.cloudbees.com/job/Olympus/${olympus.build}/artifact/target/olympus.war"/> -->
36-
<property name="restcomm-olympus.download.url" value="https://app.box.com/shared/static/xd8enx5wjxy3ofy8movo2gske7ofx6bp.war"/>
36+
<property name="restcomm-olympus.download.url" value="https://app.box.com/shared/static/0rf2w3q7r0g2b4p4rtptc24wauxegfsf.war"/>
3737
<property name="restcomm-olympus.path" value="${configuration.directory}/olympus.war"/>
3838

3939
<!-- Determine RVD retrieval URL

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ SECURESSL=FALSE
1818
TRUSTSTORE_FILE='restcomm-crt.jks' #File should be located at $RESTCOMM_HOME/standalone/configuration folder. Provide just the name of the trustore file.
1919
TRUSTSTORE_PASSWORD='changeme' #Password for the trustore file
2020
TRUSTSTORE_ALIAS='restcomm' #The certificate alias
21+
#comma separated protocols to set on SSLEngine, if empty use stack defaults
22+
SSL_PROTOCOLS=''
23+
#comma separated cipher suites to set on SSLEngine, if empty use stack defaults
24+
SSL_CIPHER_SUITES=''
2125

2226
#HTTPS Settings
2327
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
148152

149153
#MSS Configuration
150154
TLS_CLIENT_AUTH_TYPE="Disabled" #Possible values Enabled, Want, Disabled,DisabledAll
155+
156+
#USESBC: Option to disable all patch for NAT (Includes patch-for-nat-b2bua-sessions,disable-sdp-patching-on-updating-mediasession)
157+
RCUSESBC=false
158+
#Domain to be used in the SIP URI <user>@<domain>. If not defined, it will default to the webapp host name.
159+
WebOlympusDomain=""

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,25 @@ MssStackConf(){
147147
sed -i '/gov.nist.javax.sip.TLS_CLIENT_AUTH_TYPE='"$TLS_CLIENT_AUTH_TYPE"'/,+5d' $FILE
148148
fi
149149

150+
if [ -n "$SSL_PROTOCOLS" ]; then
151+
if grep -q "gov.nist.javax.sip.TLS_CLIENT_PROTOCOLS" "$FILE"; then
152+
sed -i "s|gov.nist.javax.sip.TLS_CLIENT_PROTOCOLS=.*|gov.nist.javax.sip.TLS_CLIENT_PROTOCOLS=$SSL_PROTOCOLS|" $FILE
153+
else
154+
echo "gov.nist.javax.sip.TLS_CLIENT_PROTOCOLS=$SSL_PROTOCOLS"'' >> $FILE
155+
fi
156+
157+
fi
158+
159+
if [ -n "$SSL_CIPHER_SUITES" ]; then
160+
if grep -q "gov.nist.javax.sip.ENABLED_CIPHER_SUITES" "$FILE"; then
161+
sed -i "s|gov.nist.javax.sip.ENABLED_CIPHER_SUITES=.*|gov.nist.javax.sip.ENABLED_CIPHER_SUITES=$SSL_CIPHER_SUITES|" $FILE
162+
else
163+
echo 'gov.nist.javax.sip.ENABLED_CIPHER_SUITES='"$SSL_CIPHER_SUITES"'' >> $FILE
164+
fi
165+
166+
fi
167+
168+
150169
if [[ "$TRUSTSTORE_FILE" = /* ]]; then
151170
TRUSTSTORE_LOCATION=$TRUSTSTORE_FILE
152171
else

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,18 @@ FILE=$BASEDIR/standalone/deployments/olympus.war/resources/xml/olympus.xml
3838
}
3939

4040

41+
DomainConf(){
42+
#Configure Web Olympus Domain.
43+
FILE=$BASEDIR/standalone/deployments/olympus.war/resources/xml/olympus.xml
44+
echo "WebOlympusDomain: $WebOlympusDomain"
45+
if [ ! -z "${WebOlympusDomain}" ]; then
46+
xmlstarlet ed -L -P -u "/olympus/server/address" -v ${WebOlympusDomain} $FILE
47+
fi
48+
}
4149

4250

4351
# MAIN
4452
echo 'Configuring Olympus...'
4553
#Reload Variables
4654
olympusPortConf
55+
DomainConf

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

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,6 +492,8 @@ configSMPPAccount() {
492492
peerPort="$6"
493493
sourceMap="$7"
494494
destinationMap="$8"
495+
inboundEncoding="$9"
496+
outboundEncoding="${10}"
495497

496498

497499
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() {
528530
}" $FILE
529531

530532
sed -i "s|<connection activateAddressMapping=\"false\" sourceAddressMap=\"\" destinationAddressMap=\"\" tonNpiValue=\"1\">|<connection activateAddressMapping=\"false\" sourceAddressMap=\"${sourceMap}\" destinationAddressMap=\"${destinationMap}\" tonNpiValue=\"1\">|" $FILE
533+
534+
if [ ! -z "${inboundEncoding}" ]; then
535+
xmlstarlet ed -L -P -u "/restcomm/smpp/connections/connection/inboundencoding" -v $inboundEncoding $FILE
536+
fi
537+
if [ ! -z "${outboundEncoding}" ]; then
538+
xmlstarlet ed -L -P -u "/restcomm/smpp/connections/connection/outboundencoding" -v $outboundEncoding $FILE
539+
fi
531540
echo 'Configured SMPP Account Details'
532541

533542
else
@@ -560,6 +569,10 @@ configSMPPAccount() {
560569
}" $FILE
561570

562571
sed -i "s|<connection activateAddressMapping=\"false\" sourceAddressMap=\"\" destinationAddressMap=\"\" tonNpiValue=\"1\">|<connection activateAddressMapping=\"false\" sourceAddressMap=\"\" destinationAddressMap=\"\" tonNpiValue=\"1\">|" $FILE
572+
573+
xmlstarlet ed -L -P -u "/restcomm/smpp/connections/connection/inboundencoding" -v "" $FILE
574+
xmlstarlet ed -L -P -u "/restcomm/smpp/connections/connection/outboundencoding" -v "" $FILE
575+
563576
echo 'Configured SMPP Account Details'
564577
fi
565578
}
@@ -687,6 +700,10 @@ otherRestCommConf(){
687700
echo "CACHE_NO_WAV $CACHE_NO_WAV"
688701
sed -i "s|<cache-no-wav>.*</cache-no-wav>|<cache-no-wav>${CACHE_NO_WAV}</cache-no-wav>|" $FILE
689702

703+
#Configure USESBC
704+
echo "USESBC: $RCUSESBC"
705+
sed -i "s|<use-sbc>.*</use-sbc>|<use-sbc>${RCUSESBC}</use-sbc>|" $FILE
706+
690707
echo "End Rest RestComm configuration"
691708
}
692709

@@ -876,7 +893,7 @@ configSpeechRecognizer "$ISPEECH_KEY"
876893
configSpeechSynthesizers
877894
configTelestaxProxy "$ACTIVE_PROXY" "$TP_LOGIN" "$TP_PASSWORD" "$INSTANCE_ID" "$PROXY_IP" "$SITE_ID"
878895
configMediaServerManager "$BIND_ADDRESS" "$MS_ADDRESS" "$MEDIASERVER_EXTERNAL_ADDRESS"
879-
configSMPPAccount "$SMPP_ACTIVATE" "$SMPP_SYSTEM_ID" "$SMPP_PASSWORD" "$SMPP_SYSTEM_TYPE" "$SMPP_PEER_IP" "$SMPP_PEER_PORT" "$SMPP_SOURCE_MAP" "$SMPP_DEST_MAP"
896+
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"
880897
configRestCommURIs
881898
updateRecordingsPath
882899
configHypertextPort

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ SMPP_PEER_IP='' #use IP or DNS name of peer SMPP server
5555
SMPP_PEER_PORT=''
5656
SMPP_SOURCE_MAP=''
5757
SMPP_DEST_MAP=''
58+
SMPP_INBOUND_ENCODING=''
59+
SMPP_OUTBOUND_ENCODING=''
5860

5961
# DID Provision provider variable declarations
6062
PROVISION_PROVIDER='' # values: VI (VoipInnovation), BW (Bandwidth), NX (Nexmo), VB (Voxbone)

‎restcomm/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@
174174
<module>restcomm.monitoring.service</module>
175175
<module>restcomm.tts.awspolly</module>
176176
<module>restcomm.sdr.api</module>
177-
<module>restcomm-connect.core</module>
177+
<module>restcomm.core</module>
178178
</modules>
179179

180180
<dependencyManagement>

‎restcomm/restcomm.application/src/main/webapp/WEB-INF/conf/restcomm.xml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
MA 02110-1301 USA, or see the FSF site: http://www.fsf.org. -->
1212
<restcomm>
1313
<runtime-settings>
14-
<!-- The API version that will be used. -->
14+
<client-algorithm>MD5</client-algorithm>
15+
<client-qop>auth</client-qop>
16+
<!-- The API version that will be used. -->
1517
<api-version>2012-04-24</api-version>
1618

1719
<!-- Try to run RVD workspace projects migration to apply new naming
@@ -173,6 +175,10 @@
173175
If set to false RestComm will use the Request URI to determine the destination. -->
174176
<use-to>true</use-to>
175177

178+
<!-- if this flag is set to true, it will disable all patching done for NAT
179+
even if they are enabled in the configuration file-->
180+
<use-sbc>false</use-sbc>
181+
176182
<!-- If set to true Restcomm will use the Local Address (or external address
177183
if available) in the host part of the From header for calls to the outbound
178184
proxy. Default is False, which means that Restcomm will use outbound proxy
@@ -666,6 +672,10 @@
666672
If no response received for 3 consecutive requests, connection will be killed
667673
and attempted to connect again -->
668674
<enquirelinkdelay>30000</enquirelinkdelay>
675+
<!-- when no values are set, default value from code is MODIFIED-UTF8 inbound, GSM7 for outbound-->
676+
<inboundencoding/>
677+
<outboundencoding/>
678+
669679
</connection>
670680
</connections>
671681
</smpp>

0 commit comments

Comments
 (0)