Changeset 7c5162e


Ignore:
Timestamp:
Dec 3, 2018 4:17:30 PM (16 months ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
177f595
Parents:
5e7a277
Message:

I2CP: Move the port 7654 definition

Files:
16 edited

Legend:

Unmodified
Added
Removed
  • apps/BOB/src/net/i2p/BOB/BOB.java

    r5e7a277 r7c5162e  
    3838import net.i2p.app.*;
    3939import net.i2p.client.I2PClient;
    40 import net.i2p.client.I2PSession;
    4140import net.i2p.util.I2PAppThread;
    4241import net.i2p.util.PortMapper;
     
    244243                }
    245244                if (!props.containsKey(I2PClient.PROP_TCP_PORT)) {
    246                         props.setProperty(I2PClient.PROP_TCP_PORT, Integer.toString(I2PSession.DEFAULT_LISTEN_PORT));
     245                        props.setProperty(I2PClient.PROP_TCP_PORT, Integer.toString(I2PClient.DEFAULT_LISTEN_PORT));
    247246                        save = true;
    248247                }
  • apps/BOB/src/net/i2p/BOB/MUXlisten.java

    r5e7a277 r7c5162e  
    2525import net.i2p.I2PException;
    2626import net.i2p.client.I2PClient;
    27 import net.i2p.client.I2PSession;
    2827import net.i2p.client.streaming.I2PServerSocket;
    2928import net.i2p.client.streaming.I2PSocketManager;
     
    9897
    9998                        String i2cpHost = Q.getProperty(I2PClient.PROP_TCP_HOST, "127.0.0.1");
    100                         int i2cpPort = I2PSession.DEFAULT_LISTEN_PORT;
     99                        int i2cpPort = I2PClient.DEFAULT_LISTEN_PORT;
    101100                        String i2cpPortStr = Q.getProperty(I2PClient.PROP_TCP_PORT);
    102101                        if (i2cpPortStr != null) {
  • apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java

    r5e7a277 r7c5162e  
    100100        _opts = new HashMap<String, String>();
    101101        //setProxy("127.0.0.1", 4444);
    102         setI2CPConfig("127.0.0.1", I2PSession.DEFAULT_LISTEN_PORT, null);
     102        setI2CPConfig("127.0.0.1", I2PClient.DEFAULT_LISTEN_PORT, null);
    103103        _banlist = new ConcurrentHashSet<Hash>();
    104104        _maxUploaders = Snark.MAX_TOTAL_UPLOADERS;
  • apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java

    r5e7a277 r7c5162e  
    2929import net.i2p.app.ClientAppManager;
    3030import net.i2p.app.ClientAppState;
    31 import net.i2p.client.I2PSession;
     31import net.i2p.client.I2PClient;
    3232import net.i2p.crypto.SHA1Hash;
    3333import net.i2p.crypto.SigType;
     
    787787            _config.setProperty(PROP_I2CP_HOST, "127.0.0.1");
    788788        if (!_config.containsKey(PROP_I2CP_PORT))
    789             _config.setProperty(PROP_I2CP_PORT, Integer.toString(I2PSession.DEFAULT_LISTEN_PORT));
     789            _config.setProperty(PROP_I2CP_PORT, Integer.toString(I2PClient.DEFAULT_LISTEN_PORT));
    790790        if (!_config.containsKey(PROP_I2CP_OPTS))
    791791            _config.setProperty(PROP_I2CP_OPTS, "inbound.length=3 outbound.length=3" +
     
    913913    private void updateConfig() {
    914914        String i2cpHost = _config.getProperty(PROP_I2CP_HOST);
    915         int i2cpPort = getInt(PROP_I2CP_PORT, I2PSession.DEFAULT_LISTEN_PORT);
     915        int i2cpPort = getInt(PROP_I2CP_PORT, I2PClient.DEFAULT_LISTEN_PORT);
    916916        String opts = _config.getProperty(PROP_I2CP_OPTS);
    917917        Map<String, String> i2cpOpts = new HashMap<String, String>();
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java

    r5e7a277 r7c5162e  
    9898
    9999    /** the I2CP port, non-null */
    100     public String port = System.getProperty(I2PClient.PROP_TCP_PORT, Integer.toString(I2PSession.DEFAULT_LISTEN_PORT));
     100    public String port = System.getProperty(I2PClient.PROP_TCP_PORT, Integer.toString(I2PClient.DEFAULT_LISTEN_PORT));
    101101    /** the I2CP host, non-null */
    102102    public String host = System.getProperty(I2PClient.PROP_TCP_HOST, "127.0.0.1");
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java

    r5e7a277 r7c5162e  
    410410        Properties props = new Properties();
    411411        props.putAll(tunnel.getClientOptions());
    412         int portNum = I2PSession.DEFAULT_LISTEN_PORT;
     412        int portNum = I2PClient.DEFAULT_LISTEN_PORT;
    413413        if (tunnel.port != null) {
    414414            try {
     
    472472                String portNum = getTunnel().port;
    473473                if (portNum == null)
    474                     portNum = Integer.toString(I2PSession.DEFAULT_LISTEN_PORT);
     474                    portNum = Integer.toString(I2PClient.DEFAULT_LISTEN_PORT);
    475475                String msg;
    476476                if (getTunnel().getContext().isRouterContext())
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java

    r5e7a277 r7c5162e  
    211211        Properties props = new Properties();
    212212        props.putAll(getTunnel().getClientOptions());
    213         int portNum = I2PSession.DEFAULT_LISTEN_PORT;
     213        int portNum = I2PClient.DEFAULT_LISTEN_PORT;
    214214        if (getTunnel().port != null) {
    215215            try {
     
    306306                String portNum = getTunnel().port;
    307307                if (portNum == null)
    308                     portNum = Integer.toString(I2PSession.DEFAULT_LISTEN_PORT);
     308                    portNum = Integer.toString(I2PClient.DEFAULT_LISTEN_PORT);
    309309                String msg;
    310310                if (getTunnel().getContext().isRouterContext())
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java

    r5e7a277 r7c5162e  
    734734                _tunnel.port = String.valueOf(portNum);
    735735            } catch (NumberFormatException nfe) {
    736                 _tunnel.port = Integer.toString(I2PSession.DEFAULT_LISTEN_PORT);
     736                _tunnel.port = Integer.toString(I2PClient.DEFAULT_LISTEN_PORT);
    737737            }
    738738        } else {
    739             _tunnel.port = Integer.toString(I2PSession.DEFAULT_LISTEN_PORT);
     739            _tunnel.port = Integer.toString(I2PClient.DEFAULT_LISTEN_PORT);
    740740        }
    741741    }
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java

    r5e7a277 r7c5162e  
    1212import net.i2p.I2PAppContext;
    1313import net.i2p.client.I2PClient;
    14 import net.i2p.client.I2PSession;
    1514import net.i2p.crypto.KeyGenerator;
    1615import net.i2p.crypto.SigType;
     
    838837                config.setProperty(TunnelController.PROP_I2CP_PORT, _i2cpPort);
    839838            } else {
    840                 config.setProperty(TunnelController.PROP_I2CP_PORT, Integer.toString(I2PSession.DEFAULT_LISTEN_PORT));
     839                config.setProperty(TunnelController.PROP_I2CP_PORT, Integer.toString(I2PClient.DEFAULT_LISTEN_PORT));
    841840            }
    842841        }
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java

    r5e7a277 r7c5162e  
    1515
    1616import net.i2p.I2PException;
    17 import net.i2p.client.I2PSession;
     17import net.i2p.client.I2PClient;
    1818import net.i2p.crypto.SigType;
    1919import net.i2p.data.Base64;
     
    448448            return tun.getI2CPPort();
    449449        else
    450             return Integer.toString(I2PSession.DEFAULT_LISTEN_PORT);
     450            return Integer.toString(I2PClient.DEFAULT_LISTEN_PORT);
    451451    }
    452452
  • apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java

    r5e7a277 r7c5162e  
    276276
    277277    private static int getPort() {
    278         int i2cpPort = I2PSession.DEFAULT_LISTEN_PORT;
     278        int i2cpPort = I2PClient.DEFAULT_LISTEN_PORT;
    279279        String i2cpPortStr = System.getProperty(I2PClient.PROP_TCP_PORT);
    280280        if (i2cpPortStr != null) {
  • apps/sam/java/src/net/i2p/sam/SAMStreamSession.java

    r5e7a277 r7c5162e  
    147147
    148148        String i2cpHost = allprops.getProperty(I2PClient.PROP_TCP_HOST, "127.0.0.1");
    149         int i2cpPort = I2PSession.DEFAULT_LISTEN_PORT;
     149        int i2cpPort = I2PClient.DEFAULT_LISTEN_PORT;
    150150        String sport = allprops.getProperty(I2PClient.PROP_TCP_PORT);
    151151        if (sport != null) {
  • core/java/src/net/i2p/client/I2PClient.java

    r5e7a277 r7c5162e  
    6565    public final static String PROP_FAST_RECEIVE = "i2cp.fastReceive";
    6666
     67    /**
     68     *  7654
     69     *  @since 0.9.38
     70     */
     71    public static final int DEFAULT_LISTEN_PORT = 7654;
     72
    6773    /** protocol flag that must be sent when opening the i2cp connection to the router */
    6874    public final static int PROTOCOL_BYTE = 0x2A;
  • core/java/src/net/i2p/client/I2PSession.java

    r5e7a277 r7c5162e  
    445445     */
    446446    public static final int PROTO_DATAGRAM_RAW = 18;
    447 
    448     /**
    449      *  7654
    450      *  @since 0.9.38
    451      */
    452     public static final int DEFAULT_LISTEN_PORT = 7654;
    453447}
  • core/java/src/net/i2p/client/impl/I2PSessionImpl.java

    r5e7a277 r7c5162e  
    225225    }
    226226
    227     public static final int LISTEN_PORT = DEFAULT_LISTEN_PORT;
     227    public static final int LISTEN_PORT = I2PClient.DEFAULT_LISTEN_PORT;
    228228
    229229    private static final int BUF_SIZE = 32*1024;
  • router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java

    r5e7a277 r7c5162e  
    1414import java.util.Set;
    1515
    16 import net.i2p.client.I2PSession;
     16import net.i2p.client.I2PClient;
    1717import net.i2p.client.I2PSessionException;
    1818import net.i2p.crypto.SessionKeyManager;
     
    4242    /** note that this is different than the property the client side uses, i2cp.tcp.port */
    4343    public final static String PROP_CLIENT_PORT = "i2cp.port";
    44     public final static int DEFAULT_PORT = I2PSession.DEFAULT_LISTEN_PORT;
     44    public final static int DEFAULT_PORT = I2PClient.DEFAULT_LISTEN_PORT;
    4545    /** note that this is different than the property the client side uses, i2cp.tcp.host */
    4646    public final static String PROP_CLIENT_HOST = "i2cp.hostname";
Note: See TracChangeset for help on using the changeset viewer.