Changeset 3bce2f5


Ignore:
Timestamp:
Dec 21, 2015 2:15:40 PM (5 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
a4546e1
Parents:
074c5aa1
Message:

SSU: Fix sent msg count, broken in last checkin
Increase sent threshold from 1 to 2 for mayDisconnect(),
because we send both our RI and a DeliveryStatusMessage?
Log tweak

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

Legend:

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

    r074c5aa1 r3bce2f5  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 16;
     21    public final static long BUILD = 17;
    2222
    2323    /** for example "-test" */
  • router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java

    r074c5aa1 r3bce2f5  
    294294        StringBuilder buf = new StringBuilder(256);
    295295        buf.append("OB Message ").append(_i2npMessage.getUniqueId());
     296        buf.append(" type ").append(_i2npMessage.getType());
    296297        buf.append(" with ").append(_numFragments).append(" fragments");
    297298        buf.append(" of size ").append(_messageBuf.length);
     
    305306            }
    306307        }
     308        buf.append(" to: ").append(_peer.toString());
    307309        return buf.toString();
    308310    }
  • router/java/src/net/i2p/router/transport/udp/PeerState.java

    r074c5aa1 r3bce2f5  
    11811181        //}
    11821182       
    1183         _messagesSent++;
    11841183        if (numSends < 2) {
    11851184            // caller synchs
  • router/java/src/net/i2p/router/transport/udp/UDPTransport.java

    r074c5aa1 r3bce2f5  
    24432443        final PeerState ps =  _peersByIdent.get(peer);
    24442444        if (ps != null && ps.isInbound() &&
    2445             ps.getMessagesReceived() <= 2 && ps.getMessagesSent() <= 1) {
     2445            ps.getMessagesReceived() <= 2 && ps.getMessagesSent() <= 2) {
    24462446            ps.setMayDisconnect();
    24472447        }
     
    28842884                        inactivityCutoff = longInactivityCutoff;
    28852885                    } else if (!haveCap && peer.getMayDisconnect() &&
    2886                                peer.getMessagesReceived() <= 2 && peer.getMessagesSent() <= 1) {
     2886                               peer.getMessagesReceived() <= 2 && peer.getMessagesSent() <= 2) {
    28872887                        inactivityCutoff = mayDisconCutoff;
    28882888                    } else {
Note: See TracChangeset for help on using the changeset viewer.