propagate from branch 'i2p.i2p' (head 1de143fff53bb56e6eac926d6293d62200f0c392)

to branch 'i2p.i2p.zzz.multisess' (head 70fc07857232668b93ca6ba02c433dffc7639132)

core/java/src/net/i2p/data/i2cp/CreateLeaseSetMessage.java

@@ -38,6 +38,11 @@ public class CreateLeaseSetMessage extends I2CPMessageImpl {
         return _sessionId;
     }
 
+    @Override
+    public SessionId sessionId() {
+        return _sessionId;
+    }
+
     public void setSessionId(SessionId id) {
         _sessionId = id;
     }

core/java/src/net/i2p/data/i2cp/DestroySessionMessage.java

@@ -32,6 +32,16 @@ public class DestroySessionMessage extends I2CPMessageImpl {
         return _sessionId;
     }
 
+    /**
+     * Return the SessionId for this message.
+     *
+     * @since 0.9.19
+     */
+    @Override
+    public SessionId sessionId() {
+        return _sessionId;
+    }
+
     public void setSessionId(SessionId id) {
         _sessionId = id;
     }

core/java/src/net/i2p/data/i2cp/HostLookupMessage.java

@@ -76,6 +76,16 @@ public class HostLookupMessage extends I2CPMessageImpl {
         return _sessionId;
     }
 
+    /**
+     * Return the SessionId for this message.
+     *
+     * @since 0.9.19
+     */
+    @Override
+    public SessionId sessionId() {
+        return _sessionId;
+    }
+
     /**
      *  @return 0 to 2**32 - 1
      */

core/java/src/net/i2p/data/i2cp/HostReplyMessage.java

@@ -73,6 +73,16 @@ public class HostReplyMessage extends I2CPMessageImpl {
         return _sessionId;
     }
 
+    /**
+     * Return the SessionId for this message.
+     *
+     * @since 0.9.19
+     */
+    @Override
+    public SessionId sessionId() {
+        return _sessionId;
+    }
+
     /**
      *  @return 0 to 2**32 - 1
      */

core/java/src/net/i2p/data/i2cp/I2CPMessage.java

@@ -60,9 +60,20 @@ public interface I2CPMessage extends DataStructure {
     public void writeMessage(OutputStream out) throws I2CPMessageException, IOException;
 
     /**
-     * Return the unique identifier for this type of APIMessage, as specified in the 
+     * Return the unique identifier for this type of message, as specified in the 
      * network specification document under #ClientAccessLayerMessages
-     * @return unique identifier for this type of APIMessage
+     * @return unique identifier for this type of message
      */
     public int getType();
-}
+
+    /**
+     * Return the SessionId for this type of message.
+     * Most but not all message types include a SessionId.
+     * The ones that do already define getSessionId(), but some return a SessionId and
+     * some return a long, so we define a new method here.
+     *
+     * @return SessionId or null if this message type does not include a SessionId
+     * @since 0.9.19
+     */
+    public SessionId sessionId();
+}

core/java/src/net/i2p/data/i2cp/I2CPMessageException.java

@@ -12,7 +12,7 @@ package net.i2p.data.i2cp;
 import net.i2p.I2PException;
 
 /**
- * Represent an error serializing or deserializing an APIMessage
+ * Represent an error serializing or deserializing a message
  *
  * @author jrandom
  */

core/java/src/net/i2p/data/i2cp/I2CPMessageImpl.java

@@ -127,4 +127,15 @@ public abstract class I2CPMessageImpl extends DataStructureImpl implements I2CPM
             throw new DataFormatException("Error writing the message", ime);
         }
     }
+
+    /**
+     * Return the SessionId for this type of message.
+     * Most but not all message types include a SessionId.
+     * The ones that do already define getSessionId(), but some return a SessionId and
+     * some return a long, so we define a new method here.
+     *
+     * @return null always. Extending classes with a SessionId must override.
+     * @since 0.9.19
+     */
+    public SessionId sessionId() { return null; }
 }

core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java

@@ -37,6 +37,16 @@ public class MessagePayloadMessage extends I2CPMessageImpl {
         return _sessionId;
     }
 
