marek/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

propagate from branch 'i2p.i2p.zzz.test2' (head 7db2f2b73bc7c44b4be1077185314201c5b0bfe6)

Browse Source 
to branch 'i2p.i2p' (head ea9844ecc27e816a09cf5d9b36c10ee2c3d1bcc9)
This commit is contained in:
zzz
2014-02-10 18:46:38 +00:00
parent 72e96cdd23 a2ba9bbdb1
commit 36b2547ca4
22 changed files with 80 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java
View File

@@ -1319,7 +1319,7 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
*
* @param args {username, password}
* @param l logger to receive events and output
* @since 0.9.10
* @since 0.9.11
*/
private void runAuth(String args[], Logging l) {
if (args.length == 2) {
@@ -1774,7 +1774,7 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
* @param i2cpPort may be null
* @param user may be null
* @param pw may be null
* @since 0.9.10
* @since 0.9.11
*/
private static Destination destFromName(String name, String i2cpHost,
String i2cpPort, boolean isSSL,

4
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java
View File

@@ -55,7 +55,7 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
private int localPort;
/**
* Protected for I2Ping since 0.9.10. Not for use outside package.
* Protected for I2Ping since 0.9.11. Not for use outside package.
*/
protected boolean listenerReady;
@@ -586,7 +586,7 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
}
/**
* Non-final since 0.9.10.
* Non-final since 0.9.11.
* Any overrides must set listenerReady = true.
*/
public void run() {

6
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java
View File

@@ -246,7 +246,7 @@ public class I2Ping extends I2PTunnelClientBase {
/**
* Does nothing.
* @since 0.9.10
* @since 0.9.11
*/
protected void clientConnectionRun(Socket s) {}
@@ -260,7 +260,7 @@ public class I2Ping extends I2PTunnelClientBase {
private final int remotePort;
/**
* As of 0.9.10, does NOT start itself.
* As of 0.9.11, does NOT start itself.
* Caller must call start()
* @param dest b64 or b32 or host name
*/
@@ -329,7 +329,7 @@ public class I2Ping extends I2PTunnelClientBase {
/**
* @param name b64 or b32 or host name
* @since 0.9.10
* @since 0.9.11
*/
private Destination lookup(String name) {
I2PAppContext ctx = I2PAppContext.getGlobalContext();