Changeset 231040d

Timestamp:

Nov 14, 2015 2:07:01 AM (5 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

23cb4ca

Parents:

ded249d

Message:

Profiles: Don't allow creation of our own profile
TunnelCreatorConfig?:

• locking
• comment out unused code
• don't set bandwidth stats in profile for ourselves

TunnelDispatcher?:

• don't set tunnel stats in profile for ourselves

BuildHandler?, TunnelPool?: Minor optimizations

Location:

router/java/src/net/i2p/router

Files:

• peermanager/ProfileOrganizer.java (modified) (3 diffs)
• tunnel/HopConfig.java (modified) (2 diffs)
• tunnel/TunnelCreatorConfig.java (modified) (5 diffs)
• tunnel/pool/BuildHandler.java (modified) (2 diffs)
• tunnel/pool/TunnelPool.java (modified) (1 diff)

router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java

@@ -157 +157 @@
      */
     public PeerProfile getProfile(Hash peer) {
+        if (peer.equals(_us)) {
+            if (_log.shouldWarn())
+                _log.warn("Who wanted our own profile?", new Exception("I did"));
+            return null;
+        }
         getReadLock();
         try {
@@ -169 +174 @@
      */
     public PeerProfile getProfileNonblocking(Hash peer) {
+        if (peer.equals(_us)) {
+            if (_log.shouldWarn())
+                _log.warn("Who wanted our own profile?", new Exception("I did"));
+            return null;
+        }
         if (tryReadLock()) {
             try {
@@ -185 +195 @@
 
         Hash peer = profile.getPeer();
+        if (peer.equals(_us)) {
+            if (_log.shouldWarn())
+                _log.warn("Who added our own profile?", new Exception("I did"));
+            return null;
+        }
 
         if (_log.shouldLog(Log.DEBUG))

router/java/src/net/i2p/router/tunnel/HopConfig.java

@@ -51 +51 @@
     public void setReceiveTunnelId(TunnelId id) { _receiveTunnelId = DataHelper.toLong(4, id.getTunnelId()); }
     
-    /** what is the previous peer in the tunnel (if any)? */
+    /** what is the previous peer in the tunnel (null if gateway) */
     public Hash getReceiveFrom() { return _receiveFrom; }
     public void setReceiveFrom(Hash from) { _receiveFrom = from; }
     
-    /** what is the next tunnel ID we are sending to? */
+    /** what is the next tunnel ID we are sending to? (null if endpoint) */
     public byte[] getSendTunnelId() { return _sendTunnelId; }
+
+    /** what is the next tunnel we are sending to? (null if endpoint) */
     public TunnelId getSendTunnel() { 
         if (_sendTunnel == null)
@@ -71 +73 @@
     }
     
-    /** what is the next peer in the tunnel (if any)? */
+    /** what is the next peer in the tunnel (null if endpoint) */
     public Hash getSendTo() { return _sendTo; }
     public void setSendTo(Hash to) { _sendTo = to; }

router/java/src/net/i2p/router/tunnel/TunnelCreatorConfig.java

@@ -31 +31 @@
     private final boolean _isInbound;
     private int _messagesProcessed;
-    private volatile long _verifiedBytesTransferred;
+    private long _verifiedBytesTransferred;
     private boolean _failed;
     private int _failures;
     private boolean _reused;
     private int _priority;
-    
+    //private static final int THROUGHPUT_COUNT = 3;
+    // Fastest 1 minute throughput, in bytes per minute, ordered with fastest first.
+    //private final double _peakThroughput[] = new double[THROUGHPUT_COUNT];
+    private long _peakThroughputCurrentTotal;
+    private long _peakThroughputLastCoallesce = System.currentTimeMillis();
+    // Make configurable? - but can't easily get to pool options from here
+    private static final int MAX_CONSECUTIVE_TEST_FAILURES = 3;
+    private static final SimpleDateFormat _fmt = new SimpleDateFormat("HH:mm:ss", Locale.UK);
+    
+    /** 
+     * For exploratory only (null destination)
+     * @param length 1 minimum (0 hop is length 1)
+     */
     public TunnelCreatorConfig(RouterContext ctx, int length, boolean isInbound) {
         this(ctx, length, isInbound, null);
     }
 
+    /** 
+     * @param length 1 minimum (0 hop is length 1)
+     * @param destination null for exploratory
+     */
     public TunnelCreatorConfig(RouterContext ctx, int length, boolean isInbound, Hash destination) {
         _context = ctx;
@@ -132 +148 @@
     
     /** take note of a message being pumped through this tunnel */
-    public void incrementProcessedMessages() { _messagesProcessed++; }
-    public int getProcessedMessagesCount() { return _messagesProcessed; }
-
-    public void incrementVerifiedBytesTransferred(int bytes) { 
+    public synchronized void incrementProcessedMessages() { _messagesProcessed++; }
+    public synchronized int getProcessedMessagesCount() { return _messagesProcessed; }
+
+    /**
+     *  This calls profile manager tunnelDataPushed1m() for each peer
+     *  @return null for exploratory
+     */
+    public synchronized void incrementVerifiedBytesTransferred(int bytes) { 
         _verifiedBytesTransferred += bytes; 
         _peakThroughputCurrentTotal += bytes;
@@ -145 +165 @@
             _peakThroughputLastCoallesce = now;
             _peakThroughputCurrentTotal = 0;
-            if (_context != null)
-                for (int i = 0; i < _peers.length; i++)
+            if (_context != null) {
+                // skip ourselves
+                int start = _isInbound ? 0 : 1;
+                int end = _isInbound ? _peers.length - 1 : _peers.length;
+                for (int i = start; i < end; i++) {
                     _context.profileManager().tunnelDataPushed1m(_peers[i], (int)normalized);
-        }
-    }
-
-    public long getVerifiedBytesTransferred() { return _verifiedBytesTransferred; }
-
-    private static final int THROUGHPUT_COUNT = 3;
-    /** 
-     * fastest 1 minute throughput, in bytes per minute, ordered with fastest
-     * first.
-     */
-    private final double _peakThroughput[] = new double[THROUGHPUT_COUNT];
-    private volatile long _peakThroughputCurrentTotal;
-    private volatile long _peakThroughputLastCoallesce = System.currentTimeMillis();
-    public double getPeakThroughputKBps() { 
+                }
+            }
+        }
+    }
+
+    public synchronized long getVerifiedBytesTransferred() { return _verifiedBytesTransferred; }
+
+/**** unused
+    public synchronized double getPeakThroughputKBps() { 
         double rv = 0;
         for (int i = 0; i < THROUGHPUT_COUNT; i++)
@@ -168 +186 @@
         return rv;
     }
-    public void setPeakThroughputKBps(double kBps) {
+
+    public synchronized void setPeakThroughputKBps(double kBps) {
         _peakThroughput[0] = kBps*60*1024;
         //for (int i = 0; i < THROUGHPUT_COUNT; i++)
         //    _peakThroughput[i] = kBps*60;
     }
-    
-    
-    // Make configurable? - but can't easily get to pool options from here
-    private static final int MAX_CONSECUTIVE_TEST_FAILURES = 3;
+****/
     
     /**
@@ -265 +281 @@
     }
     
-    private static final SimpleDateFormat _fmt = new SimpleDateFormat("HH:mm:ss", Locale.UK);
-
     private String getExpirationString() {
         return format(_expiration);
     }
+
     static String format(long date) {
         Date d = new Date(date);

router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java

@@ -796 +796 @@
             cfg.setLayerKey(req.readLayerKey());
             if (isInGW) {
-                cfg.setReceiveFrom(null);
+                // default
+                //cfg.setReceiveFrom(null);
             } else {
                 if (state.fromHash != null) {
@@ -809 +810 @@
             cfg.setReceiveTunnelId(DataHelper.toLong(4, ourId));
             if (isOutEnd) {
-                cfg.setSendTo(null);
-                cfg.setSendTunnelId(null);
+                // default
+                //cfg.setSendTo(null);
+                //cfg.setSendTunnelId(null);
             } else {
                 cfg.setSendTo(nextPeer);

router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java

@@ -1169 +1169 @@
             cfg.setPeer(j, peers.get(i));
             HopConfig hop = cfg.getConfig(j);
-            hop.setCreation(_context.clock().now());
+            hop.setCreation(now);
             hop.setExpiration(expiration);
             hop.setIVKey(_context.keyGenerator().generateSessionKey());