Changeset 9195e754


Ignore:
Timestamp:
May 12, 2009 1:27:17 PM (11 years ago)
Author:
mkvore-commit <mkvore-commit@…>
Branches:
master
Children:
7cd0112
Parents:
965b183d (diff), 7372a18c (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 790894dc16c840512c99302fbb75136042cbeb65)

to branch 'i2p.i2p.sam3' (head 66136bbdb44136e3756944cb7d8147d2ab07ff23)

Files:
8 edited

Legend:

Unmodified
Added
Removed
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java

    r965b183d r9195e754  
    157157        if (!defaultOpts.contains("i2p.streaming.inactivityTimeout"))
    158158            defaultOpts.setProperty("i2p.streaming.inactivityTimeout", ""+DEFAULT_READ_TIMEOUT);
     159        // delayed start
     160        if (sockMgr == null) {
     161            synchronized(sockLock) {
     162                sockMgr = getSocketManager();
     163            }
     164        }
    159165        I2PSocketOptions opts = sockMgr.buildOptions(defaultOpts);
    160166        if (!defaultOpts.containsKey(I2PSocketOptions.PROP_CONNECT_TIMEOUT))
  • apps/routerconsole/jsp/logs.jsp

    r965b183d r9195e754  
    2424 <jsp:useBean class="net.i2p.router.web.LogsHelper" id="logsHelper" scope="request" />
    2525 <jsp:setProperty name="logsHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
     26 <h4>Critical logs:</h4><a name="criticallogs"> </a>
     27 <jsp:getProperty name="logsHelper" property="criticalLogs" />
     28 <hr />
    2629 <h4>Router logs:</h4>
    2730 <jsp:getProperty name="logsHelper" property="logs" />
    28  <hr />
    29  <h4>Critical logs:</h4><a name="criticallogs"> </a>
    30  <jsp:getProperty name="logsHelper" property="criticalLogs" />
    3131 <hr />
    3232 <h4>Service (Wrapper) logs:</h4><a name="servicelogs"> </a>
  • history.txt

    r965b183d r9195e754  
     12009-05-11 zzz
     2    * Connect client: Fix NPE when used with advanced i2ptunnel features
     3    * Context: Don't instantiate unused AdminManager
     4    * logs.jsp: Put critical log at the top
     5    * NetDb: Don't accept stores of our own LeaseSets or RouterInfo
     6
    172009-05-11 mkvore
    28    * SAM: fix: removed ERROR level logging when a client disconnects
     9
    3102009-05-09 sponge
    411    * merge
     
    1522    * SAM: version 3 added
    1623    * SAM: blocking case corrected on simultaneous client connection (v.1-3)
     24
    17252009-05-07 zzz
    1826    * Add nibble.i2p to proxy list and hosts.txt
  • installer/resources/clients.config

    r965b183d r9195e754  
    22clientApp.0.args=7657 ::1,127.0.0.1 ./webapps/
    33clientApp.0.main=net.i2p.router.web.RouterConsoleRunner
    4 clientApp.0.name=webConsole
     4clientApp.0.name=Web console
    55clientApp.0.onBoot=true
    66clientApp.0.startOnLoad=true
     
    88# SAM bridge
    99clientApp.1.main=net.i2p.sam.SAMBridge
    10 clientApp.1.name=SAMBridge
     10clientApp.1.name=SAM application bridge
    1111clientApp.1.args=sam.keys 127.0.0.1 7656 i2cp.tcp.host=127.0.0.1 i2cp.tcp.port=7654
    1212clientApp.1.startOnLoad=false
     
    1414# poke the i2ptunnels defined in i2ptunnel.config
    1515clientApp.2.main=net.i2p.i2ptunnel.TunnelControllerGroup
    16 clientApp.2.name=Tunnels
     16clientApp.2.name=Application tunnels
    1717clientApp.2.args=i2ptunnel.config
    1818clientApp.2.startOnLoad=true
     
    2020# run our own eepsite with a seperate jetty instance
    2121clientApp.3.main=org.mortbay.jetty.Server
    22 clientApp.3.name=eepsite
     22clientApp.3.name=My eepsite web server
    2323clientApp.3.args=eepsite/jetty.xml
    2424clientApp.3.delay=30
     
    2727# load a browser pointing at the web console whenever we start up
    2828clientApp.4.main=net.i2p.apps.systray.UrlLauncher
    29 clientApp.4.name=consoleBrowser
     29clientApp.4.name=Browser launch at startup
    3030clientApp.4.args=http://127.0.0.1:7657/index.jsp
    3131clientApp.4.delay=15
     
    3636clientApp.5.delay=10
    3737clientApp.5.main=net.i2p.BOB.BOB
    38 clientApp.5.name=BOB
     38clientApp.5.name=BOB application bridge
    3939clientApp.5.startOnLoad=false
  • router/java/src/net/i2p/router/RouterContext.java

    r965b183d r9195e754  
    8888    }
    8989    private void initAll() {
    90         _adminManager = new AdminManager(this);
     90        //_adminManager = new AdminManager(this);
    9191        if ("false".equals(getProperty("i2p.dummyClientFacade", "false")))
    9292            _clientManagerFacade = new ClientManagerFacadeImpl(this);
  • router/java/src/net/i2p/router/RouterVersion.java

    r965b183d r9195e754  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 12;
     21    public final static long BUILD = 13;
    2222    /** for example "-test" */
    2323    public final static String EXTRA = "";
  • router/java/src/net/i2p/router/networkdb/kademlia/FloodfillVerifyStoreJob.java

    r965b183d r9195e754  
    101101            if (message instanceof DatabaseStoreMessage) {
    102102                DatabaseStoreMessage dsm = (DatabaseStoreMessage)message;
    103                 if (_key.equals(dsm.getKey()))
    104                     return true;
    105                 else
    106                     return false;
     103                return _key.equals(dsm.getKey());
    107104            } else if (message instanceof DatabaseSearchReplyMessage) {
    108105                DatabaseSearchReplyMessage dsrm = (DatabaseSearchReplyMessage)message;
    109                 if (_key.equals(dsrm.getSearchKey()))
    110                     return true;
    111                 else
    112                     return false;
     106                return _key.equals(dsrm.getSearchKey());
    113107            }
    114108            return false;
  • router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java

    r965b183d r9195e754  
    4242        ctx.statManager().createRateStat("netDb.storeHandled", "How many netDb store messages have we handled?", "NetworkDatabase", new long[] { 5*60*1000l, 60*60*1000l, 24*60*60*1000l });
    4343        ctx.statManager().createRateStat("netDb.storeLeaseSetHandled", "How many leaseSet store messages have we handled?", "NetworkDatabase", new long[] { 5*60*1000l, 60*60*1000l, 24*60*60*1000l });
     44        //ctx.statManager().createRateStat("netDb.storeLocalLeaseSetAttempt", "Peer tries to store our leaseset (multihome?)", "NetworkDatabase", new long[] { 60*60*1000l });
     45        //ctx.statManager().createRateStat("netDb.storeLocalRouterInfoAttempt", "Peer tries to store our router info", "NetworkDatabase", new long[] { 60*60*1000l });
    4446        ctx.statManager().createRateStat("netDb.storeRouterInfoHandled", "How many routerInfo store messages have we handled?", "NetworkDatabase", new long[] { 5*60*1000l, 60*60*1000l, 24*60*60*1000l });
    4547        ctx.statManager().createRateStat("netDb.storeRecvTime", "How long it takes to handle the local store part of a dbStore?", "NetworkDatabase", new long[] { 60*1000l, 10*60*1000l });
     
    6567   
    6668            try {
     69                // Never store a leaseSet for a local dest received from somebody else.
     70                // This generally happens from a FloodfillVerifyStoreJob.
     71                // If it is valid, it shouldn't be newer than what we have - unless
     72                // somebody has our keys...
     73                // This could happen with multihoming - where it's really important to prevent
     74                // storing the other guy's leaseset, it will confuse us badly.
     75                if (getContext().clientManager().isLocal(_message.getKey())) {
     76                    //getContext().statManager().addRateData("netDb.storeLocalLeaseSetAttempt", 1, 0);
     77                    // throw rather than return, so that we send the ack below (prevent easy attack)
     78                    throw new IllegalArgumentException("Peer attempted to store local leaseSet: " +
     79                                                       _message.getKey().toBase64().substring(0, 4));
     80                }
    6781                LeaseSet ls = _message.getLeaseSet();
    6882                // mark it as something we received, so we'll answer queries
     
    87101                          + new Date(_message.getRouterInfo().getPublished()));
    88102            try {
     103                // Never store our RouterInfo received from somebody else.
     104                // This generally happens from a FloodfillVerifyStoreJob.
     105                // If it is valid, it shouldn't be newer than what we have - unless
     106                // somebody has our keys...
     107                if (getContext().routerHash().equals(key)) {
     108                    //getContext().statManager().addRateData("netDb.storeLocalRouterInfoAttempt", 1, 0);
     109                    // throw rather than return, so that we send the ack below (prevent easy attack)
     110                    throw new IllegalArgumentException("Peer attempted to store our RouterInfo");
     111                }
    89112                prevNetDb = getContext().netDb().store(key, _message.getRouterInfo());
    90113                wasNew = ((null == prevNetDb) || (prevNetDb.getPublished() < _message.getRouterInfo().getPublished()));
     
    147170
    148171            } else {
     172                // Should we record in the profile?
    149173                if (_log.shouldLog(Log.WARN))
    150174                    _log.warn("Peer " + _fromHash.toBase64() + " sent bad data: " + invalidMessage);
    151175            }
     176        } else if (invalidMessage != null) {
     177            if (_log.shouldLog(Log.WARN))
     178                _log.warn("Unknown peer sent bad data: " + invalidMessage);
    152179        }
    153180    }
Note: See TracChangeset for help on using the changeset viewer.