* I2PTunnel: Fix NPE on shared client creation, thx kytv

* Transport: Add Ethiopia to hidden mode list
 * Log and javadoc tweaks
This commit is contained in:
zzz
2012-06-24 11:38:37 +00:00
parent 2a8adcb89a
commit 97b05b1dbf
6 changed files with 20 additions and 4 deletions

View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 17;
public final static long BUILD = 18;
/** for example "-test" */
public final static String EXTRA = "";

View File

@ -21,6 +21,13 @@ import net.i2p.router.ReplyJob;
import net.i2p.router.RouterContext;
import net.i2p.util.Log;
/**
* Send a message directly to another router, i.e. not through a tunnel.
* This is safe to run inline via runJob().
* If the RouterInfo for the Hash is not found locally, it will
* queue a lookup and register itself to be run again when the lookup
* succeeds or times out.
*/
public class SendMessageDirectJob extends JobImpl {
private final Log _log;
private final I2NPMessage _message;
@ -39,9 +46,11 @@ public class SendMessageDirectJob extends JobImpl {
public SendMessageDirectJob(RouterContext ctx, I2NPMessage message, Hash toPeer, int timeoutMs, int priority) {
this(ctx, message, toPeer, null, null, null, null, timeoutMs, priority);
}
public SendMessageDirectJob(RouterContext ctx, I2NPMessage message, Hash toPeer, ReplyJob onSuccess, Job onFail, MessageSelector selector, int timeoutMs, int priority) {
this(ctx, message, toPeer, null, onSuccess, onFail, selector, timeoutMs, priority);
}
public SendMessageDirectJob(RouterContext ctx, I2NPMessage message, Hash toPeer, Job onSend, ReplyJob onSuccess, Job onFail, MessageSelector selector, int timeoutMs, int priority) {
super(ctx);
_log = getContext().logManager().getLog(SendMessageDirectJob.class);
@ -66,6 +75,7 @@ public class SendMessageDirectJob extends JobImpl {
}
public String getName() { return "Send Message Direct"; }
public void runJob() {
long now = getContext().clock().now();

View File

@ -16,7 +16,7 @@ abstract class BadCountries {
// zzz.i2p/topics/969
// List created based on the Press Freedom Index. Those countries with a score of higher than 50 are included:
// http://en.wikipedia.org/wiki/Press_Freedom_Index
// Except:
// Except (quote):
// I don't really think that is usage of I2P is dangerous in countries from CIS
// General situation is really bad (like in Russia) but people here doesn't have problems with Ecnryption usage.
@ -32,6 +32,7 @@ abstract class BadCountries {
/* Democratic Republic of the Congo */ "CD",
/* Equatorial Guinea */ "GQ",
/* Eritrea */ "ER",
/* Ethiopia */ "ET",
/* Fiji */ "FJ",
/* Honduras */ "HN",
/* Iran */ "IR",