Skip to content

Commit 3e29cbe

Browse files
author
Antonis
committed
Fixed #703: Investigate impacts for DNS SRV introduction in Android SDK
1 parent 3ea20e6 commit 3e29cbe

File tree

5 files changed

+43
-19
lines changed

5 files changed

+43
-19
lines changed

‎Examples/.DS_Store‎

0 Bytes
Binary file not shown.

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

Lines changed: 28 additions & 7 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/test/res" type="java-test-resource" />
66-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
67-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7265
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7366
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
7467
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
7568
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
7669
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
7770
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
7871
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/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,5 +130,26 @@
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" />
133154
</component>
134155
</module>

‎restcomm.android.sdk/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ dependencies {
9797
compile 'com.madgag.spongycastle:pkix:1.54.0.0'
9898
// Required for local unit tests (JUnit 4 framework)
9999
//testCompile 'junit:junit:4.12'
100-
//compile files('libs/android-jain-sip-ext-1.3.0-SNAPSHOT.jar')
101100

102101
// Even though sdk doesn't directly use dnsjava, we need it for android-jain-sip-ext. The reason is that for now android-jain-sip-ext declares its dependency to
103102
// dnsjava as 'provided', because in non android environment it is provided already (i.e. sip servlets). Until we fix the android-jain-sip-ext .pom let's leave it

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222

2323
package org.restcomm.android.sdk.SignalingClient.JainSipClient;
2424

25+
import android.Manifest;
2526
import android.content.Context;
27+
import android.content.pm.PackageManager;
2628
import android.gov.nist.javax.sip.ResponseEventExt;
2729
import android.gov.nist.javax.sip.SipStackExt;
2830
import android.gov.nist.javax.sip.clientauthutils.AuthenticationHelper;
@@ -58,13 +60,18 @@
5860
import android.text.format.Formatter;
5961

6062
//import org.apache.http.conn.util.InetAddressUtils;
63+
import org.restcomm.android.sdk.R;
6164
import org.restcomm.android.sdk.RCClient;
6265
import org.restcomm.android.sdk.RCConnection;
6366
import org.restcomm.android.sdk.RCDevice;
6467
import org.restcomm.android.sdk.RCDeviceListener;
6568
import org.restcomm.android.sdk.util.RCLogger;
6669

6770
import java.io.File;
71+
import java.io.FileOutputStream;
72+
import java.io.InputStream;
73+
import java.io.OutputStream;
74+
import java.io.PrintWriter;
6875
import java.net.Inet4Address;
6976
import java.net.InetAddress;
7077
import java.net.NetworkInterface;
@@ -199,6 +206,14 @@ public void open(String jobId, Context androidContext, HashMap<String, Object> c
199206
File downloadPath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
200207
properties.setProperty("android.gov.nist.javax.sip.DEBUG_LOG", downloadPath.getAbsolutePath() + "/debug-jain.log");
201208
properties.setProperty("android.gov.nist.javax.sip.SERVER_LOG", downloadPath.getAbsolutePath() + "/server-jain.log");
209+
210+
properties.setProperty("gov.nist.javax.sip.TRACE_LEVEL", "32");
211+
properties.setProperty("gov.nist.javax.sip.DEBUG_LOG", downloadPath.getAbsolutePath() + "/debug-jain-ext.log");
212+
properties.setProperty("gov.nist.javax.sip.SERVER_LOG", downloadPath.getAbsolutePath() + "/server-jain-ext.log");
213+
214+
if (androidContext.checkCallingOrSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
215+
RCLogger.e(TAG, "JAIN SIP logging is enabled but permission " + Manifest.permission.WRITE_EXTERNAL_STORAGE + " is not granted");
216+
}
202217
}
203218

204219
try {

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -494,19 +494,8 @@ 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-
506497
DefaultDNSServerLocator dnsServerLocator = new DefaultDNSServerLocator(supportedTransports);
507-
RCLogger.e(TAG, "--- 22222");
508498
Queue<Hop> hops = dnsServerLocator.locateHops(jainSipAddressFactory.createURI(route));
509-
RCLogger.e(TAG, "--- 33333");
510499
SipURI routeUri = jainSipAddressFactory.createSipURI(null, hops.peek().getHost());
511500
routeUri.setParameter(DNSAwareRouter.DNS_ROUTE, Boolean.TRUE.toString());
512501
routeUri.setPort(hops.peek().getPort());

0 commit comments

Comments
 (0)