Changeset c1afbd3

Timestamp:

Nov 11, 2015 1:48:38 PM (5 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

37a4fcb

Parents:

1451dc6

Message:

SSU: Version check to send extended options

Location:

router/java/src/net/i2p/router/transport/udp

Files:

• EstablishmentManager.java (modified) (4 diffs)
• OutboundEstablishState.java (modified) (4 diffs)
• PacketBuilder.java (modified) (1 diff)

router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java

@@ -30 +30 @@
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
+import net.i2p.util.VersionComparator;
 
 /**
@@ -127 +128 @@
     private static final int DATA_MESSAGE_TIMEOUT = 10*1000;
     
+    /**
+     * Java I2P has always parsed the length of the extended options field,
+     * but i2pd hasn't recognized it until this release.
+     * No matter, the options weren't defined until this release anyway.
+     */
+    private static final String VERSION_ALLOW_EXTENDED_OPTIONS = "0.9.24";
+
+
     public EstablishmentManager(RouterContext ctx, UDPTransport transport) {
         _context = ctx;
@@ -357 +366 @@
                         return;
                     }
+                    boolean allowExtendedOptions = VersionComparator.comp(toRouterInfo.getVersion(),
+                                                                          VERSION_ALLOW_EXTENDED_OPTIONS) >= 0;
                     state = new OutboundEstablishState(_context, maybeTo, to,
-                                                       toIdentity,
+                                                       toIdentity, allowExtendedOptions,
                                                        sessionKey, addr, _transport.getDHFactory());
                     OutboundEstablishState oldState = _outboundStates.putIfAbsent(to, state);
@@ -478 +489 @@
             // Only offer for an IPv4 session.
             // TODO if already we have their RI, only offer if they need it (no 'C' cap)
+            // TODO if extended options, only if they asked for it
             if (_transport.canIntroduce() && state.getSentPort() >= 1024 &&
                 state.getSentIP().length == 4) {

router/java/src/net/i2p/router/transport/udp/OutboundEstablishState.java

@@ -57 +57 @@
     private final RemoteHostId _claimedAddress;
     private final RouterIdentity _remotePeer;
+    private final boolean _allowExtendedOptions;
     private final SessionKey _introKey;
     private final Queue<OutNetMessage> _queuedMessages;
@@ -113 +114 @@
     public OutboundEstablishState(RouterContext ctx, RemoteHostId claimedAddress,
                                   RemoteHostId remoteHostId,
-                                  RouterIdentity remotePeer, SessionKey introKey, UDPAddress addr,
+                                  RouterIdentity remotePeer, boolean allowExtendedOptions,
+                                  SessionKey introKey, UDPAddress addr,
                                   DHSessionKeyBuilder.Factory dh) {
         _context = ctx;
@@ -126 +128 @@
         _claimedAddress = claimedAddress;
         _remoteHostId = remoteHostId;
+        _allowExtendedOptions = allowExtendedOptions;
         _remotePeer = remotePeer;
         _introKey = introKey;
@@ -158 +161 @@
     /** @return -1 if unset */
     public long getIntroNonce() { return _introductionNonce; }
+
+    /** @since 0.9.24 */
+    public boolean isExtendedOptionsAllowed() { return _allowExtendedOptions; }
     
     /**

router/java/src/net/i2p/router/transport/udp/PacketBuilder.java

@@ -785 +785 @@
     public UDPPacket buildSessionRequestPacket(OutboundEstablishState state) {
         // TODO
+        // boolean ext = state.isExtendedOptionsAllowed();
+        // if (ext)
         //byte[] options = new byte[3];
         //UDPPacket packet = buildPacketHeader(SESSION_REQUEST_FLAG_BYTE, options);