Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 18:59:06 +01:00
Code Issues Projects Releases Wiki Activity

Parts of our jtorctl patch have been merged upstream.

Browse Source
This commit is contained in:
akwizgran
2014-10-03 13:29:12 +01:00
parent 4e028e217b
commit e5620f8b05
3 changed files with 8 additions and 1077 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
briar-android/libs/jtorctl-briar.jar
View File

Binary file not shown.

25
briar-android/src/org/briarproject/plugins/tor/TorPlugin.java
View File

@@ -21,7 +21,6 @@ import java.net.Socket;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Scanner;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executor;
@@ -546,34 +545,14 @@ class TorPlugin implements DuplexPlugin, EventHandler {
throw new UnsupportedOperationException();
}
public void circuitStatus(String status, String id, List<String> path,
Map<String, String> info) {
if(LOG.isLoggable(INFO)) {
String msg = "Circuit " + id + " " + status;
String purpose = info.get("PURPOSE");
if(purpose != null) msg += ", purpose: " + purpose;
String hsState = info.get("HS_STATE");
if(hsState != null) msg += ", state: " + hsState;
String rendQuery = info.get("REND_QUERY");
if(rendQuery != null) msg += ", service: " + rendQuery;
if(!path.isEmpty()) msg += ", path: " + shortenPath(path);
LOG.info(msg);
}
public void circuitStatus(String status, String id, String path) {
if(LOG.isLoggable(INFO)) LOG.info("Circuit " + id + " " + status);
if(status.equals("BUILT") && !circuitBuilt.getAndSet(true)) {
LOG.info("First circuit built");
if(isRunning()) callback.pollNow();
}
}
private String shortenPath(List<String> path) {
StringBuilder s = new StringBuilder();
for(String id : path) {
if(s.length() > 0) s.append(',');
s.append(id.substring(1, 7));
}
return s.toString();
}
public void streamStatus(String status, String id, String target) {}
public void orConnStatus(String status, String orName) {

1060
jtorctl.patch
View File

File diff suppressed because it is too large Load Diff