Skip to content

Commit 3ea20e6

Browse files
author
Antonis
committed
Working on #703: Investigate impacts for DNS SRV introduction in Android SDK
1 parent 7a347df commit 3ea20e6

File tree

5 files changed

+28
-41
lines changed

5 files changed

+28
-41
lines changed

‎Examples/restcomm-olympus/.idea/misc.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Examples/restcomm-olympus/app/app.iml‎

Lines changed: 7 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -62,20 +62,20 @@
6262
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
6363
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6464
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
65-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
66-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
67-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7265
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7366
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
7467
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
7568
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
7669
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
7770
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
7871
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7979
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8080
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8181
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -130,26 +130,5 @@
130130
<orderEntry type="library" exported="" name="libwebrtc-1.0.0-beta5-16765" level="project" />
131131
<orderEntry type="library" exported="" name="testfairy-android-sdk-1.5.5" level="project" />
132132
<orderEntry type="module" module-name="restcomm.android.sdk" exported="" />
133-
<orderEntry type="library" exported="" name="android-jain-sip-ext-1.3.33" level="project" />
134-
<orderEntry type="library" exported="" name="javolution-5.5.1" level="project" />
135-
<orderEntry type="library" exported="" name="dnsjava-2.1.7" level="project" />
136-
<orderEntry type="library" exported="" name="android-jain-sip-ri-1.2.293" level="project" />
137-
<orderEntry type="library" exported="" name="core-1.54.0.0" level="project" />
138-
<orderEntry type="library" exported="" name="commons-congestion-2.0.147" level="project" />
139-
<orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" />
140-
<orderEntry type="library" exported="" name="prov-1.54.0.0" level="project" />
141-
<orderEntry type="library" exported="" name="log4j-1.2.17" level="project" />
142-
<orderEntry type="library" exported="" name="slf4j-log4j12-1.5.5" level="project" />
143-
<orderEntry type="library" exported="" name="pkix-1.54.0.0" level="project" />
144-
<orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" />
145-
<orderEntry type="library" exported="" name="support-media-compat-25.3.1" level="project" />
146-
<orderEntry type="library" exported="" name="slf4j-api-1.5.5" level="project" />
147-
<orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" />
148-
<orderEntry type="library" exported="" name="appcompat-v7-25.3.1" level="project" />
149-
<orderEntry type="library" exported="" name="support-vector-drawable-25.3.1" level="project" />
150-
<orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" />
151-
<orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" />
152-
<orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" />
153-
<orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" />
154133
</component>
155134
</module>

