Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged branch 'jetty-7' into 'jetty-8'.

This commit is contained in:
Simone Bordet 2013-08-08 12:10:19 +02:00
parent f22217392b 4ce4615597
commit 59a070a9fe
1 changed files with 224 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

191
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketGeneratorRFC6455.java
View File

@ -19,14 +19,16 @@
package org.eclipse.jetty.websocket;
import java.io.IOException;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import org.eclipse.jetty.io.Buffer;
import org.eclipse.jetty.io.EndPoint;
import org.eclipse.jetty.io.EofException;
/* ------------------------------------------------------------ */
/** WebSocketGenerator.
/**
* WebSocketGenerator.
* This class generates websocket packets.
* It is fully synchronized because it is likely that async
* threads will call the addMessage methods while other
@ -34,67 +36,75 @@ import org.eclipse.jetty.io.EofException;
*/
public class WebSocketGeneratorRFC6455 implements WebSocketGenerator
{
final private WebSocketBuffers _buffers;
final private EndPoint _endp;
private final Lock _lock = new ReentrantLock();
private final WebSocketBuffers _buffers;
private final EndPoint _endp;
private final byte[] _mask = new byte[4];
private final MaskGen _maskGen;
private Buffer _buffer;
private final byte[] _mask=new byte[4];
private int _m;
private boolean _opsent;
private final MaskGen _maskGen;
private boolean _closed;
public WebSocketGeneratorRFC6455(WebSocketBuffers buffers, EndPoint endp)
{
_buffers=buffers;
_endp=endp;
_maskGen=null;
this(buffers, endp, null);
}
public WebSocketGeneratorRFC6455(WebSocketBuffers buffers, EndPoint endp, MaskGen maskGen)
{
_buffers=buffers;
_endp=endp;
_maskGen=maskGen;
_buffers = buffers;
_endp = endp;
_maskGen = maskGen;
}
public synchronized Buffer getBuffer()
public Buffer getBuffer()
{
_lock.lock();
try
{
return _buffer;
}
public synchronized void addFrame(byte flags, byte opcode, byte[] content, int offset, int length) throws IOException
finally
{
// System.err.printf("<< %s %s %s\n",TypeUtil.toHexString(flags),TypeUtil.toHexString(opcode),length);
_lock.unlock();
}
}
public void addFrame(byte flags, byte opcode, byte[] content, int offset, int length) throws IOException
{
_lock.lock();
try
{
if (_closed)
throw new EofException("Closed");
if (opcode==WebSocketConnectionRFC6455.OP_CLOSE)
_closed=true;
if (opcode == WebSocketConnectionRFC6455.OP_CLOSE)
_closed = true;
boolean mask=_maskGen!=null;
boolean mask = _maskGen != null;
if (_buffer==null)
_buffer=mask?_buffers.getBuffer():_buffers.getDirectBuffer();
if (_buffer == null)
_buffer = mask ? _buffers.getBuffer() : _buffers.getDirectBuffer();
boolean last=WebSocketConnectionRFC6455.isLastFrame(flags);
boolean last = WebSocketConnectionRFC6455.isLastFrame(flags);
int space=mask?14:10;
int space = mask ? 14 : 10;
do
{
opcode = _opsent?WebSocketConnectionRFC6455.OP_CONTINUATION:opcode;
opcode=(byte)(((0xf&flags)<<4)+(0xf&opcode));
_opsent=true;
opcode = _opsent ? WebSocketConnectionRFC6455.OP_CONTINUATION : opcode;
opcode = (byte)(((0xf & flags) << 4) + (0xf & opcode));
_opsent = true;
int payload=length;
if (payload+space>_buffer.capacity())
int payload = length;
if (payload + space > _buffer.capacity())
{
// We must fragement, so clear FIN bit
opcode=(byte)(opcode&0x7F); // Clear the FIN bit
payload=_buffer.capacity()-space;
opcode = (byte)(opcode & 0x7F); // Clear the FIN bit
payload = _buffer.capacity() - space;
}
else if (last)
opcode= (byte)(opcode|0x80); // Set the FIN bit
opcode = (byte)(opcode | 0x80); // Set the FIN bit
// ensure there is space for header
if (_buffer.space() <= space)
@ -105,40 +115,40 @@ public class WebSocketGeneratorRFC6455 implements WebSocketGenerator
}
// write the opcode and length
if (payload>0xffff)
if (payload > 0xffff)
{
_buffer.put(new byte[]{
opcode,
mask?(byte)0xff:(byte)0x7f,
mask ? (byte)0xff : (byte)0x7f,
(byte)0,
(byte)0,
(byte)0,
(byte)0,
(byte)((payload>>24)&0xff),
(byte)((payload>>16)&0xff),
(byte)((payload>>8)&0xff),
(byte)(payload&0xff)});
(byte)((payload >> 24) & 0xff),
(byte)((payload >> 16) & 0xff),
(byte)((payload >> 8) & 0xff),
(byte)(payload & 0xff)});
}
else if (payload >=0x7e)
else if (payload >= 0x7e)
{
_buffer.put(new byte[]{
opcode,
mask?(byte)0xfe:(byte)0x7e,
(byte)(payload>>8),
(byte)(payload&0xff)});
mask ? (byte)0xfe : (byte)0x7e,
(byte)(payload >> 8),
(byte)(payload & 0xff)});
}
else
{
_buffer.put(new byte[]{
opcode,
(byte)(mask?(0x80|payload):payload)});
(byte)(mask ? (0x80 | payload) : payload)});
}
// write mask
if (mask)
{
_maskGen.genMask(_mask);
_m=0;
_m = 0;
_buffer.put(_mask);
}
@ -151,8 +161,8 @@ public class WebSocketGeneratorRFC6455 implements WebSocketGenerator
if (mask)
{
for (int i=0;i<chunk;i++)
_buffer.put((byte)(content[offset+ (payload-remaining)+i]^_mask[+_m++%4]));
for (int i = 0; i < chunk; i++)
_buffer.put((byte)(content[offset + (payload - remaining) + i] ^ _mask[+_m++ % 4]));
}
else
_buffer.put(content, offset + (payload - remaining), chunk);
@ -174,52 +184,72 @@ public class WebSocketGeneratorRFC6455 implements WebSocketGenerator
}
}
}
offset+=payload;
length-=payload;
offset += payload;
length -= payload;
}
while (length>0);
_opsent=!last;
while (length > 0);
_opsent = !last;
if (_buffer!=null && _buffer.length()==0)
if (_buffer != null && _buffer.length() == 0)
{
_buffers.returnBuffer(_buffer);
_buffer=null;
_buffer = null;
}
}
finally
{
_lock.unlock();
}
}
public synchronized int flushBuffer() throws IOException
public int flushBuffer() throws IOException
{
if (!_lock.tryLock())
return 0;
try
{
if (!_endp.isOpen())
throw new EofException();
if (_buffer!=null)
if (_buffer != null)
{
int flushed=_buffer.hasContent()?_endp.flush(_buffer):0;
if (_closed&&_buffer.length()==0)
int flushed = _buffer.hasContent() ? _endp.flush(_buffer) : 0;
if (_closed && _buffer.length() == 0)
_endp.shutdownOutput();
return flushed;
}
return 0;
}
public synchronized int flush() throws IOException
finally
{
if (_buffer==null)
return 0;
int result = flushBuffer();
_lock.unlock();
}
}
public int flush() throws IOException
{
if (!_lock.tryLock())
return 0;
try
{
if (_buffer == null)
return 0;
int result = flushBuffer();
if (!_endp.isBlocking())
{
long now = System.currentTimeMillis();
long end=now+_endp.getMaxIdleTime();
while (_buffer.length()>0)
long end = now + _endp.getMaxIdleTime();
while (_buffer.length() > 0)
{
boolean ready = _endp.blockWritable(end-now);
boolean ready = _endp.blockWritable(end - now);
if (!ready)
{
now = System.currentTimeMillis();
if (now<end)
if (now < end)
continue;
throw new IOException("Write timeout");
}
@ -230,18 +260,39 @@ public class WebSocketGeneratorRFC6455 implements WebSocketGenerator
_buffer.compact();
return result;
}
public synchronized boolean isBufferEmpty()
finally
{
return _buffer==null || _buffer.length()==0;
_lock.unlock();
}
}
public synchronized void returnBuffer()
public boolean isBufferEmpty()
{
if (_buffer!=null && _buffer.length()==0)
_lock.lock();
try
{
return _buffer == null || _buffer.length() == 0;
}
finally
{
_lock.unlock();
}
}
public void returnBuffer()
{
_lock.lock();
try
{
if (_buffer != null && _buffer.length() == 0)
{
_buffers.returnBuffer(_buffer);
_buffer=null;
_buffer = null;
}
}
finally
{
_lock.unlock();
}
}