Changeset 849

Timestamp:

02/05/14 16:37:56 (10 years ago)

Author:

jts21

Message:

Increase max images to 0xFFFF, which is more images than could fit on the largest frame allowed to be transmitted

Location:

trunk/src/org/expeditee/network

Files:

• FrameShare.java (modified) (3 diffs)
• ImageSaver.java (modified) (1 diff)

trunk/src/org/expeditee/network/FrameShare.java

@@ -275 +275 @@
                 @Override
                 public void run() {
-                        System.out.println("Sending images to server");
+                        // System.out.println("Sending images to server");
                         try(Socket socket = new Socket(peer.getAddress(), peer.getPort() + ImageSaver.OFFSET)) {
                                 socket.setSoTimeout(NetworkSettings.FrameShareTimeout.get() * 2);
@@ -281 +281 @@
                                 // send the list of filenames to the server
                                 int numFiles = imageFiles.size();
-                                if(numFiles > 255) {
+                                if(numFiles > 0xFFFF) {
                                         throw new Exception("Too many images on the frame");
                                 }
+                                os.write((byte) ((numFiles >> 8) & 0xFF));
                 os.write((byte) (numFiles & 0xFF));
                 // send the list of different files
@@ -300 +301 @@
                                 while((i = is.read()) != -1 && i < imageFiles.size()) {
                                         File f = imageFiles.get(i);
-                                        System.out.println("... sending " + f.getName());
+                                        // System.out.println("... sending " + f.getName());
                                         ImageServer.sendImage(f, socket);
                                 }

trunk/src/org/expeditee/network/ImageSaver.java

@@ -66 +66 @@
                                 OutputStream os = this.socket.getOutputStream();
                                 // number of files is the first byte
-                                int numFiles = is.read();
+                                int numFiles = is.read() << 8 | is.read();
                                 if(numFiles == -1)
                                         return;