Changeset ddec4f8


Ignore:
Timestamp:
Jul 23, 2011 4:55:57 PM (10 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
49bba10
Parents:
bf8f150 (diff), 3466dc1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

propagate from branch 'i2p.i2p' (head 083b9b289063fdcac54734fe782626f5d2be03b1)

to branch 'i2p.i2p.zzz.test4' (head ac597f2218ef1bab8816e1a3d36be95fd7bd79d0)

Location:
router/java/src/net/i2p/router
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • router/java/src/net/i2p/router/OutNetMessagePool.java

    rbf8f150 rddec4f8  
    88 *
    99 */
    10 
    11 import java.util.Comparator;
    1210
    1311import net.i2p.util.Log;
  • router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java

    rbf8f150 rddec4f8  
    1717 */
    1818class OutboundMessageState {
    19     private I2PAppContext _context;
    20     private Log _log;
     19    private final I2PAppContext _context;
     20    private final Log _log;
    2121    /** may be null if we are part of the establishment */
    2222    private OutNetMessage _message;
     
    5050    }
    5151   
     52/****
    5253    public boolean initialize(OutNetMessage msg) {
    5354        if (msg == null) return false;
     
    6162        }
    6263    }
    63    
     64****/
     65   
     66    /**
     67     *  Called from UDPTransport
     68     */
    6469    public boolean initialize(I2NPMessage msg, PeerState peer) {
    6570        if (msg == null)
     
    7681    }
    7782   
     83    /**
     84     *  Called from OutboundMessageFragments
     85     */
    7886    public boolean initialize(OutNetMessage m, I2NPMessage msg) {
    7987        if ( (m == null) || (msg == null) )
  • router/java/src/net/i2p/router/transport/udp/PeerState.java

    rbf8f150 rddec4f8  
    15821582    }
    15831583
     1584    // why removed? Some risk of dups in OutboundMessageFragments._activePeers ???
     1585
    15841586    /*
    15851587    public int hashCode() {
  • router/java/src/net/i2p/router/transport/udp/TimedWeightedPriorityMessageQueue.java

    rbf8f150 rddec4f8  
    1818 *
    1919 * WARNING - UNUSED since 0.6.1.11
    20  * See comments in DQAT.java and mtn history ca. 2006-02-19
     20 * See comments in DummyThrottle.java and mtn history ca. 2006-02-19
    2121 *
    2222 */
  • router/java/src/net/i2p/router/transport/udp/UDPTransport.java

    rbf8f150 rddec4f8  
    185185        _dropList = new ConcurrentHashSet(2);
    186186       
    187         // See comments in DQAT.java
     187        // See comments in DummyThrottle.java
    188188        if (USE_PRIORITY) {
    189189            TimedWeightedPriorityMessageQueue mq = new TimedWeightedPriorityMessageQueue(ctx, PRIORITY_LIMITS, PRIORITY_WEIGHT, this);
     
    297297            _handler = new PacketHandler(_context, this, _endpoint, _establisher, _inboundFragments, _testManager, _introManager);
    298298       
    299         // See comments in DQAT.java
     299        // See comments in DummyThrottle.java
    300300        if (USE_PRIORITY && _refiller == null)
    301301            _refiller = new OutboundRefiller(_context, _fragments, _outboundMessages);
     
    11131113   
    11141114    public String getStyle() { return STYLE; }
     1115
    11151116    @Override
    11161117    public void send(OutNetMessage msg) {
     
    11521153                _log.debug("Add to fragments for " + to.toBase64());
    11531154
    1154             // See comments in DQAT.java
     1155            // See comments in DummyThrottle.java
    11551156            if (USE_PRIORITY)
    11561157                _outboundMessages.add(msg);
     
    11641165        }
    11651166    }
     1167
    11661168    void send(I2NPMessage msg, PeerState peer) {
    11671169        if (_log.shouldLog(Log.DEBUG))
Note: See TracChangeset for help on using the changeset viewer.