Changeset e4004e6


Ignore:
Timestamp:
Nov 26, 2011 10:20:31 PM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
6d5678c
Parents:
17773a2
Message:

socket error log fix

Files:
3 edited

Legend:

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

    r17773a2 re4004e6  
    112112                _log.warn("Incoming DCC connection for I2P port " + myPort +
    113113                          " sending to " + local.ia + ':' + local.port);
    114             Socket s = new Socket(local.ia, local.port);
    115             _sockList.add(socket);
    116             new I2PTunnelRunner(s, socket, slock, null, _sockList);
    117             local.socket = socket;
    118             local.expire = getTunnel().getContext().clock().now() + OUTBOUND_EXPIRE;
    119             _active.put(Integer.valueOf(myPort), local);
    120         } catch (SocketException ex) {
    121114            try {
    122                 socket.close();
    123             } catch (IOException ioe) {}
    124             if (_log.shouldLog(Log.ERROR))
    125                 _log.error("Error connecting to server " + remoteHost + ':' + remotePort, ex);
     115                Socket s = new Socket(local.ia, local.port);
     116                _sockList.add(socket);
     117                new I2PTunnelRunner(s, socket, slock, null, _sockList);
     118                local.socket = socket;
     119                local.expire = getTunnel().getContext().clock().now() + OUTBOUND_EXPIRE;
     120                _active.put(Integer.valueOf(myPort), local);
     121            } catch (SocketException ex) {
     122                try {
     123                    socket.close();
     124                } catch (IOException ioe) {}
     125                _log.error("Error relaying incoming DCC connection to IRC client at " + local.ia + ':' + local.port, ex);
     126            }
    126127        } catch (IOException ex) {
    127128            _log.error("Error while waiting for I2PConnections", ex);
  • history.txt

    r17773a2 re4004e6  
     12011-11-26 zzz
     2  * DCCServer: Socket error log fix
     3
    142011-11-23 zzz
    25  * CryptixAESEngine: Fix bogus bounds checks
  • router/java/src/net/i2p/router/RouterVersion.java

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