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

update to latest jtorctl with patches for thread, error handling

This commit is contained in:
Nathan Freitas 2014-08-11 16:05:08 -04:00
parent bacdf5438d
commit 05dd3317f1
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/jtorctl vendored

@ -1 +1 @@
Subproject commit 319377b33117035155715b9207a7b41cbacef3a7 Subproject commit 9f8affffbb03737b5606212c3ade9a1114df755f

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

@ -1020,7 +1020,10 @@ public class TorService extends Service implements TorServiceConstants, TorConst
torConnSocket = new Socket(IP_LOCALHOST, controlPort); torConnSocket = new Socket(IP_LOCALHOST, controlPort);
torConnSocket.setSoTimeout(CONTROL_SOCKET_TIMEOUT); torConnSocket.setSoTimeout(CONTROL_SOCKET_TIMEOUT);
conn = TorControlConnection.getConnection(torConnSocket); boolean oo = true;
conn = new TorControlConnection(torConnSocket);
conn.launchThread(true);//is daemon
logNotice( "SUCCESS connected to Tor control port"); logNotice( "SUCCESS connected to Tor control port");