improved close code validation. Reserved but not (yet) used codes won't be treated as invalid.

Davidiusdadi · Davidiusdadi · commit b967cba2a411 · 2012-10-28T03:04:14.000+01:00
diff --git a/src/main/java/org/java_websocket/framing/CloseFrameBuilder.java b/src/main/java/org/java_websocket/framing/CloseFrameBuilder.java
@@ -68,7 +68,7 @@ private void initCloseCode() throws InvalidFrameException {
 			bb.position( 0 );
 			code = bb.getInt();
 
-			if( code == CloseFrame.ABNORMAL_CLOSE || code == CloseFrame.TLS_ERROR || code == CloseFrame.NOCODE || code > 4999 ) {
+			if( code == CloseFrame.ABNORMAL_CLOSE || code == CloseFrame.TLS_ERROR || code == CloseFrame.NOCODE || code > 4999 || code < 1000 ) {
 				throw new InvalidFrameException( "closecode must not be sent over the wire " + code );
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ private void initCloseCode() throws InvalidFrameException {`
`68`	`68`	`bb.position( 0 );`
`69`	`69`	`code = bb.getInt();`
`70`	`70`
`71`		`- if( code == CloseFrame.ABNORMAL_CLOSE \|\| code == CloseFrame.TLS_ERROR \|\| code == CloseFrame.NOCODE \|\| code > 4999 ) {`
	`71`	`+ if( code == CloseFrame.ABNORMAL_CLOSE \|\| code == CloseFrame.TLS_ERROR \|\| code == CloseFrame.NOCODE \|\| code > 4999 \|\| code < 1000 ) {`
`72`	`72`	`throw new InvalidFrameException( "closecode must not be sent over the wire " + code );`
`73`	`73`	`}`
`74`	`74`	`}`