desu/ns-usbloader
1
0
Fork 0
Code Pull requests Actions Releases Wiki Activity

Fix bug #45

Browse source
This commit is contained in:
Dmitry Isaenko 2020-02-20 05:19:42 +03:00
parent 7b2e77a08a
commit 30923d95eb
3 changed files with 48 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pom.xml
View file

@ -8,7 +8,7 @@
<name>NS-USBloader</name> <name>NS-USBloader</name>
<artifactId>ns-usbloader</artifactId> <artifactId>ns-usbloader</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.1-SNAPSHOT</version>
<url>https://github.com/developersu/ns-usbloader/</url> <url>https://github.com/developersu/ns-usbloader/</url>
<description> <description>

60
src/main/java/nsusbloader/COM/NET/NETCommunications.java
View file

@ -124,20 +124,35 @@ public class NETCommunications extends Task<Void> { // todo: thows IOException?
catch (SocketException | UnknownHostException e2) { catch (SocketException | UnknownHostException e2) {
logPrinter.print("NET: Can't get your computer IP using Renmin Ribao server. Returned:\n\t"+e2.getMessage(), EMsgType.FAIL); logPrinter.print("NET: Can't get your computer IP using Renmin Ribao server. Returned:\n\t"+e2.getMessage(), EMsgType.FAIL);
logPrinter.print("Try using 'Expert mode' and set IP manually.", EMsgType.INFO); logPrinter.print("Try using 'Expert mode' and set IP manually.", EMsgType.INFO);
try { this.showAvalIpExamples();
Enumeration enumeration = NetworkInterface.getNetworkInterfaces(); isValid = false;
while (enumeration.hasMoreElements()) { close(EFileStatus.FAILED);
NetworkInterface n = (NetworkInterface) enumeration.nextElement(); return;
Enumeration enumeration1 = n.getInetAddresses(); }
while (enumeration1.hasMoreElements()) { }
InetAddress i = (InetAddress) enumeration1.nextElement(); }
logPrinter.print("Check for: " + i.getHostAddress(), EMsgType.INFO); // Say hello to MacOS Catalina
} // Also this part could be used instead of what we have above. One day it has to be tested on all platforms and fixed (replace code above).
} if (hostIP.equals("0.0.0.0")) {
} Socket scoketK;
catch (SocketException socketException) { // Good block. try {
logPrinter.print("Can't determine possible variants. Returned:\n\t"+socketException.getMessage(), EMsgType.FAIL); scoketK = new Socket();
} scoketK.connect(new InetSocketAddress("google.com", 80));
hostIP = scoketK.getLocalAddress().getHostAddress();
scoketK.close();
} catch (Exception scoketKex) {
scoketKex.printStackTrace();
logPrinter.print("NET: Can't get your computer IP using Google server (InetSocketAddress). Returned:\n\t"+scoketKex.getMessage(), EMsgType.INFO);
try {
scoketK = new Socket();
scoketK.connect(new InetSocketAddress("people.com.cn", 80));
hostIP = scoketK.getLocalAddress().getHostAddress();
scoketK.close();
} catch (Exception scoketKexx) {
scoketKex.printStackTrace();
logPrinter.print("NET: Can't get your computer IP using Renmin Ribao server (InetSocketAddress). Returned:\n\t"+scoketKexx.getMessage(), EMsgType.FAIL);
logPrinter.print("Try using 'Expert mode' and set IP manually.", EMsgType.INFO);
this.showAvalIpExamples();
isValid = false; isValid = false;
close(EFileStatus.FAILED); close(EFileStatus.FAILED);
return; return;
@ -212,6 +227,23 @@ public class NETCommunications extends Task<Void> { // todo: thows IOException?
} }
isValid = true; isValid = true;
} }
/**
* Show possible variants to log area
* */
private void showAvalIpExamples(){
try {
Enumeration<NetworkInterface> enumeration = NetworkInterface.getNetworkInterfaces();
while (enumeration.hasMoreElements()) {
NetworkInterface n = enumeration.nextElement();
Enumeration<InetAddress> enumeration1 = n.getInetAddresses();
while (enumeration1.hasMoreElements())
logPrinter.print("Check for: " + enumeration1.nextElement().getHostAddress(), EMsgType.INFO);
}
}
catch (SocketException socketException) { // Good block.
logPrinter.print("Can't determine possible variants. Returned:\n\t"+socketException.getMessage(), EMsgType.FAIL);
}
}
/** /**
* Override cancel block to close connection by ourselves * Override cancel block to close connection by ourselves
* */ * */

2
src/main/java/nsusbloader/NSLMain.java
View file

@ -13,7 +13,7 @@ import java.util.ResourceBundle;
public class NSLMain extends Application { public class NSLMain extends Application {
public static final String appVersion = "v2.0"; public static final String appVersion = "v2.1";
@Override @Override
public void start(Stage primaryStage) throws Exception{ public void start(Stage primaryStage) throws Exception{