Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

added client proxy settings + other fixes

Browse source
This commit is contained in:
BetaSteward 2011-05-05 23:06:19 -04:00
parent ddeb0de911
commit 1fef6e6bb4
7 changed files with 263 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Mage.Client/src/main/java/mage/client/remote/Session.java
View file

@ -86,17 +86,29 @@ public class Session {
public Session(MageFrame frame) {
this.frame = frame;
}
public boolean connect(String userName, String serverName, int port) {
return connect(userName, serverName, port, "", 0);
}
public boolean connect(String userName, String serverName, int port, String proxyServer, int proxyPort) {
if (isConnected()) {
disconnect();
}
try {
System.setSecurityManager(null);
if (proxyServer.length() > 0) {
System.setProperty("socksProxyHost", proxyServer);
System.setProperty("socksProxyPort", Integer.toString(proxyPort));
}
else {
System.clearProperty("socksProxyHost");
System.clearProperty("socksProxyPort");
}
Registry reg = LocateRegistry.getRegistry(serverName, port);
this.server = (Server) reg.lookup(Config.remoteServer);
this.userName = userName;
this.client = new Client(this, frame, userName);
if (client == null)
client = new Client(this, frame);
sessionId = server.registerClient(userName, client.getId(), frame.getVersion());
callbackDaemon = new CallbackClientDaemon(sessionId, client, server);
serverState = server.getServerState();