Changeset 099515a for apps/ministreaming


Ignore:
Timestamp:
Jun 8, 2015 9:50:42 PM (5 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
cbc2f89
Parents:
e8f4e19 (diff), 657f13a (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' (head 1de143fff53bb56e6eac926d6293d62200f0c392)

to branch 'i2p.i2p.zzz.multisess' (head 70fc07857232668b93ca6ba02c433dffc7639132)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManager.java

    re8f4e19 r099515a  
    66
    77import java.io.IOException;
     8import java.io.InputStream;
    89import java.io.InterruptedIOException;
    910import java.net.ConnectException;
     
    1112import java.net.ServerSocket;
    1213import java.net.Socket;
     14import java.util.List;
    1315import java.util.Properties;
    1416import java.util.Set;
     
    1719import net.i2p.I2PException;
    1820import net.i2p.client.I2PSession;
     21import net.i2p.client.I2PSessionException;
    1922import net.i2p.data.Destination;
    2023
     
    3639   
    3740    /**
     41     *  @return a new subsession, non-null
     42     *  @param privateKeyStream null for transient, if non-null must have same encryption keys as primary session
     43     *                          and different signing keys
     44     *  @param opts subsession options if any, may be null
     45     *  @since 0.9.19
     46     */
     47    public I2PSession addSubsession(InputStream privateKeyStream, Properties opts) throws I2PSessionException;
     48   
     49    /**
     50     *  @since 0.9.19
     51     */
     52    public void removeSubsession(I2PSession session);
     53   
     54    /**
     55     *  @return a list of subsessions, non-null, does not include the primary session
     56     *  @since 0.9.19
     57     */
     58    public List<I2PSession> getSubsessions();
     59
     60    /**
    3861     * How long should we wait for the client to .accept() a socket before
    3962     * sending back a NACK/Close? 
Note: See TracChangeset for help on using the changeset viewer.