Changeset 565 for trunk

Timestamp:

Jan 17, 2007 2:29:31 PM (17 years ago)

Author:

kennell

Message:

Added a "connect" parameter to forward connection through port router.
Added a snooze() method to sleep.
Changed reconnect logic to handle reconnects after host app exits.
Modified file load to use https if connect parameter is specified.

Location:

trunk/gui/filexfer

Files:

• filexfer.java (modified) (2 diffs)
• monitor.java (modified) (7 diffs)

trunk/gui/filexfer/filexfer.java

@@ -45 +45 @@
             cookie = "<missing>";
 
+        String connect_param = null;
+        connect_param = getParameter("connect");
+
         String ipAddr = "";
         try {
@@ -72 +75 @@
 
         mon = new monitor(this, getCodeBase().getHost(), port,
-            user, ipAddr, cookie);
+            user, ipAddr, cookie, connect_param);
         mon.start();
     }

trunk/gui/filexfer/monitor.java

@@ -27 +27 @@
     private String ipAddr;
     private String cookie;
+    private String connect_param;
 
     private Socket socket = null;
@@ -35 +36 @@
 
     public monitor(filexfer parent, String hostName, int hostPort,
-          String user, String ipAddr, String cookie) {
+          String user, String ipAddr, String cookie, String connect_param) {
         this.parent = parent;
         this.hostName = hostName;
@@ -42 +43 @@
         this.ipAddr = ipAddr;
         this.cookie = cookie;
+        this.connect_param = connect_param;
+    }
+
+    private void snooze(int sec) {
+        int ms = sec * 1000;
+        parent.status.append("Snoozing " + Integer.toString(sec) + " sec.\n");
+        try {
+            // sleep a little, so we don't chew up CPU
+            sleep(ms);
+        }
+        catch (java.lang.InterruptedException e) { 
+            // just move on
+        }
     }
 
@@ -49 +63 @@
             if (socket == null) {
                 if (!connect()) {
-                    try {
-                        // sleep a little, so we don't chew up CPU
-                        sleep(5000);
-                    }
-                    catch (java.lang.InterruptedException e) { 
-                        // just move on
-                    }
+                    snooze(60);
                 }
             } else {
                 try {
-                    line = istream.readLine();
-                    if (line == null) {
-                        parent.status.append("CLOSED\n");
-                        socket.close();
-                        socket = null;
-                    } else {
-                        handle(line);
+                    while(true) {
+                        line = istream.readLine();
+                        if (line == null) {
+                            parent.status.append("CLOSED\n");
+                            socket.close();
+                            socket = null;
+                        } else {
+                            handle(line);
+                        }
                     }
                 }
                 catch (java.io.IOException e){
                     parent.status.append("I/O error: "+e.getMessage()+"\n");
+                    try {
+                        socket.close();
+                    }
+                    catch (Exception e2) {
+                        // Ignore errors.
+                    }
+                    socket = null;
                 }
                 catch (Exception e) {
                     parent.status.append("Internal error: "+e.getMessage()+"\n");
-                }
+                    try {
+                        socket.close();
+                    }
+                    catch (Exception e2) {
+                        // Ignore errors.
+                    }
+                    socket = null;
+                }
+                snooze(60);
             }
         }
@@ -137 +162 @@
         }
 
+        if (connect_param != null) {
+            try {
+                ostream.println("CONNECT " + connect_param + " HTTP/1.1");
+                ostream.println("Host: " + connect_param);
+                ostream.println("");
+            }
+            catch (Exception e) {
+                parent.status.append("\nCan't forward connection.");
+                return false;
+            }
+            try {
+                while(true) {
+                    String line = istream.readLine();
+                    if (line.length() == 0) {
+                        parent.status.append("\nDone with forward.");
+                        break;
+                    }
+                    if (line == null) {
+                        parent.status.append("\nNull forward.");
+                        break;
+                    }
+                    parent.status.append("\n" + Integer.toString(line.length()) + ":" + line);
+                }
+            }
+            catch (Exception e) {
+                parent.status.append("\nCan't get forward response.");
+                return false;
+            }
+        }
+
         try {
             ostream.println("REGISTER "+user+" "+ipAddr+" "+cookie+" RAPPTURE/"+protocol);
@@ -144 +199 @@
         catch (Exception e) {
             parent.status.append("\nCan't talk to server");
+            return false;
         }
         return true;
@@ -153 +209 @@
         if (line.startsWith("url ")) {
             try {
-                URL url = new URL("http",
-                    hostName, hostPort, line.substring(4));
+                URL url = null;
+                if (connect_param == null) {
+                    url = new URL("http",
+                                  hostName, hostPort, line.substring(4));
+                } else {
+                    url = new URL("https", hostName,
+                                  "/" + connect_param.replace(':','/') +
+                                  line.substring(4));
+                }
 
                 try {