Merge pull request TooTallNate#47 from Davidiusdadi/master

implemented basic draft 17 support

Author: TooTallNate

example/ChatClient.java

@@ -18,6 +18,7 @@
 import net.tootallnate.websocket.Draft;
 import net.tootallnate.websocket.WebSocketClient;
 import net.tootallnate.websocket.drafts.Draft_10;
+import net.tootallnate.websocket.drafts.Draft_17;
 import net.tootallnate.websocket.drafts.Draft_75;
 import net.tootallnate.websocket.drafts.Draft_76;
 
@@ -41,7 +42,7 @@ public ChatClient() {
 		layout.setRows(6);
 		c.setLayout(layout);
 
-		Draft[] drafts =  { new Draft_10(), new Draft_76(), new Draft_75() };
+		Draft[] drafts =  { new Draft_10(), new Draft_17(), new Draft_76(), new Draft_75() };
 		draft = new JComboBox( drafts );
 		c.add(draft);
 

src/net/tootallnate/websocket/drafts/Draft_10.java

@@ -30,7 +30,19 @@ public class Draft_10 extends Draft {
 
 	private ByteBuffer incompleteframe;
 
-	
+	public static int readVersion(Handshakedata handshakedata){
+		String vers = handshakedata.getFieldValue ( "Sec-WebSocket-Version" );
+		if( !vers.isEmpty () ){
+			int v;
+			try {
+				v = new Integer ( vers.trim () );
+				return v;
+			} catch ( NumberFormatException e ) {
+				return -1;
+			}
+		}
+		return -1;
+	}
 	@Override
 	public List<Framedata> translateFrame( ByteBuffer buffer , int available ) {
 		List<Framedata> frames = new LinkedList<Framedata> ();
@@ -114,7 +126,7 @@ else if( payloadlength == 126 ){
 			}
 		}
 		int maskskeystart = foff + realpacketsize;
-                realpacketsize += ( MASK ? 4 : 0 );
+		realpacketsize += ( MASK ? 4 : 0 );
 		int payloadstart = foff + realpacketsize;
 		realpacketsize += payloadlength;
 
@@ -207,18 +219,9 @@ public List<Framedata> createFrames( byte[] binary , boolean mask ) {
 	@Override
 	public HandshakeState acceptHandshakeAsServer( Handshakedata handshakedata ) throws InvalidHandshakeException {
 		//TODO Do a more detailed formal handshake test
-		String vers = handshakedata.getFieldValue ( "Sec-WebSocket-Version" );
-		if( !vers.isEmpty () ){
-			int v;
-			try {
-				v = new Integer ( vers.trim () );
-			} catch ( NumberFormatException e ) {
-				return HandshakeState.NOT_MATCHED;
-			}
-			if( v == 7 || v == 8 )//g
-				return HandshakeState.MATCHED;
-		}
-			
+		int v = readVersion( handshakedata );
+		if( v == 7 || v == 8 )//g
+			return HandshakeState.MATCHED;
 		return HandshakeState.NOT_MATCHED;
 	}
 
@@ -241,7 +244,6 @@ public HandshakeBuilder postProcessHandshakeRequestAsClient( HandshakeBuilder re
 		request.put ( "Upgrade" , "websocket" );
 		request.put ( "Connection" , "Upgrade" ); //to respond to a Connection keep alives
 		request.put ( "Sec-WebSocket-Version" , "8" );
-		request.put ( "Sec-WebSocket-Key" , "8" );
 
 		byte[] random = new byte[16];
 		new Random().nextBytes( random );

src/net/tootallnate/websocket/drafts/Draft_17.java

@@ -0,0 +1,28 @@
+package net.tootallnate.websocket.drafts;
+
+import java.util.Random;
+
+import com.sun.org.apache.regexp.internal.recompile;
+
+import net.tootallnate.websocket.HandshakeBuilder;
+import net.tootallnate.websocket.Handshakedata;
+import net.tootallnate.websocket.Draft.HandshakeState;
+import net.tootallnate.websocket.exeptions.InvalidHandshakeException;
+import sun.misc.BASE64Encoder;
+
+public class Draft_17 extends Draft_10 {
+	@Override
+	public HandshakeState acceptHandshakeAsServer( Handshakedata handshakedata ) throws InvalidHandshakeException {
+		int v = readVersion( handshakedata );
+		if( v == 13 )
+			return HandshakeState.MATCHED;
+		return HandshakeState.NOT_MATCHED;
+	}
+	
+	@Override
+	public HandshakeBuilder postProcessHandshakeRequestAsClient( HandshakeBuilder request ) {
+		 super.postProcessHandshakeRequestAsClient( request );
+		 request.put ( "Sec-WebSocket-Version" , "13" );//overwriting the previous
+		 return request;
+	}
+}