1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-12-12 05:51:08 +01:00

More changes to the Jingle package:

- Change visibility of some Socks5Bytestreams code.
- Add central ThreadPool
- Move FullJidAndSessionId in own class
- More complete JingleSession class
- More complete JingleUtil class
- Improved tests
This commit is contained in:
vanitasvitae 2017-07-03 10:35:46 +02:00
parent 5bd01b7385
commit 7e76bc1ae5
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
33 changed files with 1859 additions and 160 deletions

View file

@ -538,7 +538,7 @@ public final class Socks5BytestreamManager extends Manager implements Bytestream
* @throws NotConnectedException
* @throws InterruptedException
*/
private List<Jid> determineProxies() throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
public List<Jid> determineProxies() throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
XMPPConnection connection = connection();
ServiceDiscoveryManager serviceDiscoveryManager = ServiceDiscoveryManager.getInstanceFor(connection);
@ -634,7 +634,7 @@ public final class Socks5BytestreamManager extends Manager implements Bytestream
* @return the stream host information of the local SOCKS5 proxy or null if local SOCKS5 proxy
* is not running
*/
private List<StreamHost> getLocalStreamHost() {
public List<StreamHost> getLocalStreamHost() {
XMPPConnection connection = connection();
// get local proxy singleton
Socks5Proxy socks5Server = Socks5Proxy.getSocks5Proxy();

View file

@ -37,7 +37,7 @@ public class Socks5BytestreamSession implements BytestreamSession {
/* flag to indicate if this session is a direct or mediated connection */
private final boolean isDirect;
protected Socks5BytestreamSession(Socket socket, boolean isDirect) {
public Socks5BytestreamSession(Socket socket, boolean isDirect) {
this.socket = socket;
this.isDirect = isDirect;
}

View file

@ -46,7 +46,7 @@ import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream.StreamHost;
*
* @author Henning Staib
*/
class Socks5Client {
public class Socks5Client {
private static final Logger LOGGER = Logger.getLogger(Socks5Client.class.getName());

View file

@ -42,7 +42,7 @@ import org.jxmpp.jid.Jid;
*
* @author Henning Staib
*/
class Socks5ClientForInitiator extends Socks5Client {
public class Socks5ClientForInitiator extends Socks5Client {
/* the XMPP connection used to communicate with the SOCKS5 proxy */
private WeakReference<XMPPConnection> connection;

View file

@ -348,7 +348,7 @@ public final class Socks5Proxy {
*
* @param digest to be added to the list of allowed transfers
*/
protected void addTransfer(String digest) {
public void addTransfer(String digest) {
this.allowedConnections.add(digest);
}

View file

@ -29,7 +29,7 @@ import org.jxmpp.jid.Jid;
*
* @author Henning Staib
*/
class Socks5Utils {
public class Socks5Utils {
/**
* Returns a SHA-1 digest of the given parameters as specified in <a