Changeset c38d72d


Ignore:
Timestamp:
Feb 5, 2011 11:21:56 PM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
f9d43a8
Parents:
b08efb6
Message:
  • i2ptunnel:
    • IRCClient: Use tunnel log instance
    • Server: Full queue log tweak
Files:
5 edited

Legend:

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

    rb08efb6 rc38d72d  
    9090            i2ps.setReadTimeout(readTimeout);
    9191            StringBuffer expectedPong = new StringBuffer();
    92             Thread in = new I2PAppThread(new IrcInboundFilter(s,i2ps, expectedPong), "IRC Client " + __clientId + " in", true);
     92            Thread in = new I2PAppThread(new IrcInboundFilter(s,i2ps, expectedPong, _log), "IRC Client " + __clientId + " in", true);
    9393            in.start();
    94             Thread out = new I2PAppThread(new IrcOutboundFilter(s,i2ps, expectedPong), "IRC Client " + __clientId + " out", true);
     94            Thread out = new I2PAppThread(new IrcOutboundFilter(s,i2ps, expectedPong, _log), "IRC Client " + __clientId + " out", true);
    9595            out.start();
    9696        } catch (Exception ex) {
     
    129129        private I2PSocket remote;
    130130        private StringBuffer expectedPong;
    131         // shadows _log in super()
    132         private final Log _log = new Log(I2PTunnelIRCClient.class);
     131        private final Log _log;
    133132               
    134         public IrcInboundFilter(Socket _local, I2PSocket _remote, StringBuffer pong) {
     133        public IrcInboundFilter(Socket _local, I2PSocket _remote, StringBuffer pong, Log log) {
    135134            local=_local;
    136135            remote=_remote;
    137136            expectedPong=pong;
     137            _log = log;
    138138        }
    139139
     
    208208            private I2PSocket remote;
    209209            private StringBuffer expectedPong;
    210             // shadows _log in super()
    211             private final Log _log = new Log(I2PTunnelIRCClient.class);
     210            private final Log _log;
    212211               
    213             public IrcOutboundFilter(Socket _local, I2PSocket _remote, StringBuffer pong) {
     212            public IrcOutboundFilter(Socket _local, I2PSocket _remote, StringBuffer pong, Log log) {
    214213                local=_local;
    215214                remote=_remote;
    216215                expectedPong=pong;
     216                _log = log;
    217217            }
    218218               
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java

    rb08efb6 rc38d72d  
    303303                             i2ps.close();
    304304                         } catch (IOException ioe) {}
    305                          if (open && _log.shouldLog(Log.ERROR))
    306                              _log.error("ServerHandler queue full for " + remoteHost + ':' + remotePort +
    307                                         "; increase " + PROP_HANDLER_COUNT + '?', ree);
     305                         if (open)
     306                             _log.logAlways(Log.WARN, "ServerHandler queue full, dropping incoming connection to " +
     307                                        remoteHost + ':' + remotePort +
     308                                        "; increase server max threads or " + PROP_HANDLER_COUNT);
    308309                    }
    309310                } else {
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSIRCTunnel.java

    rb08efb6 rc38d72d  
    5151            I2PSocket destSock = serv.getDestinationI2PSocket(this);
    5252            StringBuffer expectedPong = new StringBuffer();
    53             Thread in = new I2PAppThread(new I2PTunnelIRCClient.IrcInboundFilter(clientSock, destSock, expectedPong), "SOCKS IRC Client " + (++__clientId) + " in", true);
     53            Thread in = new I2PAppThread(new I2PTunnelIRCClient.IrcInboundFilter(clientSock, destSock, expectedPong, _log),
     54                                         "SOCKS IRC Client " + (++__clientId) + " in", true);
    5455            in.start();
    55             Thread out = new I2PAppThread(new I2PTunnelIRCClient.IrcOutboundFilter(clientSock, destSock, expectedPong), "SOCKS IRC Client " + __clientId + " out", true);
     56            Thread out = new I2PAppThread(new I2PTunnelIRCClient.IrcOutboundFilter(clientSock, destSock, expectedPong, _log),
     57                                          "SOCKS IRC Client " + __clientId + " out", true);
    5658            out.start();
    5759        } catch (SOCKSException e) {
  • history.txt

    rb08efb6 rc38d72d  
     12011-02-05 zzz
     2    * .mtn-ignore: New, to make it harder to check in stuff you shouldn't
     3    * BOB: Drop checked-in build dir
     4    * i2psnark:
     5      - Big refactor to support torrents where only the infohash is known
     6        (i.e., added by magnet links)
     7      - Big refactor to use accessors instead of public fields
     8      - Add support for metadata transfer (BEP 9) via the
     9        extension protocol (BEP 10)
     10      - Add support for adding torrents via standard magnet links (BEP 9)
     11        and "maggot" links (http://sponge.i2p/files/maggotspec.txt)
     12      - Add support for peer exchange (i2p_pex)
     13      - Add stubs for future DHT support (BEP 5)
     14      - Add more information on torrent details page;
     15        add details page for single-file torrents
     16      - Make filename filtering consistent (ticket #368)
     17      - Fix add-torrent locking (ticket #371)
     18      - Fix opentracker configuration
     19      - Add several connect-to-self checks
     20      - Add support for using new I2CP bandwidth limiter
     21      - Add support for using new in-session I2CP naming lookups
     22      - Don't expire outbound Piece messages, since we now defer loading the
     23        data from disk
     24    * i2ptunnel:
     25      - Change connect proxy default to outproxy2.h2ik.i2p
     26      - IRCClient: Use tunnel log instance
     27      - Server: Full queue log tweak
     28
    1292011-02-03 zzz
    230    * Build:
  • router/java/src/net/i2p/router/RouterVersion.java

    rb08efb6 rc38d72d  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 2;
     21    public final static long BUILD = 3;
    2222
    2323    /** for example "-test" */
Note: See TracChangeset for help on using the changeset viewer.