changed to only send extra bytes when needed. took out uneeded imports

julian · TooTallNate · commit 79bb970f2d64 · 2010-07-28T00:20:03.000-07:00
diff --git a/src/net/tootallnate/websocket/WebSocketClient.java b/src/net/tootallnate/websocket/WebSocketClient.java
@@ -49,7 +49,7 @@ public abstract class WebSocketClient implements Runnable, WebSocketListener {
   private int number2=0;
   /** Key3 used in handshake
    */
-  private byte[] key3;
+  private byte[] key3=null;
   public static enum Draft{
 	  DRAFT75,
 	  DRAFT76
@@ -142,7 +142,6 @@ public void run() {
 
             // Now send WebSocket client-side handshake
             Random r=new Random();
-            this.key3=new byte[8];
             String path = "/" + uri.getPath();
             String host = uri.getHost() + (port != WebSocket.DEFAULT_PORT ? ":" + port : "");
             String origin = null; // TODO: Make 'origin' configurable
@@ -155,12 +154,15 @@ public void run() {
             				  {
             					  request+="Sec-WebSocket-Key1: " + this.generateKey() + "\r\n";
             					  request+="Sec-WebSocket-Key2: " + this.generateKey() + "\r\n";
+            					  this.key3=new byte[8];
             					  r.nextBytes(this.key3);
             				  }
                               //extraHeaders.toString() +
                    request+="\r\n";
             conn.socketChannel().write(ByteBuffer.wrap(request.getBytes(WebSocket.UTF8_CHARSET)));
-            conn.socketChannel().write(ByteBuffer.wrap(key3));
+            if(this.key3 !=null){
+            	conn.socketChannel().write(ByteBuffer.wrap(this.key3));
+            }
           }
 
           // When 'conn' has recieved some data
diff --git a/src/net/tootallnate/websocket/WebSocketServer.java b/src/net/tootallnate/websocket/WebSocketServer.java
@@ -8,17 +8,11 @@
 import java.nio.channels.SocketChannel;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 
-import sun.misc.Regexp;
-
 /**
  * <tt>WebSocketServer</tt> is an abstract class that only takes care of the
  * HTTP handshake portion of WebSockets. It's up to a subclass to add
@@ -293,7 +287,7 @@ public boolean onHandshakeRecieved(WebSocket conn, String handshake,byte[] key3)
     String key1=p.getProperty("Sec-WebSocket-Key1");
     String key2=p.getProperty("Sec-WebSocket-Key2");
     String headerPrefix="";
-    byte[] responseChallenge=new byte[16];
+    byte[] responseChallenge=null;
     switch (this.draft){
       case DRAFT75:
     	  if (key1 != null || key2 != null || key3 != null) {
@@ -348,7 +342,9 @@ public boolean onHandshakeRecieved(WebSocket conn, String handshake,byte[] key3)
       //Can not use UTF-8 here because we might lose bytes in response during conversion
       conn.socketChannel().write(ByteBuffer.wrap(responseHandshake.getBytes()));
       //Only set when Draft 76
-      conn.socketChannel().write(ByteBuffer.wrap(responseChallenge));  
+      if(responseChallenge!=null){
+    	  conn.socketChannel().write(ByteBuffer.wrap(responseChallenge));
+      }
       return true;
     }
 