+    /**
+     * Return the SessionId for this message.
+     *
+     * @since 0.9.19
+     */
+    @Override
+    public SessionId sessionId() {
+        return _sessionId >= 0 ? new SessionId(_sessionId) : null;
+    }
+
     /** @param id 0-65535 */
     public void setSessionId(long id) {
         _sessionId = (int) id;

core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java

@@ -193,6 +193,16 @@ public class MessageStatusMessage extends I2CPMessageImpl {
         return _sessionId;
     }
 
+    /**
+     * Return the SessionId for this message.
+     *
+     * @since 0.9.19
+     */
+    @Override
+    public SessionId sessionId() {
+        return _sessionId >= 0 ? new SessionId(_sessionId) : null;
+    }
+
     /** @param id 0-65535 */
     public void setSessionId(long id) {
         _sessionId = (int) id;
@@ -275,6 +285,12 @@ public class MessageStatusMessage extends I2CPMessageImpl {
             return "GUARANTEED SUCCESS ";
         case STATUS_SEND_SUCCESS_LOCAL:
             return "LOCAL SUCCESS      ";
+        case STATUS_SEND_BEST_EFFORT_FAILURE:
+            return "PROBABLE FAILURE   ";
+        case STATUS_SEND_FAILURE_NO_TUNNELS:
+            return "NO LOCAL TUNNELS   ";
+        case STATUS_SEND_FAILURE_NO_LEASESET:
+            return "LEASESET NOT FOUND ";
         default:
             return "SEND FAILURE CODE: " + status;
         }

core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java

@@ -36,6 +36,16 @@ public class ReceiveMessageBeginMessage extends I2CPMessageImpl {
         return _sessionId;
     }
 
+    /**
+     * Return the SessionId for this message.
+     *
+     * @since 0.9.19
+     */
+    @Override
+    public SessionId sessionId() {
+        return _sessionId >= 0 ? new SessionId(_sessionId) : null;
+    }
+
     /** @param id 0-65535 */
     public void setSessionId(long id) {
         _sessionId = (int) id;

core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java

@@ -35,6 +35,16 @@ public class ReceiveMessageEndMessage extends I2CPMessageImpl {
         return _sessionId;
     }
 
+    /**
+     * Return the SessionId for this message.
+     *
+     * @since 0.9.19
+     */
+    @Override
+    public SessionId sessionId() {
+        return _sessionId >= 0 ? new SessionId(_sessionId) : null;
+    }
+
     /** @param id 0-65535 */
     public void setSessionId(long id) {
         _sessionId = (int) id;

core/java/src/net/i2p/data/i2cp/ReconfigureSessionMessage.java

@@ -33,6 +33,16 @@ public class ReconfigureSessionMessage extends I2CPMessageImpl {
         return _sessionId;
     }
 
+    /**
+     * Return the SessionId for this message.
+     *
+     * @since 0.9.19
+     */
+    @Override
+    public SessionId sessionId() {
+        return _sessionId;
+    }
+
     public void setSessionId(SessionId id) {
         _sessionId = id;
     }

core/java/src/net/i2p/data/i2cp/ReportAbuseMessage.java

@@ -35,6 +35,16 @@ public class ReportAbuseMessage extends I2CPMessageImpl {
         return _sessionId;
     }
 
+    /**
+     * Return the SessionId for this message.
+     *
+     * @since 0.9.19
+     */
+    @Override
+    public SessionId sessionId() {
+        return _sessionId;
+    }
+
     public void setSessionId(SessionId id) {
         _sessionId = id;
     }

core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java

@@ -45,6 +45,16 @@ public class RequestLeaseSetMessage extends I2CPMessageImpl {
         return _sessionId;
     }
 
+    /**
+     * Return the SessionId for this message.
+     *
+     * @since 0.9.19
+     */
+    @Override
+    public SessionId sessionId() {
+        return _sessionId;
+    }
+
     public void setSessionId(SessionId id) {
         _sessionId = id;
     }

core/java/src/net/i2p/data/i2cp/RequestVariableLeaseSetMessage.java

@@ -55,6 +55,16 @@ public class RequestVariableLeaseSetMessage extends I2CPMessageImpl {
         return _sessionId;
     }
 
+    /**
+     * Return the SessionId for this message.
+     *
+     * @since 0.9.19
+     */
+    @Override
+    public SessionId sessionId() {
+        return _sessionId;
+    }
+
     public void setSessionId(SessionId id) {
         _sessionId = id;
     }

core/java/src/net/i2p/data/i2cp/SendMessageMessage.java

@@ -38,6 +38,16 @@ public class SendMessageMessage extends I2CPMessageImpl {
         return _sessionId;
     }
 
+    /**
+     * Return the SessionId for this message.
+     *
+     * @since 0.9.19
+     */
+    @Override
+    public SessionId sessionId() {
+        return _sessionId;
+    }
+
     public void setSessionId(SessionId id) {
         _sessionId = id;
     }

core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java

@@ -42,6 +42,16 @@ public class SessionStatusMessage extends I2CPMessageImpl {
         return _sessionId;
     }
 
+    /**
+     * Return the SessionId for this message.
+     *
+     * @since 0.9.19
+     */
+    @Override
+    public SessionId sessionId() {
+        return _sessionId;
+    }
+
     public void setSessionId(SessionId id) {
         _sessionId = id;
     }