dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

improving control port connection code 

adding additional logging for problems with Samsungs
This commit is contained in:
Nathan Freitas 2014-04-15 00:47:59 -04:00
parent fa6c1015d8
commit 3824bc56e5
1 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/org/torproject/android/service/TorService.java
View File

@ -8,6 +8,7 @@
package org.torproject.android.service; package org.torproject.android.service;
import java.io.DataInputStream;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
@ -829,17 +830,18 @@ public class TorService extends Service implements TorServiceConstants, TorConst
private int initControlConnection () throws Exception, RuntimeException private int initControlConnection () throws Exception, RuntimeException
{ {
while (conn == null) int maxAttempts = 5;
int i = 0;
while (conn == null && i++ < maxAttempts)
{ {
try try
{ {
logNotice( "Connecting to control port: " + TOR_CONTROL_PORT); logNotice( "Connecting to control port: " + TOR_CONTROL_PORT);
torConnSocket = new Socket(IP_LOCALHOST, TOR_CONTROL_PORT); torConnSocket = new Socket(IP_LOCALHOST, TOR_CONTROL_PORT);
conn = TorControlConnection.getConnection(torConnSocket); conn = TorControlConnection.getConnection(torConnSocket);
// conn.authenticate(new byte[0]); // See section 3.2
logNotice( "SUCCESS connected to control port"); logNotice( "SUCCESS connected to control port");
@ -848,31 +850,40 @@ public class TorService extends Service implements TorServiceConstants, TorConst
if (fileCookie.exists()) if (fileCookie.exists())
{ {
byte[] cookie = new byte[(int)fileCookie.length()]; byte[] cookie = new byte[(int)fileCookie.length()];
new FileInputStream(fileCookie).read(cookie); DataInputStream fis = new DataInputStream(new FileInputStream(fileCookie));
fis.read(cookie);
fis.close();
conn.authenticate(cookie); conn.authenticate(cookie);
logNotice( "SUCCESS authenticated to control port"); logNotice( "SUCCESS - authenticated to control port");
sendCallbackStatusMessage(getString(R.string.tor_process_starting) + ' ' + getString(R.string.tor_process_complete)); sendCallbackStatusMessage(getString(R.string.tor_process_starting) + ' ' + getString(R.string.tor_process_complete));
addEventHandler(); addEventHandler();
String torProcId = conn.getInfo("process/pid");
return Integer.parseInt(torProcId);
}
else
{
logNotice ("Tor authentication cookie does not exist yet; trying again...");
} }
String torProcId = conn.getInfo("process/pid");
return Integer.parseInt(torProcId);
} }
catch (Exception ce) catch (Exception ce)
{ {
conn = null; conn = null;
logNotice( "Error connecting to Tor local control port: " + ce.getLocalizedMessage());
Log.d(TAG,"Attempt: Error connecting to control port: " + ce.getLocalizedMessage(),ce); Log.d(TAG,"Attempt: Error connecting to control port: " + ce.getLocalizedMessage(),ce);
sendCallbackStatusMessage(getString(R.string.tor_process_waiting));
Thread.sleep(3000);
} }
sendCallbackStatusMessage(getString(R.string.tor_process_waiting));
Thread.sleep(3000);
} }