Skip to content

Commit

Permalink
Javadoc fixes to correct release number
Browse files Browse the repository at this point in the history
 Remove unused lock object
 Add irc.dg.i2p
 0.9.11
  • Loading branch information
zzz committed Feb 8, 2014
1 parent 090a790 commit 2e91890
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 17 deletions.
4 changes: 2 additions & 2 deletions apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java
Original file line number Diff line number Diff line change
Expand Up @@ -1210,7 +1210,7 @@ private void runConfig(String args[], Logging l) {
*
* @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) {
Expand Down Expand Up @@ -1673,7 +1673,7 @@ public static Destination destFromName(String name) throws DataFormatException {
* @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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -586,7 +586,7 @@ public I2PSocket createI2PSocket(Destination dest, I2PSocketOptions opt) throws
}

/**
* Non-final since 0.9.10.
* Non-final since 0.9.11.
* Any overrides must set listenerReady = true.
*/
public void run() {
Expand Down
6 changes: 3 additions & 3 deletions apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ private boolean ping(Destination dest, long timeout) throws I2PException {

/**
* Does nothing.
* @since 0.9.10
* @since 0.9.11
*/
protected void clientConnectionRun(Socket s) {}

Expand All @@ -209,7 +209,7 @@ private class PingHandler extends I2PAppThread {
private final boolean reportTimes;

/**
* 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
*/
Expand Down Expand Up @@ -276,7 +276,7 @@ public void run() {

/**
* @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();
Expand Down
2 changes: 1 addition & 1 deletion core/java/src/net/i2p/CoreVersion.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
public class CoreVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = "0.9.10";
public final static String VERSION = "0.9.11";

public static void main(String args[]) {
System.out.println("I2P Core version: " + VERSION);
Expand Down
3 changes: 1 addition & 2 deletions core/java/src/net/i2p/I2PAppContext.java
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,7 @@ public class I2PAppContext {
_lock5 = new Object(), _lock6 = new Object(), _lock7 = new Object(), _lock8 = new Object(),
_lock9 = new Object(), _lock10 = new Object(), _lock11 = new Object(), _lock12 = new Object(),
_lock13 = new Object(), _lock14 = new Object(), _lock15 = new Object(), _lock16 = new Object(),
_lock17 = new Object(), _lock18 = new Object(), _lock19 = new Object(), _lock20 = new Object(),
_lock21 = new Object();
_lock17 = new Object(), _lock18 = new Object(), _lock19 = new Object(), _lock20 = new Object();

/**
* Pull the default context, creating a new one if necessary, else using
Expand Down
6 changes: 3 additions & 3 deletions core/java/src/net/i2p/data/i2cp/GetDateMessage.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* Only supported from client to router.
*
* Since 0.8.7, optionally include a version string.
* Since 0.9.10, optionally include options.
* Since 0.9.11, optionally include options.
*/
public class GetDateMessage extends I2CPMessageImpl {
public final static int MESSAGE_TYPE = 32;
Expand All @@ -49,7 +49,7 @@ public GetDateMessage(String version) {
* must be non-null if options is non-null and non-empty.
* @param options Client options to be sent to the router; primarily for authentication; may be null;
* keys and values 255 bytes (not chars) max each
* @since 0.9.10
* @since 0.9.11
*/
public GetDateMessage(String version, Properties options) {
super();
Expand All @@ -72,7 +72,7 @@ public String getVersion() {
* Primarily for authentication.
*
* @return may be null
* @since 0.9.10
* @since 0.9.11
*/
public Properties getOptions() {
return _options;
Expand Down
2 changes: 1 addition & 1 deletion core/java/src/net/i2p/data/i2cp/I2CPMessageHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class I2CPMessageHandler {

/**
* This is huge. Mainly to catch a completly bogus response, possibly not an I2CP socket.
* @since 0.9.10
* @since 0.9.11
*/
public static final int MAX_LENGTH = 128*1024;

Expand Down
2 changes: 2 additions & 0 deletions history.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
* 2014-02-08 0.9.11 released

2014-02-07 zzz
* Services:
- Move backup news to psi.i2p
Expand Down
2 changes: 1 addition & 1 deletion installer/install.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<info>
<appname>i2p</appname>
<appversion>0.9.10</appversion>
<appversion>0.9.11</appversion>
<authors>
<author name="I2P" email="https://geti2p.net/"/>
</authors>
Expand Down
1 change: 1 addition & 0 deletions installer/resources/hosts.txt
Original file line number Diff line number Diff line change
Expand Up @@ -352,3 +352,4 @@ salt.i2p=6V5XXGZN69jV~QhveTsA4by1Ct8Q9qljltW825zuxHAsjwZWV7vngzbucllm1mDjJmE~zPq
no.i2p=8jISadUQuR~kZ9YzZxfQwSQRdhY~gkTSgy4l33jKOAraoqSmb~IcoeN5xOXyhtX8gxKEb03-48zPZnso83TwcTFg66~Cu38a59fG0h~vy~WIY5x5CwfkoCFqYmo4OzdnTY-2TcQ2ZN44VA6Sx48UXjEsSdrvn0SfaeMAW5It-N6MAV23Qgc5NgRTVJ6YS74FnRZCy6uGU-RPz1HQQIH~byW-NHBmXAW2Bmv2Kq3bHVHY9tb4d8yfrhlnaf3bfhLeELUbtBnXhLd3Zs2kX6Afz7ofDkpmaygYO6XA8QNIVcM2ub6-jSdsly~EXBtRDzF0WSbT9v8rvpop5TxjwXAnTjbS09Qq8x2Bl8wfkkPz45beN0Je7wrxp0SBk5DHhhvVbbyFUS7bDn1~aTvE7Ujq8ael3myR56jb8NlYiXaiJYgwPXpXx5gSDf8rBaDIdJsSSHWv~DqOfJ1BkhADCEfGZ3QMFY7uWrXGuj0J3OYEvonV-deMoh6pYKtgcFiewJgjAAAA
i2pjump.i2p=ouBpQCfwiBcdoZD3vMNT8HXB091kwgI766U6sdWhstY6~7Aixpo8JsNaSO1LV01I20kEzAgmWP8cf5469gSa-YeXAjhKSQPtUgQiKCoRhv2virj--~ecvv4OhyIzCiYoWMMFHV50c02Lg~EE8LGbEkIbRXUZaIWlYwnLC-MzPtuSXhFjHW03h0v~QGeIlYFr8nkpBayqdB8SLkieKygnlOgLRSehmHWZeA0yIz1aCpDuTrZAmAdb3ZwcNm0fxWl~AEpELZ-ax8x6Ibb0kHgPxP1lRr1J7MH~yYXrkymqIPEj-sNLavlAN5oEK6~A45hLd-IENfQ9v-AlntZMon~zeDvxDwHqyKy4OOCbHV7LmitYryEZTVoQNDPPHa6o0pnkBjaPWEnJoDqzU~s-alViTYwR7qkGZMxSp~tej~TngU8GUYEHn4kdTnni0~RTY~50ZyI~2~2ESUCIfFWHzYKQXclzt-uxmNsCL7npmD1-MKZUQ1ECwPR2xKv5vqJwO5ZKAAAA
psi.i2p=a11l91etedRW5Kl2GhdDI9qiRBbDRAQY6TWJb8KlSc0P9WUrEviABAAltqDU1DFJrRhMAZg5i6rWGszkJrF-pWLQK9JOH33l4~mQjB8Hkt83l9qnNJPUlGlh9yIfBY40CQ0Ermy8gzjHLayUpypDJFv2V6rHLwxAQeaXJu8YXbyvCucEu9i6HVO49akXW9YSxcZEqxK04wZnjBqhHGlVbehleMqTx9nkd0pUpBZz~vIaG9matUSHinopEo6Wegml9FEz~FEaQpPknKuMAGGSNFVJb0NtaOQSAocAOg1nLKh80v232Y8sJOHG63asSJoBa6bGwjIHftsqD~lEmVV4NkgNPybmvsD1SCbMQ2ExaCXFPVQV-yJhIAPN9MRVT9cSBT2GCq-vpMwdJ5Nf0iPR3M-Ak961JUwWXPYTL79toXCgxDX2~nZ5QFRV490YNnfB7LQu10G89wG8lzS9GWf2i-nk~~ez0Lq0dH7qQokFXdUkPc7bvSrxqkytrbd-h8O8AAAA
irc.dg.i2p=bunRitjuWmSGkf5UV7pnjMRIxmP7fuHy9SgDfAA0M~4TWoBr4Ji4m5AyMGzhAdNaQW6c2-0CIe~RCDZ~vcN-BSNpaqzd80gKhXYxqUQQB83XRWDdLz-z0H~Y15k90p~n0GUSzsjlZctkYglNMyQ8MAUIpUEiLz6MVwArZqUI-CDOE664ZazcGtSKfBLZKycHsSj6WfLbwl2-R5Zv4f5Xisv9Hd0b8BsqJEWn1AmBMhM7p8l7okM2ZcRnC5ypzBdLfLSdkGJ5dEZAJIxz-GhtB8rJ3e0jJkbFjknGrJfxbwt~5n00nVuiUNMro2JRxQ7w~VzMw~lYRq~1B5TMtaKRDhxk7pnv5MxmVBFNhcT~hImcyxfT7GfIPzYU9s~uiFReoSjAOJZv-rKq4Oyeyz-Pa6lcg-c3MtuTXjJ2BMX2dA5Jw0FFVDDMOdDL2b1lwtyseQQkGtc15i4EtNy6iJrkbqAnIhO86E2C3jDf~yt2FlDlcbx6dkflJ3y3j2Wu9DAgAAAA
4 changes: 2 additions & 2 deletions router/java/src/net/i2p/router/RouterVersion.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 11;
public final static long BUILD = 0;

/** for example "-test" */
public final static String EXTRA = "-rc";
public final static String EXTRA = "";
public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
public static void main(String args[]) {
System.out.println("I2P Router version: " + FULL_VERSION);
Expand Down

0 comments on commit 2e91890

Please sign in to comment.