Raincloud/sheepit-shadow-nabber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow user to set the computer name

Browse Source
This commit is contained in:
Laurent Clouet
2017-05-08 01:35:08 +02:00
parent cb03b58dbc
commit c6f48661f0
5 changed files with 54 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/sheepit/client/Server.java
View File

@@ -34,12 +34,10 @@ import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
import java.net.ConnectException;
import java.net.HttpURLConnection;
import java.net.InetAddress;
import java.net.MalformedURLException;
import java.net.NoRouteToHostException;
import java.net.URL;
import java.net.URLEncoder;
import java.net.UnknownHostException;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
import java.security.cert.CertificateException;
@@ -184,14 +182,6 @@ public class Server extends Thread implements HostnameVerifier, X509TrustManager
OS os = OS.getOS();
HttpURLConnection connection = null;
try {
String hostname;
try {
hostname = InetAddress.getLocalHost().getHostName();
}
catch (UnknownHostException e) {
this.log.error("Server::getConfiguration failed to get hostname (exception: " + e + ")");
hostname = "";
}
String url_contents = String.format("%s%s?login=%s&password=%s&cpu_family=%s&cpu_model=%s&cpu_model_name=%s&cpu_cores=%s&os=%s&ram=%s&bits=%s&version=%s&hostname=%s&extras=%s",
this.base_url,
"/server/config.php",
@@ -205,7 +195,7 @@ public class Server extends Thread implements HostnameVerifier, X509TrustManager
os.getMemory(),
URLEncoder.encode(os.getCPU().arch(), "UTF-8"),
this.user_config.getJarVersion(),
URLEncoder.encode(hostname, "UTF-8"),
URLEncoder.encode(this.user_config.getHostname(), "UTF-8"),
this.user_config.getExtras());
this.log.debug("Server::getConfiguration url " + url_contents);