mirrors/ns-usbloader
1
0
Fork 0
mirror of https://github.com/developersu/ns-usbloader.git synced 2025-05-14 15:15:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Final preparations before v0.3

Browse source
This commit is contained in:
Dmitry Isaenko 2019-03-20 03:07:08 +03:00
parent 53a8a2337f
commit 7c3bb790ee
4 changed files with 73 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/nsusbloader/NET/NETCommunications.java
View file

@ -130,11 +130,12 @@ public class NETCommunications extends Task<Void> { // todo: thows IOException?
else {
try {
this.hostPort = Integer.parseInt(hostPortNum);
serverSocket = new ServerSocket(hostPort);
logPrinter.print("NET: Using defined port number: " + hostPort, EMsgType.PASS);
}
catch (NumberFormatException exeption){ // Literally never happens.
isValid = false;
catch (NumberFormatException | IOException exeption){ // Literally never happens.
logPrinter.print("NET: Can't use port defined in settings: " + hostPortNum + "\nIt's not a valid number!", EMsgType.WARNING);
isValid = false;
close(EFileStatus.FAILED);
return;
}
@ -149,11 +150,7 @@ public class NETCommunications extends Task<Void> { // todo: thows IOException?
this.close(EFileStatus.UNKNOWN);
super.cancelled();
}
/*
Replace everything to ASCII (WEB representation)
calculate
write in first 4 bytes
* */
@Override
protected Void call() {
if (!isValid | isCancelled())
@ -201,13 +198,10 @@ write in first 4 bytes
// Go transfer
Socket clientSocket;
System.out.println("0");
work_routine:
while (true){
try {
System.out.println("0.5");
clientSocket = serverSocket.accept();
System.out.println("1");
BufferedReader br = new BufferedReader(
new InputStreamReader(clientSocket.getInputStream())
);
@ -219,7 +213,7 @@ write in first 4 bytes
LinkedList<String> tcpPacket = new LinkedList<>();
while ((line = br.readLine()) != null) {
System.out.println(line); // TODO: remove DBG
//System.out.println(line); // TODO: remove DBG
if (line.trim().isEmpty()) { // If TCP packet is ended
if (handleRequest(tcpPacket)) // Proceed required things
break work_routine;
@ -228,15 +222,13 @@ write in first 4 bytes
else
tcpPacket.add(line); // Otherwise collect data
}
System.out.println("\t\tPacket covered!\n"); // reopen client sock
// and reopen client sock
clientSocket.close();
}
catch (IOException ioe){ // If server socket closed, then client socket also closed.
System.out.println("2");
break;
}
}
System.out.println("3");
if (!isCancelled())
close(EFileStatus.UNKNOWN);
return null;

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

@ -12,7 +12,7 @@ import java.util.Locale;
import java.util.ResourceBundle;
public class NSLMain extends Application {
public static final String appVersion = "v0.3_DEV";
public static final String appVersion = "v0.3";
@Override
public void start(Stage primaryStage) throws Exception{