Changeset ba7dbf9


Ignore:
Timestamp:
Jan 17, 2009 5:33:17 PM (12 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
72fd42e
Parents:
011ded2e (diff), 807f0665 (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.zzz.test' (head d4e23b124489f9a3dd9410aa941e88823702b950)

to branch 'i2p.i2p' (head 7a54e1c58b8cf2ad43830ddec6d404229e3e6e60)

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • apps/routerconsole/jsp/config.jsp

    r011ded2e rba7dbf9  
    7676    router for your router so that you can make an outbound connection to them.  I2P will use these
    7777    introductions automatically if it detects that the port is not forwarded (as shown by
    78     the <i>Status: OK (NAT)</i> line), or you can manually require them here. 
     78    the <i>Status: Firewalled</i> line), or you can manually require them here. 
    7979    Users behind symmetric NATs, such as OpenBSD's pf, are not currently supported.</p>
    8080<input type="submit" name="recheckReachability" value="Check network reachability..." />
  • router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java

    r011ded2e rba7dbf9  
    286286        t.stopListening();
    287287        newAddr.setOptions(newProps);
    288         // Give NTCP Pumper time to stop so we don't end up with two...
    289         // Need better way
    290         try { Thread.sleep(5*1000); } catch (InterruptedException ie) {}
     288        // Wait for NTCP Pumper to stop so we don't end up with two...
     289        while (t.isAlive()) {
     290            try { Thread.sleep(5*1000); } catch (InterruptedException ie) {}
     291        }
    291292        t.restartListening(newAddr);
    292293        _log.warn("Changed NTCP Address and started up, address is now " + newAddr);
  • router/java/src/net/i2p/router/transport/ntcp/EventPumper.java

    r011ded2e rba7dbf9  
    8686    }
    8787   
     88    /**
     89     *  Selector can take quite a while to close after calling stopPumping()
     90     */
     91    public boolean isAlive() {
     92        return _alive || (_selector != null && _selector.isOpen());
     93    }
     94
    8895    public void register(ServerSocketChannel chan) {
    8996        if (_log.shouldLog(Log.DEBUG)) _log.debug("Registering server socket channel");
  • router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java

    r011ded2e rba7dbf9  
    433433    }
    434434
     435    public boolean isAlive() {
     436        return _pumper.isAlive();
     437    }
     438
    435439    private RouterAddress bindAddress() {
    436440        if (_myAddress != null) {
     
    539543    }
    540544   
     545    /**
     546     *  This doesn't (completely) block, caller should check isAlive()
     547     *  before calling startListening() or restartListening()
     548     */
    541549    public void stopListening() {
    542550        if (_log.shouldLog(Log.DEBUG)) _log.debug("Stopping ntcp transport");
Note: See TracChangeset for help on using the changeset viewer.