lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
地平线
2015-09-19 16:15:25 +08:00
parent ce4509bf5c
commit d6821be002
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/wentch/redkale/net/http/WebSocketRunner.java
View File

@@ -39,18 +39,17 @@ public class WebSocketRunner implements Runnable {
private AtomicBoolean writing = new AtomicBoolean(); private AtomicBoolean writing = new AtomicBoolean();
private final Coder coder; private final Coder coder = new Coder();
private final BlockingQueue<byte[]> queue = new ArrayBlockingQueue(1024); private final BlockingQueue<byte[]> queue = new ArrayBlockingQueue(1024);
private final boolean wsbinary; private final boolean wsbinary;
public WebSocketRunner(Context context, WebSocket webSocket, AsyncConnection channel, final boolean maskData, final boolean wsbinary) { public WebSocketRunner(Context context, WebSocket webSocket, AsyncConnection channel, final boolean wsbinary) {
this.context = context; this.context = context;
this.engine = webSocket.engine; this.engine = webSocket.engine;
this.webSocket = webSocket; this.webSocket = webSocket;
this.channel = channel; this.channel = channel;
this.coder = new Coder(maskData);
this.wsbinary = wsbinary; this.wsbinary = wsbinary;
webSocket.runner = this; webSocket.runner = this;
this.coder.logger = context.getLogger(); this.coder.logger = context.getLogger();
@@ -359,7 +358,7 @@ public class WebSocketRunner implements Runnable {
protected byte outFragmentedType; protected byte outFragmentedType;
protected final boolean maskData; protected final boolean maskData = false;
protected boolean processingFragment; protected boolean processingFragment;
@@ -367,10 +366,6 @@ public class WebSocketRunner implements Runnable {
private Logger logger; private Logger logger;
Coder(boolean maskData) {
this.maskData = maskData;
}
/** /**
0 1 2 3 0 1 2 3
0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1

3
src/com/wentch/redkale/net/http/WebSocketServlet.java
View File

@@ -116,7 +116,6 @@ public abstract class WebSocketServlet extends HttpServlet implements Nameable {
response.setHeader("Connection", "Upgrade"); response.setHeader("Connection", "Upgrade");
response.addHeader("Upgrade", "websocket"); response.addHeader("Upgrade", "websocket");
response.addHeader("Sec-WebSocket-Accept", key); response.addHeader("Sec-WebSocket-Accept", key);
final boolean mask = "13".equals(request.getHeader("Sec-WebSocket-Version"));
response.sendBody((ByteBuffer) null, null, new CompletionHandler<Integer, Void>() { response.sendBody((ByteBuffer) null, null, new CompletionHandler<Integer, Void>() {
@Override @Override
@@ -130,7 +129,7 @@ public abstract class WebSocketServlet extends HttpServlet implements Nameable {
} }
webSocket.groupid = groupid; webSocket.groupid = groupid;
engine.add(webSocket); engine.add(webSocket);
context.submit(new WebSocketRunner(context, webSocket, response.removeChannel(), mask, wsbinary)); context.submit(new WebSocketRunner(context, webSocket, response.removeChannel(), wsbinary));
response.finish(true); response.finish(true);
} }