Changeset ab213f4


Ignore:
Timestamp:
Aug 29, 2012 1:28:03 PM (8 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
7005376
Parents:
fa504ae8
Message:

cleanups

Location:
router/java/src/net/i2p/router/client
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • router/java/src/net/i2p/router/client/ClientConnectionRunner.java

    rfa504ae8 rab213f4  
    8787    private Hash _destHashCache;
    8888    /** are we, uh, dead */
    89     private boolean _dead;
     89    private volatile boolean _dead;
    9090    /** For outbound traffic. true if i2cp.messageReliability = "none"; @since 0.8.1 */
    9191    private boolean _dontSendMSM;
     
    464464
    465465    private class Rerequest implements SimpleTimer.TimedEvent {
    466         private LeaseSet _ls;
    467         private long _expirationTime;
    468         private Job _onCreate;
    469         private Job _onFailed;
     466        private final LeaseSet _ls;
     467        private final long _expirationTime;
     468        private final Job _onCreate;
     469        private final Job _onFailed;
    470470        public Rerequest(LeaseSet ls, long expirationTime, Job onCreate, Job onFailed) {
    471471            _ls = ls;
  • router/java/src/net/i2p/router/client/ClientListenerRunner.java

    rfa504ae8 rab213f4  
    3232    protected final int _port;
    3333    protected final boolean _bindAllInterfaces;
    34     protected boolean _running;
    35     protected boolean _listening;
     34    protected volatile boolean _running;
     35    protected volatile boolean _listening;
    3636   
    3737    public static final String BIND_ALL_INTERFACES = "i2cp.tcp.bindAllInterfaces";
  • router/java/src/net/i2p/router/client/ClientManager.java

    rfa504ae8 rab213f4  
    4646    private final Set<ClientConnectionRunner> _pendingRunners; // ClientConnectionRunner for clients w/out a Dest yet
    4747    private final RouterContext _ctx;
    48     private boolean _isStarted;
     48    private volatile boolean _isStarted;
    4949
    5050    /** Disable external interface, allow internal clients only @since 0.8.3 */
  • router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java

    rfa504ae8 rab213f4  
    3939    private final Log _log;
    4040    private ClientManager _manager;
    41     private RouterContext _context;
     41    private final RouterContext _context;
    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";
  • router/java/src/net/i2p/router/client/ClientWriterRunner.java

    rfa504ae8 rab213f4  
    1818 */
    1919class ClientWriterRunner implements Runnable {
    20     private BlockingQueue<I2CPMessage> _messagesToWrite;
    21     private ClientConnectionRunner _runner;
    22     private Log _log;
    23     private long _id;
     20    private final BlockingQueue<I2CPMessage> _messagesToWrite;
     21    private final ClientConnectionRunner _runner;
     22    private final Log _log;
     23    private final long _id;
    2424    private static long __id = 0;
    2525   
  • router/java/src/net/i2p/router/client/CreateSessionJob.java

    rfa504ae8 rab213f4  
    2525 */
    2626class CreateSessionJob extends JobImpl {
    27     private Log _log;
    28     private ClientConnectionRunner _runner;
     27    private final Log _log;
     28    private final ClientConnectionRunner _runner;
    2929   
    3030    public CreateSessionJob(RouterContext context, ClientConnectionRunner runner) {
  • router/java/src/net/i2p/router/client/LeaseRequestState.java

    rfa504ae8 rab213f4  
    2121class LeaseRequestState {
    2222    private LeaseSet _grantedLeaseSet;
    23     private LeaseSet _requestedLeaseSet;
    24     private PrivateKey _leaseSetPrivateKey;
    25     private SigningPrivateKey _leaseSetSigningPrivateKey;
    26     private Job _onGranted;
    27     private Job _onFailed;
    28     private long _expiration;
     23    private final LeaseSet _requestedLeaseSet;
     24    //private PrivateKey _leaseSetPrivateKey;
     25    //private SigningPrivateKey _leaseSetSigningPrivateKey;
     26    private final Job _onGranted;
     27    private final Job _onFailed;
     28    private final long _expiration;
    2929    private boolean _successful;
    3030
     
    3636    }
    3737   
    38     /** created lease set from client */
     38    /** created lease set from client - FIXME always null */
    3939    public LeaseSet getGranted() { return _grantedLeaseSet; }
     40    /** FIXME unused - why? */
    4041    public void setGranted(LeaseSet ls) { _grantedLeaseSet = ls; }
     42
    4143    /** lease set that is being requested */
    4244    public LeaseSet getRequested() { return _requestedLeaseSet; }
    43     public void setRequested(LeaseSet ls) { _requestedLeaseSet = ls; }
     45    //public void setRequested(LeaseSet ls) { _requestedLeaseSet = ls; }
     46
    4447    /** the private encryption key received regarding the lease set */
    45     public PrivateKey getPrivateKey() { return _leaseSetPrivateKey; }
    46     public void getPrivateKey(PrivateKey pk) { _leaseSetPrivateKey = pk; }
     48    //public PrivateKey getPrivateKey() { return _leaseSetPrivateKey; }
     49    //public void setPrivateKey(PrivateKey pk) { _leaseSetPrivateKey = pk; }
     50
    4751    /** the private signing key received regarding the lease set (for revocation) */
    48     public SigningPrivateKey getSigningPrivateKey() { return _leaseSetSigningPrivateKey; }
    49     public void getSigningPrivateKey(SigningPrivateKey spk) { _leaseSetSigningPrivateKey = spk; }
     52    //public SigningPrivateKey getSigningPrivateKey() { return _leaseSetSigningPrivateKey; }
     53    //public void setSigningPrivateKey(SigningPrivateKey spk) { _leaseSetSigningPrivateKey = spk; }
     54
    5055    /** what to do once the lease set is created */   
    5156    public Job getOnGranted() { return _onGranted; }
    52     public void setOnGranted(Job jb) { _onGranted = jb; }
     57    //public void setOnGranted(Job jb) { _onGranted = jb; }
     58
    5359    /** what to do if the lease set create fails / times out */
    5460    public Job getOnFailed() { return _onFailed; }
    55     public void setOnFailed(Job jb) { _onFailed = jb; }
     61    //public void setOnFailed(Job jb) { _onFailed = jb; }
     62
    5663    /** when the request for the lease set expires */
    5764    public long getExpiration() { return _expiration; }
     65
    5866    /** whether the request was successful in the time allotted */
    5967    public boolean getIsSuccessful() { return _successful; }
  • router/java/src/net/i2p/router/client/LookupDestJob.java

    rfa504ae8 rab213f4  
    1717 */
    1818class LookupDestJob extends JobImpl {
    19     private ClientConnectionRunner _runner;
    20     private Hash _hash;
     19    private final ClientConnectionRunner _runner;
     20    private final Hash _hash;
    2121
    2222    public LookupDestJob(RouterContext context, ClientConnectionRunner runner, Hash h) {
  • router/java/src/net/i2p/router/client/MessageReceivedJob.java

    rfa504ae8 rab213f4  
    2323 */
    2424class MessageReceivedJob extends JobImpl {
    25     private Log _log;
    26     private ClientConnectionRunner _runner;
    27     private Payload _payload;
     25    private final Log _log;
     26    private final ClientConnectionRunner _runner;
     27    private final Payload _payload;
    2828    public MessageReceivedJob(RouterContext ctx, ClientConnectionRunner runner, Destination toDest, Destination fromDest, Payload payload) {
    2929        super(ctx);
  • router/java/src/net/i2p/router/client/ReportAbuseJob.java

    rfa504ae8 rab213f4  
    2222 */
    2323class ReportAbuseJob extends JobImpl {
    24     private Log _log;
    25     private ClientConnectionRunner _runner;
    26     private String _reason;
    27     private int _severity;
     24    private final Log _log;
     25    private final ClientConnectionRunner _runner;
     26    private final String _reason;
     27    private final int _severity;
    2828    public ReportAbuseJob(RouterContext context, ClientConnectionRunner runner, String reason, int severity) {
    2929        super(context);
Note: See TracChangeset for help on using the changeset viewer.