‎restcomm.android.sdk/src/main/java/org/restcomm/android/sdk/SignalingClient/JainSipClient/JainSipClient.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,8 @@ public void open(String jobId, Context androidContext, HashMap<String, Object> c
204204
try {
205205
JainSipConfiguration.normalizeParameters(configuration);
206206
jainSipStack = jainSipFactory.createSipStack(properties);
207-
JainSipMessageBuilder.normalizeDomain(configuration, JainSipConfiguration.getSecureEnabledValue(null, configuration));
207+
JainSipMessageBuilder.normalizeDomain(configuration, configuration.containsKey(RCDevice.ParameterKeys.SIGNALING_SECURE_ENABLED) &&
208+
(boolean) configuration.get(RCDevice.ParameterKeys.SIGNALING_SECURE_ENABLED));
208209

209210
jainSipJobManager.add(jobId, JainSipJob.Type.TYPE_OPEN, configuration);
210211
}
@@ -263,9 +264,6 @@ public void reconfigure(String jobId, HashMap<String, Object> parameters, JainSi
263264
{
264265
RCLogger.i(TAG, "reconfigure(): " + parameters.toString());
265266

266-
// normalize before checking which parameters changed
267-
//JainSipMessageBuilder.normalizeDomain(parameters, JainSipConfiguration.getSecureEnabledValue(this.configuration, parameters));
268-
269267
// check which parameters actually changed by comparing this.configuration with parameters
270268
HashMap<String, Object> modifiedParameters = JainSipConfiguration.modifiedParameters(this.configuration, parameters);
271269

@@ -281,7 +279,8 @@ public void reconfigure(String jobId, HashMap<String, Object> parameters, JainSi
281279
// remember that the new parameters can be just a subset of the currently stored in configuration, so to update the current parameters we need
282280
// to merge them with the new (i.e. keep the old and replace any new keys with new values)
283281
configuration = JainSipConfiguration.mergeParameters(configuration, parameters);
284-
JainSipMessageBuilder.normalizeDomain(configuration, JainSipConfiguration.getSecureEnabledValue(null, configuration));
282+
JainSipMessageBuilder.normalizeDomain(configuration, configuration.containsKey(RCDevice.ParameterKeys.SIGNALING_SECURE_ENABLED) &&
283+
(boolean) configuration.get(RCDevice.ParameterKeys.SIGNALING_SECURE_ENABLED));
285284

286285
// Set the media parameters right away, since they are irrelevant to signaling
287286
if (modifiedParameters.containsKey(RCDevice.ParameterKeys.MEDIA_TURN_ENABLED)) {

‎restcomm.android.sdk/src/main/java/org/restcomm/android/sdk/SignalingClient/JainSipClient/JainSipConfiguration.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,13 @@ static boolean getBoolean(HashMap<String, Object> parameters, String key)
7474
}
7575

7676

77-
static boolean getSecureEnabledValue(HashMap<String, Object> oldParameters, HashMap<String, Object> newParameters)
77+
/*
78+
static boolean getSecureEnabledValue(HashMap<String, Object> newParameters)
7879
{
79-
if (newParameters.containsKey(RCDevice.ParameterKeys.SIGNALING_SECURE_ENABLED)) {
80-
return (boolean) newParameters.get(RCDevice.ParameterKeys.SIGNALING_SECURE_ENABLED);
81-
} else {
82-
return oldParameters != null && oldParameters.containsKey(RCDevice.ParameterKeys.SIGNALING_SECURE_ENABLED) &&
83-
(boolean) oldParameters.get(RCDevice.ParameterKeys.SIGNALING_SECURE_ENABLED);
84-
}
80+
return newParameters != null && newParameters.containsKey(RCDevice.ParameterKeys.SIGNALING_SECURE_ENABLED) &&
81+
(boolean) newParameters.get(RCDevice.ParameterKeys.SIGNALING_SECURE_ENABLED);
8582
8683
}
84+
*/
8785

8886
}

‎restcomm.android.sdk/src/main/java/org/restcomm/android/sdk/SignalingClient/JainSipClient/JainSipMessageBuilder.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -494,8 +494,19 @@ private RouteHeader createRouteHeader(String route, ListeningPoint listeningPoin
494494

495495
Set<String> supportedTransports = new HashSet<String>();
496496
supportedTransports.add(listeningPoint.getTransport());
497+
RCLogger.e(TAG, "--- 11111");
498+
/*
499+
try {
500+
Thread.sleep(15000);
501+
} catch (InterruptedException e) {
502+
e.printStackTrace();
503+
}
504+
*/
505+
497506
DefaultDNSServerLocator dnsServerLocator = new DefaultDNSServerLocator(supportedTransports);
507+
RCLogger.e(TAG, "--- 22222");
498508
Queue<Hop> hops = dnsServerLocator.locateHops(jainSipAddressFactory.createURI(route));
509+
RCLogger.e(TAG, "--- 33333");
499510
SipURI routeUri = jainSipAddressFactory.createSipURI(null, hops.peek().getHost());
500511
routeUri.setParameter(DNSAwareRouter.DNS_ROUTE, Boolean.TRUE.toString());
501512
routeUri.setPort(hops.peek().getPort());

0 commit comments

Comments
 (0)