nxdumptool/nsul_nxdt_patch.diff

diff --git a/src/main/java/nsusbloader/Utilities/nxdumptool/NxdtUsbAbi1.java b/src/main/java/nsusbloader/Utilities/nxdumptool/NxdtUsbAbi1.java
index dd2a1bc..58add89 100644
--- a/src/main/java/nsusbloader/Utilities/nxdumptool/NxdtUsbAbi1.java
+++ b/src/main/java/nsusbloader/Utilities/nxdumptool/NxdtUsbAbi1.java
@@ -42,7 +42,7 @@ class NxdtUsbAbi1 {
     private final boolean isWindows;
     private boolean isWindows10;
 
-    private static final int NXDT_MAX_DIRECTIVE_SIZE = 0x1000;
+    private static final int NXDT_MAX_DIRECTIVE_SIZE = 0x800000;
     private static final int NXDT_FILE_CHUNK_SIZE = 0x800000;
     private static final int NXDT_FILE_PROPERTIES_MAX_NAME_LENGTH = 0x300;
 
@@ -51,6 +51,7 @@ class NxdtUsbAbi1 {
 
     private static final int CMD_HANDSHAKE = 0;
     private static final int CMD_SEND_FILE_PROPERTIES = 1;
+    private static final int CMD_SEND_NSP_HEADER = 2;
     private static final int CMD_ENDSESSION = 3;
 
     // Standard set of possible replies
@@ -79,9 +80,15 @@ class NxdtUsbAbi1 {
                                                     0x00, 0x00, 0x00, 0x00,
                                                     0x00, 0x00, 0x00, 0x00 };
 
-    private short endpointMaxPacketSize;
+    private short endpointMaxPacketSize = 0;
 
     private static final int NXDT_USB_TIMEOUT = 5000;
+    
+    private boolean nspTransferMode = false;
+    private long nspSize = 0;
+    private int nspHeaderSize = 0;
+    private long nspRemainingSize = 0;
+    private File nspFile = null;
 
     public NxdtUsbAbi1(DeviceHandle handler,
                        ILogPrinter logPrinter,
@@ -111,6 +118,9 @@ class NxdtUsbAbi1 {
         DeviceInformation deviceInformation = DeviceInformation.build(handlerNS);
         NsUsbEndpointDescriptor endpointInDescriptor = deviceInformation.getSimplifiedDefaultEndpointDescriptorIn();
         this.endpointMaxPacketSize = endpointInDescriptor.getwMaxPacketSize();
+        
+        USBSTATUS_SUCCESS[8] = (byte)(endpointMaxPacketSize & 0xFF);
+        USBSTATUS_SUCCESS[9] = (byte)((endpointMaxPacketSize >> 8) & 0xFF);
     }
 
     private void readLoop(){
@@ -134,6 +144,9 @@ class NxdtUsbAbi1 {
                     case CMD_SEND_FILE_PROPERTIES:
                         handleSendFileProperties(directive);
                         break;
+                    case CMD_SEND_NSP_HEADER:
+                        handleSendNspHeader(directive);
+                        break;
                     case CMD_ENDSESSION:
                         logPrinter.print("Session successfully ended.", EMsgType.PASS);
                         return;
@@ -187,30 +200,52 @@ class NxdtUsbAbi1 {
             writeUsb(USBSTATUS_UNSUPPORTED_ABI);
             throw new Exception("ABI v"+versionABI+" is not supported in current version.");
         }
-        replyToHandshake();
-    }
-    private void replyToHandshake() throws Exception{
-        // Send status response + endpoint max packet size
-        ByteBuffer buffer = ByteBuffer.allocate(USBSTATUS_SUCCESS.length + 2).order(ByteOrder.LITTLE_ENDIAN);
-        buffer.put(USBSTATUS_SUCCESS);
-        buffer.putShort(endpointMaxPacketSize);
-        byte[] response = buffer.array();
-
-        writeUsb(response);
+        
+        writeUsb(USBSTATUS_SUCCESS);
     }
 
     private void handleSendFileProperties(byte[] message) throws Exception{
         final long fileSize = getLElong(message, 0x10);
         final int fileNameLen = getLEint(message, 0x18);
+        final int headerSize = getLEint(message, 0x1C);
         String filename = new String(message, 0x20, fileNameLen, StandardCharsets.UTF_8);
 
+        if (!this.nspTransferMode && fileSize > 0 && headerSize >= fileSize) {
+            writeUsb(USBSTATUS_MALFORMED_REQUEST);
+            logPrinter.print("NSP header size non-zero in NSP transfer mode!", EMsgType.FAIL);
+            return;
+        }
+
+        if (this.nspTransferMode && headerSize > 0) {
+            writeUsb(USBSTATUS_MALFORMED_REQUEST);
+            logPrinter.print("NSP header size non-zero in NSP transfer mode!", EMsgType.FAIL);
+            resetNspInfo();
+            return;
+        }
+
         if (fileNameLen <= 0 || fileNameLen > NXDT_FILE_PROPERTIES_MAX_NAME_LENGTH){
             writeUsb(USBSTATUS_MALFORMED_REQUEST);
             logPrinter.print("Invalid filename length!", EMsgType.FAIL);
+            resetNspInfo();
             return;
         }
+
         // TODO: Note, in case of a big amount of small files performace decreses dramatically. It's better to handle this only in case of 1-big-file-transfer
-        logPrinter.print("Receiving: '"+filename+"' ("+fileSize+" b)", EMsgType.INFO);
+        if (!this.nspTransferMode) {
+            logPrinter.print("Receiving: '"+filename+"' ("+fileSize+" b)", EMsgType.INFO);
+        } else {
+            logPrinter.print("Receiving NSP file entry: '"+filename+"' ("+fileSize+" b)", EMsgType.INFO);
+        }
+
+        if (!this.nspTransferMode && fileSize > 0 && headerSize > 0) {
+            // Enable NSP transfer mode
+            this.nspTransferMode = true;
+            this.nspSize = fileSize;
+            this.nspRemainingSize = (fileSize - headerSize);
+            this.nspHeaderSize = headerSize;
+            this.nspFile = null;
+        }
+
         // If RomFs related
         if (isRomFs(filename)) {
             if (isWindows)
@@ -225,24 +260,48 @@ class NxdtUsbAbi1 {
             filename = saveToPath + filename;
         }
 
-        File fileToDump = new File(filename);
-        // Check if enough space
-        if (fileToDump.getParentFile().getFreeSpace() <= fileSize){
-            writeUsb(USBSTATUS_HOSTIOERROR);
-            logPrinter.print("Not enough space on selected volume. Need: "+fileSize+
-                    " while available: "+fileToDump.getParentFile().getFreeSpace(), EMsgType.FAIL);
-            return;
-        }
-        // Check if FS is NOT read-only
-        if (! (fileToDump.canWrite() || fileToDump.createNewFile()) ){
-            writeUsb(USBSTATUS_HOSTIOERROR);
-            logPrinter.print("Unable to write into selected volume: "+fileToDump.getAbsolutePath(), EMsgType.FAIL);
-            return;
+        File fileToDump;
+
+        if (!this.nspTransferMode || (this.nspTransferMode && this.nspFile == null)) {
+            fileToDump = new File(filename);
+
+            // Check if enough space
+            if (fileToDump.getParentFile().getFreeSpace() <= fileSize){
+                writeUsb(USBSTATUS_HOSTIOERROR);
+                logPrinter.print("Not enough space on selected volume. Need: "+fileSize+
+                        " while available: "+fileToDump.getParentFile().getFreeSpace(), EMsgType.FAIL);
+                resetNspInfo();
+                return;
+            }
+
+            // Check if FS is NOT read-only
+            if (! (fileToDump.canWrite() || fileToDump.createNewFile()) ){
+                writeUsb(USBSTATUS_HOSTIOERROR);
+                logPrinter.print("Unable to write into selected volume: "+fileToDump.getAbsolutePath(), EMsgType.FAIL);
+                resetNspInfo();
+                return;
+            }
+
+            // Delete file if it exists
+            if (fileToDump.exists()) fileToDump.delete();
+
+            if (this.nspTransferMode) {
+                // Update NSP file object
+                this.nspFile = fileToDump;
+
+                // Write padding
+                try (FileOutputStream fos = new FileOutputStream(this.nspFile, false)) {
+                    byte[] reserved = new byte[this.nspHeaderSize];
+                    fos.write(reserved);
+                }
+            }
+        } else {
+            fileToDump = this.nspFile;
         }
 
         writeUsb(USBSTATUS_SUCCESS);
 
-        if (fileSize == 0)
+        if (fileSize == 0 || (this.nspTransferMode && fileSize == this.nspSize))
             return;
 
         dumpFile(fileToDump, fileSize);
@@ -251,6 +310,49 @@ class NxdtUsbAbi1 {
 
     }
 
+    private void handleSendNspHeader(byte[] message) throws Exception{
+        final int headerSize = getLEint(message, 0x8);
+        
+        if (!this.nspTransferMode) {
+            writeUsb(USBSTATUS_MALFORMED_REQUEST);
+            logPrinter.print("Received NSP send header request outside of NSP transfer mode!", EMsgType.FAIL);
+            resetNspInfo();
+            return;
+        }
+
+        if (this.nspRemainingSize > 0) {
+            writeUsb(USBSTATUS_MALFORMED_REQUEST);
+            logPrinter.print("Received NSP send header request without receiving all NSP file entry data!", EMsgType.FAIL);
+            resetNspInfo();
+            return;
+        }
+
+        if (headerSize != this.nspHeaderSize) {
+            writeUsb(USBSTATUS_MALFORMED_REQUEST);
+            logPrinter.print("Received NSP header size mismatch! "+headerSize+" != "+this.nspHeaderSize, EMsgType.FAIL);
+            resetNspInfo();
+            return;
+        }
+
+        try (RandomAccessFile raf = new RandomAccessFile(this.nspFile, "rw")) {
+            byte[] headerData = Arrays.copyOfRange(message, 0x10, headerSize + 0x10);
+            raf.seek(0);
+            raf.write(headerData);
+        }
+
+        resetNspInfo();
+
+        writeUsb(USBSTATUS_SUCCESS);
+    }
+
+    private void resetNspInfo(){
+        this.nspTransferMode = false;
+        this.nspSize = 0;
+        this.nspHeaderSize = 0;
+        this.nspRemainingSize = 0;
+        this.nspFile = null;
+    }
+
     private int getLEint(byte[] bytes, int fromOffset){
         return ByteBuffer.wrap(bytes, fromOffset, 0x4).order(ByteOrder.LITTLE_ENDIAN).getInt();
     }
@@ -279,7 +381,7 @@ class NxdtUsbAbi1 {
 
     // @see https://bugs.openjdk.java.net/browse/JDK-8146538
     private void dumpFile(File file, long size) throws Exception{
-        FileOutputStream fos = new FileOutputStream(file, true);
+        FileOutputStream fos = new FileOutputStream(file, this.nspTransferMode);
 
         try (BufferedOutputStream bos = new BufferedOutputStream(fos)) {
             FileDescriptor fd = fos.getFD();
@@ -296,15 +398,21 @@ class NxdtUsbAbi1 {
                 bufferSize = readBuffer.length;
                 received += bufferSize;
 
-                logPrinter.updateProgress((double)received / (double)size);
+                if (!this.nspTransferMode) {
+                    logPrinter.updateProgress((double)received / (double)size);
+                } else {
+                    this.nspRemainingSize -= bufferSize;
+                    logPrinter.updateProgress((double)(this.nspSize - this.nspRemainingSize) / (double)this.nspSize);
+                }
             }
             int lastChunkSize = (int)(size - received) + 1;
             readBuffer = readUsbFileDebug(lastChunkSize);
             bos.write(readBuffer);
             if (isWindows10)
                 fd.sync();
+            if (this.nspTransferMode) this.nspRemainingSize -= (lastChunkSize - 1);
         } finally {
-            logPrinter.updateProgress(1.0);
+            if (!this.nspTransferMode || (this.nspTransferMode && this.nspRemainingSize == 0)) logPrinter.updateProgress(1.0);
         }
     }
     /* Handle Zero-length terminator
diff --git a/src/main/resources/NSLMain.fxml b/src/main/resources/NSLMain.fxml
index a2d42d6..9114c3d 100644
--- a/src/main/resources/NSLMain.fxml
+++ b/src/main/resources/NSLMain.fxml
@@ -71,12 +71,12 @@ Steps to roll NXDT functionality back:
                         <SVGPath content="M9,22A1,1 0 0,1 8,21V18H4A2,2 0 0,1 2,16V4C2,2.89 2.9,2 4,2H20A2,2 0 0,1 22,4V16A2,2 0 0,1 20,18H13.9L10.2,21.71C10,21.9 9.75,22 9.5,22V22H9M10,16V19.08L13.08,16H20V4H4V16H10M17,11H15V9H17V11M13,11H11V9H13V11M9,11H7V9H9V11Z" />
                      </graphic>
                 </Tab>
-                  <Tab closable="false" disable="true">
+                  <Tab closable="false" disable="false">
                       <content>
                           <fx:include fx:id="NXDTab" source="NXDTab.fxml" VBox.vgrow="ALWAYS" />
                       </content>
                       <graphic>
-                          <SVGPath content="M 7 0 L 0 4 C -0.02484618 7.6613523 4.6259293e-18 7.3229335 0 10.984375 C 0 10.993031 0.015625 7 0.015625 8 L 13 0 L 7 0 z M 17.966797 6.46875 L 17.966797 10.673828 C 17.715715 10.211268 17.396999 9.8685131 17.011719 9.6464844 C 16.630766 9.4198301 16.171566 9.3066406 15.634766 9.3066406 C 14.755976 9.3066406 14.040441 9.682293 13.486328 10.431641 C 12.936542 11.180987 12.660156 12.165561 12.660156 13.386719 C 12.660156 14.607877 12.936542 15.59245 13.486328 16.341797 C 14.040441 17.091144 14.755976 17.466797 15.634766 17.466797 C 16.171566 17.466797 16.630766 17.354841 17.011719 17.132812 C 17.396999 16.90616 17.715715 16.562169 17.966797 16.099609 L 17.966797 17.265625 L 19.160156 17.265625 L 19.160156 6.46875 L 17.966797 6.46875 z M 20.572266 7.3652344 L 20.572266 9.5546875 L 19.800781 9.5546875 L 19.800781 10.539062 L 20.572266 10.539062 L 20.572266 14.724609 C 20.572266 15.688531 20.728201 16.353495 21.037109 16.720703 C 21.346016 17.083321 21.906432 17.265625 22.71875 17.265625 L 23.800781 17.265625 L 23.800781 16.205078 L 22.71875 16.205078 C 22.280176 16.205078 21.98867 16.114559 21.84375 15.935547 C 21.702645 15.756534 21.630859 15.353453 21.630859 14.724609 L 21.630859 10.539062 L 23.800781 10.539062 L 23.800781 9.5546875 L 21.630859 9.5546875 L 21.630859 7.3652344 L 20.572266 7.3652344 z M 3.6386719 9.3066406 C 3.1397071 9.3066406 2.6982722 9.4230165 2.3144531 9.6542969 C 1.9348986 9.8855772 1.6037331 10.233986 1.3222656 10.701172 L 1.3222656 9.4941406 L 0.13867188 9.4941406 L 0.13867188 17.265625 L 1.3222656 17.265625 L 1.3222656 12.873047 C 1.3222656 12.114448 1.5062865 11.515605 1.8730469 11.076172 C 2.2398077 10.636739 2.7395664 10.417969 3.375 10.417969 C 3.9038175 10.417969 4.3000442 10.599421 4.5644531 10.964844 C 4.8288618 11.330266 4.9609375 11.881715 4.9609375 12.617188 L 4.9609375 17.265625 L 6.1386719 17.265625 L 6.1386719 12.576172 C 6.1386719 11.503031 5.9280604 10.691072 5.5058594 10.140625 C 5.0836585 9.5855522 4.4617505 9.3066406 3.6386719 9.3066406 z M 6.984375 9.4941406 L 9.2207031 13.199219 L 6.7773438 17.265625 L 7.9960938 17.265625 L 9.828125 14.212891 L 11.658203 17.265625 L 12.878906 17.265625 L 10.484375 13.275391 L 12.759766 9.4941406 L 11.541016 9.4941406 L 9.8730469 12.263672 L 8.2050781 9.4941406 L 6.984375 9.4941406 z M 15.927734 10.375 C 16.559769 10.375 17.056283 10.643118 17.419922 11.179688 C 17.783557 11.711631 17.966797 12.447722 17.966797 13.386719 C 17.966797 14.325715 17.783557 15.06304 17.419922 15.599609 C 17.056283 16.131553 16.559769 16.398437 15.927734 16.398438 C 15.295699 16.398438 14.797233 16.131553 14.433594 15.599609 C 14.074286 15.06304 13.894531 14.325715 13.894531 13.386719 C 13.894531 12.447722 14.074286 11.711631 14.433594 11.179688 C 14.797233 10.643118 15.295699 10.375 15.927734 10.375 z M 24 18.400391 C 24.0056 21.386719 23.984375 22 23.984375 19 L 15 23.982422 L 23.984375 23.996094 C 23.993075 23.996094 24 23.990492 24 23.982422 L 24 18.400391 z" visible="false" />
+                          <SVGPath content="M 7 0 L 0 4 C -0.02484618 7.6613523 4.6259293e-18 7.3229335 0 10.984375 C 0 10.993031 0.015625 7 0.015625 8 L 13 0 L 7 0 z M 17.966797 6.46875 L 17.966797 10.673828 C 17.715715 10.211268 17.396999 9.8685131 17.011719 9.6464844 C 16.630766 9.4198301 16.171566 9.3066406 15.634766 9.3066406 C 14.755976 9.3066406 14.040441 9.682293 13.486328 10.431641 C 12.936542 11.180987 12.660156 12.165561 12.660156 13.386719 C 12.660156 14.607877 12.936542 15.59245 13.486328 16.341797 C 14.040441 17.091144 14.755976 17.466797 15.634766 17.466797 C 16.171566 17.466797 16.630766 17.354841 17.011719 17.132812 C 17.396999 16.90616 17.715715 16.562169 17.966797 16.099609 L 17.966797 17.265625 L 19.160156 17.265625 L 19.160156 6.46875 L 17.966797 6.46875 z M 20.572266 7.3652344 L 20.572266 9.5546875 L 19.800781 9.5546875 L 19.800781 10.539062 L 20.572266 10.539062 L 20.572266 14.724609 C 20.572266 15.688531 20.728201 16.353495 21.037109 16.720703 C 21.346016 17.083321 21.906432 17.265625 22.71875 17.265625 L 23.800781 17.265625 L 23.800781 16.205078 L 22.71875 16.205078 C 22.280176 16.205078 21.98867 16.114559 21.84375 15.935547 C 21.702645 15.756534 21.630859 15.353453 21.630859 14.724609 L 21.630859 10.539062 L 23.800781 10.539062 L 23.800781 9.5546875 L 21.630859 9.5546875 L 21.630859 7.3652344 L 20.572266 7.3652344 z M 3.6386719 9.3066406 C 3.1397071 9.3066406 2.6982722 9.4230165 2.3144531 9.6542969 C 1.9348986 9.8855772 1.6037331 10.233986 1.3222656 10.701172 L 1.3222656 9.4941406 L 0.13867188 9.4941406 L 0.13867188 17.265625 L 1.3222656 17.265625 L 1.3222656 12.873047 C 1.3222656 12.114448 1.5062865 11.515605 1.8730469 11.076172 C 2.2398077 10.636739 2.7395664 10.417969 3.375 10.417969 C 3.9038175 10.417969 4.3000442 10.599421 4.5644531 10.964844 C 4.8288618 11.330266 4.9609375 11.881715 4.9609375 12.617188 L 4.9609375 17.265625 L 6.1386719 17.265625 L 6.1386719 12.576172 C 6.1386719 11.503031 5.9280604 10.691072 5.5058594 10.140625 C 5.0836585 9.5855522 4.4617505 9.3066406 3.6386719 9.3066406 z M 6.984375 9.4941406 L 9.2207031 13.199219 L 6.7773438 17.265625 L 7.9960938 17.265625 L 9.828125 14.212891 L 11.658203 17.265625 L 12.878906 17.265625 L 10.484375 13.275391 L 12.759766 9.4941406 L 11.541016 9.4941406 L 9.8730469 12.263672 L 8.2050781 9.4941406 L 6.984375 9.4941406 z M 15.927734 10.375 C 16.559769 10.375 17.056283 10.643118 17.419922 11.179688 C 17.783557 11.711631 17.966797 12.447722 17.966797 13.386719 C 17.966797 14.325715 17.783557 15.06304 17.419922 15.599609 C 17.056283 16.131553 16.559769 16.398437 15.927734 16.398438 C 15.295699 16.398438 14.797233 16.131553 14.433594 15.599609 C 14.074286 15.06304 13.894531 14.325715 13.894531 13.386719 C 13.894531 12.447722 14.074286 11.711631 14.433594 11.179688 C 14.797233 10.643118 15.295699 10.375 15.927734 10.375 z M 24 18.400391 C 24.0056 21.386719 23.984375 22 23.984375 19 L 15 23.982422 L 23.984375 23.996094 C 23.993075 23.996094 24 23.990492 24 23.982422 L 24 18.400391 z" visible="true" />
                       </graphic>
                   </Tab>
               </tabs>