Nabble - Netty Commit Logs

r1920 - branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel.

2009-11-23T23:52:11Z

Author: trustin
Date: 2009-11-24 02:52:10 -0500 (Tue, 24 Nov 2009)
New Revision: 1920

Modified:
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/AcceptedServerChannelRequestDispatch.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ChannelFutureAggregator.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannelSink.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannel.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelConfig.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelSink.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientPollHandler.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientSendHandler.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelMessageUtils.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelSink.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitch.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/WriteFragmenter.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/WriteSplitter.java
Log:
* if( -> if (

Modified: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/AcceptedServerChannelRequestDispatch.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/AcceptedServerChannelRequestDispatch.java 2009-11-24 07:49:24 UTC (rev 1919)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/AcceptedServerChannelRequestDispatch.java 2009-11-24 07:52:10 UTC (rev 1920)
@@ -51,13 +51,13 @@
public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
HttpRequest request = (HttpRequest)e.getMessage();

- if(HttpTunnelMessageUtils.isOpenTunnelRequest(request)) {
+ if (HttpTunnelMessageUtils.isOpenTunnelRequest(request)) {
handleOpenTunnel(ctx);
- } else if(HttpTunnelMessageUtils.isSendDataRequest(request)) {
+ } else if (HttpTunnelMessageUtils.isSendDataRequest(request)) {
handleSendData(ctx, request);
- } else if(HttpTunnelMessageUtils.isReceiveDataRequest(request)) {
+ } else if (HttpTunnelMessageUtils.isReceiveDataRequest(request)) {
handleReceiveData(ctx, request);
- } else if(HttpTunnelMessageUtils.isCloseTunnelRequest(request)) {
+ } else if (HttpTunnelMessageUtils.isCloseTunnelRequest(request)) {
handleCloseTunnel(ctx, request);
} else {
LOG.warn("Invalid request received on http tunnel channel");
@@ -79,7 +79,7 @@

private void handleCloseTunnel(ChannelHandlerContext ctx, HttpRequest request) {
String tunnelId = checkTunnelId(request, ctx);
- if(tunnelId == null) {
+ if (tunnelId == null) {
return;
}

@@ -92,14 +92,14 @@

private void handleSendData(ChannelHandlerContext ctx, HttpRequest request) {
String tunnelId = checkTunnelId(request, ctx);
- if(tunnelId == null) {
+ if (tunnelId == null) {
return;
}
if (LOG.isDebugEnabled()) {
LOG.debug("send data request received for tunnel " + tunnelId);
}

- if(request.getContentLength() == 0 || request.getContent() == null || request.getContent().readableBytes() == 0) {
+ if (request.getContentLength() == 0 || request.getContent() == null || request.getContent().readableBytes() == 0) {
if (LOG.isWarnEnabled()) {
LOG.warn("send data request contained no data on tunnel " + tunnelId);
}
@@ -113,7 +113,7 @@

private void handleReceiveData(ChannelHandlerContext ctx, HttpRequest request) {
String tunnelId = checkTunnelId(request, ctx);
- if(tunnelId == null) {
+ if (tunnelId == null) {
return;
}
if (LOG.isDebugEnabled()) {
@@ -124,10 +124,10 @@

private String checkTunnelId(HttpRequest request, ChannelHandlerContext ctx) {
String tunnelId = HttpTunnelMessageUtils.extractTunnelId(request);
- if(tunnelId == null) {
+ if (tunnelId == null) {
LOG.warn("request without a tunnel id received - rejecting");
Channels.write(ctx, Channels.future(ctx.getChannel()), HttpTunnelMessageUtils.createRejection(request, "no tunnel id specified in send data request"));
- } else if(!messageSwitch.isOpenTunnel(tunnelId)) {
+ } else if (!messageSwitch.isOpenTunnel(tunnelId)) {
LOG.warn("request for unknown tunnel id " + tunnelId + " received - rejecting");
Channels.write(ctx, Channels.future(ctx.getChannel()), HttpTunnelMessageUtils.createRejection(request, "tunnel id \"" + tunnelId + "\" is either closed or does not exist"));
return null;

Modified: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ChannelFutureAggregator.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ChannelFutureAggregator.java 2009-11-24 07:49:24 UTC (rev 1919)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ChannelFutureAggregator.java 2009-11-24 07:52:10 UTC (rev 1920)
@@ -25,14 +25,14 @@
}

public synchronized void operationComplete(ChannelFuture future) throws Exception {
- if(future.isCancelled()) {
+ if (future.isCancelled()) {
// TODO: what should the correct behaviour be when a fragment is cancelled?
// cancel all outstanding fragments and cancel the aggregate?
return;
}

pendingFutures.remove(future);
- if(!future.isSuccess()) {
+ if (!future.isSuccess()) {
aggregateFuture.setFailure(future.getCause());
for(ChannelFuture pendingFuture : pendingFutures) {
pendingFuture.cancel();
@@ -40,7 +40,7 @@
return;
}

- if(pendingFutures.isEmpty()) {
+ if (pendingFutures.isEmpty()) {
aggregateFuture.setSuccess();
}
}

Modified: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannelSink.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannelSink.java 2009-11-24 07:49:24 UTC (rev 1919)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannelSink.java 2009-11-24 07:52:10 UTC (rev 1920)
@@ -45,15 +45,15 @@
}

public void eventSunk(ChannelPipeline pipeline, ChannelEvent e) throws Exception {
- if(e instanceof MessageEvent) {
+ if (e instanceof MessageEvent) {
handleMessageEvent((MessageEvent)e);
- } else if(e instanceof ChannelStateEvent) {
+ } else if (e instanceof ChannelStateEvent) {
handleStateEvent((ChannelStateEvent)e);
}
}

private void handleMessageEvent(MessageEvent ev) {
- if(!(ev.getMessage() instanceof ChannelBuffer)) {
+ if (!(ev.getMessage() instanceof ChannelBuffer)) {
throw new IllegalArgumentException("Attempt to send data which is not a ChannelBuffer:" + ev.getMessage());
}
messageSwitch.routeOutboundData(tunnelId, (ChannelBuffer)ev.getMessage(), ev.getFuture());
@@ -63,20 +63,20 @@
Channel owner = ev.getChannel();
switch(ev.getState()) {
case OPEN:
- if(Boolean.FALSE.equals(ev.getValue())) {
+ if (Boolean.FALSE.equals(ev.getValue())) {
messageSwitch.closeTunnel(tunnelId);
active = false;
Channels.fireChannelClosed(owner);
}
break;
case BOUND:
- if(ev.getValue() == null) {
+ if (ev.getValue() == null) {
messageSwitch.closeTunnel(tunnelId);
active = false;
Channels.fireChannelUnbound(owner);
}
case CONNECTED:
- if(ev.getValue() == null) {
+ if (ev.getValue() == null) {
messageSwitch.closeTunnel(tunnelId);
active = false;
Channels.fireChannelDisconnected(owner);

Modified: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannel.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannel.java 2009-11-24 07:49:24 UTC (rev 1919)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannel.java 2009-11-24 07:52:10 UTC (rev 1920)
@@ -106,7 +106,7 @@
serverAddress = remoteAddress;

SocketAddress connectTarget;
- if(config.getProxyAddress() != null) {
+ if (config.getProxyAddress() != null) {
connectTarget = config.getProxyAddress();
} else {
connectTarget = remoteAddress;
@@ -180,7 +180,7 @@
}

public void fullyEstablished() {
- if(!bound) {
+ if (!bound) {
bound = true;
Channels.fireChannelBound(this, getLocalAddress());
}
@@ -195,7 +195,7 @@
Channels.write(sendChannel, e.getMessage()).addListener(new ChannelFutureListener() {

public void operationComplete(ChannelFuture future) throws Exception {
- if(future.isSuccess()) {
+ if (future.isSuccess()) {
originalFuture.setSuccess();
} else {
originalFuture.setFailure(future.getCause());
@@ -205,7 +205,7 @@
}

public String getServerHostName() {
- if(serverHostName == null) {
+ if (serverHostName == null) {
serverHostName = HttpTunnelMessageUtils.convertToHostString(serverAddress);
}

@@ -223,9 +223,9 @@
}

public void operationComplete(ChannelFuture future) throws Exception {
- if(!future.isSuccess()) {
+ if (!future.isSuccess()) {
completionFuture.setFailure(future.getCause());
- } else if(eventsLeft.decrementAndGet() == 0) {
+ } else if (eventsLeft.decrementAndGet() == 0) {
completionFuture.setSuccess();
}
}

Modified: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelConfig.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelConfig.java 2009-11-24 07:49:24 UTC (rev 1919)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelConfig.java 2009-11-24 07:52:10 UTC (rev 1920)
@@ -57,11 +57,11 @@

@Override
public boolean setOption(String key, Object value) {
- if(super.setOption(key, value)) {
+ if (super.setOption(key, value)) {
return true;
}

- if(PROXY_ADDRESS_OPTION.equals(key)) {
+ if (PROXY_ADDRESS_OPTION.equals(key)) {
setProxyAddress((SocketAddress) value);
} else {
return false;

Modified: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelSink.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelSink.java 2009-11-24 07:49:24 UTC (rev 1919)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelSink.java 2009-11-24 07:52:10 UTC (rev 1920)
@@ -32,9 +32,9 @@
class HttpTunnelClientChannelSink extends AbstractChannelSink {

public void eventSunk(ChannelPipeline pipeline, ChannelEvent e) throws Exception {
- if(e instanceof ChannelStateEvent) {
+ if (e instanceof ChannelStateEvent) {
handleChannelStateEvent((ChannelStateEvent)e);
- } else if(e instanceof MessageEvent) {
+ } else if (e instanceof MessageEvent) {
handleMessageEvent((MessageEvent)e);
}
}
@@ -49,21 +49,21 @@

switch(e.getState()) {
case CONNECTED:
- if(e.getValue() != null) {
+ if (e.getValue() != null) {
channel.onConnectRequest(e.getFuture(), (InetSocketAddress) e.getValue());
} else {
channel.onDisconnectRequest(e.getFuture());
}
break;
case BOUND:
- if(e.getValue() != null) {
+ if (e.getValue() != null) {
channel.onBindRequest((SocketAddress)e.getValue(), e.getFuture());
} else {
channel.onUnbindRequest(e.getFuture());
}
break;
case OPEN:
- if(Boolean.FALSE.equals(e.getValue())) {
+ if (Boolean.FALSE.equals(e.getValue())) {
channel.onCloseRequest(e.getFuture());
}
break;

Modified: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientPollHandler.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientPollHandler.java 2009-11-24 07:49:24 UTC (rev 1919)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientPollHandler.java 2009-11-24 07:52:10 UTC (rev 1920)
@@ -65,7 +65,7 @@
throws Exception {
HttpResponse response = (HttpResponse) e.getMessage();

- if(HttpTunnelMessageUtils.isOKResponse(response)) {
+ if (HttpTunnelMessageUtils.isOKResponse(response)) {
long rtTime = System.nanoTime() - pollTime;
if (LOG.isDebugEnabled()) {
LOG.debug("OK response received for poll on tunnel " + tunnelId + " after " + rtTime + " ns");

Modified: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientSendHandler.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientSendHandler.java 2009-11-24 07:49:24 UTC (rev 1919)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientSendHandler.java 2009-11-24 07:52:10 UTC (rev 1920)
@@ -67,7 +67,7 @@

@Override
public void channelConnected(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
- if(tunnelId == null) {
+ if (tunnelId == null) {
if (LOG.isDebugEnabled()) {
LOG.debug("connection to " + e.getValue() + " succeeded - sending open tunnel request");
}
@@ -84,22 +84,22 @@
public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
HttpResponse response = (HttpResponse)e.getMessage();

- if(HttpTunnelMessageUtils.isOKResponse(response)) {
+ if (HttpTunnelMessageUtils.isOKResponse(response)) {
long roundTripTime = System.nanoTime() - sendRequestTime;
if (LOG.isDebugEnabled()) {
LOG.debug("OK response received for tunnel " + tunnelId + ", after " + roundTripTime + " ns");
}
sendNextAfterResponse(ctx);
- } else if(HttpTunnelMessageUtils.isTunnelOpenResponse(response)) {
+ } else if (HttpTunnelMessageUtils.isTunnelOpenResponse(response)) {
tunnelId = HttpTunnelMessageUtils.extractCookie(response);
if (LOG.isInfoEnabled()) {
LOG.info("tunnel open request accepted - id " + tunnelId);
}
tunnelChannel.onTunnelOpened(tunnelId);
sendNextAfterResponse(ctx);
- } else if(HttpTunnelMessageUtils.isTunnelCloseResponse(response)) {
+ } else if (HttpTunnelMessageUtils.isTunnelCloseResponse(response)) {
if (LOG.isInfoEnabled()) {
- if(disconnecting.get()) {
+ if (disconnecting.get()) {
LOG.info("server acknowledged disconnect for tunnel " + tunnelId);
} else {
LOG.info("server closed tunnel " + tunnelId);
@@ -116,7 +116,7 @@
}

private void sendNextAfterResponse(ChannelHandlerContext ctx) {
- if(pendingRequestCount.decrementAndGet() > 0) {
+ if (pendingRequestCount.decrementAndGet() > 0) {
if (LOG.isDebugEnabled()) {
LOG.debug("Immediately sending next send request for tunnel " + tunnelId);
}
@@ -125,7 +125,7 @@
}

private synchronized void sendQueuedData(ChannelHandlerContext ctx) {
- if(disconnecting.get()) {
+ if (disconnecting.get()) {
if (LOG.isDebugEnabled()) {
LOG.debug("sending close request for tunnel " + tunnelId);
}
@@ -185,7 +185,7 @@
if (LOG.isInfoEnabled()) {
LOG.info("tunnel shutdown requested for send channel of tunnel " + tunnelId);
}
- if(!ctx.getChannel().isConnected()) {
+ if (!ctx.getChannel().isConnected()) {
if (LOG.isDebugEnabled()) {
LOG.debug("send channel of tunnel " + tunnelId + " is already disconnected");
}
@@ -193,7 +193,7 @@
return;
}

- if(!disconnecting.compareAndSet(false, true)) {
+ if (!disconnecting.compareAndSet(false, true)) {
if (LOG.isWarnEnabled()) {
LOG.warn("tunnel shutdown process already initiated for tunnel " + tunnelId);
}
@@ -203,7 +203,7 @@
this.postShutdownEvent = postShutdownEvent;

// if the channel is idle, send a close request immediately
- if(pendingRequestCount.incrementAndGet() == 1) {
+ if (pendingRequestCount.incrementAndGet() == 1) {
sendQueuedData(ctx);
}
}

Modified: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelMessageUtils.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelMessageUtils.java 2009-11-24 07:49:24 UTC (rev 1919)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelMessageUtils.java 2009-11-24 07:52:10 UTC (rev 1920)
@@ -136,7 +136,7 @@
StringWriter host = new StringWriter();
InetSocketAddress inetSocketAddr = (InetSocketAddress) hostAddress;
InetAddress addr = inetSocketAddr.getAddress();
- if(addr instanceof Inet6Address) {
+ if (addr instanceof Inet6Address) {
host.append('[');
host.append(addr.getHostAddress());
host.append(']');
@@ -153,7 +153,7 @@
HttpRequest request = new DefaultHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST, createCompleteUri(host, uri));
request.setHeader(HttpHeaders.Names.HOST, host);
request.setHeader(HttpHeaders.Names.USER_AGENT, USER_AGENT);
- if(tunnelId != null) {
+ if (tunnelId != null) {
request.setHeader(HttpHeaders.Names.COOKIE, tunnelId);
}

@@ -216,7 +216,7 @@
}

public static boolean hasContents(HttpResponse response, byte[] expectedContents) {
- if(response.getContent() != null
+ if (response.getContent() != null
&& response.getContentLength() == expectedContents.length
&& response.getContent().readableBytes() == expectedContents.length) {
byte[] compareBytes = new byte[expectedContents.length];
@@ -237,7 +237,7 @@
}

public static String extractCookie(HttpResponse response) {
- if(response.containsHeader(HttpHeaders.Names.SET_COOKIE)) {
+ if (response.containsHeader(HttpHeaders.Names.SET_COOKIE)) {
return response.getHeader(HttpHeaders.Names.SET_COOKIE);
}

@@ -267,7 +267,7 @@
}

public static Object extractErrorMessage(HttpResponse response) {
- if(response.getContent() == null || response.getContentLength() == 0) {
+ if (response.getContent() == null || response.getContentLength() == 0) {
return "";
}

@@ -291,7 +291,7 @@

private static HttpResponse createResponseTemplate(HttpResponseStatus status, ChannelBuffer data) {
HttpResponse response = new DefaultHttpResponse(HttpVersion.HTTP_1_1, status);
- if(data != null) {
+ if (data != null) {
response.setHeader(HttpHeaders.Names.CONTENT_LENGTH, Integer.toString(data.readableBytes()));
response.setHeader(HttpHeaders.Names.CONTENT_TYPE, "application/octet-stream");
response.setContent(data);

Modified: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelSink.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelSink.java 2009-11-24 07:49:24 UTC (rev 1919)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelSink.java 2009-11-24 07:52:10 UTC (rev 1920)
@@ -36,16 +36,16 @@

public void eventSunk(ChannelPipeline pipeline, ChannelEvent e) throws Exception {

- if(e instanceof ChannelStateEvent) {
+ if (e instanceof ChannelStateEvent) {
ChannelStateEvent ev = (ChannelStateEvent) e;
switch(ev.getState()) {
case OPEN:
- if(Boolean.FALSE.equals(ev.getValue())) {
+ if (Boolean.FALSE.equals(ev.getValue())) {
realChannel.close().addListener(new ChannelFutureProxy(e.getFuture()));
}
break;
case BOUND:
- if(ev.getValue() != null) {
+ if (ev.getValue() != null) {
realChannel.bind((SocketAddress)ev.getValue()).addListener(new ChannelFutureProxy(e.getFuture()));
} else {
realChannel.unbind().addListener(new ChannelFutureProxy(e.getFuture()));
@@ -63,7 +63,7 @@
}

public void operationComplete(ChannelFuture future) throws Exception {
- if(future.isSuccess()) {
+ if (future.isSuccess()) {
upstreamFuture.setSuccess();
} else {
upstreamFuture.setFailure(future.getCause());

Modified: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitch.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitch.java 2009-11-24 07:49:24 UTC (rev 1919)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitch.java 2009-11-24 07:52:10 UTC (rev 1920)
@@ -70,7 +70,7 @@

public void pollOutboundData(String tunnelId, Channel channel) {
TunnelInfo tunnel = tunnelsById.get(tunnelId);
- if(tunnel == null) {
+ if (tunnel == null) {
if (LOG.isWarnEnabled()) {
LOG.warn("Poll request for tunnel " + tunnelId + " which does not exist or already closed");
}
@@ -78,7 +78,7 @@
return;
}

- if(!tunnel.responseChannel.compareAndSet(null, channel)) {
+ if (!tunnel.responseChannel.compareAndSet(null, channel)) {
if (LOG.isWarnEnabled()) {
LOG.warn("Duplicate poll request detected for tunnel " + tunnelId);
}
@@ -91,13 +91,13 @@

private void sendQueuedData(TunnelInfo state) {
ConcurrentLinkedQueue<QueuedResponse> queuedData = state.queuedResponses;
- if(queuedData.peek() == null) {
+ if (queuedData.peek() == null) {
// no data to send, or it has already been dealt with by another thread
return;
}

Channel responseChannel = state.responseChannel.getAndSet(null);
- if(responseChannel == null) {
+ if (responseChannel == null) {
// no response channel, or another thread has already used it
return;
}
@@ -110,7 +110,7 @@
final ChannelFuture originalFuture = messageToSend.writeFuture;
Channels.write(responseChannel, response).addListener(new ChannelFutureListener() {
public void operationComplete(ChannelFuture future) throws Exception {
- if(future.isSuccess()) {
+ if (future.isSuccess()) {
originalFuture.setSuccess();
} else {
originalFuture.setFailure(future.getCause());
@@ -121,7 +121,7 @@

public void routeInboundData(String tunnelId, ChannelBuffer inboundData) {
TunnelInfo tunnel = tunnelsById.get(tunnelId);
- if(tunnel == null) {
+ if (tunnel == null) {
return;
}

@@ -137,7 +137,7 @@

public void routeOutboundData(String tunnelId, ChannelBuffer data, ChannelFuture writeFuture) {
TunnelInfo tunnel = tunnelsById.get(tunnelId);
- if(tunnel == null) {
+ if (tunnel == null) {
// tunnel is closed
if (LOG.isWarnEnabled()) {
LOG.warn("attempt made to send data out on tunnel id " + tunnelId + " which is unknown or closed");

Modified: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/WriteFragmenter.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/WriteFragmenter.java 2009-11-24 07:49:24 UTC (rev 1919)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/WriteFragmenter.java 2009-11-24 07:52:10 UTC (rev 1920)
@@ -57,7 +57,7 @@
public void writeRequested(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
ChannelBuffer data = (ChannelBuffer)e.getMessage();

- if(data.readableBytes() <= splitThreshold) {
+ if (data.readableBytes() <= splitThreshold) {
super.writeRequested(ctx, e);
} else {
WriteSplitter splitter = new WriteSplitter(splitThreshold);

Modified: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/WriteSplitter.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/WriteSplitter.java 2009-11-24 07:49:24 UTC (rev 1919)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/WriteSplitter.java 2009-11-24 07:52:10 UTC (rev 1920)
@@ -43,7 +43,7 @@

int startReadIndex = buffer.readerIndex();

- if(buffer.readableBytes() > splitThreshold) {
+ if (buffer.readableBytes() > splitThreshold) {
while(buffer.readable()) {
ChannelBuffer chunk = ChannelBuffers.buffer(Math.min(splitThreshold, buffer.readableBytes()));
buffer.readBytes(chunk);

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits

r1919 - branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel.

2009-11-23T23:49:25Z

Author: trustin
Date: 2009-11-24 02:49:24 -0500 (Tue, 24 Nov 2009)
New Revision: 1919

Modified:
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/AcceptedServerChannelRequestDispatch.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientPollHandler.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientSendHandler.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitch.java
Log:
Switched from java.util.logging to Netty's internal loggers

Modified: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/AcceptedServerChannelRequestDispatch.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/AcceptedServerChannelRequestDispatch.java 2009-11-24 04:07:10 UTC (rev 1918)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/AcceptedServerChannelRequestDispatch.java 2009-11-24 07:49:24 UTC (rev 1919)
@@ -15,9 +15,6 @@
*/
package org.jboss.netty.channel.socket.httptunnel;

-import java.util.logging.Level;
-import java.util.logging.Logger;
-
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.ChannelPipelineCoverage;
import org.jboss.netty.channel.Channels;
@@ -25,25 +22,27 @@
import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
import org.jboss.netty.handler.codec.http.HttpRequest;
import org.jboss.netty.handler.codec.http.HttpResponse;
+import org.jboss.netty.logging.InternalLogger;
+import org.jboss.netty.logging.InternalLoggerFactory;

/**
* Upstream handler which is responsible for determining whether a received HTTP request is a legal
- * tunnel request, and if so, invoking the appropriate request method on the
+ * tunnel request, and if so, invoking the appropriate request method on the
* {@link ServerMessageSwitch} to service the request.
- *
+ *
* @author The Netty Project ([hidden email])
* @author Iain McGinniss ([hidden email])
* @version $Rev$, $Date$
*/
@ChannelPipelineCoverage("one")
class AcceptedServerChannelRequestDispatch extends SimpleChannelUpstreamHandler {
-
+
public static final String NAME = "AcceptedServerChannelRequestDispatch";
-
- private static final Logger LOG = Logger.getLogger(AcceptedServerChannelRequestDispatch.class.getName());
-
- private ServerMessageSwitchUpstreamInterface messageSwitch;

+ private static final InternalLogger LOG = InternalLoggerFactory.getInstance(AcceptedServerChannelRequestDispatch.class);
+
+ private final ServerMessageSwitchUpstreamInterface messageSwitch;
+
public AcceptedServerChannelRequestDispatch(ServerMessageSwitchUpstreamInterface messageSwitch) {
this.messageSwitch = messageSwitch;
}
@@ -51,7 +50,7 @@
@Override
public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
HttpRequest request = (HttpRequest)e.getMessage();
-
+
if(HttpTunnelMessageUtils.isOpenTunnelRequest(request)) {
handleOpenTunnel(ctx);
} else if(HttpTunnelMessageUtils.isSendDataRequest(request)) {
@@ -61,7 +60,7 @@
} else if(HttpTunnelMessageUtils.isCloseTunnelRequest(request)) {
handleCloseTunnel(ctx, request);
} else {
- LOG.warning("Invalid request received on http tunnel channel");
+ LOG.warn("Invalid request received on http tunnel channel");
respondWith(ctx, HttpTunnelMessageUtils.createRejection(request, "invalid request to netty HTTP tunnel gateway"));
}
}
@@ -72,18 +71,21 @@

private void handleOpenTunnel(ChannelHandlerContext ctx) {
String tunnelId = messageSwitch.createTunnel(ctx.getChannel().getRemoteAddress());
- LOG.log(Level.INFO, "open tunnel request received from {0} - allocated ID {1}", new Object[] { ctx.getChannel().getRemoteAddress(), tunnelId });
+ if (LOG.isInfoEnabled()) {
+ LOG.info("open tunnel request received from " + ctx.getChannel().getRemoteAddress() + " - allocated ID " + tunnelId);
+ }
respondWith(ctx, HttpTunnelMessageUtils.createTunnelOpenResponse(tunnelId));
}
-
+
private void handleCloseTunnel(ChannelHandlerContext ctx, HttpRequest request) {
String tunnelId = checkTunnelId(request, ctx);
if(tunnelId == null) {
return;
}
-
- LOG.log(Level.INFO, "close tunnel request received for tunnel {0}", tunnelId);
-
+
+ if (LOG.isInfoEnabled()) {
+ LOG.info("close tunnel request received for tunnel " + tunnelId);
+ }
messageSwitch.closeTunnel(tunnelId);
respondWith(ctx, HttpTunnelMessageUtils.createTunnelCloseResponse());
}
@@ -93,39 +95,44 @@
if(tunnelId == null) {
return;
}
- LOG.log(Level.FINE, "send data request received for tunnel {0}", tunnelId);
-
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("send data request received for tunnel " + tunnelId);
+ }
+
if(request.getContentLength() == 0 || request.getContent() == null || request.getContent().readableBytes() == 0) {
- LOG.log(Level.WARNING, "send data request contained no data on tunnel {0}", tunnelId);
+ if (LOG.isWarnEnabled()) {
+ LOG.warn("send data request contained no data on tunnel " + tunnelId);
+ }
respondWith(ctx, HttpTunnelMessageUtils.createRejection(request, "Send data requests must contain data"));
return;
}
-
+
messageSwitch.routeInboundData(tunnelId, request.getContent());
respondWith(ctx, HttpTunnelMessageUtils.createSendDataResponse());
}
-
+
private void handleReceiveData(ChannelHandlerContext ctx, HttpRequest request) {
String tunnelId = checkTunnelId(request, ctx);
if(tunnelId == null) {
return;
}
- LOG.log(Level.FINE, "poll data request received for tunnel {0}", tunnelId);
-
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("poll data request received for tunnel " + tunnelId);
+ }
messageSwitch.pollOutboundData(tunnelId, ctx.getChannel());
}

private String checkTunnelId(HttpRequest request, ChannelHandlerContext ctx) {
String tunnelId = HttpTunnelMessageUtils.extractTunnelId(request);
if(tunnelId == null) {
- LOG.warning("request without a tunnel id received - rejecting");
+ LOG.warn("request without a tunnel id received - rejecting");
Channels.write(ctx, Channels.future(ctx.getChannel()), HttpTunnelMessageUtils.createRejection(request, "no tunnel id specified in send data request"));
} else if(!messageSwitch.isOpenTunnel(tunnelId)) {
- LOG.log(Level.WARNING, "request for unknown tunnel id {0} received - rejecting", tunnelId);
+ LOG.warn("request for unknown tunnel id " + tunnelId + " received - rejecting");
Channels.write(ctx, Channels.future(ctx.getChannel()), HttpTunnelMessageUtils.createRejection(request, "tunnel id \"" + tunnelId + "\" is either closed or does not exist"));
return null;
}
-
+
return tunnelId;
}
}

Modified: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientPollHandler.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientPollHandler.java 2009-11-24 04:07:10 UTC (rev 1918)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientPollHandler.java 2009-11-24 07:49:24 UTC (rev 1919)
@@ -15,9 +15,6 @@
*/
package org.jboss.netty.channel.socket.httptunnel;

-import java.util.logging.Level;
-import java.util.logging.Logger;
-
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.ChannelPipelineCoverage;
import org.jboss.netty.channel.ChannelStateEvent;
@@ -26,6 +23,8 @@
import org.jboss.netty.channel.SimpleChannelHandler;
import org.jboss.netty.handler.codec.http.HttpRequest;
import org.jboss.netty.handler.codec.http.HttpResponse;
+import org.jboss.netty.logging.InternalLogger;
+import org.jboss.netty.logging.InternalLoggerFactory;

/**
* @author The Netty Project ([hidden email])
@@ -36,47 +35,55 @@
class HttpTunnelClientPollHandler extends SimpleChannelHandler {

public static final String NAME = "server2client";
-
- private static final Logger LOG = Logger.getLogger(HttpTunnelClientPollHandler.class.getName());

+ private static final InternalLogger LOG = InternalLoggerFactory.getInstance(HttpTunnelClientPollHandler.class);
+
private String tunnelId;
- private HttpTunnelClientWorkerOwner tunnelChannel;
+ private final HttpTunnelClientWorkerOwner tunnelChannel;

private long pollTime;

public HttpTunnelClientPollHandler(HttpTunnelClientWorkerOwner tunnelChannel) {
this.tunnelChannel = tunnelChannel;
}
-
+
public void setTunnelId(String tunnelId) {
this.tunnelId = tunnelId;
}

@Override
public void channelConnected(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
- LOG.log(Level.FINE, "Poll channel for tunnel {0} established", tunnelId);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Poll channel for tunnel " + tunnelId + " established");
+ }
tunnelChannel.fullyEstablished();
sendPoll(ctx);
}
-
+
@Override
public void messageReceived(ChannelHandlerContext ctx, MessageEvent e)
throws Exception {
HttpResponse response = (HttpResponse) e.getMessage();
-
+
if(HttpTunnelMessageUtils.isOKResponse(response)) {
long rtTime = System.nanoTime() - pollTime;
- LOG.log(Level.FINE, "OK response received for poll on tunnel {0} after {1}ns", new Object[] { tunnelId, rtTime });
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("OK response received for poll on tunnel " + tunnelId + " after " + rtTime + " ns");
+ }
tunnelChannel.onMessageReceived(response.getContent());
sendPoll(ctx);
} else {
- LOG.log(Level.WARNING, "non-OK response received for poll on tunnel {0}", tunnelId);
+ if (LOG.isWarnEnabled()) {
+ LOG.warn("non-OK response received for poll on tunnel " + tunnelId);
+ }
}
}

private void sendPoll(ChannelHandlerContext ctx) {
pollTime = System.nanoTime();
- LOG.log(Level.FINE, "sending poll request for tunnel {0}", tunnelId);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("sending poll request for tunnel " + tunnelId);
+ }
HttpRequest request = HttpTunnelMessageUtils.createReceiveDataRequest(tunnelChannel.getServerHostName(), tunnelId);
Channels.write(ctx, Channels.future(ctx.getChannel()), request);
}

Modified: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientSendHandler.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientSendHandler.java 2009-11-24 04:07:10 UTC (rev 1918)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientSendHandler.java 2009-11-24 07:49:24 UTC (rev 1919)
@@ -18,8 +18,6 @@
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
-import java.util.logging.Level;
-import java.util.logging.Logger;

import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.channel.Channel;
@@ -32,6 +30,8 @@
import org.jboss.netty.channel.SimpleChannelHandler;
import org.jboss.netty.handler.codec.http.HttpRequest;
import org.jboss.netty.handler.codec.http.HttpResponse;
+import org.jboss.netty.logging.InternalLogger;
+import org.jboss.netty.logging.InternalLoggerFactory;

/**
* @author The Netty Project ([hidden email])
@@ -43,7 +43,7 @@

public static final String NAME = "client2server";

- private static final Logger LOG = Logger.getLogger(HttpTunnelClientSendHandler.class.getName());
+ private static final InternalLogger LOG = InternalLoggerFactory.getInstance(HttpTunnelClientSendHandler.class);

private final HttpTunnelClientWorkerOwner tunnelChannel;

@@ -68,7 +68,9 @@
@Override
public void channelConnected(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
if(tunnelId == null) {
- LOG.log(Level.FINE, "connection to {0} succeeded - sending open tunnel request", e.getValue());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("connection to " + e.getValue() + " succeeded - sending open tunnel request");
+ }
HttpRequest request = HttpTunnelMessageUtils.createOpenTunnelRequest(tunnelChannel.getServerHostName());
Channel thisChannel = ctx.getChannel();
DownstreamMessageEvent event = new DownstreamMessageEvent(thisChannel, Channels.future(thisChannel), request, thisChannel.getRemoteAddress());
@@ -84,41 +86,55 @@

if(HttpTunnelMessageUtils.isOKResponse(response)) {
long roundTripTime = System.nanoTime() - sendRequestTime;
- LOG.log(Level.FINE, "OK response received for tunnel {0}, after {1}ns", new Object[] { tunnelId, roundTripTime });
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("OK response received for tunnel " + tunnelId + ", after " + roundTripTime + " ns");
+ }
sendNextAfterResponse(ctx);
} else if(HttpTunnelMessageUtils.isTunnelOpenResponse(response)) {
tunnelId = HttpTunnelMessageUtils.extractCookie(response);
- LOG.log(Level.INFO, "tunnel open request accepted - id {0}", tunnelId);
+ if (LOG.isInfoEnabled()) {
+ LOG.info("tunnel open request accepted - id " + tunnelId);
+ }
tunnelChannel.onTunnelOpened(tunnelId);
sendNextAfterResponse(ctx);
} else if(HttpTunnelMessageUtils.isTunnelCloseResponse(response)) {
- if(disconnecting.get()) {
- LOG.log(Level.INFO, "server acknowledged disconnect for tunnel {0}", tunnelId);
- } else {
- LOG.log(Level.INFO, "server closed tunnel {0}", tunnelId);
+ if (LOG.isInfoEnabled()) {
+ if(disconnecting.get()) {
+ LOG.info("server acknowledged disconnect for tunnel " + tunnelId);
+ } else {
+ LOG.info("server closed tunnel " + tunnelId);
+ }
}
ctx.sendDownstream(postShutdownEvent);
} else {
// TODO: kill connection
- LOG.log(Level.WARNING, "unknown response received for tunnel {0}, closing connection", tunnelId);
+ if (LOG.isWarnEnabled()) {
+ LOG.warn("unknown response received for tunnel " + tunnelId + ", closing connection");
+ }
Channels.close(ctx, ctx.getChannel().getCloseFuture());
}
}

private void sendNextAfterResponse(ChannelHandlerContext ctx) {
if(pendingRequestCount.decrementAndGet() > 0) {
- LOG.log(Level.FINE, "Immediately sending next send request for tunnel {0}", tunnelId);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Immediately sending next send request for tunnel " + tunnelId);
+ }
sendQueuedData(ctx);
}
}

private synchronized void sendQueuedData(ChannelHandlerContext ctx) {
if(disconnecting.get()) {
- LOG.log(Level.FINE, "sending close request for tunnel {0}", tunnelId);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("sending close request for tunnel " + tunnelId);
+ }
HttpRequest closeRequest = HttpTunnelMessageUtils.createCloseTunnelRequest(tunnelChannel.getServerHostName(), tunnelId);
Channels.write(ctx, Channels.future(ctx.getChannel()), closeRequest);
} else {
- LOG.log(Level.FINE, "sending next request for tunnel {0}", tunnelId);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("sending next request for tunnel " + tunnelId);
+ }
MessageEvent nextWrite = queuedWrites.poll();
sendRequestTime = System.nanoTime();
ctx.sendDownstream(nextWrite);
@@ -127,9 +143,13 @@

@Override
public void writeRequested(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
- LOG.log(Level.FINER, "request to send data for tunnel {0}", tunnelId);
- if(disconnecting.get()) {
- LOG.log(Level.WARNING, "rejecting write request for tunnel {0} received after disconnect requested", tunnelId);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("request to send data for tunnel " + tunnelId);
+ }
+ if (disconnecting.get()) {
+ if (LOG.isWarnEnabled()) {
+ LOG.warn("rejecting write request for tunnel " + tunnelId + " received after disconnect requested");
+ }
e.getFuture().setFailure(new IllegalStateException("tunnel is closing"));
return;
}
@@ -137,10 +157,12 @@
HttpRequest request = HttpTunnelMessageUtils.createSendDataRequest(tunnelChannel.getServerHostName(), tunnelId, data);
DownstreamMessageEvent translatedEvent = new DownstreamMessageEvent(ctx.getChannel(), e.getFuture(), request, ctx.getChannel().getRemoteAddress());
queuedWrites.offer(translatedEvent);
- if(pendingRequestCount.incrementAndGet() == 1) {
+ if (pendingRequestCount.incrementAndGet() == 1) {
sendQueuedData(ctx);
} else {
- LOG.log(Level.FINE, "write request for tunnel {0} queued", tunnelId);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("write request for tunnel " + tunnelId + " queued");
+ }
}
}

@@ -160,15 +182,21 @@
}

private void shutdownTunnel(ChannelHandlerContext ctx, ChannelStateEvent postShutdownEvent) {
- LOG.log(Level.INFO, "tunnel shutdown requested for send channel of tunnel {0}", tunnelId);
+ if (LOG.isInfoEnabled()) {
+ LOG.info("tunnel shutdown requested for send channel of tunnel " + tunnelId);
+ }
if(!ctx.getChannel().isConnected()) {
- LOG.log(Level.FINE, "send channel of tunnel {0} is already disconnected", tunnelId);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("send channel of tunnel " + tunnelId + " is already disconnected");
+ }
ctx.sendDownstream(postShutdownEvent);
return;
}

if(!disconnecting.compareAndSet(false, true)) {
- LOG.log(Level.WARNING, "tunnel shutdown process already initiated for tunnel {0}", tunnelId);
+ if (LOG.isWarnEnabled()) {
+ LOG.warn("tunnel shutdown process already initiated for tunnel " + tunnelId);
+ }
return;
}

Modified: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitch.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitch.java 2009-11-24 04:07:10 UTC (rev 1918)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitch.java 2009-11-24 07:49:24 UTC (rev 1919)
@@ -22,8 +22,6 @@
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
-import java.util.logging.Level;
-import java.util.logging.Logger;

import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.channel.Channel;
@@ -31,6 +29,8 @@
import org.jboss.netty.channel.ChannelFutureListener;
import org.jboss.netty.channel.Channels;
import org.jboss.netty.handler.codec.http.HttpResponse;
+import org.jboss.netty.logging.InternalLogger;
+import org.jboss.netty.logging.InternalLoggerFactory;

/**
* @author The Netty Project ([hidden email])
@@ -39,7 +39,7 @@
*/
class ServerMessageSwitch implements ServerMessageSwitchUpstreamInterface, ServerMessageSwitchDownstreamInterface {

- private static final Logger LOG = Logger.getLogger(ServerMessageSwitch.class.getName());
+ private static final InternalLogger LOG = InternalLoggerFactory.getInstance(ServerMessageSwitch.class.getName());

private final String tunnelIdPrefix;
private final AtomicInteger tunnelIdSequence;
@@ -71,13 +71,17 @@
public void pollOutboundData(String tunnelId, Channel channel) {
TunnelInfo tunnel = tunnelsById.get(tunnelId);
if(tunnel == null) {
- LOG.log(Level.WARNING, "Poll request for tunnel {0} which does not exist or already closed");
+ if (LOG.isWarnEnabled()) {
+ LOG.warn("Poll request for tunnel " + tunnelId + " which does not exist or already closed");
+ }
Channels.write(channel, HttpTunnelMessageUtils.createRejection(null, "Unknown tunnel, possibly already closed"));
return;
}

if(!tunnel.responseChannel.compareAndSet(null, channel)) {
- LOG.log(Level.WARNING, "Duplicate poll request detected for tunnel {0}", tunnelId);
+ if (LOG.isWarnEnabled()) {
+ LOG.warn("Duplicate poll request detected for tunnel " + tunnelId);
+ }
Channels.write(channel, HttpTunnelMessageUtils.createRejection(null, "Only one poll request at a time per tunnel allowed"));
return;
}
@@ -98,7 +102,9 @@
return;
}

- LOG.log(Level.FINE, "sending response for tunnel id {0} to {1}", new Object[] { state.tunnelId, responseChannel.getRemoteAddress() });
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("sending response for tunnel id " + state.tunnelId + " to " + responseChannel.getRemoteAddress());
+ }
QueuedResponse messageToSend = queuedData.poll();
HttpResponse response = HttpTunnelMessageUtils.createRecvDataResponse(messageToSend.data);
final ChannelFuture originalFuture = messageToSend.writeFuture;
@@ -119,7 +125,9 @@
return;
}

- LOG.log(Level.FINE, "routing inbound data for tunnel {0}", tunnelId);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("routing inbound data for tunnel " + tunnelId);
+ }
Channels.fireMessageReceived(tunnel.localChannel, inboundData);
}

@@ -131,7 +139,9 @@
TunnelInfo tunnel = tunnelsById.get(tunnelId);
if(tunnel == null) {
// tunnel is closed
- LOG.log(Level.WARNING, "attempt made to send data out on tunnel id {0} which is unknown or closed", tunnelId);
+ if (LOG.isWarnEnabled()) {
+ LOG.warn("attempt made to send data out on tunnel id " + tunnelId + " which is unknown or closed");
+ }
return;
}

@@ -140,7 +150,9 @@
ChannelFutureAggregator aggregator = new ChannelFutureAggregator(writeFuture);
List<ChannelBuffer> fragments = splitter.split(data);

- LOG.log(Level.FINE, "routing outbound data for tunnel {0}", tunnelId);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("routing outbound data for tunnel " + tunnelId);
+ }
for(ChannelBuffer fragment : fragments) {
ChannelFuture fragmentFuture = Channels.future(writeFuture.getChannel());
aggregator.addFuture(fragmentFuture);

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits

r1918 - in branches/httptunnel/src: test/java/org/jboss/netty/channel/socket/httptunnel and 1 other directory.

2009-11-23T20:07:12Z

Author: trustin
Date: 2009-11-23 23:07:10 -0500 (Mon, 23 Nov 2009)
New Revision: 1918

Modified:
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/AcceptedServerChannelPipelineFactory.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/AcceptedServerChannelRequestDispatch.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ChannelFutureAggregator.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannel.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannelFactory.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannelSink.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannel.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelConfig.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelFactory.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelSink.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientPollHandler.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientSendHandler.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientWorkerOwner.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelMessageUtils.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannel.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelConfig.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelFactory.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelSink.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitch.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitchDownstreamInterface.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitchUpstreamInterface.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/TunnelWrappedServerChannelHandler.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/WriteFragmenter.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/WriteSplitter.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/AcceptedServerChannelRequestDispatchTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeChannelConfig.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeChannelSink.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeClientSocketChannelFactory.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeServerSocketChannel.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeServerSocketChannelConfig.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeServerSocketChannelFactory.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeSocketChannel.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannelSinkTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelConfigTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientPollHandlerTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientSendHandlerTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelFactoryTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelSinkTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelSoakTester.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/MockChannelStateListener.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/NettyTestUtils.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/NettyTestUtilsTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/NullChannelHandler.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitchTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/UpstreamEventCatcher.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/WriteFragmenterTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/WriteSplitterTest.java
Log:
* Set SVN properties for Java source code files
** svn:eol-style = native
** svn:keywords = Rev Date

Property changes on: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/AcceptedServerChannelPipelineFactory.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/AcceptedServerChannelRequestDispatch.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Modified: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ChannelFutureAggregator.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ChannelFutureAggregator.java 2009-11-24 04:00:01 UTC (rev 1917)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ChannelFutureAggregator.java 2009-11-24 04:07:10 UTC (rev 1918)
@@ -1,47 +1,47 @@
-/**
- *
- */
-package org.jboss.netty.channel.socket.httptunnel;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-
-class ChannelFutureAggregator implements ChannelFutureListener {
-
- private ChannelFuture aggregateFuture;
- private Set<ChannelFuture> pendingFutures;
-
- public ChannelFutureAggregator(ChannelFuture aggregateFuture) {
- this.aggregateFuture = aggregateFuture;
- this.pendingFutures = new HashSet<ChannelFuture>();
- }
-
- public void addFuture(ChannelFuture future) {
- this.pendingFutures.add(future);
- future.addListener(this);
- }
-
- public synchronized void operationComplete(ChannelFuture future) throws Exception {
- if(future.isCancelled()) {
- // TODO: what should the correct behaviour be when a fragment is cancelled?
- // cancel all outstanding fragments and cancel the aggregate?
- return;
- }
-
- pendingFutures.remove(future);
- if(!future.isSuccess()) {
- aggregateFuture.setFailure(future.getCause());
- for(ChannelFuture pendingFuture : pendingFutures) {
- pendingFuture.cancel();
- }
- return;
- }
-
- if(pendingFutures.isEmpty()) {
- aggregateFuture.setSuccess();
- }
- }
+/**
+ *
+ */
+package org.jboss.netty.channel.socket.httptunnel;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelFutureListener;
+
+class ChannelFutureAggregator implements ChannelFutureListener {
+
+ private ChannelFuture aggregateFuture;
+ private Set<ChannelFuture> pendingFutures;
+
+ public ChannelFutureAggregator(ChannelFuture aggregateFuture) {
+ this.aggregateFuture = aggregateFuture;
+ this.pendingFutures = new HashSet<ChannelFuture>();
+ }
+
+ public void addFuture(ChannelFuture future) {
+ this.pendingFutures.add(future);
+ future.addListener(this);
+ }
+
+ public synchronized void operationComplete(ChannelFuture future) throws Exception {
+ if(future.isCancelled()) {
+ // TODO: what should the correct behaviour be when a fragment is cancelled?
+ // cancel all outstanding fragments and cancel the aggregate?
+ return;
+ }
+
+ pendingFutures.remove(future);
+ if(!future.isSuccess()) {
+ aggregateFuture.setFailure(future.getCause());
+ for(ChannelFuture pendingFuture : pendingFutures) {
+ pendingFuture.cancel();
+ }
+ return;
+ }
+
+ if(pendingFutures.isEmpty()) {
+ aggregateFuture.setSuccess();
+ }
+ }
}
\ No newline at end of file

Property changes on: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ChannelFutureAggregator.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannel.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannelFactory.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannelSink.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannel.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelConfig.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelFactory.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelSink.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Modified: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientPollHandler.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientPollHandler.java 2009-11-24 04:00:01 UTC (rev 1917)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientPollHandler.java 2009-11-24 04:07:10 UTC (rev 1918)
@@ -1,83 +1,83 @@
-/*
- * Copyright 2009 Red Hat, Inc.
- *
- * Red Hat licenses this file to you under the Apache License, version 2.0
- * (the "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-package org.jboss.netty.channel.socket.httptunnel;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipelineCoverage;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelHandler;
-import org.jboss.netty.handler.codec.http.HttpRequest;
-import org.jboss.netty.handler.codec.http.HttpResponse;
-
-/**
- * @author The Netty Project ([hidden email])
- * @author Iain McGinniss ([hidden email])
- * @version $Rev$, $Date$
- */
-@ChannelPipelineCoverage("one")
-class HttpTunnelClientPollHandler extends SimpleChannelHandler {
-
- public static final String NAME = "server2client";
-
- private static final Logger LOG = Logger.getLogger(HttpTunnelClientPollHandler.class.getName());
-
- private String tunnelId;
- private HttpTunnelClientWorkerOwner tunnelChannel;
-
- private long pollTime;
-
- public HttpTunnelClientPollHandler(HttpTunnelClientWorkerOwner tunnelChannel) {
- this.tunnelChannel = tunnelChannel;
- }
-
- public void setTunnelId(String tunnelId) {
- this.tunnelId = tunnelId;
- }
-
- @Override
- public void channelConnected(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
- LOG.log(Level.FINE, "Poll channel for tunnel {0} established", tunnelId);
- tunnelChannel.fullyEstablished();
- sendPoll(ctx);
- }
-
- @Override
- public void messageReceived(ChannelHandlerContext ctx, MessageEvent e)
- throws Exception {
- HttpResponse response = (HttpResponse) e.getMessage();
-
- if(HttpTunnelMessageUtils.isOKResponse(response)) {
- long rtTime = System.nanoTime() - pollTime;
- LOG.log(Level.FINE, "OK response received for poll on tunnel {0} after {1}ns", new Object[] { tunnelId, rtTime });
- tunnelChannel.onMessageReceived(response.getContent());
- sendPoll(ctx);
- } else {
- LOG.log(Level.WARNING, "non-OK response received for poll on tunnel {0}", tunnelId);
- }
- }
-
- private void sendPoll(ChannelHandlerContext ctx) {
- pollTime = System.nanoTime();
- LOG.log(Level.FINE, "sending poll request for tunnel {0}", tunnelId);
- HttpRequest request = HttpTunnelMessageUtils.createReceiveDataRequest(tunnelChannel.getServerHostName(), tunnelId);
- Channels.write(ctx, Channels.future(ctx.getChannel()), request);
- }
-}
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jboss.netty.channel.socket.httptunnel;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.ChannelStateEvent;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.channel.SimpleChannelHandler;
+import org.jboss.netty.handler.codec.http.HttpRequest;
+import org.jboss.netty.handler.codec.http.HttpResponse;
+
+/**
+ * @author The Netty Project ([hidden email])
+ * @author Iain McGinniss ([hidden email])
+ * @version $Rev$, $Date$
+ */
+@ChannelPipelineCoverage("one")
+class HttpTunnelClientPollHandler extends SimpleChannelHandler {
+
+ public static final String NAME = "server2client";
+
+ private static final Logger LOG = Logger.getLogger(HttpTunnelClientPollHandler.class.getName());
+
+ private String tunnelId;
+ private HttpTunnelClientWorkerOwner tunnelChannel;
+
+ private long pollTime;
+
+ public HttpTunnelClientPollHandler(HttpTunnelClientWorkerOwner tunnelChannel) {
+ this.tunnelChannel = tunnelChannel;
+ }
+
+ public void setTunnelId(String tunnelId) {
+ this.tunnelId = tunnelId;
+ }
+
+ @Override
+ public void channelConnected(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
+ LOG.log(Level.FINE, "Poll channel for tunnel {0} established", tunnelId);
+ tunnelChannel.fullyEstablished();
+ sendPoll(ctx);
+ }
+
+ @Override
+ public void messageReceived(ChannelHandlerContext ctx, MessageEvent e)
+ throws Exception {
+ HttpResponse response = (HttpResponse) e.getMessage();
+
+ if(HttpTunnelMessageUtils.isOKResponse(response)) {
+ long rtTime = System.nanoTime() - pollTime;
+ LOG.log(Level.FINE, "OK response received for poll on tunnel {0} after {1}ns", new Object[] { tunnelId, rtTime });
+ tunnelChannel.onMessageReceived(response.getContent());
+ sendPoll(ctx);
+ } else {
+ LOG.log(Level.WARNING, "non-OK response received for poll on tunnel {0}", tunnelId);
+ }
+ }
+
+ private void sendPoll(ChannelHandlerContext ctx) {
+ pollTime = System.nanoTime();
+ LOG.log(Level.FINE, "sending poll request for tunnel {0}", tunnelId);
+ HttpRequest request = HttpTunnelMessageUtils.createReceiveDataRequest(tunnelChannel.getServerHostName(), tunnelId);
+ Channels.write(ctx, Channels.future(ctx.getChannel()), request);
+ }
+}

Property changes on: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientPollHandler.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientSendHandler.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientWorkerOwner.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelMessageUtils.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannel.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelConfig.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelFactory.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelSink.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitch.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitchDownstreamInterface.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitchUpstreamInterface.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/TunnelWrappedServerChannelHandler.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/WriteFragmenter.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/WriteSplitter.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/AcceptedServerChannelRequestDispatchTest.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeChannelConfig.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeChannelSink.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeClientSocketChannelFactory.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeServerSocketChannel.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeServerSocketChannelConfig.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeServerSocketChannelFactory.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeSocketChannel.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannelSinkTest.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelConfigTest.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelTest.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Modified: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientPollHandlerTest.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientPollHandlerTest.java 2009-11-24 04:00:01 UTC (rev 1917)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientPollHandlerTest.java 2009-11-24 04:07:10 UTC (rev 1918)
@@ -1,91 +1,91 @@
-package org.jboss.netty.channel.socket.httptunnel;
-
-
-import static org.junit.Assert.*;
-
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.UnknownHostException;
-
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.DownstreamMessageEvent;
-import org.jboss.netty.handler.codec.http.HttpRequest;
-import org.jboss.netty.handler.codec.http.HttpResponse;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * @author [hidden email]
- */
-public class HttpTunnelClientPollHandlerTest {
-
- private static final String TUNNEL_ID = "1";
- private static final InetSocketAddress SERVER_ADDRESS = createAddress(new byte[] { 10, 0, 0, 3}, 12345);
- private static final InetSocketAddress PROXY_ADDRESS = createAddress(new byte[] { 10, 0, 0, 2 }, 8888);
- private static final InetSocketAddress LOCAL_ADDRESS = createAddress(new byte[] { 10, 0, 0, 1 }, 54321);
-
-
- private FakeSocketChannel channel;
- private FakeChannelSink sink;
- private HttpTunnelClientPollHandler handler;
- private MockChannelStateListener listener;
-
- private static InetSocketAddress createAddress(byte[] addr, int port) {
- try {
- return new InetSocketAddress(InetAddress.getByAddress(addr), port);
- } catch (UnknownHostException e) {
- throw new RuntimeException("Bad address in test");
- }
- }
-
- @Before
- public void setUp() throws Exception {
- sink = new FakeChannelSink();
-
- ChannelPipeline pipeline = Channels.pipeline();
- listener = new MockChannelStateListener();
- listener.serverHostName = HttpTunnelMessageUtils.convertToHostString(SERVER_ADDRESS);
- handler = new HttpTunnelClientPollHandler(listener);
- handler.setTunnelId(TUNNEL_ID);
- pipeline.addLast(HttpTunnelClientPollHandler.NAME, handler);
-
- channel = new FakeSocketChannel(null, null, pipeline, sink);
- channel.remoteAddress = PROXY_ADDRESS;
- channel.localAddress = LOCAL_ADDRESS;
- }
-
- @Test
- public void testSendsRequestOnConnect() {
- Channels.fireChannelConnected(channel, PROXY_ADDRESS);
- assertEquals(1, sink.events.size());
- HttpRequest request = checkIsMessageEventContainingHttpRequest(sink.events.poll());
- assertTrue(HttpTunnelMessageUtils.isServerToClientRequest(request));
- assertTrue(HttpTunnelMessageUtils.checkHost(request, SERVER_ADDRESS));
- assertTrue(listener.fullyEstablished);
- }
-
- @Test
- public void testSendsReceivedDataSentUpstream() {
- HttpResponse response = HttpTunnelMessageUtils.createRecvDataResponse(NettyTestUtils.createData(1234L));
- Channels.fireMessageReceived(channel, response);
- assertEquals(1, listener.messages.size());
- assertEquals(1234L, listener.messages.get(0).readLong());
- }
-
- @Test
- public void testSendsAnotherRequestAfterResponse() {
- HttpResponse response = HttpTunnelMessageUtils.createRecvDataResponse(NettyTestUtils.createData(1234L));
- Channels.fireMessageReceived(channel, response);
- assertEquals(1, sink.events.size());
- checkIsMessageEventContainingHttpRequest(sink.events.poll());
- }
-
- private HttpRequest checkIsMessageEventContainingHttpRequest(ChannelEvent event) {
- assertTrue(event instanceof DownstreamMessageEvent);
- DownstreamMessageEvent messageEvent = (DownstreamMessageEvent) event;
- assertTrue(messageEvent.getMessage() instanceof HttpRequest);
- return (HttpRequest) messageEvent.getMessage();
- }
-}
+package org.jboss.netty.channel.socket.httptunnel;
+
+
+import static org.junit.Assert.*;
+
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.UnknownHostException;
+
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.channel.DownstreamMessageEvent;
+import org.jboss.netty.handler.codec.http.HttpRequest;
+import org.jboss.netty.handler.codec.http.HttpResponse;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * @author [hidden email]
+ */
+public class HttpTunnelClientPollHandlerTest {
+
+ private static final String TUNNEL_ID = "1";
+ private static final InetSocketAddress SERVER_ADDRESS = createAddress(new byte[] { 10, 0, 0, 3}, 12345);
+ private static final InetSocketAddress PROXY_ADDRESS = createAddress(new byte[] { 10, 0, 0, 2 }, 8888);
+ private static final InetSocketAddress LOCAL_ADDRESS = createAddress(new byte[] { 10, 0, 0, 1 }, 54321);
+
+
+ private FakeSocketChannel channel;
+ private FakeChannelSink sink;
+ private HttpTunnelClientPollHandler handler;
+ private MockChannelStateListener listener;
+
+ private static InetSocketAddress createAddress(byte[] addr, int port) {
+ try {
+ return new InetSocketAddress(InetAddress.getByAddress(addr), port);
+ } catch (UnknownHostException e) {
+ throw new RuntimeException("Bad address in test");
+ }
+ }
+
+ @Before
+ public void setUp() throws Exception {
+ sink = new FakeChannelSink();
+
+ ChannelPipeline pipeline = Channels.pipeline();
+ listener = new MockChannelStateListener();
+ listener.serverHostName = HttpTunnelMessageUtils.convertToHostString(SERVER_ADDRESS);
+ handler = new HttpTunnelClientPollHandler(listener);
+ handler.setTunnelId(TUNNEL_ID);
+ pipeline.addLast(HttpTunnelClientPollHandler.NAME, handler);
+
+ channel = new FakeSocketChannel(null, null, pipeline, sink);
+ channel.remoteAddress = PROXY_ADDRESS;
+ channel.localAddress = LOCAL_ADDRESS;
+ }
+
+ @Test
+ public void testSendsRequestOnConnect() {
+ Channels.fireChannelConnected(channel, PROXY_ADDRESS);
+ assertEquals(1, sink.events.size());
+ HttpRequest request = checkIsMessageEventContainingHttpRequest(sink.events.poll());
+ assertTrue(HttpTunnelMessageUtils.isServerToClientRequest(request));
+ assertTrue(HttpTunnelMessageUtils.checkHost(request, SERVER_ADDRESS));
+ assertTrue(listener.fullyEstablished);
+ }
+
+ @Test
+ public void testSendsReceivedDataSentUpstream() {
+ HttpResponse response = HttpTunnelMessageUtils.createRecvDataResponse(NettyTestUtils.createData(1234L));
+ Channels.fireMessageReceived(channel, response);
+ assertEquals(1, listener.messages.size());
+ assertEquals(1234L, listener.messages.get(0).readLong());
+ }
+
+ @Test
+ public void testSendsAnotherRequestAfterResponse() {
+ HttpResponse response = HttpTunnelMessageUtils.createRecvDataResponse(NettyTestUtils.createData(1234L));
+ Channels.fireMessageReceived(channel, response);
+ assertEquals(1, sink.events.size());
+ checkIsMessageEventContainingHttpRequest(sink.events.poll());
+ }
+
+ private HttpRequest checkIsMessageEventContainingHttpRequest(ChannelEvent event) {
+ assertTrue(event instanceof DownstreamMessageEvent);
+ DownstreamMessageEvent messageEvent = (DownstreamMessageEvent) event;
+ assertTrue(messageEvent.getMessage() instanceof HttpRequest);
+ return (HttpRequest) messageEvent.getMessage();
+ }
+}

Property changes on: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientPollHandlerTest.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientSendHandlerTest.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelFactoryTest.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelSinkTest.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelTest.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelSoakTester.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelTest.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/MockChannelStateListener.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/NettyTestUtils.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/NettyTestUtilsTest.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/NullChannelHandler.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitchTest.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/UpstreamEventCatcher.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/WriteFragmenterTest.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Property changes on: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/WriteSplitterTest.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits

r1917 - in branches/httptunnel/src: test/java/org/jboss/netty/channel/socket/httptunnel and 1 other directory.

2009-11-23T20:00:02Z

Author: trustin
Date: 2009-11-23 23:00:01 -0500 (Mon, 23 Nov 2009)
New Revision: 1917

Modified:
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelConfig.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientPollHandler.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelMessageUtils.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelConfigTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientPollHandlerTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientSendHandlerTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/NettyTestUtils.java
Log:
Replaced tabs with spaces

Modified: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelConfig.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelConfig.java 2009-11-24 03:58:04 UTC (rev 1916)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelConfig.java 2009-11-24 04:00:01 UTC (rev 1917)
@@ -143,17 +143,17 @@
}

public void setSoLinger(int soLinger) {
- pollChannelConfig.setSoLinger(soLinger);
+ pollChannelConfig.setSoLinger(soLinger);
sendChannelConfig.setSoLinger(soLinger);
}

public void setTcpNoDelay(boolean tcpNoDelay) {
- pollChannelConfig.setTcpNoDelay(true);
+ pollChannelConfig.setTcpNoDelay(true);
sendChannelConfig.setTcpNoDelay(true);
}

public void setTrafficClass(int trafficClass) {
- pollChannelConfig.setTrafficClass(1);
+ pollChannelConfig.setTrafficClass(1);
sendChannelConfig.setTrafficClass(1);
}
}

Modified: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientPollHandler.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientPollHandler.java 2009-11-24 03:58:04 UTC (rev 1916)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientPollHandler.java 2009-11-24 04:00:01 UTC (rev 1917)
@@ -35,49 +35,49 @@
@ChannelPipelineCoverage("one")
class HttpTunnelClientPollHandler extends SimpleChannelHandler {

- public static final String NAME = "server2client";
-
- private static final Logger LOG = Logger.getLogger(HttpTunnelClientPollHandler.class.getName());
+ public static final String NAME = "server2client";
+
+ private static final Logger LOG = Logger.getLogger(HttpTunnelClientPollHandler.class.getName());

- private String tunnelId;
+ private String tunnelId;
private HttpTunnelClientWorkerOwner tunnelChannel;

private long pollTime;

- public HttpTunnelClientPollHandler(HttpTunnelClientWorkerOwner tunnelChannel) {
- this.tunnelChannel = tunnelChannel;
+ public HttpTunnelClientPollHandler(HttpTunnelClientWorkerOwner tunnelChannel) {
+ this.tunnelChannel = tunnelChannel;
}
-
- public void setTunnelId(String tunnelId) {
- this.tunnelId = tunnelId;
- }
+
+ public void setTunnelId(String tunnelId) {
+ this.tunnelId = tunnelId;
+ }

@Override
- public void channelConnected(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
+ public void channelConnected(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
LOG.log(Level.FINE, "Poll channel for tunnel {0} established", tunnelId);
tunnelChannel.fullyEstablished();
- sendPoll(ctx);
- }
-
- @Override
- public void messageReceived(ChannelHandlerContext ctx, MessageEvent e)
- throws Exception {
- HttpResponse response = (HttpResponse) e.getMessage();
-
- if(HttpTunnelMessageUtils.isOKResponse(response)) {
- long rtTime = System.nanoTime() - pollTime;
- LOG.log(Level.FINE, "OK response received for poll on tunnel {0} after {1}ns", new Object[] { tunnelId, rtTime });
- tunnelChannel.onMessageReceived(response.getContent());
- sendPoll(ctx);
- } else {
- LOG.log(Level.WARNING, "non-OK response received for poll on tunnel {0}", tunnelId);
- }
- }
+ sendPoll(ctx);
+ }
+
+ @Override
+ public void messageReceived(ChannelHandlerContext ctx, MessageEvent e)
+ throws Exception {
+ HttpResponse response = (HttpResponse) e.getMessage();
+
+ if(HttpTunnelMessageUtils.isOKResponse(response)) {
+ long rtTime = System.nanoTime() - pollTime;
+ LOG.log(Level.FINE, "OK response received for poll on tunnel {0} after {1}ns", new Object[] { tunnelId, rtTime });
+ tunnelChannel.onMessageReceived(response.getContent());
+ sendPoll(ctx);
+ } else {
+ LOG.log(Level.WARNING, "non-OK response received for poll on tunnel {0}", tunnelId);
+ }
+ }

private void sendPoll(ChannelHandlerContext ctx) {
pollTime = System.nanoTime();
LOG.log(Level.FINE, "sending poll request for tunnel {0}", tunnelId);
HttpRequest request = HttpTunnelMessageUtils.createReceiveDataRequest(tunnelChannel.getServerHostName(), tunnelId);
- Channels.write(ctx, Channels.future(ctx.getChannel()), request);
+ Channels.write(ctx, Channels.future(ctx.getChannel()), request);
}
}

Modified: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelMessageUtils.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelMessageUtils.java 2009-11-24 03:58:04 UTC (rev 1916)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelMessageUtils.java 2009-11-24 04:00:01 UTC (rev 1917)
@@ -70,11 +70,11 @@

public static HttpRequest createOpenTunnelRequest(SocketAddress host) {
- return createOpenTunnelRequest(convertToHostString(host));
+ return createOpenTunnelRequest(convertToHostString(host));
}

public static HttpRequest createOpenTunnelRequest(String host) {
- HttpRequest request = createRequestTemplate(host, null, OPEN_TUNNEL_REQUEST_URI);
+ HttpRequest request = createRequestTemplate(host, null, OPEN_TUNNEL_REQUEST_URI);
setNoData(request);
return request;
}
@@ -89,7 +89,7 @@
}

public static HttpRequest createSendDataRequest(SocketAddress host, String cookie, ChannelBuffer data) {
- return createSendDataRequest(convertToHostString(host), cookie, data);
+ return createSendDataRequest(convertToHostString(host), cookie, data);
}

public static HttpRequest createSendDataRequest(String host, String cookie, ChannelBuffer data) {
@@ -105,13 +105,13 @@
}

public static HttpRequest createReceiveDataRequest(SocketAddress host, String tunnelId) {
- return createReceiveDataRequest(convertToHostString(host), tunnelId);
+ return createReceiveDataRequest(convertToHostString(host), tunnelId);
}

public static HttpRequest createReceiveDataRequest(String host, String tunnelId) {
- HttpRequest request = createRequestTemplate(host, tunnelId, CLIENT_RECV_REQUEST_URI);
- setNoData(request);
- return request;
+ HttpRequest request = createRequestTemplate(host, tunnelId, CLIENT_RECV_REQUEST_URI);
+ setNoData(request);
+ return request;
}

public static boolean isReceiveDataRequest(HttpRequest request) {
@@ -129,24 +129,24 @@
}

public static boolean isServerToClientRequest(HttpRequest request) {
- return isRequestTo(request, CLIENT_RECV_REQUEST_URI);
- }
+ return isRequestTo(request, CLIENT_RECV_REQUEST_URI);
+ }

public static String convertToHostString(SocketAddress hostAddress) {
- StringWriter host = new StringWriter();
- InetSocketAddress inetSocketAddr = (InetSocketAddress) hostAddress;
- InetAddress addr = inetSocketAddr.getAddress();
- if(addr instanceof Inet6Address) {
- host.append('[');
- host.append(addr.getHostAddress());
- host.append(']');
- } else {
- host.append(addr.getHostAddress());
- }
-
- host.append(':');
- host.append(Integer.toString(inetSocketAddr.getPort()));
- return host.toString();
+ StringWriter host = new StringWriter();
+ InetSocketAddress inetSocketAddr = (InetSocketAddress) hostAddress;
+ InetAddress addr = inetSocketAddr.getAddress();
+ if(addr instanceof Inet6Address) {
+ host.append('[');
+ host.append(addr.getHostAddress());
+ host.append(']');
+ } else {
+ host.append(addr.getHostAddress());
+ }
+
+ host.append(':');
+ host.append(Integer.toString(inetSocketAddr.getPort()));
+ return host.toString();
}

private static HttpRequest createRequestTemplate(String host, String tunnelId, String uri) {
@@ -183,10 +183,10 @@
&& uri.equals(decodedUri.getPath());
}

- private static void setNoData(HttpRequest request) {
- request.setHeader(HttpHeaders.Names.CONTENT_LENGTH, "0");
- request.setContent(null);
- }
+ private static void setNoData(HttpRequest request) {
+ request.setHeader(HttpHeaders.Names.CONTENT_LENGTH, "0");
+ request.setContent(null);
+ }

public static String extractTunnelId(HttpRequest request) {
return request.getHeader(HttpHeaders.Names.COOKIE);

Modified: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelConfigTest.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelConfigTest.java 2009-11-24 03:58:04 UTC (rev 1916)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelConfigTest.java 2009-11-24 04:00:01 UTC (rev 1917)
@@ -13,162 +13,162 @@
@RunWith(JMock.class)
public class HttpTunnelClientChannelConfigTest {

- JUnit4Mockery mockContext = new JUnit4Mockery();
-
- SocketChannelConfig sendChannelConfig;
- SocketChannelConfig pollChannelConfig;
-
- HttpTunnelClientChannelConfig config;
-
- @Before
- public void setUp() {
- sendChannelConfig = mockContext.mock(SocketChannelConfig.class, "sendChannelConfig");
- pollChannelConfig = mockContext.mock(SocketChannelConfig.class, "pollChannelConfig");
-
- config = new HttpTunnelClientChannelConfig(sendChannelConfig, pollChannelConfig);
- }
-
- @Test
- public void testGetReceiveBufferSize() {
- mockContext.checking(new Expectations() {{
- one(pollChannelConfig).getReceiveBufferSize(); will(returnValue(100));
- }});
-
- assertEquals(100, config.getReceiveBufferSize());
- }
-
- @Test
- public void testGetSendBufferSize() {
- mockContext.checking(new Expectations() {{
- one(pollChannelConfig).getSendBufferSize(); will(returnValue(100));
- }});
-
- assertEquals(100, config.getSendBufferSize());
- }
-
- @Test
- public void testGetSoLinger() {
- mockContext.checking(new Expectations() {{
- one(pollChannelConfig).getSoLinger(); will(returnValue(100));
- }});
-
- assertEquals(100, config.getSoLinger());
- }
-
- @Test
- public void testTrafficClass() {
- mockContext.checking(new Expectations() {{
- one(pollChannelConfig).getTrafficClass(); will(returnValue(1));
- }});
-
- assertEquals(1, config.getTrafficClass());
- }
-
- @Test
- public void testIsKeepAlive() {
- mockContext.checking(new Expectations() {{
- one(pollChannelConfig).isKeepAlive(); will(returnValue(true));
- }});
-
- assertTrue(config.isKeepAlive());
- }
-
- @Test
- public void testIsReuseAddress() {
- mockContext.checking(new Expectations() {{
- one(pollChannelConfig).isReuseAddress(); will(returnValue(true));
- }});
-
- assertTrue(config.isReuseAddress());
- }
-
- @Test
- public void testIsTcpNoDelay() {
- mockContext.checking(new Expectations() {{
- one(pollChannelConfig).isTcpNoDelay(); will(returnValue(true));
- }});
-
- assertTrue(config.isTcpNoDelay());
- }
-
- @Test
- public void testSetKeepAlive() {
- mockContext.checking(new Expectations() {{
- one(pollChannelConfig).setKeepAlive(true);
- one(sendChannelConfig).setKeepAlive(true);
- }});
-
- config.setKeepAlive(true);
- }
-
- @Test
- public void testSetPerformancePreferences() {
- mockContext.checking(new Expectations() {{
- one(pollChannelConfig).setPerformancePreferences(100, 200, 300);
- one(sendChannelConfig).setPerformancePreferences(100, 200, 300);
- }});
-
- config.setPerformancePreferences(100, 200, 300);
- }
-
- @Test
- public void testSetReceiveBufferSize() {
- mockContext.checking(new Expectations() {{
- one(pollChannelConfig).setReceiveBufferSize(100);
- one(sendChannelConfig).setReceiveBufferSize(100);
- }});
-
- config.setReceiveBufferSize(100);
- }
-
- @Test
- public void testSetReuseAddress() {
- mockContext.checking(new Expectations() {{
- one(pollChannelConfig).setReuseAddress(true);
- one(sendChannelConfig).setReuseAddress(true);
- }});
-
- config.setReuseAddress(true);
- }
-
- @Test
- public void testSetSendBufferSize() {
- mockContext.checking(new Expectations() {{
- one(pollChannelConfig).setSendBufferSize(100);
- one(sendChannelConfig).setSendBufferSize(100);
- }});
-
- config.setSendBufferSize(100);
- }
-
- @Test
- public void testSetSoLinger() {
- mockContext.checking(new Expectations() {{
- one(pollChannelConfig).setSoLinger(100);
- one(sendChannelConfig).setSoLinger(100);
- }});
-
- config.setSoLinger(100);
- }
-
- @Test
- public void testTcpNoDelay() {
- mockContext.checking(new Expectations() {{
- one(pollChannelConfig).setTcpNoDelay(true);
- one(sendChannelConfig).setTcpNoDelay(true);
- }});
-
- config.setTcpNoDelay(true);
- }
-
- @Test
- public void testSetTrafficClass() {
- mockContext.checking(new Expectations() {{
- one(pollChannelConfig).setTrafficClass(1);
- one(sendChannelConfig).setTrafficClass(1);
- }});
-
- config.setTrafficClass(1);
- }
-
+ JUnit4Mockery mockContext = new JUnit4Mockery();
+
+ SocketChannelConfig sendChannelConfig;
+ SocketChannelConfig pollChannelConfig;
+
+ HttpTunnelClientChannelConfig config;
+
+ @Before
+ public void setUp() {
+ sendChannelConfig = mockContext.mock(SocketChannelConfig.class, "sendChannelConfig");
+ pollChannelConfig = mockContext.mock(SocketChannelConfig.class, "pollChannelConfig");
+
+ config = new HttpTunnelClientChannelConfig(sendChannelConfig, pollChannelConfig);
+ }
+
+ @Test
+ public void testGetReceiveBufferSize() {
+ mockContext.checking(new Expectations() {{
+ one(pollChannelConfig).getReceiveBufferSize(); will(returnValue(100));
+ }});
+
+ assertEquals(100, config.getReceiveBufferSize());
+ }
+
+ @Test
+ public void testGetSendBufferSize() {
+ mockContext.checking(new Expectations() {{
+ one(pollChannelConfig).getSendBufferSize(); will(returnValue(100));
+ }});
+
+ assertEquals(100, config.getSendBufferSize());
+ }
+
+ @Test
+ public void testGetSoLinger() {
+ mockContext.checking(new Expectations() {{
+ one(pollChannelConfig).getSoLinger(); will(returnValue(100));
+ }});
+
+ assertEquals(100, config.getSoLinger());
+ }
+
+ @Test
+ public void testTrafficClass() {
+ mockContext.checking(new Expectations() {{
+ one(pollChannelConfig).getTrafficClass(); will(returnValue(1));
+ }});
+
+ assertEquals(1, config.getTrafficClass());
+ }
+
+ @Test
+ public void testIsKeepAlive() {
+ mockContext.checking(new Expectations() {{
+ one(pollChannelConfig).isKeepAlive(); will(returnValue(true));
+ }});
+
+ assertTrue(config.isKeepAlive());
+ }
+
+ @Test
+ public void testIsReuseAddress() {
+ mockContext.checking(new Expectations() {{
+ one(pollChannelConfig).isReuseAddress(); will(returnValue(true));
+ }});
+
+ assertTrue(config.isReuseAddress());
+ }
+
+ @Test
+ public void testIsTcpNoDelay() {
+ mockContext.checking(new Expectations() {{
+ one(pollChannelConfig).isTcpNoDelay(); will(returnValue(true));
+ }});
+
+ assertTrue(config.isTcpNoDelay());
+ }
+
+ @Test
+ public void testSetKeepAlive() {
+ mockContext.checking(new Expectations() {{
+ one(pollChannelConfig).setKeepAlive(true);
+ one(sendChannelConfig).setKeepAlive(true);
+ }});
+
+ config.setKeepAlive(true);
+ }
+
+ @Test
+ public void testSetPerformancePreferences() {
+ mockContext.checking(new Expectations() {{
+ one(pollChannelConfig).setPerformancePreferences(100, 200, 300);
+ one(sendChannelConfig).setPerformancePreferences(100, 200, 300);
+ }});
+
+ config.setPerformancePreferences(100, 200, 300);
+ }
+
+ @Test
+ public void testSetReceiveBufferSize() {
+ mockContext.checking(new Expectations() {{
+ one(pollChannelConfig).setReceiveBufferSize(100);
+ one(sendChannelConfig).setReceiveBufferSize(100);
+ }});
+
+ config.setReceiveBufferSize(100);
+ }
+
+ @Test
+ public void testSetReuseAddress() {
+ mockContext.checking(new Expectations() {{
+ one(pollChannelConfig).setReuseAddress(true);
+ one(sendChannelConfig).setReuseAddress(true);
+ }});
+
+ config.setReuseAddress(true);
+ }
+
+ @Test
+ public void testSetSendBufferSize() {
+ mockContext.checking(new Expectations() {{
+ one(pollChannelConfig).setSendBufferSize(100);
+ one(sendChannelConfig).setSendBufferSize(100);
+ }});
+
+ config.setSendBufferSize(100);
+ }
+
+ @Test
+ public void testSetSoLinger() {
+ mockContext.checking(new Expectations() {{
+ one(pollChannelConfig).setSoLinger(100);
+ one(sendChannelConfig).setSoLinger(100);
+ }});
+
+ config.setSoLinger(100);
+ }
+
+ @Test
+ public void testTcpNoDelay() {
+ mockContext.checking(new Expectations() {{
+ one(pollChannelConfig).setTcpNoDelay(true);
+ one(sendChannelConfig).setTcpNoDelay(true);
+ }});
+
+ config.setTcpNoDelay(true);
+ }
+
+ @Test
+ public void testSetTrafficClass() {
+ mockContext.checking(new Expectations() {{
+ one(pollChannelConfig).setTrafficClass(1);
+ one(sendChannelConfig).setTrafficClass(1);
+ }});
+
+ config.setTrafficClass(1);
+ }
+
}

Modified: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientPollHandlerTest.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientPollHandlerTest.java 2009-11-24 03:58:04 UTC (rev 1916)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientPollHandlerTest.java 2009-11-24 04:00:01 UTC (rev 1917)
@@ -21,8 +21,8 @@
*/
public class HttpTunnelClientPollHandlerTest {

- private static final String TUNNEL_ID = "1";
- private static final InetSocketAddress SERVER_ADDRESS = createAddress(new byte[] { 10, 0, 0, 3}, 12345);
+ private static final String TUNNEL_ID = "1";
+ private static final InetSocketAddress SERVER_ADDRESS = createAddress(new byte[] { 10, 0, 0, 3}, 12345);
private static final InetSocketAddress PROXY_ADDRESS = createAddress(new byte[] { 10, 0, 0, 2 }, 8888);
private static final InetSocketAddress LOCAL_ADDRESS = createAddress(new byte[] { 10, 0, 0, 1 }, 54321);

@@ -40,11 +40,11 @@
}
}

- @Before
- public void setUp() throws Exception {
- sink = new FakeChannelSink();
+ @Before
+ public void setUp() throws Exception {
+ sink = new FakeChannelSink();

- ChannelPipeline pipeline = Channels.pipeline();
+ ChannelPipeline pipeline = Channels.pipeline();
listener = new MockChannelStateListener();
listener.serverHostName = HttpTunnelMessageUtils.convertToHostString(SERVER_ADDRESS);
handler = new HttpTunnelClientPollHandler(listener);
@@ -54,38 +54,38 @@
channel = new FakeSocketChannel(null, null, pipeline, sink);
channel.remoteAddress = PROXY_ADDRESS;
channel.localAddress = LOCAL_ADDRESS;
- }
+ }

- @Test
- public void testSendsRequestOnConnect() {
- Channels.fireChannelConnected(channel, PROXY_ADDRESS);
- assertEquals(1, sink.events.size());
- HttpRequest request = checkIsMessageEventContainingHttpRequest(sink.events.poll());
- assertTrue(HttpTunnelMessageUtils.isServerToClientRequest(request));
- assertTrue(HttpTunnelMessageUtils.checkHost(request, SERVER_ADDRESS));
- assertTrue(listener.fullyEstablished);
- }
-
- @Test
- public void testSendsReceivedDataSentUpstream() {
- HttpResponse response = HttpTunnelMessageUtils.createRecvDataResponse(NettyTestUtils.createData(1234L));
- Channels.fireMessageReceived(channel, response);
- assertEquals(1, listener.messages.size());
- assertEquals(1234L, listener.messages.get(0).readLong());
- }
-
- @Test
- public void testSendsAnotherRequestAfterResponse() {
- HttpResponse response = HttpTunnelMessageUtils.createRecvDataResponse(NettyTestUtils.createData(1234L));
- Channels.fireMessageReceived(channel, response);
- assertEquals(1, sink.events.size());
- checkIsMessageEventContainingHttpRequest(sink.events.poll());
- }
+ @Test
+ public void testSendsRequestOnConnect() {
+ Channels.fireChannelConnected(channel, PROXY_ADDRESS);
+ assertEquals(1, sink.events.size());
+ HttpRequest request = checkIsMessageEventContainingHttpRequest(sink.events.poll());
+ assertTrue(HttpTunnelMessageUtils.isServerToClientRequest(request));
+ assertTrue(HttpTunnelMessageUtils.checkHost(request, SERVER_ADDRESS));
+ assertTrue(listener.fullyEstablished);
+ }
+
+ @Test
+ public void testSendsReceivedDataSentUpstream() {
+ HttpResponse response = HttpTunnelMessageUtils.createRecvDataResponse(NettyTestUtils.createData(1234L));
+ Channels.fireMessageReceived(channel, response);
+ assertEquals(1, listener.messages.size());
+ assertEquals(1234L, listener.messages.get(0).readLong());
+ }
+
+ @Test
+ public void testSendsAnotherRequestAfterResponse() {
+ HttpResponse response = HttpTunnelMessageUtils.createRecvDataResponse(NettyTestUtils.createData(1234L));
+ Channels.fireMessageReceived(channel, response);
+ assertEquals(1, sink.events.size());
+ checkIsMessageEventContainingHttpRequest(sink.events.poll());
+ }

- private HttpRequest checkIsMessageEventContainingHttpRequest(ChannelEvent event) {
- assertTrue(event instanceof DownstreamMessageEvent);
- DownstreamMessageEvent messageEvent = (DownstreamMessageEvent) event;
- assertTrue(messageEvent.getMessage() instanceof HttpRequest);
- return (HttpRequest) messageEvent.getMessage();
- }
+ private HttpRequest checkIsMessageEventContainingHttpRequest(ChannelEvent event) {
+ assertTrue(event instanceof DownstreamMessageEvent);
+ DownstreamMessageEvent messageEvent = (DownstreamMessageEvent) event;
+ assertTrue(messageEvent.getMessage() instanceof HttpRequest);
+ return (HttpRequest) messageEvent.getMessage();
+ }
}

Modified: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientSendHandlerTest.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientSendHandlerTest.java 2009-11-24 03:58:04 UTC (rev 1916)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientSendHandlerTest.java 2009-11-24 04:00:01 UTC (rev 1917)
@@ -90,18 +90,18 @@

@Test
public void testOnlyOneRequestAtATime() {
- emulateConnectAndOpen();
+ emulateConnectAndOpen();

- channel.write(NettyTestUtils.createData(1234L));
- assertEquals(1, sink.events.size());
- checkIsSendDataRequestWithData(sink.events.poll(), "10.0.0.2:12345", NettyTestUtils.createData(1234L));
+ channel.write(NettyTestUtils.createData(1234L));
+ assertEquals(1, sink.events.size());
+ checkIsSendDataRequestWithData(sink.events.poll(), "10.0.0.2:12345", NettyTestUtils.createData(1234L));

- channel.write(NettyTestUtils.createData(5678L));
- assertEquals(0, sink.events.size());
+ channel.write(NettyTestUtils.createData(5678L));
+ assertEquals(0, sink.events.size());

- Channels.fireMessageReceived(channel, HttpTunnelMessageUtils.createSendDataResponse());
- assertEquals(1, sink.events.size());
- checkIsSendDataRequestWithData(sink.events.poll(), "10.0.0.2:12345", NettyTestUtils.createData(5678L));
+ Channels.fireMessageReceived(channel, HttpTunnelMessageUtils.createSendDataResponse());
+ assertEquals(1, sink.events.size());
+ checkIsSendDataRequestWithData(sink.events.poll(), "10.0.0.2:12345", NettyTestUtils.createData(5678L));
}

@Test
@@ -148,19 +148,19 @@

// FIXME expectedHost is unused. Safe to remove?
private void checkIsSendDataRequestWithData(ChannelEvent event, String expectedHost, ChannelBuffer data) {
- assertTrue(event instanceof DownstreamMessageEvent);
- DownstreamMessageEvent messageEvent = (DownstreamMessageEvent) event;
- assertTrue(messageEvent.getMessage() instanceof HttpRequest);
- HttpRequest request = (HttpRequest) messageEvent.getMessage();
- assertTrue(HttpTunnelMessageUtils.isSendDataRequest(request));
- assertEquals(data.readableBytes(), request.getContentLength());
+ assertTrue(event instanceof DownstreamMessageEvent);
+ DownstreamMessageEvent messageEvent = (DownstreamMessageEvent) event;
+ assertTrue(messageEvent.getMessage() instanceof HttpRequest);
+ HttpRequest request = (HttpRequest) messageEvent.getMessage();
+ assertTrue(HttpTunnelMessageUtils.isSendDataRequest(request));
+ assertEquals(data.readableBytes(), request.getContentLength());

- ChannelBuffer content = request.getContent();
- NettyTestUtils.assertEquals(data, content);
- }
+ ChannelBuffer content = request.getContent();
+ NettyTestUtils.assertEquals(data, content);
+ }

- private void emulateConnect() {
- channel.emulateConnected(LOCAL_ADDRESS, PROXY_ADDRESS, null);
+ private void emulateConnect() {
+ channel.emulateConnected(LOCAL_ADDRESS, PROXY_ADDRESS, null);
sink.events.clear();
}

Modified: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/NettyTestUtils.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/NettyTestUtils.java 2009-11-24 03:58:04 UTC (rev 1916)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/NettyTestUtils.java 2009-11-24 04:00:01 UTC (rev 1917)
@@ -108,14 +108,14 @@
}

public static ChannelBuffer createData(long containedNumber) {
- ChannelBuffer data = ChannelBuffers.dynamicBuffer();
- data.writeLong(containedNumber);
- return data;
- }
+ ChannelBuffer data = ChannelBuffers.dynamicBuffer();
+ data.writeLong(containedNumber);
+ return data;
+ }

public static void checkIsUpstreamMessageEventContainingData(ChannelEvent event, ChannelBuffer expectedData) {
ChannelBuffer data = checkIsUpstreamMessageEvent(event, ChannelBuffer.class);
- assertEquals(expectedData, data);
+ assertEquals(expectedData, data);
}

public static <T> T checkIsUpstreamMessageEvent(ChannelEvent event, Class<T> expectedMessageType) {

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits

r1916 - in branches/httptunnel/src: test/java/org/jboss/netty/channel/socket/httptunnel and 1 other directory.

2009-11-23T19:58:04Z

Author: trustin
Date: 2009-11-23 22:58:04 -0500 (Mon, 23 Nov 2009)
New Revision: 1916

Modified:
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannelSink.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannel.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelConfig.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientSendHandler.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelSink.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitch.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/WriteFragmenter.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/AcceptedServerChannelRequestDispatchTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannelSinkTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientSendHandlerTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelFactoryTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelSinkTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelSoakTester.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitchTest.java
Log:
* Changed the access modifier of the private fields which are accessed by other inner classes
* Added the FIXME markers for unused fields and parameters
* Fixed Javadoc errors

Modified: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannelSink.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannelSink.java 2009-11-24 03:29:26 UTC (rev 1915)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannelSink.java 2009-11-24 03:58:04 UTC (rev 1916)
@@ -28,22 +28,22 @@
* Sink for the server end of an http tunnel. Data sent down through the server end is dispatched
* from here to the ServerMessageSwitch, which queues the data awaiting a poll request from the
* client end of the tunnel.
- *
+ *
* @author The Netty Project ([hidden email])
* @author Iain McGinniss ([hidden email])
* @version $Rev$, $Date$
*/
class HttpTunnelAcceptedChannelSink extends AbstractChannelSink {

- private ServerMessageSwitchDownstreamInterface messageSwitch;
- private String tunnelId;
+ private final ServerMessageSwitchDownstreamInterface messageSwitch;
+ private final String tunnelId;
private boolean active;

public HttpTunnelAcceptedChannelSink(ServerMessageSwitchDownstreamInterface messageSwitch, String tunnelId) {
this.messageSwitch = messageSwitch;
this.tunnelId = tunnelId;
}
-
+
public void eventSunk(ChannelPipeline pipeline, ChannelEvent e) throws Exception {
if(e instanceof MessageEvent) {
handleMessageEvent((MessageEvent)e);
@@ -60,30 +60,30 @@
}

private void handleStateEvent(ChannelStateEvent ev) {
- Channel owner = (Channel) ev.getChannel();
+ Channel owner = ev.getChannel();
switch(ev.getState()) {
case OPEN:
if(Boolean.FALSE.equals(ev.getValue())) {
messageSwitch.closeTunnel(tunnelId);
- this.active = false;
+ active = false;
Channels.fireChannelClosed(owner);
}
break;
case BOUND:
if(ev.getValue() == null) {
messageSwitch.closeTunnel(tunnelId);
- this.active = false;
+ active = false;
Channels.fireChannelUnbound(owner);
}
case CONNECTED:
if(ev.getValue() == null) {
messageSwitch.closeTunnel(tunnelId);
- this.active = false;
+ active = false;
Channels.fireChannelDisconnected(owner);
}
}
}
-
+
public boolean isActive() {
return active;
}

Modified: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannel.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannel.java 2009-11-24 03:29:26 UTC (rev 1915)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannel.java 2009-11-24 03:58:04 UTC (rev 1916)
@@ -38,38 +38,38 @@
* The client end of an HTTP tunnel, created by an {@link HttpTunnelClientChannelFactory}. Channels of
* this type are designed to emulate a normal TCP based socket channel as far as is feasible within the limitations
* of the HTTP 1.1 protocol, and the usage patterns permitted by commonly used HTTP proxies and firewalls.
- *
+ *
* @author The Netty Project ([hidden email])
* @author Iain McGinniss ([hidden email])
* @version $Rev$, $Date$
*/
public class HttpTunnelClientChannel extends AbstractChannel implements SocketChannel, HttpTunnelClientWorkerOwner {
-
- private HttpTunnelClientChannelConfig config;

- private SocketChannel sendChannel;
- private SocketChannel pollChannel;
-
+ private final HttpTunnelClientChannelConfig config;
+
+ private final SocketChannel sendChannel;
+ private final SocketChannel pollChannel;
+
private String tunnelId;
private ChannelFuture connectFuture;
private boolean connected;
private boolean bound;
-
- private InetSocketAddress serverAddress;
+
+ InetSocketAddress serverAddress;
private String serverHostName;

protected HttpTunnelClientChannel(ChannelFactory factory, ChannelPipeline pipeline, HttpTunnelClientChannelSink sink, ClientSocketChannelFactory outboundFactory, ChannelGroup realConnections) {
super(null, factory, pipeline, sink);
-
- this.sendChannel = outboundFactory.newChannel(createSendPipeline());
- this.pollChannel = outboundFactory.newChannel(createPollPipeline());
- this.config = new HttpTunnelClientChannelConfig(sendChannel.getConfig(), pollChannel.getConfig());
- this.serverAddress = null;
-
+
+ sendChannel = outboundFactory.newChannel(createSendPipeline());
+ pollChannel = outboundFactory.newChannel(createPollPipeline());
+ config = new HttpTunnelClientChannelConfig(sendChannel.getConfig(), pollChannel.getConfig());
+ serverAddress = null;
+
realConnections.add(sendChannel);
realConnections.add(pollChannel);
-
+
Channels.fireChannelOpen(this);
}

@@ -92,7 +92,7 @@
public InetSocketAddress getRemoteAddress() {
return serverAddress;
}
-
+
public void onMessageReceived(ChannelBuffer content) {
Channels.fireMessageReceived(this, content);
}
@@ -103,18 +103,18 @@
* The send and poll channels can later ask for the correct server address using
* getServerHostName().
*/
- this.serverAddress = remoteAddress;
-
+ serverAddress = remoteAddress;
+
SocketAddress connectTarget;
if(config.getProxyAddress() != null) {
connectTarget = config.getProxyAddress();
} else {
connectTarget = remoteAddress;
}
-
+
Channels.connect(sendChannel, connectTarget);
}
-
+
public void onDisconnectRequest(final ChannelFuture disconnectFuture) {
ChannelFutureListener disconnectListener = new ConsolidatingFutureListener(disconnectFuture, 2);
sendChannel.disconnect().addListener(disconnectListener);
@@ -126,13 +126,13 @@
}
});
}
-
+
public void onBindRequest(SocketAddress localAddress, final ChannelFuture bindFuture) {
ChannelFutureListener bindListener = new ConsolidatingFutureListener(bindFuture, 2);
sendChannel.bind(localAddress).addListener(bindListener);
pollChannel.bind(localAddress).addListener(bindListener);
}
-
+
public void onUnbindRequest(final ChannelFuture unbindFuture) {
ChannelFutureListener unbindListener = new ConsolidatingFutureListener(unbindFuture, 2);
sendChannel.unbind().addListener(unbindListener);
@@ -144,7 +144,7 @@
sendChannel.close().addListener(closeListener);
pollChannel.close().addListener(closeListener);
}
-
+
public void onTunnelOpened(String tunnelId) {
this.tunnelId = tunnelId;
setTunnelIdForPollChannel();
@@ -153,27 +153,27 @@

private ChannelPipeline createSendPipeline() {
ChannelPipeline pipeline = Channels.pipeline();
-
+
pipeline.addLast("reqencoder", new HttpRequestEncoder()); // downstream
pipeline.addLast("respdecoder", new HttpResponseDecoder()); // upstream
pipeline.addLast("aggregator", new HttpChunkAggregator(HttpTunnelMessageUtils.MAX_BODY_SIZE)); // upstream
pipeline.addLast("sendHandler", new HttpTunnelClientSendHandler(this)); // both
pipeline.addLast("writeFragmenter", new WriteFragmenter(HttpTunnelMessageUtils.MAX_BODY_SIZE));
-
+
return pipeline;
}

private ChannelPipeline createPollPipeline() {
ChannelPipeline pipeline = Channels.pipeline();
-
+
pipeline.addLast("reqencoder", new HttpRequestEncoder()); // downstream
pipeline.addLast("respdecoder", new HttpResponseDecoder()); // upstream
pipeline.addLast("aggregator", new HttpChunkAggregator(HttpTunnelMessageUtils.MAX_BODY_SIZE)); // upstream
pipeline.addLast(HttpTunnelClientPollHandler.NAME, new HttpTunnelClientPollHandler(this)); // both
-
+
return pipeline;
}
-
+
private void setTunnelIdForPollChannel() {
HttpTunnelClientPollHandler pollHandler = pollChannel.getPipeline().get(HttpTunnelClientPollHandler.class);
pollHandler.setTunnelId(tunnelId);
@@ -181,11 +181,11 @@

public void fullyEstablished() {
if(!bound) {
- this.bound = true;
+ bound = true;
Channels.fireChannelBound(this, getLocalAddress());
}
-
- this.connected = true;
+
+ connected = true;
connectFuture.setSuccess();
Channels.fireChannelConnected(this, getRemoteAddress());
}
@@ -203,25 +203,25 @@
}
});
}
-
+
public String getServerHostName() {
if(serverHostName == null) {
- serverHostName = HttpTunnelMessageUtils.convertToHostString(serverAddress);
+ serverHostName = HttpTunnelMessageUtils.convertToHostString(serverAddress);
}
-
- return serverHostName;
+
+ return serverHostName;
}
-
+
private class ConsolidatingFutureListener implements ChannelFutureListener {

- private ChannelFuture completionFuture;
- private AtomicInteger eventsLeft;
+ private final ChannelFuture completionFuture;
+ private final AtomicInteger eventsLeft;

public ConsolidatingFutureListener(ChannelFuture completionFuture, int numToConsolidate) {
this.completionFuture = completionFuture;
eventsLeft = new AtomicInteger(numToConsolidate);
}
-
+
public void operationComplete(ChannelFuture future) throws Exception {
if(!future.isSuccess()) {
completionFuture.setFailure(future.getCause());

Modified: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelConfig.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelConfig.java 2009-11-24 03:29:26 UTC (rev 1915)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelConfig.java 2009-11-24 03:58:04 UTC (rev 1916)
@@ -15,27 +15,26 @@
*/
package org.jboss.netty.channel.socket.httptunnel;

-import java.net.Socket;
import java.net.SocketAddress;

import org.jboss.netty.channel.DefaultChannelConfig;
import org.jboss.netty.channel.socket.SocketChannelConfig;

/**
- * Configuration for the client end of an HTTP tunnel. Any socket channel properties set here
- * will be applied uniformly to the underlying send and poll channels, created from the channel
+ * Configuration for the client end of an HTTP tunnel. Any socket channel properties set here
+ * will be applied uniformly to the underlying send and poll channels, created from the channel
* factory provided to the {@link HttpTunnelClientChannelFactory}.
* <p>
* HTTP tunnel clients have the following additional options:
- *
+ *
* <table border="1" cellspacing="0" cellpadding="6">
* <tr>
* <th>Name</th><th>Associated setter method</th>
* </tr><tr>
- * <td>{@code "proxyAddress"}</td><td>{@link #setProxyAddress(Socket)}</td>
+ * <td>{@code "proxyAddress"}</td><td>{@link #setProxyAddress(SocketAddress)}</td>
* </tr>
* </table>
- *
+ *
* @author The Netty Project ([hidden email])
* @author Iain McGinniss ([hidden email])
* @version $Rev$, $Date$
@@ -43,34 +42,34 @@
public class HttpTunnelClientChannelConfig extends DefaultChannelConfig implements SocketChannelConfig {

public static final String PROXY_ADDRESS_OPTION = "proxyAddress";
-
+
private final SocketChannelConfig sendChannelConfig;
private final SocketChannelConfig pollChannelConfig;
-
+
private SocketAddress proxyAddress;

public HttpTunnelClientChannelConfig(SocketChannelConfig sendChannelConfig, SocketChannelConfig pollChannelConfig) {
this.sendChannelConfig = sendChannelConfig;
this.pollChannelConfig = pollChannelConfig;
}
-
+
/* HTTP TUNNEL SPECIFIC CONFIGURATION */
-
+
@Override
public boolean setOption(String key, Object value) {
if(super.setOption(key, value)) {
return true;
}
-
+
if(PROXY_ADDRESS_OPTION.equals(key)) {
setProxyAddress((SocketAddress) value);
} else {
return false;
}
-
+
return true;
}
-
+
/**
* @return the address of the http proxy. If this is null, then no proxy
* should be used.
@@ -78,7 +77,7 @@
public SocketAddress getProxyAddress() {
return proxyAddress;
}
-
+
/**
* Specify a proxy to be used for the http tunnel. If this is null, then
* no proxy should be used, otherwise this should be a directly accessible IPv4/IPv6
@@ -87,7 +86,7 @@
public void setProxyAddress(SocketAddress proxyAddress) {
this.proxyAddress = proxyAddress;
}
-
+
/* GENERIC SOCKET CHANNEL CONFIGURATION */

public int getReceiveBufferSize() {

Modified: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientSendHandler.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientSendHandler.java 2009-11-24 03:29:26 UTC (rev 1915)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientSendHandler.java 2009-11-24 03:58:04 UTC (rev 1916)
@@ -42,28 +42,29 @@
class HttpTunnelClientSendHandler extends SimpleChannelHandler {

public static final String NAME = "client2server";
-
+
private static final Logger LOG = Logger.getLogger(HttpTunnelClientSendHandler.class.getName());
-
- private HttpTunnelClientWorkerOwner tunnelChannel;
-
+
+ private final HttpTunnelClientWorkerOwner tunnelChannel;
+
private String tunnelId = null;
+ // FIXME Unused field - safe to remove?
private String host;
-
- private AtomicBoolean disconnecting;
+
+ private final AtomicBoolean disconnecting;
private ChannelStateEvent postShutdownEvent;
- private ConcurrentLinkedQueue<MessageEvent> queuedWrites;
- private AtomicInteger pendingRequestCount;
+ private final ConcurrentLinkedQueue<MessageEvent> queuedWrites;
+ private final AtomicInteger pendingRequestCount;

private long sendRequestTime;
-
+
public HttpTunnelClientSendHandler(HttpTunnelClientWorkerOwner tunnelChannel) {
this.tunnelChannel = tunnelChannel;
queuedWrites = new ConcurrentLinkedQueue<MessageEvent>();
pendingRequestCount = new AtomicInteger(0);
disconnecting = new AtomicBoolean(false);
}
-
+
@Override
public void channelConnected(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
if(tunnelId == null) {
@@ -76,17 +77,17 @@
sendQueuedData(ctx);
}
}
-
+
@Override
public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
HttpResponse response = (HttpResponse)e.getMessage();
-
+
if(HttpTunnelMessageUtils.isOKResponse(response)) {
long roundTripTime = System.nanoTime() - sendRequestTime;
LOG.log(Level.FINE, "OK response received for tunnel {0}, after {1}ns", new Object[] { tunnelId, roundTripTime });
sendNextAfterResponse(ctx);
} else if(HttpTunnelMessageUtils.isTunnelOpenResponse(response)) {
- this.tunnelId = HttpTunnelMessageUtils.extractCookie(response);
+ tunnelId = HttpTunnelMessageUtils.extractCookie(response);
LOG.log(Level.INFO, "tunnel open request accepted - id {0}", tunnelId);
tunnelChannel.onTunnelOpened(tunnelId);
sendNextAfterResponse(ctx);
@@ -110,7 +111,7 @@
sendQueuedData(ctx);
}
}
-
+
private synchronized void sendQueuedData(ChannelHandlerContext ctx) {
if(disconnecting.get()) {
LOG.log(Level.FINE, "sending close request for tunnel {0}", tunnelId);
@@ -142,22 +143,22 @@
LOG.log(Level.FINE, "write request for tunnel {0} queued", tunnelId);
}
}
-
+
@Override
public void closeRequested(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
shutdownTunnel(ctx, e);
}
-
+
@Override
public void disconnectRequested(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
shutdownTunnel(ctx, e);
}
-
+
@Override
public void unbindRequested(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
shutdownTunnel(ctx, e);
}
-
+
private void shutdownTunnel(ChannelHandlerContext ctx, ChannelStateEvent postShutdownEvent) {
LOG.log(Level.INFO, "tunnel shutdown requested for send channel of tunnel {0}", tunnelId);
if(!ctx.getChannel().isConnected()) {
@@ -165,20 +166,20 @@
ctx.sendDownstream(postShutdownEvent);
return;
}
-
+
if(!disconnecting.compareAndSet(false, true)) {
LOG.log(Level.WARNING, "tunnel shutdown process already initiated for tunnel {0}", tunnelId);
return;
}
-
+
this.postShutdownEvent = postShutdownEvent;
-
+
// if the channel is idle, send a close request immediately
if(pendingRequestCount.incrementAndGet() == 1) {
sendQueuedData(ctx);
}
}
-
+
public String getTunnelId() {
return tunnelId;
}

Modified: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelSink.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelSink.java 2009-11-24 03:29:26 UTC (rev 1915)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelSink.java 2009-11-24 03:58:04 UTC (rev 1916)
@@ -33,9 +33,9 @@
class HttpTunnelServerChannelSink extends AbstractChannelSink {

private ServerSocketChannel realChannel;
-
+
public void eventSunk(ChannelPipeline pipeline, ChannelEvent e) throws Exception {
-
+
if(e instanceof ChannelStateEvent) {
ChannelStateEvent ev = (ChannelStateEvent) e;
switch(ev.getState()) {
@@ -58,7 +58,7 @@
private final class ChannelFutureProxy implements ChannelFutureListener {
private final ChannelFuture upstreamFuture;

- private ChannelFutureProxy(ChannelFuture upstreamFuture) {
+ ChannelFutureProxy(ChannelFuture upstreamFuture) {
this.upstreamFuture = upstreamFuture;
}

Modified: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitch.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitch.java 2009-11-24 03:29:26 UTC (rev 1915)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitch.java 2009-11-24 03:58:04 UTC (rev 1916)
@@ -40,13 +40,13 @@
class ServerMessageSwitch implements ServerMessageSwitchUpstreamInterface, ServerMessageSwitchDownstreamInterface {

private static final Logger LOG = Logger.getLogger(ServerMessageSwitch.class.getName());
-
- private String tunnelIdPrefix;
- private AtomicInteger tunnelIdSequence;
-
- private HttpTunnelAcceptedChannelFactory newChannelFactory;
- private ConcurrentHashMap<String, TunnelInfo> tunnelsById;
-
+
+ private final String tunnelIdPrefix;
+ private final AtomicInteger tunnelIdSequence;
+
+ private final HttpTunnelAcceptedChannelFactory newChannelFactory;
+ private final ConcurrentHashMap<String, TunnelInfo> tunnelsById;
+
public ServerMessageSwitch(HttpTunnelAcceptedChannelFactory newChannelFactory) {
this.newChannelFactory = newChannelFactory;
tunnelIdPrefix = Long.toHexString(new Random().nextLong());
@@ -75,13 +75,13 @@
Channels.write(channel, HttpTunnelMessageUtils.createRejection(null, "Unknown tunnel, possibly already closed"));
return;
}
-
+
if(!tunnel.responseChannel.compareAndSet(null, channel)) {
LOG.log(Level.WARNING, "Duplicate poll request detected for tunnel {0}", tunnelId);
Channels.write(channel, HttpTunnelMessageUtils.createRejection(null, "Only one poll request at a time per tunnel allowed"));
return;
}
-
+
sendQueuedData(tunnel);
}

@@ -91,13 +91,13 @@
// no data to send, or it has already been dealt with by another thread
return;
}
-
+
Channel responseChannel = state.responseChannel.getAndSet(null);
if(responseChannel == null) {
// no response channel, or another thread has already used it
return;
}
-
+
LOG.log(Level.FINE, "sending response for tunnel id {0} to {1}", new Object[] { state.tunnelId, responseChannel.getRemoteAddress() });
QueuedResponse messageToSend = queuedData.poll();
HttpResponse response = HttpTunnelMessageUtils.createRecvDataResponse(messageToSend.data);
@@ -118,11 +118,11 @@
if(tunnel == null) {
return;
}
-
+
LOG.log(Level.FINE, "routing inbound data for tunnel {0}", tunnelId);
Channels.fireMessageReceived(tunnel.localChannel, inboundData);
}
-
+
public void closeTunnel(String tunnelId) {
tunnelsById.remove(tunnelId);
}
@@ -134,34 +134,38 @@
LOG.log(Level.WARNING, "attempt made to send data out on tunnel id {0} which is unknown or closed", tunnelId);
return;
}
-
+
WriteSplitter splitter = new WriteSplitter(HttpTunnelMessageUtils.MAX_BODY_SIZE);
-
+
ChannelFutureAggregator aggregator = new ChannelFutureAggregator(writeFuture);
List<ChannelBuffer> fragments = splitter.split(data);
-
+
LOG.log(Level.FINE, "routing outbound data for tunnel {0}", tunnelId);
for(ChannelBuffer fragment : fragments) {
ChannelFuture fragmentFuture = Channels.future(writeFuture.getChannel());
aggregator.addFuture(fragmentFuture);
tunnel.queuedResponses.offer(new QueuedResponse(fragment, fragmentFuture));
}
-
+
sendQueuedData(tunnel);
}
-
- private class TunnelInfo {
+
+ private static final class TunnelInfo {
public String tunnelId;
public Channel localChannel;
public AtomicReference<Channel> responseChannel = new AtomicReference<Channel>(null);
public ConcurrentLinkedQueue<QueuedResponse> queuedResponses = new ConcurrentLinkedQueue<QueuedResponse>();
+
+ TunnelInfo() {
+ super();
+ }
}
-
- private class QueuedResponse {
+
+ private static final class QueuedResponse {
public ChannelBuffer data;
public ChannelFuture writeFuture;
-
- public QueuedResponse(ChannelBuffer data, ChannelFuture writeFuture) {
+
+ QueuedResponse(ChannelBuffer data, ChannelFuture writeFuture) {
this.data = data;
this.writeFuture = writeFuture;
}

Modified: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/WriteFragmenter.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/WriteFragmenter.java 2009-11-24 03:29:26 UTC (rev 1915)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/WriteFragmenter.java 2009-11-24 03:58:04 UTC (rev 1916)
@@ -28,13 +28,13 @@

/**
* Downstream handler which places an upper bound on the size of written
- * {@link org.jboss.netty.ChannelBuffer ChannelBuffers}. If a buffer
+ * {@link ChannelBuffer ChannelBuffers}. If a buffer
* is bigger than the specified upper bound, the buffer is broken up
* into two or more smaller pieces.
* <p>
* This is utilised by the http tunnel to smooth out the per-byte latency,
* by placing an upper bound on HTTP request / response body sizes.
- *
+ *
* @author The Netty Project ([hidden email])
* @author Iain McGinniss ([hidden email])
* @version $Rev$, $Date$
@@ -48,15 +48,15 @@
public WriteFragmenter(int splitThreshold) {
this.splitThreshold = splitThreshold;
}
-
+
public void setSplitThreshold(int splitThreshold) {
this.splitThreshold = splitThreshold;
}
-
+
@Override
public void writeRequested(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
ChannelBuffer data = (ChannelBuffer)e.getMessage();
-
+
if(data.readableBytes() <= splitThreshold) {
super.writeRequested(ctx, e);
} else {

Modified: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/AcceptedServerChannelRequestDispatchTest.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/AcceptedServerChannelRequestDispatchTest.java 2009-11-24 03:29:26 UTC (rev 1915)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/AcceptedServerChannelRequestDispatchTest.java 2009-11-24 03:58:04 UTC (rev 1916)
@@ -27,16 +27,16 @@
public class AcceptedServerChannelRequestDispatchTest {

private static final String HOST = "test.server.com";
-
+
private static final String KNOWN_TUNNEL_ID = "1";
protected static final String UNKNOWN_TUNNEL_ID = "unknownTunnel";

- private JUnit4Mockery mockContext = new JUnit4Mockery();
-
+ private final JUnit4Mockery mockContext = new JUnit4Mockery();
+
private AcceptedServerChannelRequestDispatch handler;
- private FakeSocketChannel channel;
+ FakeSocketChannel channel;
private FakeChannelSink sink;
- private ServerMessageSwitchUpstreamInterface messageSwitch;
+ ServerMessageSwitchUpstreamInterface messageSwitch;

@Before
public void setUp() throws Exception {
@@ -47,49 +47,49 @@
sink = new FakeChannelSink();
channel = new FakeSocketChannel(null, null, pipeline, sink);
channel.remoteAddress = InetSocketAddress.createUnresolved("test.client.com", 51231);
-
+
mockContext.checking(new Expectations() {{
ignoring(messageSwitch).isOpenTunnel(KNOWN_TUNNEL_ID); will(returnValue(true));
}});
}
-
+
@Test
public void testTunnelOpenRequest() {
mockContext.checking(new Expectations() {{
one(messageSwitch).createTunnel(channel.remoteAddress); will(returnValue(KNOWN_TUNNEL_ID));
}});
-
+
Channels.fireMessageReceived(channel, HttpTunnelMessageUtils.createOpenTunnelRequest(HOST));
assertEquals(1, sink.events.size());
HttpResponse response = NettyTestUtils.checkIsDownstreamMessageEvent(sink.events.poll(), HttpResponse.class);
assertTrue(HttpTunnelMessageUtils.isTunnelOpenResponse(response));
}
-
+
@Test
public void testTunnelCloseRequest() {
mockContext.checking(new Expectations() {{
one(messageSwitch).closeTunnel(KNOWN_TUNNEL_ID);
}});
-
+
HttpRequest request = HttpTunnelMessageUtils.createCloseTunnelRequest(HOST, KNOWN_TUNNEL_ID);
Channels.fireMessageReceived(channel, request);
assertEquals(1, sink.events.size());
HttpResponse response = NettyTestUtils.checkIsDownstreamMessageEvent(sink.events.poll(), HttpResponse.class);
assertTrue(HttpTunnelMessageUtils.isTunnelCloseResponse(response));
}
-
+
@Test
public void testTunnelCloseRequestWithoutTunnelIdRejected() {
HttpRequest request = HttpTunnelMessageUtils.createCloseTunnelRequest(HOST, null);
checkRequestWithoutTunnelIdIsRejected(request);
}
-
+
@Test
public void testTunnelCloseRequestWithUnknownTunnelId() {
HttpRequest request = HttpTunnelMessageUtils.createCloseTunnelRequest(HOST, UNKNOWN_TUNNEL_ID);
checkRequestWithUnknownTunnelIdIsRejected(request);
}
-
+
@Test
public void testSendDataRequest() {
final ChannelBuffer expectedData = ChannelBuffers.dynamicBuffer();
@@ -97,36 +97,36 @@
mockContext.checking(new Expectations() {{
one(messageSwitch).routeInboundData(KNOWN_TUNNEL_ID, expectedData);
}});
-
+
HttpRequest request = HttpTunnelMessageUtils.createSendDataRequest(HOST, KNOWN_TUNNEL_ID, expectedData);
Channels.fireMessageReceived(channel, request);
-
+
assertEquals(1, sink.events.size());
HttpResponse response = NettyTestUtils.checkIsDownstreamMessageEvent(sink.events.poll(), HttpResponse.class);
assertTrue(HttpTunnelMessageUtils.isOKResponse(response));
}
-
+
@Test
public void testSendDataRequestWithNoContentRejected() {
HttpRequest request = HttpTunnelMessageUtils.createSendDataRequest(HOST, KNOWN_TUNNEL_ID, ChannelBuffers.dynamicBuffer());
Channels.fireMessageReceived(channel, request);
-
+
assertEquals(1, sink.events.size());
checkResponseIsRejection("Send data requests must contain data");
}
-
+
@Test
public void testSendDataRequestForUnknownTunnelIdRejected() {
HttpRequest request = HttpTunnelMessageUtils.createSendDataRequest(HOST, UNKNOWN_TUNNEL_ID, ChannelBuffers.dynamicBuffer());
checkRequestWithUnknownTunnelIdIsRejected(request);
}
-
+
@Test
public void testSendDataRequestWithoutTunnelIdRejected() {
HttpRequest request = HttpTunnelMessageUtils.createSendDataRequest(HOST, null, ChannelBuffers.dynamicBuffer());
checkRequestWithoutTunnelIdIsRejected(request);
}
-
+
@Test
public void testReceiveDataRequest() {
mockContext.checking(new Expectations() {{
@@ -135,39 +135,39 @@
HttpRequest request = HttpTunnelMessageUtils.createReceiveDataRequest(HOST, KNOWN_TUNNEL_ID);
Channels.fireMessageReceived(channel, request);
}
-
+
@Test
public void testReceiveDataRequestWithoutTunnelIdRejected() {
HttpRequest request = HttpTunnelMessageUtils.createReceiveDataRequest(HOST, null);
checkRequestWithoutTunnelIdIsRejected(request);
}
-
+
@Test
public void testReceiveDataRequestForUnknownTunnelIdRejected() {
HttpRequest request = HttpTunnelMessageUtils.createReceiveDataRequest(HOST, UNKNOWN_TUNNEL_ID);
checkRequestWithUnknownTunnelIdIsRejected(request);
}
-
+
private void checkRequestWithoutTunnelIdIsRejected(HttpRequest request) {
Channels.fireMessageReceived(channel, request);
assertEquals(1, sink.events.size());
-
+
HttpResponse response = NettyTestUtils.checkIsDownstreamMessageEvent(sink.events.poll(), HttpResponse.class);
assertTrue(HttpTunnelMessageUtils.isRejection(response));
assertEquals("no tunnel id specified in send data request", HttpTunnelMessageUtils.extractErrorMessage(response));
}
-
+
private void checkRequestWithUnknownTunnelIdIsRejected(HttpRequest request) {
mockContext.checking(new Expectations() {{
one(messageSwitch).isOpenTunnel(UNKNOWN_TUNNEL_ID); will(returnValue(false));
}});
-
+
Channels.fireMessageReceived(channel, request);
assertEquals(1, sink.events.size());
-
+
checkResponseIsRejection("tunnel id \"unknownTunnel\" is either closed or does not exist");
}
-
+
private void checkResponseIsRejection(String errorMessage) {
HttpResponse response = NettyTestUtils.checkIsDownstreamMessageEvent(sink.events.poll(), HttpResponse.class);
assertTrue(HttpTunnelMessageUtils.isRejection(response));

Modified: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannelSinkTest.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannelSinkTest.java 2009-11-24 03:29:26 UTC (rev 1915)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannelSinkTest.java 2009-11-24 03:58:04 UTC (rev 1916)
@@ -22,12 +22,12 @@
public class HttpTunnelAcceptedChannelSinkTest {

private static final String TUNNEL_ID = "1";
- private JUnit4Mockery mockContext = new JUnit4Mockery();
- private ServerMessageSwitchDownstreamInterface messageSwitch;
+ private final JUnit4Mockery mockContext = new JUnit4Mockery();
+ ServerMessageSwitchDownstreamInterface messageSwitch;
private HttpTunnelAcceptedChannelSink sink;
private FakeSocketChannel channel;
private UpstreamEventCatcher upstreamCatcher;
-
+
@Before
public void setUp() throws Exception {
messageSwitch = mockContext.mock(ServerMessageSwitchDownstreamInterface.class);
@@ -42,21 +42,21 @@
@Test
public void testSendData() {
final ChannelBuffer outboundData = NettyTestUtils.createData(1234L);
-
+
mockContext.checking(new Expectations() {{
one(messageSwitch).routeOutboundData(with(equal(TUNNEL_ID)), with(same(outboundData)), with(any(ChannelFuture.class)));
}});
-
+
Channels.write(channel, outboundData);
}
-
+
@Test
public void testSendInvalidDataType() {
Channels.write(channel, new Object());
assertEquals(1, upstreamCatcher.events.size());
NettyTestUtils.checkIsExceptionEvent(upstreamCatcher.events.poll());
}
-
+
@Test
public void testUnbind() {
mockContext.checking(new Expectations() {{
@@ -64,13 +64,13 @@
}});
Channels.unbind(channel);
}
-
+
@Test
public void testDisconnect() {
mockContext.checking(new Expectations() {{
one(messageSwitch).closeTunnel(TUNNEL_ID);
}});
-
+
Channels.disconnect(channel);
}
}

Modified: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientSendHandlerTest.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientSendHandlerTest.java 2009-11-24 03:29:26 UTC (rev 1915)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientSendHandlerTest.java 2009-11-24 03:58:04 UTC (rev 1916)
@@ -20,7 +20,7 @@
* @author [hidden email]
*/
public class HttpTunnelClientSendHandlerTest {
-
+
private static final InetSocketAddress SERVER_ADDRESS = createAddress(new byte[] { 10, 0, 0, 3 }, 12345);
private static final InetSocketAddress PROXY_ADDRESS = createAddress(new byte[] { 10, 0, 0, 2 }, 8888);
private static final InetSocketAddress LOCAL_ADDRESS = createAddress(new byte[] { 10, 0, 0, 1 }, 54321);
@@ -29,7 +29,7 @@
private HttpTunnelClientSendHandler handler;

private MockChannelStateListener listener;
-
+
@Before
public void setUp() {
sink = new FakeChannelSink();
@@ -42,7 +42,7 @@
channel.remoteAddress = PROXY_ADDRESS;
channel.localAddress = LOCAL_ADDRESS;
}
-
+
private static InetSocketAddress createAddress(byte[] addr, int port) {
try {
return new InetSocketAddress(InetAddress.getByAddress(addr), port);
@@ -59,7 +59,7 @@
assertTrue(HttpTunnelMessageUtils.isOpenTunnelRequest(request));
assertTrue(HttpTunnelMessageUtils.checkHost(request, SERVER_ADDRESS));
}
-
+
@Test
public void testStoresTunnelId() throws Exception {
emulateConnect();
@@ -67,7 +67,7 @@
assertEquals("newTunnel", handler.getTunnelId());
assertEquals("newTunnel", listener.tunnelId);
}
-
+
@Test
public void testSendData() {
emulateConnectAndOpen();
@@ -76,38 +76,38 @@
ChannelEvent sentEvent = sink.events.poll();
checkIsSendDataRequestWithData(sentEvent, "10.0.0.2:12345", NettyTestUtils.createData(1234L));
}
-
+
@Test
public void testWillNotSendDataUntilTunnelIdSet() {
emulateConnect();
channel.write(NettyTestUtils.createData(1234L));
-
+
assertEquals(0, sink.events.size());
-
+
Channels.fireChannelConnected(channel, PROXY_ADDRESS);
assertEquals(1, sink.events.size());
}
-
+
@Test
public void testOnlyOneRequestAtATime() {
emulateConnectAndOpen();
-
+
channel.write(NettyTestUtils.createData(1234L));
assertEquals(1, sink.events.size());
checkIsSendDataRequestWithData(sink.events.poll(), "10.0.0.2:12345", NettyTestUtils.createData(1234L));

channel.write(NettyTestUtils.createData(5678L));
assertEquals(0, sink.events.size());
-
+
Channels.fireMessageReceived(channel, HttpTunnelMessageUtils.createSendDataResponse());
assertEquals(1, sink.events.size());
checkIsSendDataRequestWithData(sink.events.poll(), "10.0.0.2:12345", NettyTestUtils.createData(5678L));
}
-
+
@Test
public void testDisconnect() {
emulateConnectAndOpen();
-
+
channel.write(NettyTestUtils.createData(1234L));
assertEquals(1, sink.events.size());
checkIsSendDataRequestWithData(sink.events.poll(), "10.0.0.2:12345", NettyTestUtils.createData(1234L));
@@ -115,7 +115,7 @@
channel.disconnect();
Channels.fireMessageReceived(channel, HttpTunnelMessageUtils.createSendDataResponse());
assertEquals(1, sink.events.size());
-
+
HttpRequest request = NettyTestUtils.checkIsDownstreamMessageEvent(sink.events.poll(), HttpRequest.class);
assertTrue(HttpTunnelMessageUtils.isCloseTunnelRequest(request));
assertEquals("newTunnel", HttpTunnelMessageUtils.extractTunnelId(request));
@@ -123,11 +123,11 @@
assertEquals(1, sink.events.size());
NettyTestUtils.checkIsStateEvent(sink.events.poll(), ChannelState.CONNECTED, null);
}
-
+
@Test
public void testClose() {
emulateConnectAndOpen();
-
+
channel.close();
assertEquals(1, sink.events.size());
HttpRequest request = NettyTestUtils.checkIsDownstreamMessageEvent(sink.events.poll(), HttpRequest.class);
@@ -137,7 +137,7 @@
assertEquals(1, sink.events.size());
NettyTestUtils.checkIsStateEvent(sink.events.poll(), ChannelState.OPEN, false);
}
-
+
@Test
public void testWritesAfterCloseAreRejected() {
emulateConnectAndOpen();
@@ -145,7 +145,8 @@
channel.close();
assertFalse(channel.write(NettyTestUtils.createData(1234L)).isSuccess());
}
-
+
+ // FIXME expectedHost is unused. Safe to remove?
private void checkIsSendDataRequestWithData(ChannelEvent event, String expectedHost, ChannelBuffer data) {
assertTrue(event instanceof DownstreamMessageEvent);
DownstreamMessageEvent messageEvent = (DownstreamMessageEvent) event;
@@ -153,7 +154,7 @@
HttpRequest request = (HttpRequest) messageEvent.getMessage();
assertTrue(HttpTunnelMessageUtils.isSendDataRequest(request));
assertEquals(data.readableBytes(), request.getContentLength());
-
+
ChannelBuffer content = request.getContent();
NettyTestUtils.assertEquals(data, content);
}
@@ -162,11 +163,11 @@
channel.emulateConnected(LOCAL_ADDRESS, PROXY_ADDRESS, null);
sink.events.clear();
}
-
+
private void emulateConnectAndOpen() {
emulateConnect();
Channels.fireMessageReceived(channel, HttpTunnelMessageUtils.createTunnelOpenResponse("newTunnel"));
-
+
sink.events.clear();
}
}

Modified: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelFactoryTest.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelFactoryTest.java 2009-11-24 03:29:26 UTC (rev 1915)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelFactoryTest.java 2009-11-24 03:58:04 UTC (rev 1916)
@@ -21,12 +21,12 @@
@RunWith(JMock.class)
public class HttpTunnelServerChannelFactoryTest {

- private JUnit4Mockery mockContext = new JUnit4Mockery();
- private ServerSocketChannelFactory realChannelFactory;
+ private final JUnit4Mockery mockContext = new JUnit4Mockery();
+ ServerSocketChannelFactory realChannelFactory;
private HttpTunnelServerChannelFactory factory;
-
- private ServerSocketChannel realChannel;
-
+
+ ServerSocketChannel realChannel;
+
@Before
public void setUp() throws Exception {
realChannelFactory = mockContext.mock(ServerSocketChannelFactory.class);
@@ -45,14 +45,14 @@
assertNotNull(newChannel);
assertSame(pipeline, newChannel.getPipeline());
}
-
+
@Test
public void testNewChannel_forwardsWrappedFactoryFailure() {
final ChannelException innerException = new ChannelException();
mockContext.checking(new Expectations() {{
one(realChannelFactory).newChannel(with(any(ChannelPipeline.class))); will(throwException(innerException));
}});
-
+
try {
factory.newChannel(Channels.pipeline());
fail("Expected ChannelException");
@@ -60,17 +60,17 @@
assertSame(innerException, e);
}
}
-
+
// @Test
// public void testChannelCreation_withServerBootstrap() {
// mockContext.checking(new Expectations() {{
// one(realChannelFactory).newChannel(with(any(ChannelPipeline.class))); will(returnValue(realChannel));
// }});
-//
+//
// ServerBootstrap bootstrap = new ServerBootstrap(factory);
// Channel newChannel = bootstrap.bind(new InetSocketAddress(80));
// assertNotNull(newChannel);
-//
+//
// }
-
+
}

Modified: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelSinkTest.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelSinkTest.java 2009-11-24 03:29:26 UTC (rev 1915)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelSinkTest.java 2009-11-24 03:58:04 UTC (rev 1916)
@@ -27,16 +27,16 @@
@RunWith(JMock.class)
public class HttpTunnelServerChannelSinkTest {

- private JUnit4Mockery mockContext = new JUnit4Mockery();
-
+ private final JUnit4Mockery mockContext = new JUnit4Mockery();
+
private HttpTunnelServerChannelSink sink;
private ChannelPipeline pipeline;
private FakeSocketChannel channel;
- private ServerSocketChannel realChannel;
-
- private ChannelFuture realFuture;
- private Throwable exceptionInPipeline;
+ ServerSocketChannel realChannel;

+ ChannelFuture realFuture;
+ Throwable exceptionInPipeline;
+
@Before
public void setUp() throws Exception {
realChannel = mockContext.mock(ServerSocketChannel.class);
@@ -47,18 +47,18 @@
channel = new FakeSocketChannel(null, null, pipeline, sink);
realFuture = Channels.future(realChannel);
}
-
+
@After
public void teardown() throws Exception {
assertTrue("exception caught in pipeline: " + exceptionInPipeline, exceptionInPipeline == null);
}
-
+
@Test
public void testCloseRequest() throws Exception {
mockContext.checking(new Expectations() {{
- one(realChannel).close(); will(returnValue(realFuture));
+// one(realChannel).close(); will(returnValue(realFuture));
}});
-
+
ChannelFuture virtualFuture1 = Channels.close(channel);
mockContext.assertIsSatisfied();
ChannelFuture virtualFuture = virtualFuture1;
@@ -72,7 +72,7 @@
realFuture.setSuccess();
assertTrue(virtualFuture.isSuccess());
}
-
+
@Test
public void testUnbindRequest_withFailure() throws Exception {
ChannelFuture virtualFuture = checkUnbind();
@@ -84,19 +84,19 @@
mockContext.checking(new Expectations() {{
one(realChannel).unbind(); will(returnValue(realFuture));
}});
-
+
ChannelFuture virtualFuture = Channels.unbind(channel);
mockContext.assertIsSatisfied();
return virtualFuture;
}
-
+
@Test
public void testBindRequest_withSuccess() {
ChannelFuture virtualFuture = checkBind();
realFuture.setSuccess();
assertTrue(virtualFuture.isSuccess());
}
-
+
@Test
public void testBindRequest_withFailure() {
ChannelFuture virtualFuture = checkBind();
@@ -109,16 +109,21 @@
mockContext.checking(new Expectations() {{
one(realChannel).bind(toAddress); will(returnValue(realFuture));
}});
-
+
ChannelFuture virtualFuture = Channels.bind(channel, toAddress);
return virtualFuture;
}
-
+
@ChannelPipelineCoverage("one")
private final class ExceptionCatcher extends SimpleChannelUpstreamHandler {
+
+ ExceptionCatcher() {
+ super();
+ }
+
@Override
- public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e) throws Exception {
- exceptionInPipeline = e.getCause();
- }
+ public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e) throws Exception {
+ exceptionInPipeline = e.getCause();
+ }
}
}

Modified: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelSoakTester.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelSoakTester.java 2009-11-24 03:29:26 UTC (rev 1915)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelSoakTester.java 2009-11-24 03:58:04 UTC (rev 1916)
@@ -41,18 +41,18 @@

private static final int SERVER_PORT = 20100;

- private static final Logger LOG = Logger.getLogger(HttpTunnelSoakTester.class.getName());
+ static final Logger LOG = Logger.getLogger(HttpTunnelSoakTester.class.getName());

private final ServerBootstrap serverBootstrap;
private final ClientBootstrap clientBootstrap;
- private final ChannelGroup channels;
+ final ChannelGroup channels;

int expectedNextByte = 0;
int nextWriteByte = 0;

private final ExecutorService executor;
- private final ScheduledExecutorService scheduledExecutor;
- private final ConcurrentLinkedQueue<ChannelBuffer> verificationQueue;
+ final ScheduledExecutorService scheduledExecutor;
+ final ConcurrentLinkedQueue<ChannelBuffer> verificationQueue;

public HttpTunnelSoakTester() {
try {
@@ -246,7 +246,7 @@
return randomBytes;
}

- public static void main(String[] args) throws UnknownHostException {
+ public static void main(String[] args) throws Exception {
HttpTunnelSoakTester soakTester = new HttpTunnelSoakTester();
try {
soakTester.run();
@@ -263,7 +263,12 @@
}

@ChannelPipelineCoverage("one")
- private class EchoHandler extends SimpleChannelUpstreamHandler {
+ private static class EchoHandler extends SimpleChannelUpstreamHandler {
+
+ EchoHandler() {
+ super();
+ }
+
@Override
public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
Channels.write(ctx.getChannel(), e.getMessage());
@@ -272,6 +277,11 @@

@ChannelPipelineCoverage("one")
private class ResponseVerifier extends SimpleChannelUpstreamHandler {
+
+ ResponseVerifier() {
+ super();
+ }
+
@Override
public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
final ChannelBuffer receivedBytes = (ChannelBuffer) e.getMessage();
@@ -285,6 +295,11 @@
}

private class VerificationTask implements Runnable {
+
+ VerificationTask() {
+ super();
+ }
+
public void run() {
ChannelBuffer bytesToVerify = verificationQueue.poll();
if(bytesToVerify == null) {

Modified: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelTest.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelTest.java 2009-11-24 03:29:26 UTC (rev 1915)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelTest.java 2009-11-24 03:58:04 UTC (rev 1916)
@@ -41,29 +41,29 @@
private HttpTunnelServerChannelFactory serverFactory;
private ClientBootstrap clientBootstrap;
private ServerBootstrap serverBootstrap;
-
- private ChannelGroup activeConnections;
- private ChannelHandler clientCaptureHandler;
- private ServerEndHandler connectionCaptureHandler;
-
- private Channel serverEnd;
- private CountDownLatch serverEndLatch;
-
- private ChannelBuffer receivedBytes;
- private CountDownLatch messageReceivedLatch;
-
- private ChannelBuffer clientReceivedBytes;
- private CountDownLatch clientMessageReceivedLatch;
+
+ ChannelGroup activeConnections;
+ ChannelHandler clientCaptureHandler;
+ ServerEndHandler connectionCaptureHandler;
+
+ Channel serverEnd;
+ CountDownLatch serverEndLatch;
+
+ ChannelBuffer receivedBytes;
+ CountDownLatch messageReceivedLatch;
+
+ ChannelBuffer clientReceivedBytes;
+ CountDownLatch clientMessageReceivedLatch;
private Channel serverChannel;
-
+
@Before
public void setUp() throws UnknownHostException {
activeConnections = new DefaultChannelGroup();
clientFactory = new HttpTunnelClientChannelFactory(new NioClientSocketChannelFactory(Executors.newCachedThreadPool(), Executors.newCachedThreadPool()));
serverFactory = new HttpTunnelServerChannelFactory(new NioServerSocketChannelFactory(Executors.newCachedThreadPool(), Executors.newCachedThreadPool()));
-
+
clientBootstrap = new ClientBootstrap(clientFactory);
-
+
clientCaptureHandler = new ClientEndHandler();
clientBootstrap.setPipelineFactory(new ChannelPipelineFactory() {

@@ -73,30 +73,30 @@
return pipeline;
}
});
-
+
clientReceivedBytes = ChannelBuffers.dynamicBuffer();
clientMessageReceivedLatch = new CountDownLatch(1);
-
+
serverBootstrap = new ServerBootstrap(serverFactory);
-
+
connectionCaptureHandler = new ServerEndHandler();
serverBootstrap.setPipelineFactory(new ChannelPipelineFactory() {
-
+
public ChannelPipeline getPipeline() throws Exception {
ChannelPipeline pipeline = Channels.pipeline();
pipeline.addLast("capture", connectionCaptureHandler);
return pipeline;
}
});
-
+
serverEndLatch = new CountDownLatch(1);
receivedBytes = ChannelBuffers.dynamicBuffer();
messageReceivedLatch = new CountDownLatch(1);
-
+
serverChannel = serverBootstrap.bind(new InetSocketAddress(InetAddress.getLocalHost(), 12345));
activeConnections.add(serverChannel);
}
-
+
@After
public void tearDown() throws Exception {
activeConnections.disconnect().await(1000L);
@@ -110,55 +110,55 @@
assertTrue(connectFuture.await(1000L));
assertTrue(connectFuture.isSuccess());
assertNotNull(connectFuture.getChannel());
-
+
Channel clientChannel = connectFuture.getChannel();
activeConnections.add(clientChannel);
assertEquals(serverChannel.getLocalAddress(), clientChannel.getRemoteAddress());
-
+
assertTrue(serverEndLatch.await(1000, TimeUnit.MILLISECONDS));
assertNotNull(serverEnd);
assertEquals(clientChannel.getLocalAddress(), serverEnd.getRemoteAddress());
}
-
+
@Test
public void testSendDataFromClientToServer() throws Exception {
ChannelFuture connectFuture = clientBootstrap.connect(new InetSocketAddress(InetAddress.getLocalHost(), 12345));
assertTrue(connectFuture.await(1000L));
-
+
Channel clientEnd = connectFuture.getChannel();
activeConnections.add(clientEnd);
-
+
assertTrue(serverEndLatch.await(1000, TimeUnit.MILLISECONDS));
-
+
ChannelFuture writeFuture = Channels.write(clientEnd, NettyTestUtils.createData(100L));
assertTrue(writeFuture.await(1000L));
assertTrue(writeFuture.isSuccess());
-
+
assertTrue(messageReceivedLatch.await(1000L, TimeUnit.MILLISECONDS));
assertEquals(100L, receivedBytes.readLong());
}
-
+
@Test
public void testSendDataFromServerToClient() throws Exception {
ChannelFuture connectFuture = clientBootstrap.connect(new InetSocketAddress(InetAddress.getLocalHost(), 12345));
assertTrue(connectFuture.await(1000L));
-
+
Channel clientEnd = connectFuture.getChannel();
activeConnections.add(clientEnd);
-
+
assertTrue(serverEndLatch.await(1000, TimeUnit.MILLISECONDS));
-
+
ChannelFuture writeFuture = Channels.write(serverEnd, NettyTestUtils.createData(4321L));
assertTrue(writeFuture.await(1000L));
assertTrue(writeFuture.isSuccess());
-
+
assertTrue(clientMessageReceivedLatch.await(1000, TimeUnit.MILLISECONDS));
assertEquals(4321L, clientReceivedBytes.readLong());
}
-
+
@ChannelPipelineCoverage("one")
class ServerEndHandler extends SimpleChannelUpstreamHandler {
-
+
@Override
public void channelConnected(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
serverEnd = e.getChannel();
@@ -166,14 +166,14 @@
serverEndLatch.countDown();
super.channelConnected(ctx, e);
}
-
+
@Override
public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
receivedBytes.writeBytes((ChannelBuffer) e.getMessage());
messageReceivedLatch.countDown();
}
}
-
+
@ChannelPipelineCoverage("one")
class ClientEndHandler extends SimpleChannelUpstreamHandler {

Modified: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitchTest.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitchTest.java 2009-11-24 03:29:26 UTC (rev 1915)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitchTest.java 2009-11-24 03:58:04 UTC (rev 1916)
@@ -26,26 +26,26 @@
public class ServerMessageSwitchTest {

public static final InetSocketAddress REMOTE_ADDRESS = InetSocketAddress.createUnresolved("test.client.com", 52354);
-
- private JUnit4Mockery mockContext = new JUnit4Mockery();

+ private final JUnit4Mockery mockContext = new JUnit4Mockery();
+
private ServerMessageSwitch messageSwitch;
- private HttpTunnelAcceptedChannelFactory newChannelFactory;
+ HttpTunnelAcceptedChannelFactory newChannelFactory;

private UpstreamEventCatcher htunEventCatcher;
private FakeChannelSink responseCatcher;

private FakeSocketChannel htunChannel;
private FakeSocketChannel requesterChannel;
-
+
@Before
public void setUp() throws Exception {
newChannelFactory = mockContext.mock(HttpTunnelAcceptedChannelFactory.class);
messageSwitch = new ServerMessageSwitch(newChannelFactory);
-
+
final Channel htunAcceptedChannel = createTunnelChannel();
createRequesterChannel();
-
+
mockContext.checking(new Expectations() {{
one(newChannelFactory).newChannel(with(any(String.class)), with(equal(REMOTE_ADDRESS))); will(returnValue(htunAcceptedChannel));
}});
@@ -57,67 +57,67 @@
acceptedChannelPipeline.addLast(UpstreamEventCatcher.NAME, htunEventCatcher);
FakeSocketChannel htunAcceptedChannel = new FakeSocketChannel(null, null, acceptedChannelPipeline, new FakeChannelSink());
htunEventCatcher.events.clear();
-
+
return htunAcceptedChannel;
}
-
+
private FakeSocketChannel createRequesterChannel() {
ChannelPipeline requesterChannelPipeline = Channels.pipeline();
responseCatcher = new FakeChannelSink();
requesterChannel = new FakeSocketChannel(null, null, requesterChannelPipeline, responseCatcher);
responseCatcher.events.clear();
-
+
return requesterChannel;
}
-
+
@Test
public void testRouteInboundData() {
ChannelBuffer inboundData = ChannelBuffers.dynamicBuffer();
inboundData.writeLong(1234L);
-
+
String tunnelId = messageSwitch.createTunnel(REMOTE_ADDRESS);
messageSwitch.routeInboundData(tunnelId, inboundData);
assertEquals(1, htunEventCatcher.events.size());
ChannelBuffer receivedData = NettyTestUtils.checkIsUpstreamMessageEvent(htunEventCatcher.events.poll(), ChannelBuffer.class);
assertSame(receivedData, inboundData);
}
-
+
@Test
public void testRouteOutboundData_onPoll() {
ChannelBuffer outboundData = ChannelBuffers.dynamicBuffer();
outboundData.writeLong(1234L);
-
+
String tunnelId = messageSwitch.createTunnel(REMOTE_ADDRESS);
messageSwitch.routeOutboundData(tunnelId, outboundData, Channels.future(htunChannel));
messageSwitch.pollOutboundData(tunnelId, requesterChannel);
-
+
assertEquals(1, responseCatcher.events.size());
HttpResponse response = NettyTestUtils.checkIsDownstreamMessageEvent(responseCatcher.events.poll(), HttpResponse.class);
assertSame(outboundData, response.getContent());
}
-
+
@Test
public void testRouteOutboundData_withDanglingRequest() {
String tunnelId = messageSwitch.createTunnel(REMOTE_ADDRESS);
messageSwitch.pollOutboundData(tunnelId, requesterChannel);
assertEquals(0, responseCatcher.events.size());
-
+
ChannelBuffer outboundData = ChannelBuffers.dynamicBuffer();
outboundData.writeLong(1234L);
-
+
messageSwitch.routeOutboundData(tunnelId, outboundData, Channels.future(htunChannel));
assertEquals(1, responseCatcher.events.size());
HttpResponse response = NettyTestUtils.checkIsDownstreamMessageEvent(responseCatcher.events.poll(), HttpResponse.class);
assertSame(outboundData, response.getContent());
}
-
+
@Test
public void testCloseTunnel() {
String tunnelId = messageSwitch.createTunnel(REMOTE_ADDRESS);
messageSwitch.closeTunnel(tunnelId);
assertFalse(messageSwitch.isOpenTunnel(tunnelId));
}
-
+
@Test
public void testRouteInboundDataIgnoredAfterClose() {
ChannelBuffer data = NettyTestUtils.createData(1234L);
@@ -126,7 +126,7 @@
messageSwitch.routeInboundData(tunnelId, data);
assertEquals(0, htunEventCatcher.events.size());
}
-
+
@Test
public void testRouteOutboundDataIgnoredAfterClose() {
ChannelBuffer data = NettyTestUtils.createData(1234L);

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits

r1915 - branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel.

2009-11-23T19:29:27Z

Author: trustin
Date: 2009-11-23 22:29:26 -0500 (Mon, 23 Nov 2009)
New Revision: 1915

Modified:
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelSoakTester.java
Log:
Fixed a compilation error in Java 5

Modified: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelSoakTester.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelSoakTester.java 2009-11-23 11:47:40 UTC (rev 1914)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelSoakTester.java 2009-11-24 03:29:26 UTC (rev 1915)
@@ -42,18 +42,18 @@
private static final int SERVER_PORT = 20100;

private static final Logger LOG = Logger.getLogger(HttpTunnelSoakTester.class.getName());
-
- private ServerBootstrap serverBootstrap;
- private ClientBootstrap clientBootstrap;
- private ChannelGroup channels;
-
+
+ private final ServerBootstrap serverBootstrap;
+ private final ClientBootstrap clientBootstrap;
+ private final ChannelGroup channels;
+
int expectedNextByte = 0;
int nextWriteByte = 0;

- private ExecutorService executor;
- private ScheduledExecutorService scheduledExecutor;
- private ConcurrentLinkedQueue<ChannelBuffer> verificationQueue;
-
+ private final ExecutorService executor;
+ private final ScheduledExecutorService scheduledExecutor;
+ private final ConcurrentLinkedQueue<ChannelBuffer> verificationQueue;
+
public HttpTunnelSoakTester() {
try {
System.in.read();
@@ -66,23 +66,23 @@
verificationQueue = new ConcurrentLinkedQueue<ChannelBuffer>();
ServerSocketChannelFactory serverChannelFactory = new NioServerSocketChannelFactory(executor, executor);
HttpTunnelServerChannelFactory serverTunnelFactory = new HttpTunnelServerChannelFactory(serverChannelFactory);
-
+
serverBootstrap = new ServerBootstrap(serverTunnelFactory);
serverBootstrap.setPipelineFactory(createServerPipelineFactory());
-
+
ClientSocketChannelFactory clientChannelFactory = new NioClientSocketChannelFactory(executor, executor);
HttpTunnelClientChannelFactory clientTunnelFactory = new HttpTunnelClientChannelFactory(clientChannelFactory);
-
+
clientBootstrap = new ClientBootstrap(clientTunnelFactory);
clientBootstrap.setPipelineFactory(createClientPipelineFactory());
configureProxy();
-
+
channels = new DefaultChannelGroup();
}
-
+
private void configureProxy() {
String proxyHost = System.getProperty("http.proxyHost");
- if(proxyHost != null && !proxyHost.isEmpty()) {
+ if(proxyHost != null && proxyHost.length() != 0) {
int proxyPort = Integer.getInteger("http.proxyPort", 80);
InetAddress chosenAddress = chooseAddress(proxyHost);
InetSocketAddress proxyAddress = new InetSocketAddress(chosenAddress, proxyPort);
@@ -104,10 +104,10 @@
if(address.isAnyLocalAddress() || address.isLinkLocalAddress()) {
continue;
}
-
+
return address;
}
-
+
return null;
} catch (UnknownHostException e) {
return null;
@@ -116,7 +116,7 @@

protected ChannelPipelineFactory createClientPipelineFactory() {
return new ChannelPipelineFactory() {
-
+
public ChannelPipeline getPipeline() throws Exception {
ChannelPipeline pipeline = Channels.pipeline();
pipeline.addLast("responseVerifier", new ResponseVerifier());
@@ -127,7 +127,7 @@

protected ChannelPipelineFactory createServerPipelineFactory() {
return new ChannelPipelineFactory() {
-
+
public ChannelPipeline getPipeline() throws Exception {
ChannelPipeline pipeline = Channels.pipeline();
pipeline.addLast("echo", new EchoHandler());
@@ -141,27 +141,27 @@
Channel serverChannel = serverBootstrap.bind(new InetSocketAddress(SERVER_PORT));
channels.add(serverChannel);
LOG.log(Level.INFO, "server channel bound to {0}", serverChannel.getLocalAddress());
-
-
+
+
Channel clientChannel = createClientChannel();
if(clientChannel == null) {
LOG.severe("no client channel - bailing out");
return;
}
channels.add(clientChannel);
-
+
scheduledExecutor.execute(new VerificationTask());
-
+
if(!pushData(clientChannel)) {
LOG.severe("Data send cycle failed");
} else {
LOG.info("send cycle completed successfully");
}
-
+
LOG.info("closing channels");
closeChannel(clientChannel);
closeChannel(serverChannel);
-
+
LOG.info("done!");
}

@@ -181,7 +181,7 @@
for(int i=0; i < 10000; i++) {
byte[] randomBytesForSend = createRandomSizeByteArray();
totalBytesSent += randomBytesForSend.length;
-
+
long startTime = System.nanoTime();
ChannelFuture writeFuture = clientChannel.write(ChannelBuffers.wrappedBuffer(randomBytesForSend));
try {
@@ -198,18 +198,18 @@
LOG.log(Level.SEVERE, "Interrupted while waiting for bytes to be written", e);
return false;
}
-
+
if(i % 100 == 0 && i > 0) {
LOG.log(Level.INFO, "{0} writes completed, totalling {1} bytes", new Object[] { i, totalBytesSent });
}
}
-
+
long runEndTime = System.currentTimeMillis();
long totalTime = runEndTime - runStartTime;
long totalKB = totalBytesSent / 1024;
double rate = totalKB / (totalTime / 1000.0);
LOG.log(Level.INFO, "Average throughput: {0} KB/s", rate);
-
+
return true;
}

@@ -225,12 +225,12 @@
LOG.severe("Interrupted while waiting for client connect to be established");
return null;
}
-
+
if(!clientChannelFuture.isSuccess()) {
LOG.log(Level.SEVERE, "did not connect successfully", clientChannelFuture.getCause());
return null;
}
-
+
return clientChannelFuture.getChannel();
}

@@ -242,7 +242,7 @@
randomBytes[i] = (byte)nextWriteByte;
nextWriteByte = (nextWriteByte + 1) % 127;
}
-
+
return randomBytes;
}

@@ -254,7 +254,7 @@
soakTester.shutdown();
}
}
-
+
private void shutdown() {
serverBootstrap.releaseExternalResources();
clientBootstrap.releaseExternalResources();
@@ -269,7 +269,7 @@
Channels.write(ctx.getChannel(), e.getMessage());
}
}
-
+
@ChannelPipelineCoverage("one")
private class ResponseVerifier extends SimpleChannelUpstreamHandler {
@Override
@@ -277,31 +277,31 @@
final ChannelBuffer receivedBytes = (ChannelBuffer) e.getMessage();
verificationQueue.offer(receivedBytes);
}
-
+
@Override
public void channelOpen(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
channels.add(ctx.getChannel());
}
}
-
+
private class VerificationTask implements Runnable {
public void run() {
ChannelBuffer bytesToVerify = verificationQueue.poll();
if(bytesToVerify == null) {
scheduledExecutor.schedule(this, 10, TimeUnit.MILLISECONDS);
}
-
-
+
+
while(bytesToVerify.readable()) {
if(bytesToVerify.readByte() != expectedNextByte) {
LOG.severe("received a byte out of sequence");
System.exit(-1);
return;
}
-
+
expectedNextByte = (expectedNextByte + 1) % 127;
}
-
+
scheduledExecutor.execute(this);
}
}

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits

r1914 - in branches/httptunnel: src/main/java/org/jboss/netty/channel/socket and 3 other directories.

2009-11-23T03:47:41Z

Author: iainmcgin
Date: 2009-11-23 06:47:40 -0500 (Mon, 23 Nov 2009)
New Revision: 1914

Added:
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/AcceptedServerChannelPipelineFactory.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/AcceptedServerChannelRequestDispatch.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ChannelFutureAggregator.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannel.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannelFactory.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannelSink.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannel.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelConfig.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelFactory.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelSink.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientPollHandler.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientSendHandler.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientWorkerOwner.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelMessageUtils.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannel.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelConfig.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelFactory.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelSink.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitch.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitchDownstreamInterface.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitchUpstreamInterface.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/TunnelWrappedServerChannelHandler.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/WriteFragmenter.java
branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/WriteSplitter.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/AcceptedServerChannelRequestDispatchTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeChannelConfig.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeChannelSink.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeClientSocketChannelFactory.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeServerSocketChannel.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeServerSocketChannelConfig.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeServerSocketChannelFactory.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeSocketChannel.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannelSinkTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelConfigTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientPollHandlerTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientSendHandlerTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelFactoryTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelSinkTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelSoakTester.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/MockChannelStateListener.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/NettyTestUtils.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/NettyTestUtilsTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/NullChannelHandler.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitchTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/UpstreamEventCatcher.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/WriteFragmenterTest.java
branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/WriteSplitterTest.java
Modified:
branches/httptunnel/pom.xml
Log:
commit of netty_http_20091123.patch from issue NETTY-246 on JIRA.

Modified: branches/httptunnel/pom.xml
===================================================================
--- branches/httptunnel/pom.xml 2009-11-23 11:13:48 UTC (rev 1913)
+++ branches/httptunnel/pom.xml 2009-11-23 11:47:40 UTC (rev 1914)
@@ -206,6 +206,18 @@
<version>1.5.8</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <version>2.5.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-junit4</artifactId>
+ <version>2.5.1</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>

<properties>

Added: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/AcceptedServerChannelPipelineFactory.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/AcceptedServerChannelPipelineFactory.java (rev 0)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/AcceptedServerChannelPipelineFactory.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.jboss.netty.channel.socket.httptunnel;
+
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.handler.codec.http.HttpChunkAggregator;
+import org.jboss.netty.handler.codec.http.HttpRequestDecoder;
+import org.jboss.netty.handler.codec.http.HttpResponseEncoder;
+
+/**
+ * Creates pipelines for incoming http tunnel connections, capable of decoding the incoming HTTP
+ * requests, determining their type (client sending data, client polling data, or unknown) and
+ * handling them appropriately.
+ *
+ * @author The Netty Project ([hidden email])
+ * @author Iain McGinniss ([hidden email])
+ * @version $Rev$, $Date$
+ */
+class AcceptedServerChannelPipelineFactory implements ChannelPipelineFactory {
+
+ private ServerMessageSwitch messageSwitch;
+
+ public AcceptedServerChannelPipelineFactory(ServerMessageSwitch messageSwitch) {
+ this.messageSwitch = messageSwitch;
+ }
+
+ public ChannelPipeline getPipeline() throws Exception {
+ ChannelPipeline pipeline = Channels.pipeline();
+
+ pipeline.addLast("httpResponseEncoder", new HttpResponseEncoder());
+ pipeline.addLast("httpRequestDecoder", new HttpRequestDecoder());
+ pipeline.addLast("httpChunkAggregator", new HttpChunkAggregator(HttpTunnelMessageUtils.MAX_BODY_SIZE));
+ pipeline.addLast("messageSwitchClient", new AcceptedServerChannelRequestDispatch(messageSwitch));
+
+ return pipeline;
+ }
+}

Added: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/AcceptedServerChannelRequestDispatch.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/AcceptedServerChannelRequestDispatch.java (rev 0)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/AcceptedServerChannelRequestDispatch.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jboss.netty.channel.socket.httptunnel;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import org.jboss.netty.handler.codec.http.HttpRequest;
+import org.jboss.netty.handler.codec.http.HttpResponse;
+
+/**
+ * Upstream handler which is responsible for determining whether a received HTTP request is a legal
+ * tunnel request, and if so, invoking the appropriate request method on the
+ * {@link ServerMessageSwitch} to service the request.
+ *
+ * @author The Netty Project ([hidden email])
+ * @author Iain McGinniss ([hidden email])
+ * @version $Rev$, $Date$
+ */
+@ChannelPipelineCoverage("one")
+class AcceptedServerChannelRequestDispatch extends SimpleChannelUpstreamHandler {
+
+ public static final String NAME = "AcceptedServerChannelRequestDispatch";
+
+ private static final Logger LOG = Logger.getLogger(AcceptedServerChannelRequestDispatch.class.getName());
+
+ private ServerMessageSwitchUpstreamInterface messageSwitch;
+
+ public AcceptedServerChannelRequestDispatch(ServerMessageSwitchUpstreamInterface messageSwitch) {
+ this.messageSwitch = messageSwitch;
+ }
+
+ @Override
+ public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
+ HttpRequest request = (HttpRequest)e.getMessage();
+
+ if(HttpTunnelMessageUtils.isOpenTunnelRequest(request)) {
+ handleOpenTunnel(ctx);
+ } else if(HttpTunnelMessageUtils.isSendDataRequest(request)) {
+ handleSendData(ctx, request);
+ } else if(HttpTunnelMessageUtils.isReceiveDataRequest(request)) {
+ handleReceiveData(ctx, request);
+ } else if(HttpTunnelMessageUtils.isCloseTunnelRequest(request)) {
+ handleCloseTunnel(ctx, request);
+ } else {
+ LOG.warning("Invalid request received on http tunnel channel");
+ respondWith(ctx, HttpTunnelMessageUtils.createRejection(request, "invalid request to netty HTTP tunnel gateway"));
+ }
+ }
+
+ private void respondWith(ChannelHandlerContext ctx, HttpResponse response) {
+ Channels.write(ctx, Channels.future(ctx.getChannel()), response);
+ }
+
+ private void handleOpenTunnel(ChannelHandlerContext ctx) {
+ String tunnelId = messageSwitch.createTunnel(ctx.getChannel().getRemoteAddress());
+ LOG.log(Level.INFO, "open tunnel request received from {0} - allocated ID {1}", new Object[] { ctx.getChannel().getRemoteAddress(), tunnelId });
+ respondWith(ctx, HttpTunnelMessageUtils.createTunnelOpenResponse(tunnelId));
+ }
+
+ private void handleCloseTunnel(ChannelHandlerContext ctx, HttpRequest request) {
+ String tunnelId = checkTunnelId(request, ctx);
+ if(tunnelId == null) {
+ return;
+ }
+
+ LOG.log(Level.INFO, "close tunnel request received for tunnel {0}", tunnelId);
+
+ messageSwitch.closeTunnel(tunnelId);
+ respondWith(ctx, HttpTunnelMessageUtils.createTunnelCloseResponse());
+ }
+
+ private void handleSendData(ChannelHandlerContext ctx, HttpRequest request) {
+ String tunnelId = checkTunnelId(request, ctx);
+ if(tunnelId == null) {
+ return;
+ }
+ LOG.log(Level.FINE, "send data request received for tunnel {0}", tunnelId);
+
+ if(request.getContentLength() == 0 || request.getContent() == null || request.getContent().readableBytes() == 0) {
+ LOG.log(Level.WARNING, "send data request contained no data on tunnel {0}", tunnelId);
+ respondWith(ctx, HttpTunnelMessageUtils.createRejection(request, "Send data requests must contain data"));
+ return;
+ }
+
+ messageSwitch.routeInboundData(tunnelId, request.getContent());
+ respondWith(ctx, HttpTunnelMessageUtils.createSendDataResponse());
+ }
+
+ private void handleReceiveData(ChannelHandlerContext ctx, HttpRequest request) {
+ String tunnelId = checkTunnelId(request, ctx);
+ if(tunnelId == null) {
+ return;
+ }
+ LOG.log(Level.FINE, "poll data request received for tunnel {0}", tunnelId);
+
+ messageSwitch.pollOutboundData(tunnelId, ctx.getChannel());
+ }
+
+ private String checkTunnelId(HttpRequest request, ChannelHandlerContext ctx) {
+ String tunnelId = HttpTunnelMessageUtils.extractTunnelId(request);
+ if(tunnelId == null) {
+ LOG.warning("request without a tunnel id received - rejecting");
+ Channels.write(ctx, Channels.future(ctx.getChannel()), HttpTunnelMessageUtils.createRejection(request, "no tunnel id specified in send data request"));
+ } else if(!messageSwitch.isOpenTunnel(tunnelId)) {
+ LOG.log(Level.WARNING, "request for unknown tunnel id {0} received - rejecting", tunnelId);
+ Channels.write(ctx, Channels.future(ctx.getChannel()), HttpTunnelMessageUtils.createRejection(request, "tunnel id \"" + tunnelId + "\" is either closed or does not exist"));
+ return null;
+ }
+
+ return tunnelId;
+ }
+}

Added: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ChannelFutureAggregator.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ChannelFutureAggregator.java (rev 0)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ChannelFutureAggregator.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,47 @@
+/**
+ *
+ */
+package org.jboss.netty.channel.socket.httptunnel;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelFutureListener;
+
+class ChannelFutureAggregator implements ChannelFutureListener {
+
+ private ChannelFuture aggregateFuture;
+ private Set<ChannelFuture> pendingFutures;
+
+ public ChannelFutureAggregator(ChannelFuture aggregateFuture) {
+ this.aggregateFuture = aggregateFuture;
+ this.pendingFutures = new HashSet<ChannelFuture>();
+ }
+
+ public void addFuture(ChannelFuture future) {
+ this.pendingFutures.add(future);
+ future.addListener(this);
+ }
+
+ public synchronized void operationComplete(ChannelFuture future) throws Exception {
+ if(future.isCancelled()) {
+ // TODO: what should the correct behaviour be when a fragment is cancelled?
+ // cancel all outstanding fragments and cancel the aggregate?
+ return;
+ }
+
+ pendingFutures.remove(future);
+ if(!future.isSuccess()) {
+ aggregateFuture.setFailure(future.getCause());
+ for(ChannelFuture pendingFuture : pendingFutures) {
+ pendingFuture.cancel();
+ }
+ return;
+ }
+
+ if(pendingFutures.isEmpty()) {
+ aggregateFuture.setSuccess();
+ }
+ }
+}
\ No newline at end of file

Added: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannel.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannel.java (rev 0)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannel.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jboss.netty.channel.socket.httptunnel;
+
+import static org.jboss.netty.channel.Channels.*;
+
+import java.net.SocketAddress;
+
+import org.jboss.netty.channel.AbstractChannel;
+import org.jboss.netty.channel.ChannelConfig;
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.DefaultChannelConfig;
+
+/**
+ * Represents the server end of an HTTP tunnel, created after a legal tunnel creation
+ * request is received from a client. The server end of a tunnel does not have any
+ * directly related TCP connections - the connections used by a client are likely
+ * to change over the lifecycle of a tunnel, especially when an HTTP proxy is in
+ * use.
+ *
+ * @author The Netty Project ([hidden email])
+ * @author Iain McGinniss ([hidden email])
+ * @version $Rev$, $Date$
+ */
+class HttpTunnelAcceptedChannel extends AbstractChannel {
+
+ private ChannelConfig config;
+ private HttpTunnelAcceptedChannelSink sink;
+ private SocketAddress remoteAddress;
+
+ protected HttpTunnelAcceptedChannel(HttpTunnelServerChannel parent, ChannelFactory factory, ChannelPipeline pipeline, HttpTunnelAcceptedChannelSink sink, SocketAddress remoteAddress) {
+ super(parent, factory, pipeline, sink);
+ config = new DefaultChannelConfig();
+ this.sink = sink;
+ this.remoteAddress = remoteAddress;
+ fireChannelOpen(this);
+ fireChannelBound(this, getLocalAddress());
+ fireChannelConnected(this, getRemoteAddress());
+ }
+
+ public ChannelConfig getConfig() {
+ return config;
+ }
+
+ public SocketAddress getLocalAddress() {
+ return getParent().getLocalAddress();
+ }
+
+ public SocketAddress getRemoteAddress() {
+ return remoteAddress;
+ }
+
+ public boolean isBound() {
+ return sink.isActive();
+ }
+
+ public boolean isConnected() {
+ return sink.isActive();
+ }
+}

Added: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannelFactory.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannelFactory.java (rev 0)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannelFactory.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jboss.netty.channel.socket.httptunnel;
+
+import java.net.SocketAddress;
+
+import org.jboss.netty.channel.Channel;
+
+/**
+ * Simple interface provided to a {@link ServerMessageSwitch}, allowing it to
+ * create the server end of tunnels in response to legal tunnel creation
+ * requests from clients.
+ *
+ * @author The Netty Project ([hidden email])
+ * @author Iain McGinniss ([hidden email])
+ * @version $Rev$, $Date$
+ */
+interface HttpTunnelAcceptedChannelFactory {
+
+ public Channel newChannel(String newTunnelId, SocketAddress remoteAddress);
+
+}
\ No newline at end of file

Added: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannelSink.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannelSink.java (rev 0)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannelSink.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jboss.netty.channel.socket.httptunnel;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.channel.AbstractChannelSink;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelStateEvent;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.channel.MessageEvent;
+
+/**
+ * Sink for the server end of an http tunnel. Data sent down through the server end is dispatched
+ * from here to the ServerMessageSwitch, which queues the data awaiting a poll request from the
+ * client end of the tunnel.
+ *
+ * @author The Netty Project ([hidden email])
+ * @author Iain McGinniss ([hidden email])
+ * @version $Rev$, $Date$
+ */
+class HttpTunnelAcceptedChannelSink extends AbstractChannelSink {
+
+ private ServerMessageSwitchDownstreamInterface messageSwitch;
+ private String tunnelId;
+ private boolean active;
+
+ public HttpTunnelAcceptedChannelSink(ServerMessageSwitchDownstreamInterface messageSwitch, String tunnelId) {
+ this.messageSwitch = messageSwitch;
+ this.tunnelId = tunnelId;
+ }
+
+ public void eventSunk(ChannelPipeline pipeline, ChannelEvent e) throws Exception {
+ if(e instanceof MessageEvent) {
+ handleMessageEvent((MessageEvent)e);
+ } else if(e instanceof ChannelStateEvent) {
+ handleStateEvent((ChannelStateEvent)e);
+ }
+ }
+
+ private void handleMessageEvent(MessageEvent ev) {
+ if(!(ev.getMessage() instanceof ChannelBuffer)) {
+ throw new IllegalArgumentException("Attempt to send data which is not a ChannelBuffer:" + ev.getMessage());
+ }
+ messageSwitch.routeOutboundData(tunnelId, (ChannelBuffer)ev.getMessage(), ev.getFuture());
+ }
+
+ private void handleStateEvent(ChannelStateEvent ev) {
+ Channel owner = (Channel) ev.getChannel();
+ switch(ev.getState()) {
+ case OPEN:
+ if(Boolean.FALSE.equals(ev.getValue())) {
+ messageSwitch.closeTunnel(tunnelId);
+ this.active = false;
+ Channels.fireChannelClosed(owner);
+ }
+ break;
+ case BOUND:
+ if(ev.getValue() == null) {
+ messageSwitch.closeTunnel(tunnelId);
+ this.active = false;
+ Channels.fireChannelUnbound(owner);
+ }
+ case CONNECTED:
+ if(ev.getValue() == null) {
+ messageSwitch.closeTunnel(tunnelId);
+ this.active = false;
+ Channels.fireChannelDisconnected(owner);
+ }
+ }
+ }
+
+ public boolean isActive() {
+ return active;
+ }
+}

Added: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannel.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannel.java (rev 0)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannel.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,233 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jboss.netty.channel.socket.httptunnel;
+
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.channel.AbstractChannel;
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelFutureListener;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.channel.group.ChannelGroup;
+import org.jboss.netty.channel.socket.ClientSocketChannelFactory;
+import org.jboss.netty.channel.socket.SocketChannel;
+import org.jboss.netty.handler.codec.http.HttpChunkAggregator;
+import org.jboss.netty.handler.codec.http.HttpRequestEncoder;
+import org.jboss.netty.handler.codec.http.HttpResponseDecoder;
+
+/**
+ * The client end of an HTTP tunnel, created by an {@link HttpTunnelClientChannelFactory}. Channels of
+ * this type are designed to emulate a normal TCP based socket channel as far as is feasible within the limitations
+ * of the HTTP 1.1 protocol, and the usage patterns permitted by commonly used HTTP proxies and firewalls.
+ *
+ * @author The Netty Project ([hidden email])
+ * @author Iain McGinniss ([hidden email])
+ * @version $Rev$, $Date$
+ */
+public class HttpTunnelClientChannel extends AbstractChannel implements SocketChannel, HttpTunnelClientWorkerOwner {
+
+ private HttpTunnelClientChannelConfig config;
+
+ private SocketChannel sendChannel;
+ private SocketChannel pollChannel;
+
+ private String tunnelId;
+ private ChannelFuture connectFuture;
+ private boolean connected;
+ private boolean bound;
+
+ private InetSocketAddress serverAddress;
+ private String serverHostName;
+
+
+ protected HttpTunnelClientChannel(ChannelFactory factory, ChannelPipeline pipeline, HttpTunnelClientChannelSink sink, ClientSocketChannelFactory outboundFactory, ChannelGroup realConnections) {
+ super(null, factory, pipeline, sink);
+
+ this.sendChannel = outboundFactory.newChannel(createSendPipeline());
+ this.pollChannel = outboundFactory.newChannel(createPollPipeline());
+ this.config = new HttpTunnelClientChannelConfig(sendChannel.getConfig(), pollChannel.getConfig());
+ this.serverAddress = null;
+
+ realConnections.add(sendChannel);
+ realConnections.add(pollChannel);
+
+ Channels.fireChannelOpen(this);
+ }
+
+ public HttpTunnelClientChannelConfig getConfig() {
+ return config;
+ }
+
+ public boolean isBound() {
+ return bound;
+ }
+
+ public boolean isConnected() {
+ return connected;
+ }
+
+ public InetSocketAddress getLocalAddress() {
+ return sendChannel.getLocalAddress();
+ }
+
+ public InetSocketAddress getRemoteAddress() {
+ return serverAddress;
+ }
+
+ public void onMessageReceived(ChannelBuffer content) {
+ Channels.fireMessageReceived(this, content);
+ }
+
+ public void onConnectRequest(ChannelFuture connectFuture, InetSocketAddress remoteAddress) {
+ this.connectFuture = connectFuture;
+ /* if we are using a proxy, the remoteAddress is swapped here for the address of the proxy.
+ * The send and poll channels can later ask for the correct server address using
+ * getServerHostName().
+ */
+ this.serverAddress = remoteAddress;
+
+ SocketAddress connectTarget;
+ if(config.getProxyAddress() != null) {
+ connectTarget = config.getProxyAddress();
+ } else {
+ connectTarget = remoteAddress;
+ }
+
+ Channels.connect(sendChannel, connectTarget);
+ }
+
+ public void onDisconnectRequest(final ChannelFuture disconnectFuture) {
+ ChannelFutureListener disconnectListener = new ConsolidatingFutureListener(disconnectFuture, 2);
+ sendChannel.disconnect().addListener(disconnectListener);
+ pollChannel.disconnect().addListener(disconnectListener);
+
+ disconnectFuture.addListener(new ChannelFutureListener() {
+ public void operationComplete(ChannelFuture future) throws Exception {
+ serverAddress = null;
+ }
+ });
+ }
+
+ public void onBindRequest(SocketAddress localAddress, final ChannelFuture bindFuture) {
+ ChannelFutureListener bindListener = new ConsolidatingFutureListener(bindFuture, 2);
+ sendChannel.bind(localAddress).addListener(bindListener);
+ pollChannel.bind(localAddress).addListener(bindListener);
+ }
+
+ public void onUnbindRequest(final ChannelFuture unbindFuture) {
+ ChannelFutureListener unbindListener = new ConsolidatingFutureListener(unbindFuture, 2);
+ sendChannel.unbind().addListener(unbindListener);
+ pollChannel.unbind().addListener(unbindListener);
+ }
+
+ public void onCloseRequest(final ChannelFuture closeFuture) {
+ ChannelFutureListener closeListener = new ConsolidatingFutureListener(closeFuture, 2);
+ sendChannel.close().addListener(closeListener);
+ pollChannel.close().addListener(closeListener);
+ }
+
+ public void onTunnelOpened(String tunnelId) {
+ this.tunnelId = tunnelId;
+ setTunnelIdForPollChannel();
+ Channels.connect(pollChannel, sendChannel.getRemoteAddress());
+ }
+
+ private ChannelPipeline createSendPipeline() {
+ ChannelPipeline pipeline = Channels.pipeline();
+
+ pipeline.addLast("reqencoder", new HttpRequestEncoder()); // downstream
+ pipeline.addLast("respdecoder", new HttpResponseDecoder()); // upstream
+ pipeline.addLast("aggregator", new HttpChunkAggregator(HttpTunnelMessageUtils.MAX_BODY_SIZE)); // upstream
+ pipeline.addLast("sendHandler", new HttpTunnelClientSendHandler(this)); // both
+ pipeline.addLast("writeFragmenter", new WriteFragmenter(HttpTunnelMessageUtils.MAX_BODY_SIZE));
+
+ return pipeline;
+ }
+
+ private ChannelPipeline createPollPipeline() {
+ ChannelPipeline pipeline = Channels.pipeline();
+
+ pipeline.addLast("reqencoder", new HttpRequestEncoder()); // downstream
+ pipeline.addLast("respdecoder", new HttpResponseDecoder()); // upstream
+ pipeline.addLast("aggregator", new HttpChunkAggregator(HttpTunnelMessageUtils.MAX_BODY_SIZE)); // upstream
+ pipeline.addLast(HttpTunnelClientPollHandler.NAME, new HttpTunnelClientPollHandler(this)); // both
+
+ return pipeline;
+ }
+
+ private void setTunnelIdForPollChannel() {
+ HttpTunnelClientPollHandler pollHandler = pollChannel.getPipeline().get(HttpTunnelClientPollHandler.class);
+ pollHandler.setTunnelId(tunnelId);
+ }
+
+ public void fullyEstablished() {
+ if(!bound) {
+ this.bound = true;
+ Channels.fireChannelBound(this, getLocalAddress());
+ }
+
+ this.connected = true;
+ connectFuture.setSuccess();
+ Channels.fireChannelConnected(this, getRemoteAddress());
+ }
+
+ public void sendData(MessageEvent e) {
+ final ChannelFuture originalFuture = e.getFuture();
+ Channels.write(sendChannel, e.getMessage()).addListener(new ChannelFutureListener() {
+
+ public void operationComplete(ChannelFuture future) throws Exception {
+ if(future.isSuccess()) {
+ originalFuture.setSuccess();
+ } else {
+ originalFuture.setFailure(future.getCause());
+ }
+ }
+ });
+ }
+
+ public String getServerHostName() {
+ if(serverHostName == null) {
+ serverHostName = HttpTunnelMessageUtils.convertToHostString(serverAddress);
+ }
+
+ return serverHostName;
+ }
+
+ private class ConsolidatingFutureListener implements ChannelFutureListener {
+
+ private ChannelFuture completionFuture;
+ private AtomicInteger eventsLeft;
+
+ public ConsolidatingFutureListener(ChannelFuture completionFuture, int numToConsolidate) {
+ this.completionFuture = completionFuture;
+ eventsLeft = new AtomicInteger(numToConsolidate);
+ }
+
+ public void operationComplete(ChannelFuture future) throws Exception {
+ if(!future.isSuccess()) {
+ completionFuture.setFailure(future.getCause());
+ } else if(eventsLeft.decrementAndGet() == 0) {
+ completionFuture.setSuccess();
+ }
+ }
+ }
+}

Added: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelConfig.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelConfig.java (rev 0)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelConfig.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,160 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jboss.netty.channel.socket.httptunnel;
+
+import java.net.Socket;
+import java.net.SocketAddress;
+
+import org.jboss.netty.channel.DefaultChannelConfig;
+import org.jboss.netty.channel.socket.SocketChannelConfig;
+
+/**
+ * Configuration for the client end of an HTTP tunnel. Any socket channel properties set here
+ * will be applied uniformly to the underlying send and poll channels, created from the channel
+ * factory provided to the {@link HttpTunnelClientChannelFactory}.
+ * <p>
+ * HTTP tunnel clients have the following additional options:
+ *
+ * <table border="1" cellspacing="0" cellpadding="6">
+ * <tr>
+ * <th>Name</th><th>Associated setter method</th>
+ * </tr><tr>
+ * <td>{@code "proxyAddress"}</td><td>{@link #setProxyAddress(Socket)}</td>
+ * </tr>
+ * </table>
+ *
+ * @author The Netty Project ([hidden email])
+ * @author Iain McGinniss ([hidden email])
+ * @version $Rev$, $Date$
+ */
+public class HttpTunnelClientChannelConfig extends DefaultChannelConfig implements SocketChannelConfig {
+
+ public static final String PROXY_ADDRESS_OPTION = "proxyAddress";
+
+ private final SocketChannelConfig sendChannelConfig;
+ private final SocketChannelConfig pollChannelConfig;
+
+ private SocketAddress proxyAddress;
+
+ public HttpTunnelClientChannelConfig(SocketChannelConfig sendChannelConfig, SocketChannelConfig pollChannelConfig) {
+ this.sendChannelConfig = sendChannelConfig;
+ this.pollChannelConfig = pollChannelConfig;
+ }
+
+ /* HTTP TUNNEL SPECIFIC CONFIGURATION */
+
+ @Override
+ public boolean setOption(String key, Object value) {
+ if(super.setOption(key, value)) {
+ return true;
+ }
+
+ if(PROXY_ADDRESS_OPTION.equals(key)) {
+ setProxyAddress((SocketAddress) value);
+ } else {
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * @return the address of the http proxy. If this is null, then no proxy
+ * should be used.
+ */
+ public SocketAddress getProxyAddress() {
+ return proxyAddress;
+ }
+
+ /**
+ * Specify a proxy to be used for the http tunnel. If this is null, then
+ * no proxy should be used, otherwise this should be a directly accessible IPv4/IPv6
+ * address and port.
+ */
+ public void setProxyAddress(SocketAddress proxyAddress) {
+ this.proxyAddress = proxyAddress;
+ }
+
+ /* GENERIC SOCKET CHANNEL CONFIGURATION */
+
+ public int getReceiveBufferSize() {
+ return pollChannelConfig.getReceiveBufferSize();
+ }
+
+ public int getSendBufferSize() {
+ return pollChannelConfig.getSendBufferSize();
+ }
+
+ public int getSoLinger() {
+ return pollChannelConfig.getSoLinger();
+ }
+
+ public int getTrafficClass() {
+ return pollChannelConfig.getTrafficClass();
+ }
+
+ public boolean isKeepAlive() {
+ return pollChannelConfig.isKeepAlive();
+ }
+
+ public boolean isReuseAddress() {
+ return pollChannelConfig.isReuseAddress();
+ }
+
+ public boolean isTcpNoDelay() {
+ return pollChannelConfig.isTcpNoDelay();
+ }
+
+ public void setKeepAlive(boolean keepAlive) {
+ pollChannelConfig.setKeepAlive(keepAlive);
+ sendChannelConfig.setKeepAlive(keepAlive);
+ }
+
+ public void setPerformancePreferences(int connectionTime, int latency, int bandwidth) {
+ pollChannelConfig.setPerformancePreferences(connectionTime, latency, bandwidth);
+ sendChannelConfig.setPerformancePreferences(connectionTime, latency, bandwidth);
+ }
+
+ public void setReceiveBufferSize(int receiveBufferSize) {
+ pollChannelConfig.setReceiveBufferSize(receiveBufferSize);
+ sendChannelConfig.setReceiveBufferSize(receiveBufferSize);
+ }
+
+ public void setReuseAddress(boolean reuseAddress) {
+ pollChannelConfig.setReuseAddress(reuseAddress);
+ sendChannelConfig.setReuseAddress(reuseAddress);
+ }
+
+ public void setSendBufferSize(int sendBufferSize) {
+ pollChannelConfig.setSendBufferSize(sendBufferSize);
+ sendChannelConfig.setSendBufferSize(sendBufferSize);
+ }
+
+ public void setSoLinger(int soLinger) {
+ pollChannelConfig.setSoLinger(soLinger);
+ sendChannelConfig.setSoLinger(soLinger);
+ }
+
+ public void setTcpNoDelay(boolean tcpNoDelay) {
+ pollChannelConfig.setTcpNoDelay(true);
+ sendChannelConfig.setTcpNoDelay(true);
+ }
+
+ public void setTrafficClass(int trafficClass) {
+ pollChannelConfig.setTrafficClass(1);
+ sendChannelConfig.setTrafficClass(1);
+ }
+}

Added: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelFactory.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelFactory.java (rev 0)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelFactory.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jboss.netty.channel.socket.httptunnel;
+
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.group.ChannelGroup;
+import org.jboss.netty.channel.group.DefaultChannelGroup;
+import org.jboss.netty.channel.socket.ClientSocketChannelFactory;
+
+/**
+ *
+ * @author The Netty Project ([hidden email])
+ * @author Iain McGinniss ([hidden email])
+ * @version $Rev$, $Date$
+ */
+public class HttpTunnelClientChannelFactory implements ClientSocketChannelFactory {
+
+ private ClientSocketChannelFactory factory;
+ private ChannelGroup realConnections;
+
+ public HttpTunnelClientChannelFactory(ClientSocketChannelFactory factory) {
+ this.factory = factory;
+ realConnections = new DefaultChannelGroup();
+ }
+
+ public HttpTunnelClientChannel newChannel(ChannelPipeline pipeline) {
+ HttpTunnelClientChannel channel = new HttpTunnelClientChannel(this, pipeline, new HttpTunnelClientChannelSink(), factory, realConnections);
+ return channel;
+ }
+
+ public void releaseExternalResources() {
+ realConnections.close();
+ factory.releaseExternalResources();
+ }
+
+}

Added: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelSink.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelSink.java (rev 0)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelSink.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jboss.netty.channel.socket.httptunnel;
+
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+
+import org.jboss.netty.channel.AbstractChannelSink;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelStateEvent;
+import org.jboss.netty.channel.MessageEvent;
+
+/**
+ * @author The Netty Project ([hidden email])
+ * @author Iain McGinniss ([hidden email])
+ * @version $Rev$, $Date$
+ */
+class HttpTunnelClientChannelSink extends AbstractChannelSink {
+
+ public void eventSunk(ChannelPipeline pipeline, ChannelEvent e) throws Exception {
+ if(e instanceof ChannelStateEvent) {
+ handleChannelStateEvent((ChannelStateEvent)e);
+ } else if(e instanceof MessageEvent) {
+ handleMessageEvent((MessageEvent)e);
+ }
+ }
+
+ private void handleMessageEvent(MessageEvent e) {
+ HttpTunnelClientChannel channel = (HttpTunnelClientChannel) e.getChannel();
+ channel.sendData(e);
+ }
+
+ private void handleChannelStateEvent(ChannelStateEvent e) {
+ HttpTunnelClientChannel channel = (HttpTunnelClientChannel) e.getChannel();
+
+ switch(e.getState()) {
+ case CONNECTED:
+ if(e.getValue() != null) {
+ channel.onConnectRequest(e.getFuture(), (InetSocketAddress) e.getValue());
+ } else {
+ channel.onDisconnectRequest(e.getFuture());
+ }
+ break;
+ case BOUND:
+ if(e.getValue() != null) {
+ channel.onBindRequest((SocketAddress)e.getValue(), e.getFuture());
+ } else {
+ channel.onUnbindRequest(e.getFuture());
+ }
+ break;
+ case OPEN:
+ if(Boolean.FALSE.equals(e.getValue())) {
+ channel.onCloseRequest(e.getFuture());
+ }
+ break;
+ }
+ }
+}

Added: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientPollHandler.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientPollHandler.java (rev 0)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientPollHandler.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jboss.netty.channel.socket.httptunnel;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.ChannelStateEvent;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.channel.SimpleChannelHandler;
+import org.jboss.netty.handler.codec.http.HttpRequest;
+import org.jboss.netty.handler.codec.http.HttpResponse;
+
+/**
+ * @author The Netty Project ([hidden email])
+ * @author Iain McGinniss ([hidden email])
+ * @version $Rev$, $Date$
+ */
+@ChannelPipelineCoverage("one")
+class HttpTunnelClientPollHandler extends SimpleChannelHandler {
+
+ public static final String NAME = "server2client";
+
+ private static final Logger LOG = Logger.getLogger(HttpTunnelClientPollHandler.class.getName());
+
+ private String tunnelId;
+ private HttpTunnelClientWorkerOwner tunnelChannel;
+
+ private long pollTime;
+
+ public HttpTunnelClientPollHandler(HttpTunnelClientWorkerOwner tunnelChannel) {
+ this.tunnelChannel = tunnelChannel;
+ }
+
+ public void setTunnelId(String tunnelId) {
+ this.tunnelId = tunnelId;
+ }
+
+ @Override
+ public void channelConnected(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
+ LOG.log(Level.FINE, "Poll channel for tunnel {0} established", tunnelId);
+ tunnelChannel.fullyEstablished();
+ sendPoll(ctx);
+ }
+
+ @Override
+ public void messageReceived(ChannelHandlerContext ctx, MessageEvent e)
+ throws Exception {
+ HttpResponse response = (HttpResponse) e.getMessage();
+
+ if(HttpTunnelMessageUtils.isOKResponse(response)) {
+ long rtTime = System.nanoTime() - pollTime;
+ LOG.log(Level.FINE, "OK response received for poll on tunnel {0} after {1}ns", new Object[] { tunnelId, rtTime });
+ tunnelChannel.onMessageReceived(response.getContent());
+ sendPoll(ctx);
+ } else {
+ LOG.log(Level.WARNING, "non-OK response received for poll on tunnel {0}", tunnelId);
+ }
+ }
+
+ private void sendPoll(ChannelHandlerContext ctx) {
+ pollTime = System.nanoTime();
+ LOG.log(Level.FINE, "sending poll request for tunnel {0}", tunnelId);
+ HttpRequest request = HttpTunnelMessageUtils.createReceiveDataRequest(tunnelChannel.getServerHostName(), tunnelId);
+ Channels.write(ctx, Channels.future(ctx.getChannel()), request);
+ }
+}

Added: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientSendHandler.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientSendHandler.java (rev 0)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientSendHandler.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,185 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jboss.netty.channel.socket.httptunnel;
+
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.ChannelStateEvent;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.channel.DownstreamMessageEvent;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.channel.SimpleChannelHandler;
+import org.jboss.netty.handler.codec.http.HttpRequest;
+import org.jboss.netty.handler.codec.http.HttpResponse;
+
+/**
+ * @author The Netty Project ([hidden email])
+ * @author Iain McGinniss ([hidden email])
+ * @version $Rev$, $Date$
+ */
+@ChannelPipelineCoverage("one")
+class HttpTunnelClientSendHandler extends SimpleChannelHandler {
+
+ public static final String NAME = "client2server";
+
+ private static final Logger LOG = Logger.getLogger(HttpTunnelClientSendHandler.class.getName());
+
+ private HttpTunnelClientWorkerOwner tunnelChannel;
+
+ private String tunnelId = null;
+ private String host;
+
+ private AtomicBoolean disconnecting;
+ private ChannelStateEvent postShutdownEvent;
+ private ConcurrentLinkedQueue<MessageEvent> queuedWrites;
+ private AtomicInteger pendingRequestCount;
+
+ private long sendRequestTime;
+
+ public HttpTunnelClientSendHandler(HttpTunnelClientWorkerOwner tunnelChannel) {
+ this.tunnelChannel = tunnelChannel;
+ queuedWrites = new ConcurrentLinkedQueue<MessageEvent>();
+ pendingRequestCount = new AtomicInteger(0);
+ disconnecting = new AtomicBoolean(false);
+ }
+
+ @Override
+ public void channelConnected(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
+ if(tunnelId == null) {
+ LOG.log(Level.FINE, "connection to {0} succeeded - sending open tunnel request", e.getValue());
+ HttpRequest request = HttpTunnelMessageUtils.createOpenTunnelRequest(tunnelChannel.getServerHostName());
+ Channel thisChannel = ctx.getChannel();
+ DownstreamMessageEvent event = new DownstreamMessageEvent(thisChannel, Channels.future(thisChannel), request, thisChannel.getRemoteAddress());
+ queuedWrites.offer(event);
+ pendingRequestCount.incrementAndGet();
+ sendQueuedData(ctx);
+ }
+ }
+
+ @Override
+ public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
+ HttpResponse response = (HttpResponse)e.getMessage();
+
+ if(HttpTunnelMessageUtils.isOKResponse(response)) {
+ long roundTripTime = System.nanoTime() - sendRequestTime;
+ LOG.log(Level.FINE, "OK response received for tunnel {0}, after {1}ns", new Object[] { tunnelId, roundTripTime });
+ sendNextAfterResponse(ctx);
+ } else if(HttpTunnelMessageUtils.isTunnelOpenResponse(response)) {
+ this.tunnelId = HttpTunnelMessageUtils.extractCookie(response);
+ LOG.log(Level.INFO, "tunnel open request accepted - id {0}", tunnelId);
+ tunnelChannel.onTunnelOpened(tunnelId);
+ sendNextAfterResponse(ctx);
+ } else if(HttpTunnelMessageUtils.isTunnelCloseResponse(response)) {
+ if(disconnecting.get()) {
+ LOG.log(Level.INFO, "server acknowledged disconnect for tunnel {0}", tunnelId);
+ } else {
+ LOG.log(Level.INFO, "server closed tunnel {0}", tunnelId);
+ }
+ ctx.sendDownstream(postShutdownEvent);
+ } else {
+ // TODO: kill connection
+ LOG.log(Level.WARNING, "unknown response received for tunnel {0}, closing connection", tunnelId);
+ Channels.close(ctx, ctx.getChannel().getCloseFuture());
+ }
+ }
+
+ private void sendNextAfterResponse(ChannelHandlerContext ctx) {
+ if(pendingRequestCount.decrementAndGet() > 0) {
+ LOG.log(Level.FINE, "Immediately sending next send request for tunnel {0}", tunnelId);
+ sendQueuedData(ctx);
+ }
+ }
+
+ private synchronized void sendQueuedData(ChannelHandlerContext ctx) {
+ if(disconnecting.get()) {
+ LOG.log(Level.FINE, "sending close request for tunnel {0}", tunnelId);
+ HttpRequest closeRequest = HttpTunnelMessageUtils.createCloseTunnelRequest(tunnelChannel.getServerHostName(), tunnelId);
+ Channels.write(ctx, Channels.future(ctx.getChannel()), closeRequest);
+ } else {
+ LOG.log(Level.FINE, "sending next request for tunnel {0}", tunnelId);
+ MessageEvent nextWrite = queuedWrites.poll();
+ sendRequestTime = System.nanoTime();
+ ctx.sendDownstream(nextWrite);
+ }
+ }
+
+ @Override
+ public void writeRequested(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
+ LOG.log(Level.FINER, "request to send data for tunnel {0}", tunnelId);
+ if(disconnecting.get()) {
+ LOG.log(Level.WARNING, "rejecting write request for tunnel {0} received after disconnect requested", tunnelId);
+ e.getFuture().setFailure(new IllegalStateException("tunnel is closing"));
+ return;
+ }
+ ChannelBuffer data = (ChannelBuffer) e.getMessage();
+ HttpRequest request = HttpTunnelMessageUtils.createSendDataRequest(tunnelChannel.getServerHostName(), tunnelId, data);
+ DownstreamMessageEvent translatedEvent = new DownstreamMessageEvent(ctx.getChannel(), e.getFuture(), request, ctx.getChannel().getRemoteAddress());
+ queuedWrites.offer(translatedEvent);
+ if(pendingRequestCount.incrementAndGet() == 1) {
+ sendQueuedData(ctx);
+ } else {
+ LOG.log(Level.FINE, "write request for tunnel {0} queued", tunnelId);
+ }
+ }
+
+ @Override
+ public void closeRequested(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
+ shutdownTunnel(ctx, e);
+ }
+
+ @Override
+ public void disconnectRequested(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
+ shutdownTunnel(ctx, e);
+ }
+
+ @Override
+ public void unbindRequested(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
+ shutdownTunnel(ctx, e);
+ }
+
+ private void shutdownTunnel(ChannelHandlerContext ctx, ChannelStateEvent postShutdownEvent) {
+ LOG.log(Level.INFO, "tunnel shutdown requested for send channel of tunnel {0}", tunnelId);
+ if(!ctx.getChannel().isConnected()) {
+ LOG.log(Level.FINE, "send channel of tunnel {0} is already disconnected", tunnelId);
+ ctx.sendDownstream(postShutdownEvent);
+ return;
+ }
+
+ if(!disconnecting.compareAndSet(false, true)) {
+ LOG.log(Level.WARNING, "tunnel shutdown process already initiated for tunnel {0}", tunnelId);
+ return;
+ }
+
+ this.postShutdownEvent = postShutdownEvent;
+
+ // if the channel is idle, send a close request immediately
+ if(pendingRequestCount.incrementAndGet() == 1) {
+ sendQueuedData(ctx);
+ }
+ }
+
+ public String getTunnelId() {
+ return tunnelId;
+ }
+}

Added: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientWorkerOwner.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientWorkerOwner.java (rev 0)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientWorkerOwner.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jboss.netty.channel.socket.httptunnel;
+
+import java.net.InetSocketAddress;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.channel.ChannelFuture;
+
+/**
+ * Interface which is used by the send and poll "worker" channels
+ * to notify the virtual tunnel channel of key events, and to get
+ * access to higher level information required for correct
+ * operation.
+ *
+ * @author The Netty Project ([hidden email])
+ * @author Iain McGinniss ([hidden email])
+ * @version $Rev$, $Date$
+ */
+interface HttpTunnelClientWorkerOwner {
+
+ /**
+ * The HTTP tunnel client sink invokes this when the application code requests the connection
+ * of an HTTP tunnel to the specified remote address.
+ */
+ public void onConnectRequest(ChannelFuture connectFuture, InetSocketAddress remoteAddress);
+
+ /**
+ * The send channel handler calls this method when the server accepts the open tunnel request,
+ * returning a unique tunnel ID.
+ *
+ * @param tunnelId the server allocated tunnel ID
+ */
+ public void onTunnelOpened(String tunnelId);
+
+ /**
+ * The poll channel handler calls this method when the poll channel is connected, indicating
+ * that full duplex communications are now possible.
+ */
+ public void fullyEstablished();
+
+ /**
+ * The poll handler calls this method when some data is received and decoded from the server.
+ * @param content the data received from the server
+ */
+ public void onMessageReceived(ChannelBuffer content);
+
+ /**
+ * @return the name of the server with whom we are communicating with - this is used within
+ * the HOST HTTP header for all requests. This is particularly important for operation behind
+ * a proxy, where the HOST string is used to route the request.
+ */
+ public String getServerHostName();
+
+}
\ No newline at end of file

Added: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelMessageUtils.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelMessageUtils.java (rev 0)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelMessageUtils.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,304 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jboss.netty.channel.socket.httptunnel;
+
+import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Arrays;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.handler.codec.http.DefaultHttpRequest;
+import org.jboss.netty.handler.codec.http.DefaultHttpResponse;
+import org.jboss.netty.handler.codec.http.HttpHeaders;
+import org.jboss.netty.handler.codec.http.HttpMethod;
+import org.jboss.netty.handler.codec.http.HttpRequest;
+import org.jboss.netty.handler.codec.http.HttpResponse;
+import org.jboss.netty.handler.codec.http.HttpResponseStatus;
+import org.jboss.netty.handler.codec.http.HttpVersion;
+
+/**
+ * Utility class for creating http requests for the operation of the full duplex
+ * http tunnel, and verifying that received requests are of the correct types.
+ *
+ * @author The Netty Project ([hidden email])
+ * @author Iain McGinniss ([hidden email])
+ * @version $Rev$, $Date$
+ */
+public class HttpTunnelMessageUtils {
+
+ private static final String HTTP_URL_PREFIX = "http://";
+
+ /**
+ * An upper bound is enforced on the size of message bodies, so as
+ * to ensure we do not dump large chunks of data on either peer.
+ */
+ public static final int MAX_BODY_SIZE = 16 * 1024;
+
+ /**
+ * The tunnel will only accept connections from this specific user agent. This
+ * allows us to distinguish a legitimate tunnel connection from someone pointing
+ * a web browser or robot at the tunnel URL.
+ */
+ static final String USER_AGENT = "HttpTunnelClient";
+
+ static final String OPEN_TUNNEL_REQUEST_URI = "/http-tunnel/open";
+ static final String CLOSE_TUNNEL_REQUEST_URI = "/http-tunnel/close";
+ static final String CLIENT_SEND_REQUEST_URI = "/http-tunnel/send";
+ static final String CLIENT_RECV_REQUEST_URI = "/http-tunnel/poll";
+
+ static final String CONTENT_TYPE = "application/octet-stream";
+
+
+ public static HttpRequest createOpenTunnelRequest(SocketAddress host) {
+ return createOpenTunnelRequest(convertToHostString(host));
+ }
+
+ public static HttpRequest createOpenTunnelRequest(String host) {
+ HttpRequest request = createRequestTemplate(host, null, OPEN_TUNNEL_REQUEST_URI);
+ setNoData(request);
+ return request;
+ }
+
+ public static boolean isOpenTunnelRequest(HttpRequest request) {
+ return isRequestTo(request, OPEN_TUNNEL_REQUEST_URI);
+ }
+
+ public static boolean checkHost(HttpRequest request, SocketAddress expectedHost) {
+ String host = request.getHeader(HttpHeaders.Names.HOST);
+ return expectedHost == null ? (host == null) : HttpTunnelMessageUtils.convertToHostString(expectedHost).equals(host);
+ }
+
+ public static HttpRequest createSendDataRequest(SocketAddress host, String cookie, ChannelBuffer data) {
+ return createSendDataRequest(convertToHostString(host), cookie, data);
+ }
+
+ public static HttpRequest createSendDataRequest(String host, String cookie, ChannelBuffer data) {
+ HttpRequest request = createRequestTemplate(host, cookie, CLIENT_SEND_REQUEST_URI);
+ request.setHeader(HttpHeaders.Names.CONTENT_LENGTH, Long.toString(data.readableBytes()));
+ request.setContent(data);
+
+ return request;
+ }
+
+ public static boolean isSendDataRequest(HttpRequest request) {
+ return isRequestTo(request, CLIENT_SEND_REQUEST_URI);
+ }
+
+ public static HttpRequest createReceiveDataRequest(SocketAddress host, String tunnelId) {
+ return createReceiveDataRequest(convertToHostString(host), tunnelId);
+ }
+
+ public static HttpRequest createReceiveDataRequest(String host, String tunnelId) {
+ HttpRequest request = createRequestTemplate(host, tunnelId, CLIENT_RECV_REQUEST_URI);
+ setNoData(request);
+ return request;
+ }
+
+ public static boolean isReceiveDataRequest(HttpRequest request) {
+ return isRequestTo(request, CLIENT_RECV_REQUEST_URI);
+ }
+
+ public static HttpRequest createCloseTunnelRequest(String host, String tunnelId) {
+ HttpRequest request = createRequestTemplate(host, tunnelId, CLOSE_TUNNEL_REQUEST_URI);
+ setNoData(request);
+ return request;
+ }
+
+ public static boolean isCloseTunnelRequest(HttpRequest request) {
+ return isRequestTo(request, CLOSE_TUNNEL_REQUEST_URI);
+ }
+
+ public static boolean isServerToClientRequest(HttpRequest request) {
+ return isRequestTo(request, CLIENT_RECV_REQUEST_URI);
+ }
+
+ public static String convertToHostString(SocketAddress hostAddress) {
+ StringWriter host = new StringWriter();
+ InetSocketAddress inetSocketAddr = (InetSocketAddress) hostAddress;
+ InetAddress addr = inetSocketAddr.getAddress();
+ if(addr instanceof Inet6Address) {
+ host.append('[');
+ host.append(addr.getHostAddress());
+ host.append(']');
+ } else {
+ host.append(addr.getHostAddress());
+ }
+
+ host.append(':');
+ host.append(Integer.toString(inetSocketAddr.getPort()));
+ return host.toString();
+ }
+
+ private static HttpRequest createRequestTemplate(String host, String tunnelId, String uri) {
+ HttpRequest request = new DefaultHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST, createCompleteUri(host, uri));
+ request.setHeader(HttpHeaders.Names.HOST, host);
+ request.setHeader(HttpHeaders.Names.USER_AGENT, USER_AGENT);
+ if(tunnelId != null) {
+ request.setHeader(HttpHeaders.Names.COOKIE, tunnelId);
+ }
+
+ return request;
+ }
+
+ private static String createCompleteUri(String host, String uri) {
+ StringBuilder builder = new StringBuilder(HTTP_URL_PREFIX.length() + host.length() + uri.length());
+ builder.append(HTTP_URL_PREFIX);
+ builder.append(host);
+ builder.append(uri);
+
+ return builder.toString();
+ }
+
+ private static boolean isRequestTo(HttpRequest request, String uri) {
+ URI decodedUri;
+ try {
+ decodedUri = new URI(request.getUri());
+ } catch (URISyntaxException e) {
+ return false;
+ }
+
+ return HttpVersion.HTTP_1_1.equals(request.getProtocolVersion())
+ && USER_AGENT.equals(request.getHeader(HttpHeaders.Names.USER_AGENT))
+ && HttpMethod.POST.equals(request.getMethod())
+ && uri.equals(decodedUri.getPath());
+ }
+
+ private static void setNoData(HttpRequest request) {
+ request.setHeader(HttpHeaders.Names.CONTENT_LENGTH, "0");
+ request.setContent(null);
+ }
+
+ public static String extractTunnelId(HttpRequest request) {
+ return request.getHeader(HttpHeaders.Names.COOKIE);
+ }
+
+ private static byte[] toBytes(String string) {
+ try {
+ return string.getBytes("UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ // UTF-8 is meant to be supported on all platforms
+ throw new RuntimeException("UTF-8 encoding not supported!");
+ }
+ }
+
+ public static HttpResponse createTunnelOpenResponse(String tunnelId) {
+ HttpResponse response = createResponseTemplate(HttpResponseStatus.CREATED, null);
+ response.setHeader(HttpHeaders.Names.SET_COOKIE, tunnelId);
+ return response;
+ }
+
+ public static boolean isTunnelOpenResponse(HttpResponse response) {
+ return isResponseWithCode(response, HttpResponseStatus.CREATED);
+ }
+
+ public static boolean isOKResponse(HttpResponse response) {
+ return isResponseWithCode(response, HttpResponseStatus.OK);
+ }
+
+ public static boolean hasContents(HttpResponse response, byte[] expectedContents) {
+ if(response.getContent() != null
+ && response.getContentLength() == expectedContents.length
+ && response.getContent().readableBytes() == expectedContents.length) {
+ byte[] compareBytes = new byte[expectedContents.length];
+ response.getContent().readBytes(compareBytes);
+ return Arrays.equals(expectedContents, compareBytes);
+ }
+
+ return false;
+ }
+
+ public static HttpResponse createTunnelCloseResponse() {
+ HttpResponse response = createResponseTemplate(HttpResponseStatus.RESET_CONTENT, null);
+ return response;
+ }
+
+ public static boolean isTunnelCloseResponse(HttpResponse response) {
+ return isResponseWithCode(response, HttpResponseStatus.RESET_CONTENT);
+ }
+
+ public static String extractCookie(HttpResponse response) {
+ if(response.containsHeader(HttpHeaders.Names.SET_COOKIE)) {
+ return response.getHeader(HttpHeaders.Names.SET_COOKIE);
+ }
+
+ return null;
+ }
+
+ public static HttpResponse createSendDataResponse() {
+ return createOKResponseTemplate(null);
+ }
+
+ public static HttpResponse createRecvDataResponse(ChannelBuffer data) {
+ return createOKResponseTemplate(data);
+ }
+
+ public static HttpResponse createRejection(HttpRequest request, String reason) {
+ HttpVersion version = (request != null) ? request.getProtocolVersion() : HttpVersion.HTTP_1_1;
+ HttpResponse response = new DefaultHttpResponse(version, HttpResponseStatus.BAD_REQUEST);
+ response.setHeader(HttpHeaders.Names.CONTENT_TYPE, "text/plain; charset=\"utf-8\"");
+ ChannelBuffer reasonBuffer = ChannelBuffers.wrappedBuffer(toBytes(reason));
+ response.setHeader(HttpHeaders.Names.CONTENT_LENGTH, Integer.toString(reasonBuffer.readableBytes()));
+ response.setContent(reasonBuffer);
+ return response;
+ }
+
+ public static boolean isRejection(HttpResponse response) {
+ return !(HttpResponseStatus.OK.equals(response.getStatus()));
+ }
+
+ public static Object extractErrorMessage(HttpResponse response) {
+ if(response.getContent() == null || response.getContentLength() == 0) {
+ return "";
+ }
+
+ byte[] bytes = new byte[response.getContent().readableBytes()];
+ response.getContent().readBytes(bytes);
+ try {
+ return new String(bytes, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ return "";
+ }
+ }
+
+ private static boolean isResponseWithCode(HttpResponse response, HttpResponseStatus status) {
+ return HttpVersion.HTTP_1_1.equals(response.getProtocolVersion())
+ && status.equals(response.getStatus());
+ }
+
+ private static HttpResponse createOKResponseTemplate(ChannelBuffer data) {
+ return createResponseTemplate(HttpResponseStatus.OK, data);
+ }
+
+ private static HttpResponse createResponseTemplate(HttpResponseStatus status, ChannelBuffer data) {
+ HttpResponse response = new DefaultHttpResponse(HttpVersion.HTTP_1_1, status);
+ if(data != null) {
+ response.setHeader(HttpHeaders.Names.CONTENT_LENGTH, Integer.toString(data.readableBytes()));
+ response.setHeader(HttpHeaders.Names.CONTENT_TYPE, "application/octet-stream");
+ response.setContent(data);
+ } else {
+ response.setHeader(HttpHeaders.Names.CONTENT_LENGTH, "0");
+ response.setContent(null);
+ }
+ return response;
+ }
+}

Added: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannel.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannel.java (rev 0)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannel.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jboss.netty.channel.socket.httptunnel;
+
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+
+import org.jboss.netty.channel.AbstractServerChannel;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelPipelineException;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.channel.socket.ServerSocketChannel;
+import org.jboss.netty.channel.socket.ServerSocketChannelConfig;
+
+/**
+ * @author The Netty Project ([hidden email])
+ * @author Iain McGinniss ([hidden email])
+ * @version $Rev$, $Date$
+ */
+public class HttpTunnelServerChannel extends AbstractServerChannel implements ServerSocketChannel, HttpTunnelAcceptedChannelFactory {
+
+ private ServerSocketChannel realChannel;
+ private HttpTunnelServerChannelConfig config;
+ private ServerMessageSwitch messageSwitch;
+
+ protected HttpTunnelServerChannel(HttpTunnelServerChannelFactory factory, ChannelPipeline pipeline) {
+ super(factory, pipeline, new HttpTunnelServerChannelSink());
+ }
+
+ public void setRealChannel(ServerSocketChannel realChannel, ServerMessageSwitch messageSwitch) {
+ this.realChannel = realChannel;
+ HttpTunnelServerChannelSink sink = (HttpTunnelServerChannelSink) this.getPipeline().getSink();
+ sink.setRealChannel(realChannel);
+ config = new HttpTunnelServerChannelConfig(realChannel);
+ this.messageSwitch = messageSwitch;
+ Channels.fireChannelOpen(this);
+ }
+
+ public ServerSocketChannelConfig getConfig() {
+ return config;
+ }
+
+ public InetSocketAddress getLocalAddress() {
+ return realChannel.getLocalAddress();
+ }
+
+ public InetSocketAddress getRemoteAddress() {
+ // server channels never have a remote address
+ return null;
+ }
+
+ public boolean isBound() {
+ return realChannel.isBound();
+ }
+
+ public ServerMessageSwitch getMessageSwitch() {
+ return messageSwitch;
+ }
+
+ public HttpTunnelAcceptedChannel newChannel(String newTunnelId, SocketAddress remoteAddress) {
+ ChannelPipeline childPipeline = null;
+ try {
+ childPipeline = getConfig().getPipelineFactory().getPipeline();
+ } catch(Exception e) {
+ throw new ChannelPipelineException("Failed to initialize a pipeline.", e);
+ }
+ HttpTunnelAcceptedChannelSink sink = new HttpTunnelAcceptedChannelSink(messageSwitch, newTunnelId);
+ return new HttpTunnelAcceptedChannel(this, this.getFactory(), childPipeline, sink, remoteAddress);
+ }
+}

Added: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelConfig.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelConfig.java (rev 0)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelConfig.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jboss.netty.channel.socket.httptunnel;
+
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.jboss.netty.buffer.ChannelBufferFactory;
+import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.channel.socket.ServerSocketChannel;
+import org.jboss.netty.channel.socket.ServerSocketChannelConfig;
+
+/**
+ * @author The Netty Project ([hidden email])
+ * @author Iain McGinniss ([hidden email])
+ * @version $Rev$, $Date$
+ */
+public class HttpTunnelServerChannelConfig implements ServerSocketChannelConfig {
+
+ private ChannelPipelineFactory pipelineFactory;
+ private ServerSocketChannel realChannel;
+
+ public HttpTunnelServerChannelConfig(ServerSocketChannel realChannel) {
+ this.realChannel = realChannel;
+ }
+
+ private ServerSocketChannelConfig getWrappedConfig() {
+ return realChannel.getConfig();
+ }
+
+ public int getBacklog() {
+ return getWrappedConfig().getBacklog();
+ }
+
+ public int getReceiveBufferSize() {
+ return getWrappedConfig().getReceiveBufferSize();
+ }
+
+ public boolean isReuseAddress() {
+ return getWrappedConfig().isReuseAddress();
+ }
+
+ public void setBacklog(int backlog) {
+ getWrappedConfig().setBacklog(backlog);
+ }
+
+ public void setPerformancePreferences(int connectionTime, int latency, int bandwidth) {
+ getWrappedConfig().setPerformancePreferences(connectionTime, latency, bandwidth);
+ }
+
+ public void setReceiveBufferSize(int receiveBufferSize) {
+ getWrappedConfig().setReceiveBufferSize(receiveBufferSize);
+ }
+
+ public void setReuseAddress(boolean reuseAddress) {
+ getWrappedConfig().setReuseAddress(reuseAddress);
+ }
+
+ public ChannelBufferFactory getBufferFactory() {
+ return getWrappedConfig().getBufferFactory();
+ }
+
+ public int getConnectTimeoutMillis() {
+ return getWrappedConfig().getConnectTimeoutMillis();
+ }
+
+ public ChannelPipelineFactory getPipelineFactory() {
+ return pipelineFactory;
+ }
+
+ public void setBufferFactory(ChannelBufferFactory bufferFactory) {
+ getWrappedConfig().setBufferFactory(bufferFactory);
+ }
+
+ public void setConnectTimeoutMillis(int connectTimeoutMillis) {
+ getWrappedConfig().setConnectTimeoutMillis(connectTimeoutMillis);
+ }
+
+ public boolean setOption(String name, Object value) {
+ if (name.equals("pipelineFactory")) {
+ setPipelineFactory((ChannelPipelineFactory) value);
+ return true;
+ } else {
+ return getWrappedConfig().setOption(name, value);
+ }
+ }
+
+ public void setOptions(Map<String, Object> options) {
+ for (Entry<String, Object> e: options.entrySet()) {
+ setOption(e.getKey(), e.getValue());
+ }
+ }
+
+ public void setPipelineFactory(ChannelPipelineFactory pipelineFactory) {
+ this.pipelineFactory = pipelineFactory;
+ }
+}

Added: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelFactory.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelFactory.java (rev 0)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelFactory.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jboss.netty.channel.socket.httptunnel;
+
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.channel.group.ChannelGroup;
+import org.jboss.netty.channel.group.DefaultChannelGroup;
+import org.jboss.netty.channel.socket.ServerSocketChannel;
+import org.jboss.netty.channel.socket.ServerSocketChannelFactory;
+
+/**
+ * @author The Netty Project ([hidden email])
+ * @author Iain McGinniss ([hidden email])
+ * @version $Rev$, $Date$
+ */
+public class HttpTunnelServerChannelFactory implements ServerSocketChannelFactory {
+
+ private ServerSocketChannelFactory realConnectionFactory;
+ private ChannelGroup realConnections;
+
+ public HttpTunnelServerChannelFactory(ServerSocketChannelFactory realConnectionFactory) {
+ this.realConnectionFactory = realConnectionFactory;
+ realConnections = new DefaultChannelGroup();
+ }
+
+ public HttpTunnelServerChannel newChannel(ChannelPipeline pipeline) {
+ HttpTunnelServerChannel channel = new HttpTunnelServerChannel(this, pipeline);
+ ServerMessageSwitch messageSwitch = new ServerMessageSwitch(channel);
+ ServerSocketChannel realChannel = createRealChannel(channel, messageSwitch);
+ channel.setRealChannel(realChannel, messageSwitch);
+ return channel;
+ }
+
+ private ServerSocketChannel createRealChannel(HttpTunnelServerChannel channel, ServerMessageSwitch messageSwitch) {
+ ChannelPipeline realChannelPipeline = Channels.pipeline();
+ AcceptedServerChannelPipelineFactory realPipelineFactory = new AcceptedServerChannelPipelineFactory(messageSwitch);
+ realChannelPipeline.addFirst(TunnelWrappedServerChannelHandler.NAME, new TunnelWrappedServerChannelHandler(channel, realPipelineFactory, realConnections));
+ ServerSocketChannel newChannel = realConnectionFactory.newChannel(realChannelPipeline);
+ realConnections.add(newChannel);
+ return newChannel;
+ }
+
+ public void releaseExternalResources() {
+ realConnections.close();
+ realConnectionFactory.releaseExternalResources();
+ }
+
+}

Added: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelSink.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelSink.java (rev 0)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelSink.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jboss.netty.channel.socket.httptunnel;
+
+import java.net.SocketAddress;
+
+import org.jboss.netty.channel.AbstractChannelSink;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelFutureListener;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelStateEvent;
+import org.jboss.netty.channel.socket.ServerSocketChannel;
+
+/**
+ * @author The Netty Project ([hidden email])
+ * @author Iain McGinniss ([hidden email])
+ * @version $Rev$, $Date$
+ */
+class HttpTunnelServerChannelSink extends AbstractChannelSink {
+
+ private ServerSocketChannel realChannel;
+
+ public void eventSunk(ChannelPipeline pipeline, ChannelEvent e) throws Exception {
+
+ if(e instanceof ChannelStateEvent) {
+ ChannelStateEvent ev = (ChannelStateEvent) e;
+ switch(ev.getState()) {
+ case OPEN:
+ if(Boolean.FALSE.equals(ev.getValue())) {
+ realChannel.close().addListener(new ChannelFutureProxy(e.getFuture()));
+ }
+ break;
+ case BOUND:
+ if(ev.getValue() != null) {
+ realChannel.bind((SocketAddress)ev.getValue()).addListener(new ChannelFutureProxy(e.getFuture()));
+ } else {
+ realChannel.unbind().addListener(new ChannelFutureProxy(e.getFuture()));
+ }
+ break;
+ }
+ }
+ }
+
+ private final class ChannelFutureProxy implements ChannelFutureListener {
+ private final ChannelFuture upstreamFuture;
+
+ private ChannelFutureProxy(ChannelFuture upstreamFuture) {
+ this.upstreamFuture = upstreamFuture;
+ }
+
+ public void operationComplete(ChannelFuture future) throws Exception {
+ if(future.isSuccess()) {
+ upstreamFuture.setSuccess();
+ } else {
+ upstreamFuture.setFailure(future.getCause());
+ }
+ }
+ }
+
+ public void setRealChannel(ServerSocketChannel realChannel) {
+ this.realChannel = realChannel;
+ }
+}

Added: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitch.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitch.java (rev 0)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitch.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,169 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jboss.netty.channel.socket.httptunnel;
+
+import java.net.SocketAddress;
+import java.util.List;
+import java.util.Random;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelFutureListener;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.handler.codec.http.HttpResponse;
+
+/**
+ * @author The Netty Project ([hidden email])
+ * @author Iain McGinniss ([hidden email])
+ * @version $Rev$, $Date$
+ */
+class ServerMessageSwitch implements ServerMessageSwitchUpstreamInterface, ServerMessageSwitchDownstreamInterface {
+
+ private static final Logger LOG = Logger.getLogger(ServerMessageSwitch.class.getName());
+
+ private String tunnelIdPrefix;
+ private AtomicInteger tunnelIdSequence;
+
+ private HttpTunnelAcceptedChannelFactory newChannelFactory;
+ private ConcurrentHashMap<String, TunnelInfo> tunnelsById;
+
+ public ServerMessageSwitch(HttpTunnelAcceptedChannelFactory newChannelFactory) {
+ this.newChannelFactory = newChannelFactory;
+ tunnelIdPrefix = Long.toHexString(new Random().nextLong());
+ tunnelIdSequence = new AtomicInteger(0);
+ tunnelsById = new ConcurrentHashMap<String, TunnelInfo>();
+ }
+
+ public String createTunnel(SocketAddress remoteAddress) {
+ String newTunnelId = tunnelIdPrefix + '_' + tunnelIdSequence.incrementAndGet();
+ TunnelInfo newTunnel = new TunnelInfo();
+ newTunnel.tunnelId = newTunnelId;
+ tunnelsById.put(newTunnelId, newTunnel);
+ newTunnel.localChannel = newChannelFactory.newChannel(newTunnelId, remoteAddress);
+ return newTunnelId;
+ }
+
+ public boolean isOpenTunnel(String tunnelId) {
+ TunnelInfo tunnel = tunnelsById.get(tunnelId);
+ return tunnel != null;
+ }
+
+ public void pollOutboundData(String tunnelId, Channel channel) {
+ TunnelInfo tunnel = tunnelsById.get(tunnelId);
+ if(tunnel == null) {
+ LOG.log(Level.WARNING, "Poll request for tunnel {0} which does not exist or already closed");
+ Channels.write(channel, HttpTunnelMessageUtils.createRejection(null, "Unknown tunnel, possibly already closed"));
+ return;
+ }
+
+ if(!tunnel.responseChannel.compareAndSet(null, channel)) {
+ LOG.log(Level.WARNING, "Duplicate poll request detected for tunnel {0}", tunnelId);
+ Channels.write(channel, HttpTunnelMessageUtils.createRejection(null, "Only one poll request at a time per tunnel allowed"));
+ return;
+ }
+
+ sendQueuedData(tunnel);
+ }
+
+ private void sendQueuedData(TunnelInfo state) {
+ ConcurrentLinkedQueue<QueuedResponse> queuedData = state.queuedResponses;
+ if(queuedData.peek() == null) {
+ // no data to send, or it has already been dealt with by another thread
+ return;
+ }
+
+ Channel responseChannel = state.responseChannel.getAndSet(null);
+ if(responseChannel == null) {
+ // no response channel, or another thread has already used it
+ return;
+ }
+
+ LOG.log(Level.FINE, "sending response for tunnel id {0} to {1}", new Object[] { state.tunnelId, responseChannel.getRemoteAddress() });
+ QueuedResponse messageToSend = queuedData.poll();
+ HttpResponse response = HttpTunnelMessageUtils.createRecvDataResponse(messageToSend.data);
+ final ChannelFuture originalFuture = messageToSend.writeFuture;
+ Channels.write(responseChannel, response).addListener(new ChannelFutureListener() {
+ public void operationComplete(ChannelFuture future) throws Exception {
+ if(future.isSuccess()) {
+ originalFuture.setSuccess();
+ } else {
+ originalFuture.setFailure(future.getCause());
+ }
+ }
+ });
+ }
+
+ public void routeInboundData(String tunnelId, ChannelBuffer inboundData) {
+ TunnelInfo tunnel = tunnelsById.get(tunnelId);
+ if(tunnel == null) {
+ return;
+ }
+
+ LOG.log(Level.FINE, "routing inbound data for tunnel {0}", tunnelId);
+ Channels.fireMessageReceived(tunnel.localChannel, inboundData);
+ }
+
+ public void closeTunnel(String tunnelId) {
+ tunnelsById.remove(tunnelId);
+ }
+
+ public void routeOutboundData(String tunnelId, ChannelBuffer data, ChannelFuture writeFuture) {
+ TunnelInfo tunnel = tunnelsById.get(tunnelId);
+ if(tunnel == null) {
+ // tunnel is closed
+ LOG.log(Level.WARNING, "attempt made to send data out on tunnel id {0} which is unknown or closed", tunnelId);
+ return;
+ }
+
+ WriteSplitter splitter = new WriteSplitter(HttpTunnelMessageUtils.MAX_BODY_SIZE);
+
+ ChannelFutureAggregator aggregator = new ChannelFutureAggregator(writeFuture);
+ List<ChannelBuffer> fragments = splitter.split(data);
+
+ LOG.log(Level.FINE, "routing outbound data for tunnel {0}", tunnelId);
+ for(ChannelBuffer fragment : fragments) {
+ ChannelFuture fragmentFuture = Channels.future(writeFuture.getChannel());
+ aggregator.addFuture(fragmentFuture);
+ tunnel.queuedResponses.offer(new QueuedResponse(fragment, fragmentFuture));
+ }
+
+ sendQueuedData(tunnel);
+ }
+
+ private class TunnelInfo {
+ public String tunnelId;
+ public Channel localChannel;
+ public AtomicReference<Channel> responseChannel = new AtomicReference<Channel>(null);
+ public ConcurrentLinkedQueue<QueuedResponse> queuedResponses = new ConcurrentLinkedQueue<QueuedResponse>();
+ }
+
+ private class QueuedResponse {
+ public ChannelBuffer data;
+ public ChannelFuture writeFuture;
+
+ public QueuedResponse(ChannelBuffer data, ChannelFuture writeFuture) {
+ this.data = data;
+ this.writeFuture = writeFuture;
+ }
+ }
+}

Added: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitchDownstreamInterface.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitchDownstreamInterface.java (rev 0)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitchDownstreamInterface.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jboss.netty.channel.socket.httptunnel;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.channel.ChannelFuture;
+
+/**
+ * @author The Netty Project ([hidden email])
+ * @author Iain McGinniss ([hidden email])
+ * @version $Rev$, $Date$
+ */
+interface ServerMessageSwitchDownstreamInterface {
+
+ public void closeTunnel(String tunnelId);
+
+ public void routeOutboundData(String tunnelId, ChannelBuffer data, ChannelFuture writeFuture);
+
+}
\ No newline at end of file

Added: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitchUpstreamInterface.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitchUpstreamInterface.java (rev 0)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitchUpstreamInterface.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jboss.netty.channel.socket.httptunnel;
+
+import java.net.SocketAddress;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.channel.Channel;
+
+/**
+ * @author The Netty Project ([hidden email])
+ * @author Iain McGinniss ([hidden email])
+ * @version $Rev$, $Date$
+ */
+interface ServerMessageSwitchUpstreamInterface {
+
+ public String createTunnel(SocketAddress remoteAddress);
+
+ public boolean isOpenTunnel(String tunnelId);
+
+ public void closeTunnel(String tunnelId);
+
+ public void routeInboundData(String tunnelId, ChannelBuffer inboundData);
+
+ public void pollOutboundData(String tunnelId, Channel responseChannel);
+
+}
\ No newline at end of file

Added: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/TunnelWrappedServerChannelHandler.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/TunnelWrappedServerChannelHandler.java (rev 0)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/TunnelWrappedServerChannelHandler.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jboss.netty.channel.socket.httptunnel;
+
+import java.net.SocketAddress;
+
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.ChannelStateEvent;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.channel.ChildChannelStateEvent;
+import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import org.jboss.netty.channel.group.ChannelGroup;
+
+/**
+ * @author The Netty Project ([hidden email])
+ * @author Iain McGinniss ([hidden email])
+ * @version $Rev$, $Date$
+ */
+@ChannelPipelineCoverage("one")
+class TunnelWrappedServerChannelHandler extends SimpleChannelUpstreamHandler {
+
+ public static final String NAME = "TunnelWrappedServerChannelHandler";
+
+ private HttpTunnelServerChannel tunnelChannel;
+ private AcceptedServerChannelPipelineFactory pipelineFactory;
+ private ChannelGroup allChannels;
+
+ public TunnelWrappedServerChannelHandler(HttpTunnelServerChannel tunnelChannel, AcceptedServerChannelPipelineFactory pipelineFactory, ChannelGroup allChannels) {
+ this.tunnelChannel = tunnelChannel;
+ this.pipelineFactory = pipelineFactory;
+ this.allChannels = allChannels;
+ }
+
+ @Override
+ public void channelOpen(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
+ e.getChannel().getConfig().setPipelineFactory(pipelineFactory);
+ super.channelOpen(ctx, e);
+ }
+
+ @Override
+ public void channelBound(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
+ Channels.fireChannelBound(tunnelChannel, (SocketAddress) e.getValue());
+ super.channelBound(ctx, e);
+ }
+
+ @Override
+ public void channelUnbound(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
+ Channels.fireChannelUnbound(tunnelChannel);
+ super.channelUnbound(ctx, e);
+ }
+
+ @Override
+ public void channelClosed(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
+ Channels.fireChannelClosed(tunnelChannel);
+ super.channelClosed(ctx, e);
+ }
+
+ @Override
+ public void childChannelOpen(ChannelHandlerContext ctx, ChildChannelStateEvent e) throws Exception {
+ allChannels.add(e.getChildChannel());
+ }
+}

Added: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/WriteFragmenter.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/WriteFragmenter.java (rev 0)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/WriteFragmenter.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jboss.netty.channel.socket.httptunnel;
+
+
+import java.util.List;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.channel.SimpleChannelDownstreamHandler;
+
+/**
+ * Downstream handler which places an upper bound on the size of written
+ * {@link org.jboss.netty.ChannelBuffer ChannelBuffers}. If a buffer
+ * is bigger than the specified upper bound, the buffer is broken up
+ * into two or more smaller pieces.
+ * <p>
+ * This is utilised by the http tunnel to smooth out the per-byte latency,
+ * by placing an upper bound on HTTP request / response body sizes.
+ *
+ * @author The Netty Project ([hidden email])
+ * @author Iain McGinniss ([hidden email])
+ * @version $Rev$, $Date$
+ */
+@ChannelPipelineCoverage("one")
+public class WriteFragmenter extends SimpleChannelDownstreamHandler {
+
+ public static final String NAME = "writeFragmenter";
+ private int splitThreshold;
+
+ public WriteFragmenter(int splitThreshold) {
+ this.splitThreshold = splitThreshold;
+ }
+
+ public void setSplitThreshold(int splitThreshold) {
+ this.splitThreshold = splitThreshold;
+ }
+
+ @Override
+ public void writeRequested(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
+ ChannelBuffer data = (ChannelBuffer)e.getMessage();
+
+ if(data.readableBytes() <= splitThreshold) {
+ super.writeRequested(ctx, e);
+ } else {
+ WriteSplitter splitter = new WriteSplitter(splitThreshold);
+ List<ChannelBuffer> fragments = splitter.split(data);
+ ChannelFutureAggregator aggregator = new ChannelFutureAggregator(e.getFuture());
+ for(ChannelBuffer fragment : fragments) {
+ ChannelFuture fragmentFuture = Channels.future(ctx.getChannel(), true);
+ aggregator.addFuture(fragmentFuture);
+ Channels.write(ctx, fragmentFuture, fragment);
+ }
+ }
+ }
+}

Added: branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/WriteSplitter.java
===================================================================
--- branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/WriteSplitter.java (rev 0)
+++ branches/httptunnel/src/main/java/org/jboss/netty/channel/socket/httptunnel/WriteSplitter.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jboss.netty.channel.socket.httptunnel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+
+/**
+ * Provides functionality to split a provided ChannelBuffer into multiple fragments which fit
+ * under a specified size threshold.
+ *
+ * @author The Netty Project ([hidden email])
+ * @author Iain McGinniss ([hidden email])
+ * @version $Rev$, $Date$
+ */
+public class WriteSplitter {
+
+ private int splitThreshold;
+
+ public WriteSplitter(int splitThreshold) {
+ this.splitThreshold = splitThreshold;
+ }
+
+ public List<ChannelBuffer> split(ChannelBuffer buffer) {
+ int listSize = (int)(((float)buffer.readableBytes()) / splitThreshold);
+ ArrayList<ChannelBuffer> fragmentList = new ArrayList<ChannelBuffer>(listSize);
+
+ int startReadIndex = buffer.readerIndex();
+
+ if(buffer.readableBytes() > splitThreshold) {
+ while(buffer.readable()) {
+ ChannelBuffer chunk = ChannelBuffers.buffer(Math.min(splitThreshold, buffer.readableBytes()));
+ buffer.readBytes(chunk);
+ fragmentList.add(chunk);
+ }
+ } else {
+ fragmentList.add(ChannelBuffers.wrappedBuffer(buffer));
+ }
+
+ buffer.readerIndex(startReadIndex);
+
+ return fragmentList;
+ }
+
+}

Added: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/AcceptedServerChannelRequestDispatchTest.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/AcceptedServerChannelRequestDispatchTest.java (rev 0)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/AcceptedServerChannelRequestDispatchTest.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,176 @@
+package org.jboss.netty.channel.socket.httptunnel;
+
+
+import static org.junit.Assert.*;
+
+import java.net.InetSocketAddress;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.handler.codec.http.HttpRequest;
+import org.jboss.netty.handler.codec.http.HttpResponse;
+import org.jmock.Expectations;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * @author [hidden email]
+ */
+@RunWith(JMock.class)
+@Ignore
+public class AcceptedServerChannelRequestDispatchTest {
+
+ private static final String HOST = "test.server.com";
+
+ private static final String KNOWN_TUNNEL_ID = "1";
+ protected static final String UNKNOWN_TUNNEL_ID = "unknownTunnel";
+
+ private JUnit4Mockery mockContext = new JUnit4Mockery();
+
+ private AcceptedServerChannelRequestDispatch handler;
+ private FakeSocketChannel channel;
+ private FakeChannelSink sink;
+ private ServerMessageSwitchUpstreamInterface messageSwitch;
+
+ @Before
+ public void setUp() throws Exception {
+ ChannelPipeline pipeline = Channels.pipeline();
+ messageSwitch = mockContext.mock(ServerMessageSwitchUpstreamInterface.class);
+ handler = new AcceptedServerChannelRequestDispatch(messageSwitch);
+ pipeline.addLast(AcceptedServerChannelRequestDispatch.NAME, handler);
+ sink = new FakeChannelSink();
+ channel = new FakeSocketChannel(null, null, pipeline, sink);
+ channel.remoteAddress = InetSocketAddress.createUnresolved("test.client.com", 51231);
+
+ mockContext.checking(new Expectations() {{
+ ignoring(messageSwitch).isOpenTunnel(KNOWN_TUNNEL_ID); will(returnValue(true));
+ }});
+ }
+
+ @Test
+ public void testTunnelOpenRequest() {
+ mockContext.checking(new Expectations() {{
+ one(messageSwitch).createTunnel(channel.remoteAddress); will(returnValue(KNOWN_TUNNEL_ID));
+ }});
+
+ Channels.fireMessageReceived(channel, HttpTunnelMessageUtils.createOpenTunnelRequest(HOST));
+ assertEquals(1, sink.events.size());
+ HttpResponse response = NettyTestUtils.checkIsDownstreamMessageEvent(sink.events.poll(), HttpResponse.class);
+ assertTrue(HttpTunnelMessageUtils.isTunnelOpenResponse(response));
+ }
+
+ @Test
+ public void testTunnelCloseRequest() {
+ mockContext.checking(new Expectations() {{
+ one(messageSwitch).closeTunnel(KNOWN_TUNNEL_ID);
+ }});
+
+ HttpRequest request = HttpTunnelMessageUtils.createCloseTunnelRequest(HOST, KNOWN_TUNNEL_ID);
+ Channels.fireMessageReceived(channel, request);
+ assertEquals(1, sink.events.size());
+ HttpResponse response = NettyTestUtils.checkIsDownstreamMessageEvent(sink.events.poll(), HttpResponse.class);
+ assertTrue(HttpTunnelMessageUtils.isTunnelCloseResponse(response));
+ }
+
+ @Test
+ public void testTunnelCloseRequestWithoutTunnelIdRejected() {
+ HttpRequest request = HttpTunnelMessageUtils.createCloseTunnelRequest(HOST, null);
+ checkRequestWithoutTunnelIdIsRejected(request);
+ }
+
+ @Test
+ public void testTunnelCloseRequestWithUnknownTunnelId() {
+ HttpRequest request = HttpTunnelMessageUtils.createCloseTunnelRequest(HOST, UNKNOWN_TUNNEL_ID);
+ checkRequestWithUnknownTunnelIdIsRejected(request);
+ }
+
+ @Test
+ public void testSendDataRequest() {
+ final ChannelBuffer expectedData = ChannelBuffers.dynamicBuffer();
+ expectedData.writeLong(1234L);
+ mockContext.checking(new Expectations() {{
+ one(messageSwitch).routeInboundData(KNOWN_TUNNEL_ID, expectedData);
+ }});
+
+ HttpRequest request = HttpTunnelMessageUtils.createSendDataRequest(HOST, KNOWN_TUNNEL_ID, expectedData);
+ Channels.fireMessageReceived(channel, request);
+
+ assertEquals(1, sink.events.size());
+ HttpResponse response = NettyTestUtils.checkIsDownstreamMessageEvent(sink.events.poll(), HttpResponse.class);
+ assertTrue(HttpTunnelMessageUtils.isOKResponse(response));
+ }
+
+ @Test
+ public void testSendDataRequestWithNoContentRejected() {
+ HttpRequest request = HttpTunnelMessageUtils.createSendDataRequest(HOST, KNOWN_TUNNEL_ID, ChannelBuffers.dynamicBuffer());
+ Channels.fireMessageReceived(channel, request);
+
+ assertEquals(1, sink.events.size());
+ checkResponseIsRejection("Send data requests must contain data");
+ }
+
+ @Test
+ public void testSendDataRequestForUnknownTunnelIdRejected() {
+ HttpRequest request = HttpTunnelMessageUtils.createSendDataRequest(HOST, UNKNOWN_TUNNEL_ID, ChannelBuffers.dynamicBuffer());
+ checkRequestWithUnknownTunnelIdIsRejected(request);
+ }
+
+ @Test
+ public void testSendDataRequestWithoutTunnelIdRejected() {
+ HttpRequest request = HttpTunnelMessageUtils.createSendDataRequest(HOST, null, ChannelBuffers.dynamicBuffer());
+ checkRequestWithoutTunnelIdIsRejected(request);
+ }
+
+ @Test
+ public void testReceiveDataRequest() {
+ mockContext.checking(new Expectations() {{
+ one(messageSwitch).pollOutboundData(KNOWN_TUNNEL_ID, channel);
+ }});
+ HttpRequest request = HttpTunnelMessageUtils.createReceiveDataRequest(HOST, KNOWN_TUNNEL_ID);
+ Channels.fireMessageReceived(channel, request);
+ }
+
+ @Test
+ public void testReceiveDataRequestWithoutTunnelIdRejected() {
+ HttpRequest request = HttpTunnelMessageUtils.createReceiveDataRequest(HOST, null);
+ checkRequestWithoutTunnelIdIsRejected(request);
+ }
+
+ @Test
+ public void testReceiveDataRequestForUnknownTunnelIdRejected() {
+ HttpRequest request = HttpTunnelMessageUtils.createReceiveDataRequest(HOST, UNKNOWN_TUNNEL_ID);
+ checkRequestWithUnknownTunnelIdIsRejected(request);
+ }
+
+ private void checkRequestWithoutTunnelIdIsRejected(HttpRequest request) {
+ Channels.fireMessageReceived(channel, request);
+ assertEquals(1, sink.events.size());
+
+ HttpResponse response = NettyTestUtils.checkIsDownstreamMessageEvent(sink.events.poll(), HttpResponse.class);
+ assertTrue(HttpTunnelMessageUtils.isRejection(response));
+ assertEquals("no tunnel id specified in send data request", HttpTunnelMessageUtils.extractErrorMessage(response));
+ }
+
+ private void checkRequestWithUnknownTunnelIdIsRejected(HttpRequest request) {
+ mockContext.checking(new Expectations() {{
+ one(messageSwitch).isOpenTunnel(UNKNOWN_TUNNEL_ID); will(returnValue(false));
+ }});
+
+ Channels.fireMessageReceived(channel, request);
+ assertEquals(1, sink.events.size());
+
+ checkResponseIsRejection("tunnel id \"unknownTunnel\" is either closed or does not exist");
+ }
+
+ private void checkResponseIsRejection(String errorMessage) {
+ HttpResponse response = NettyTestUtils.checkIsDownstreamMessageEvent(sink.events.poll(), HttpResponse.class);
+ assertTrue(HttpTunnelMessageUtils.isRejection(response));
+ assertEquals(errorMessage, HttpTunnelMessageUtils.extractErrorMessage(response));
+ }
+}

Added: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeChannelConfig.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeChannelConfig.java (rev 0)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeChannelConfig.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,161 @@
+package org.jboss.netty.channel.socket.httptunnel;
+
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.jboss.netty.buffer.ChannelBufferFactory;
+import org.jboss.netty.buffer.HeapChannelBufferFactory;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.channel.socket.SocketChannelConfig;
+import org.jboss.netty.util.internal.ConversionUtil;
+
+/**
+ * @author [hidden email]
+ */
+public class FakeChannelConfig implements SocketChannelConfig {
+
+ private int receiveBufferSize = 1024;
+ private int sendBufferSize = 1024;
+ private int soLinger = 500;
+ private int trafficClass = 0;
+ private boolean keepAlive = true;
+ private boolean reuseAddress = true;
+ private boolean tcpNoDelay = false;
+ private ChannelBufferFactory bufferFactory = new HeapChannelBufferFactory();
+ private int connectTimeout = 5000;
+ private ChannelPipelineFactory pipelineFactory = new ChannelPipelineFactory() {
+ public ChannelPipeline getPipeline() throws Exception {
+ return Channels.pipeline();
+ }
+ };
+
+ private int writeTimeout = 3000;
+
+ public int getReceiveBufferSize() {
+ return receiveBufferSize;
+ }
+
+ public void setReceiveBufferSize(int receiveBufferSize) {
+ this.receiveBufferSize = receiveBufferSize;
+ }
+
+ public int getSendBufferSize() {
+ return sendBufferSize;
+ }
+
+ public void setSendBufferSize(int sendBufferSize) {
+ this.sendBufferSize = sendBufferSize;
+ }
+
+ public int getSoLinger() {
+ return soLinger;
+ }
+
+ public void setSoLinger(int soLinger) {
+ this.soLinger = soLinger;
+ }
+
+ public int getTrafficClass() {
+ return trafficClass;
+ }
+
+ public void setTrafficClass(int trafficClass) {
+ this.trafficClass = trafficClass;
+ }
+
+ public boolean isKeepAlive() {
+ return keepAlive;
+ }
+
+ public void setKeepAlive(boolean keepAlive) {
+ this.keepAlive = keepAlive;
+ }
+
+ public boolean isReuseAddress() {
+ return reuseAddress;
+ }
+
+ public void setReuseAddress(boolean reuseAddress) {
+ this.reuseAddress = reuseAddress;
+ }
+
+ public boolean isTcpNoDelay() {
+ return tcpNoDelay;
+ }
+
+ public void setTcpNoDelay(boolean tcpNoDelay) {
+ this.tcpNoDelay = tcpNoDelay;
+ }
+
+ public void setPerformancePreferences(int connectionTime, int latency, int bandwidth) {
+ // do nothing
+ }
+
+ public ChannelBufferFactory getBufferFactory() {
+ return bufferFactory;
+ }
+
+ public void setBufferFactory(ChannelBufferFactory bufferFactory) {
+ this.bufferFactory = bufferFactory;
+ }
+
+ public int getConnectTimeoutMillis() {
+ return connectTimeout;
+ }
+
+ public void setConnectTimeoutMillis(int connectTimeoutMillis) {
+ this.connectTimeout = connectTimeoutMillis;
+ }
+
+ public ChannelPipelineFactory getPipelineFactory() {
+ return pipelineFactory;
+ }
+
+ public void setPipelineFactory(ChannelPipelineFactory pipelineFactory) {
+ this.pipelineFactory = pipelineFactory;
+ }
+
+ public int getWriteTimeoutMillis() {
+ return writeTimeout;
+ }
+
+ public void setWriteTimeoutMillis(int writeTimeoutMillis) {
+ this.writeTimeout = writeTimeoutMillis;
+ }
+
+ public boolean setOption(String key, Object value) {
+ if (key.equals("pipelineFactory")) {
+ setPipelineFactory((ChannelPipelineFactory) value);
+ } else if (key.equals("connectTimeoutMillis")) {
+ setConnectTimeoutMillis(ConversionUtil.toInt(value));
+ } else if (key.equals("bufferFactory")) {
+ setBufferFactory((ChannelBufferFactory) value);
+ } else if (key.equals("receiveBufferSize")) {
+ setReceiveBufferSize(ConversionUtil.toInt(value));
+ } else if (key.equals("sendBufferSize")) {
+ setSendBufferSize(ConversionUtil.toInt(value));
+ } else if (key.equals("tcpNoDelay")) {
+ setTcpNoDelay(ConversionUtil.toBoolean(value));
+ } else if (key.equals("keepAlive")) {
+ setKeepAlive(ConversionUtil.toBoolean(value));
+ } else if (key.equals("reuseAddress")) {
+ setReuseAddress(ConversionUtil.toBoolean(value));
+ } else if (key.equals("soLinger")) {
+ setSoLinger(ConversionUtil.toInt(value));
+ } else if (key.equals("trafficClass")) {
+ setTrafficClass(ConversionUtil.toInt(value));
+ } else {
+ return false;
+ }
+ return true;
+ }
+
+ public void setOptions(Map<String, Object> options) {
+ for (Entry<String, Object> e: options.entrySet()) {
+ setOption(e.getKey(), e.getValue());
+ }
+ }
+
+}

Added: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeChannelSink.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeChannelSink.java (rev 0)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeChannelSink.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,21 @@
+package org.jboss.netty.channel.socket.httptunnel;
+
+import java.util.LinkedList;
+import java.util.Queue;
+
+import org.jboss.netty.channel.AbstractChannelSink;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelPipeline;
+
+/**
+ * @author [hidden email]
+ */
+public class FakeChannelSink extends AbstractChannelSink {
+
+ public Queue<ChannelEvent> events = new LinkedList<ChannelEvent>();
+
+ public void eventSunk(ChannelPipeline pipeline, ChannelEvent e) throws Exception {
+ events.add(e);
+ }
+
+}

Added: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeClientSocketChannelFactory.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeClientSocketChannelFactory.java (rev 0)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeClientSocketChannelFactory.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,31 @@
+package org.jboss.netty.channel.socket.httptunnel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.socket.ClientSocketChannelFactory;
+import org.jboss.netty.channel.socket.SocketChannel;
+
+/**
+ * @author [hidden email]
+ */
+public class FakeClientSocketChannelFactory implements ClientSocketChannelFactory {
+
+ public List<FakeSocketChannel> createdChannels;
+
+ public FakeClientSocketChannelFactory() {
+ createdChannels = new ArrayList<FakeSocketChannel>();
+ }
+
+ public SocketChannel newChannel(ChannelPipeline pipeline) {
+ FakeSocketChannel channel = new FakeSocketChannel(null, this, pipeline, new FakeChannelSink());
+ createdChannels.add(channel);
+ return channel;
+ }
+
+ public void releaseExternalResources() {
+ // nothing to do
+ }
+
+}

Added: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeServerSocketChannel.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeServerSocketChannel.java (rev 0)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeServerSocketChannel.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,63 @@
+package org.jboss.netty.channel.socket.httptunnel;
+
+import static org.jboss.netty.channel.Channels.*;
+
+import java.net.InetSocketAddress;
+
+import org.jboss.netty.channel.AbstractChannel;
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelSink;
+import org.jboss.netty.channel.socket.ServerSocketChannel;
+import org.jboss.netty.channel.socket.ServerSocketChannelConfig;
+
+/**
+ * @author [hidden email]
+ */
+public class FakeServerSocketChannel extends AbstractChannel implements ServerSocketChannel {
+
+ public boolean bound;
+ public boolean connected;
+ public InetSocketAddress remoteAddress;
+ public InetSocketAddress localAddress;
+ public ServerSocketChannelConfig config = new FakeServerSocketChannelConfig();
+
+ public FakeServerSocketChannel(ChannelFactory factory, ChannelPipeline pipeline, ChannelSink sink) {
+ super(null, factory, pipeline, sink);
+ }
+
+ public ServerSocketChannelConfig getConfig() {
+ return config;
+ }
+
+ public InetSocketAddress getLocalAddress() {
+ return localAddress;
+ }
+
+ public InetSocketAddress getRemoteAddress() {
+ return remoteAddress;
+ }
+
+ public boolean isBound() {
+ return bound;
+ }
+
+ public boolean isConnected() {
+ return connected;
+ }
+
+
+ public FakeSocketChannel acceptNewConnection(InetSocketAddress remoteAddress, ChannelSink sink) throws Exception {
+ ChannelPipeline newPipeline = getConfig().getPipelineFactory().getPipeline();
+ FakeSocketChannel newChannel = new FakeSocketChannel(this, getFactory(), newPipeline, sink);
+ newChannel.localAddress = this.localAddress;
+ newChannel.remoteAddress = remoteAddress;
+ fireChannelOpen(newChannel);
+ fireChannelBound(newChannel, newChannel.localAddress);
+ fireChannelConnected(this, newChannel.remoteAddress);
+
+ return newChannel;
+ }
+
+
+}

Added: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeServerSocketChannelConfig.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeServerSocketChannelConfig.java (rev 0)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeServerSocketChannelConfig.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,49 @@
+package org.jboss.netty.channel.socket.httptunnel;
+
+import org.jboss.netty.buffer.ChannelBufferFactory;
+import org.jboss.netty.buffer.HeapChannelBufferFactory;
+import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.channel.DefaultChannelConfig;
+import org.jboss.netty.channel.socket.ServerSocketChannelConfig;
+
+/**
+ * @author [hidden email]
+ */
+public class FakeServerSocketChannelConfig extends DefaultChannelConfig implements ServerSocketChannelConfig {
+
+ public int backlog = 5;
+ public int receiveBufferSize = 1024;
+ public boolean reuseAddress = false;
+ public int connectionTimeout = 5000;
+ public ChannelPipelineFactory pipelineFactory;
+ public int writeTimeout = 5000;
+ public ChannelBufferFactory bufferFactory = new HeapChannelBufferFactory();
+
+ public int getBacklog() {
+ return backlog;
+ }
+
+ public void setBacklog(int backlog) {
+ this.backlog = backlog;
+ }
+
+ public int getReceiveBufferSize() {
+ return receiveBufferSize;
+ }
+
+ public void setReceiveBufferSize(int receiveBufferSize) {
+ this.receiveBufferSize = receiveBufferSize;
+ }
+
+ public boolean isReuseAddress() {
+ return reuseAddress;
+ }
+
+ public void setReuseAddress(boolean reuseAddress) {
+ this.reuseAddress = reuseAddress;
+ }
+
+ public void setPerformancePreferences(int connectionTime, int latency, int bandwidth) {
+ // ignore
+ }
+}

Added: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeServerSocketChannelFactory.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeServerSocketChannelFactory.java (rev 0)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeServerSocketChannelFactory.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,25 @@
+package org.jboss.netty.channel.socket.httptunnel;
+
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelSink;
+import org.jboss.netty.channel.socket.ServerSocketChannel;
+import org.jboss.netty.channel.socket.ServerSocketChannelFactory;
+
+/**
+ * @author [hidden email]
+ */
+public class FakeServerSocketChannelFactory implements ServerSocketChannelFactory {
+
+ public ChannelSink sink = new FakeChannelSink();
+ public FakeServerSocketChannel createdChannel;
+
+ public ServerSocketChannel newChannel(ChannelPipeline pipeline) {
+ createdChannel = new FakeServerSocketChannel(this, pipeline, sink);
+ return createdChannel;
+ }
+
+ public void releaseExternalResources() {
+ // nothing to do
+ }
+
+}

Added: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeSocketChannel.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeSocketChannel.java (rev 0)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/FakeSocketChannel.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,79 @@
+package org.jboss.netty.channel.socket.httptunnel;
+
+import java.net.InetSocketAddress;
+
+import org.jboss.netty.channel.AbstractChannel;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelSink;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.channel.socket.SocketChannel;
+import org.jboss.netty.channel.socket.SocketChannelConfig;
+
+/**
+ * @author [hidden email]
+ */
+public class FakeSocketChannel extends AbstractChannel implements SocketChannel {
+
+ public InetSocketAddress localAddress;
+ public InetSocketAddress remoteAddress;
+ public SocketChannelConfig config = new FakeChannelConfig();
+ public boolean bound = false;
+ public boolean connected = false;
+ public ChannelSink sink;
+
+ public FakeSocketChannel(Channel parent, ChannelFactory factory, ChannelPipeline pipeline, ChannelSink sink) {
+ super(parent, factory, pipeline, sink);
+ this.sink = sink;
+ }
+
+ public InetSocketAddress getLocalAddress() {
+ return localAddress;
+ }
+
+ public SocketChannelConfig getConfig() {
+ return config;
+ }
+
+ public InetSocketAddress getRemoteAddress() {
+ return remoteAddress;
+ }
+
+ public boolean isBound() {
+ return bound;
+ }
+
+ public boolean isConnected() {
+ return connected;
+ }
+
+ public void emulateConnected(InetSocketAddress localAddress, InetSocketAddress remoteAddress, ChannelFuture connectedFuture) {
+ if(connected) {
+ return;
+ }
+
+ emulateBound(localAddress, null);
+ this.remoteAddress = remoteAddress;
+ connected = true;
+ Channels.fireChannelConnected(this, remoteAddress);
+ if(connectedFuture != null) {
+ connectedFuture.setSuccess();
+ }
+ }
+
+ public void emulateBound(InetSocketAddress localAddress, ChannelFuture boundFuture) {
+ if(bound) {
+ return;
+ }
+
+ bound = true;
+ this.localAddress = localAddress;
+ Channels.fireChannelBound(this, localAddress);
+ if(boundFuture != null) {
+ boundFuture.setSuccess();
+ }
+ }
+
+}

Added: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannelSinkTest.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannelSinkTest.java (rev 0)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelAcceptedChannelSinkTest.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,76 @@
+package org.jboss.netty.channel.socket.httptunnel;
+
+import static org.junit.Assert.*;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.Channels;
+import org.jmock.Expectations;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * @author [hidden email]
+ */
+@RunWith(JMock.class)
+@Ignore
+public class HttpTunnelAcceptedChannelSinkTest {
+
+ private static final String TUNNEL_ID = "1";
+ private JUnit4Mockery mockContext = new JUnit4Mockery();
+ private ServerMessageSwitchDownstreamInterface messageSwitch;
+ private HttpTunnelAcceptedChannelSink sink;
+ private FakeSocketChannel channel;
+ private UpstreamEventCatcher upstreamCatcher;
+
+ @Before
+ public void setUp() throws Exception {
+ messageSwitch = mockContext.mock(ServerMessageSwitchDownstreamInterface.class);
+ sink = new HttpTunnelAcceptedChannelSink(messageSwitch, TUNNEL_ID);
+ ChannelPipeline pipeline = Channels.pipeline();
+ upstreamCatcher = new UpstreamEventCatcher();
+ pipeline.addLast(UpstreamEventCatcher.NAME, upstreamCatcher);
+ channel = new FakeSocketChannel(null, null, pipeline, sink);
+ upstreamCatcher.events.clear();
+ }
+
+ @Test
+ public void testSendData() {
+ final ChannelBuffer outboundData = NettyTestUtils.createData(1234L);
+
+ mockContext.checking(new Expectations() {{
+ one(messageSwitch).routeOutboundData(with(equal(TUNNEL_ID)), with(same(outboundData)), with(any(ChannelFuture.class)));
+ }});
+
+ Channels.write(channel, outboundData);
+ }
+
+ @Test
+ public void testSendInvalidDataType() {
+ Channels.write(channel, new Object());
+ assertEquals(1, upstreamCatcher.events.size());
+ NettyTestUtils.checkIsExceptionEvent(upstreamCatcher.events.poll());
+ }
+
+ @Test
+ public void testUnbind() {
+ mockContext.checking(new Expectations() {{
+ one(messageSwitch).closeTunnel(TUNNEL_ID);
+ }});
+ Channels.unbind(channel);
+ }
+
+ @Test
+ public void testDisconnect() {
+ mockContext.checking(new Expectations() {{
+ one(messageSwitch).closeTunnel(TUNNEL_ID);
+ }});
+
+ Channels.disconnect(channel);
+ }
+}

Added: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelConfigTest.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelConfigTest.java (rev 0)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelConfigTest.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,174 @@
+package org.jboss.netty.channel.socket.httptunnel;
+
+import static org.junit.Assert.*;
+
+import org.jboss.netty.channel.socket.SocketChannelConfig;
+import org.jmock.Expectations;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(JMock.class)
+public class HttpTunnelClientChannelConfigTest {
+
+ JUnit4Mockery mockContext = new JUnit4Mockery();
+
+ SocketChannelConfig sendChannelConfig;
+ SocketChannelConfig pollChannelConfig;
+
+ HttpTunnelClientChannelConfig config;
+
+ @Before
+ public void setUp() {
+ sendChannelConfig = mockContext.mock(SocketChannelConfig.class, "sendChannelConfig");
+ pollChannelConfig = mockContext.mock(SocketChannelConfig.class, "pollChannelConfig");
+
+ config = new HttpTunnelClientChannelConfig(sendChannelConfig, pollChannelConfig);
+ }
+
+ @Test
+ public void testGetReceiveBufferSize() {
+ mockContext.checking(new Expectations() {{
+ one(pollChannelConfig).getReceiveBufferSize(); will(returnValue(100));
+ }});
+
+ assertEquals(100, config.getReceiveBufferSize());
+ }
+
+ @Test
+ public void testGetSendBufferSize() {
+ mockContext.checking(new Expectations() {{
+ one(pollChannelConfig).getSendBufferSize(); will(returnValue(100));
+ }});
+
+ assertEquals(100, config.getSendBufferSize());
+ }
+
+ @Test
+ public void testGetSoLinger() {
+ mockContext.checking(new Expectations() {{
+ one(pollChannelConfig).getSoLinger(); will(returnValue(100));
+ }});
+
+ assertEquals(100, config.getSoLinger());
+ }
+
+ @Test
+ public void testTrafficClass() {
+ mockContext.checking(new Expectations() {{
+ one(pollChannelConfig).getTrafficClass(); will(returnValue(1));
+ }});
+
+ assertEquals(1, config.getTrafficClass());
+ }
+
+ @Test
+ public void testIsKeepAlive() {
+ mockContext.checking(new Expectations() {{
+ one(pollChannelConfig).isKeepAlive(); will(returnValue(true));
+ }});
+
+ assertTrue(config.isKeepAlive());
+ }
+
+ @Test
+ public void testIsReuseAddress() {
+ mockContext.checking(new Expectations() {{
+ one(pollChannelConfig).isReuseAddress(); will(returnValue(true));
+ }});
+
+ assertTrue(config.isReuseAddress());
+ }
+
+ @Test
+ public void testIsTcpNoDelay() {
+ mockContext.checking(new Expectations() {{
+ one(pollChannelConfig).isTcpNoDelay(); will(returnValue(true));
+ }});
+
+ assertTrue(config.isTcpNoDelay());
+ }
+
+ @Test
+ public void testSetKeepAlive() {
+ mockContext.checking(new Expectations() {{
+ one(pollChannelConfig).setKeepAlive(true);
+ one(sendChannelConfig).setKeepAlive(true);
+ }});
+
+ config.setKeepAlive(true);
+ }
+
+ @Test
+ public void testSetPerformancePreferences() {
+ mockContext.checking(new Expectations() {{
+ one(pollChannelConfig).setPerformancePreferences(100, 200, 300);
+ one(sendChannelConfig).setPerformancePreferences(100, 200, 300);
+ }});
+
+ config.setPerformancePreferences(100, 200, 300);
+ }
+
+ @Test
+ public void testSetReceiveBufferSize() {
+ mockContext.checking(new Expectations() {{
+ one(pollChannelConfig).setReceiveBufferSize(100);
+ one(sendChannelConfig).setReceiveBufferSize(100);
+ }});
+
+ config.setReceiveBufferSize(100);
+ }
+
+ @Test
+ public void testSetReuseAddress() {
+ mockContext.checking(new Expectations() {{
+ one(pollChannelConfig).setReuseAddress(true);
+ one(sendChannelConfig).setReuseAddress(true);
+ }});
+
+ config.setReuseAddress(true);
+ }
+
+ @Test
+ public void testSetSendBufferSize() {
+ mockContext.checking(new Expectations() {{
+ one(pollChannelConfig).setSendBufferSize(100);
+ one(sendChannelConfig).setSendBufferSize(100);
+ }});
+
+ config.setSendBufferSize(100);
+ }
+
+ @Test
+ public void testSetSoLinger() {
+ mockContext.checking(new Expectations() {{
+ one(pollChannelConfig).setSoLinger(100);
+ one(sendChannelConfig).setSoLinger(100);
+ }});
+
+ config.setSoLinger(100);
+ }
+
+ @Test
+ public void testTcpNoDelay() {
+ mockContext.checking(new Expectations() {{
+ one(pollChannelConfig).setTcpNoDelay(true);
+ one(sendChannelConfig).setTcpNoDelay(true);
+ }});
+
+ config.setTcpNoDelay(true);
+ }
+
+ @Test
+ public void testSetTrafficClass() {
+ mockContext.checking(new Expectations() {{
+ one(pollChannelConfig).setTrafficClass(1);
+ one(sendChannelConfig).setTrafficClass(1);
+ }});
+
+ config.setTrafficClass(1);
+ }
+
+}

Added: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelTest.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelTest.java (rev 0)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientChannelTest.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,116 @@
+package org.jboss.netty.channel.socket.httptunnel;
+
+
+import static org.junit.Assert.*;
+
+import java.net.InetSocketAddress;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelState;
+import org.jboss.netty.channel.ChannelStateEvent;
+import org.jboss.netty.channel.Channels;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * @author [hidden email]
+ */
+public class HttpTunnelClientChannelTest {
+
+ public static final InetSocketAddress LOCAL_ADDRESS = InetSocketAddress.createUnresolved("localhost", 50123);
+ public static final InetSocketAddress REMOTE_ADDRESS = InetSocketAddress.createUnresolved("test.server.com", 12345);
+
+ private UpstreamEventCatcher upstreamCatcher;
+ private HttpTunnelClientChannel channel;
+
+ private FakeClientSocketChannelFactory outboundFactory;
+ private FakeSocketChannel sendChannel;
+ private FakeSocketChannel pollChannel;
+ private FakeChannelSink sendSink;
+ private FakeChannelSink pollSink;
+
+ @Before
+ public void setUp() throws Exception {
+ ChannelPipeline pipeline = Channels.pipeline();
+ upstreamCatcher = new UpstreamEventCatcher();
+ pipeline.addLast(UpstreamEventCatcher.NAME, upstreamCatcher);
+
+ outboundFactory = new FakeClientSocketChannelFactory();
+
+ HttpTunnelClientChannelFactory factory = new HttpTunnelClientChannelFactory(outboundFactory);
+ channel = factory.newChannel(pipeline);
+
+ assertEquals(2, outboundFactory.createdChannels.size());
+
+ sendChannel = outboundFactory.createdChannels.get(0);
+ pollChannel = outboundFactory.createdChannels.get(1);
+ sendSink = (FakeChannelSink) sendChannel.sink;
+ pollSink = (FakeChannelSink) pollChannel.sink;
+ }
+
+ @Test
+ public void testConnect() {
+ Channels.connect(channel, REMOTE_ADDRESS);
+
+ // this should result in a CONNECTED state event on the send channel, but not on the poll
+ // channel just yet
+ assertEquals(1, sendSink.events.size());
+ assertEquals(0, pollSink.events.size());
+ ChannelEvent sendChannelEvent = sendSink.events.poll();
+ NettyTestUtils.checkIsStateEvent(sendChannelEvent, ChannelState.CONNECTED, REMOTE_ADDRESS);
+
+ // once the send channel indicates that it is connected, we should see the tunnel open request
+ // being sent
+ sendChannel.emulateConnected(LOCAL_ADDRESS, REMOTE_ADDRESS, ((ChannelStateEvent)sendChannelEvent).getFuture());
+ assertEquals(1, sendSink.events.size());
+ ChannelEvent openTunnelRequest = sendSink.events.poll();
+ NettyTestUtils.checkIsDownstreamMessageEvent(openTunnelRequest, ChannelBuffer.class);
+ }
+
+ @Test
+ public void testBind() {
+ ChannelFuture bindFuture = Channels.bind(channel, LOCAL_ADDRESS);
+ assertFalse(bindFuture.isDone());
+
+ assertEquals(1, sendSink.events.size());
+ assertEquals(1, pollSink.events.size());
+
+ ChannelEvent sendChannelEvent = sendSink.events.poll();
+ NettyTestUtils.checkIsStateEvent(sendChannelEvent, ChannelState.BOUND, LOCAL_ADDRESS);
+ ChannelEvent pollChannelEvent = pollSink.events.poll();
+ NettyTestUtils.checkIsStateEvent(pollChannelEvent, ChannelState.BOUND, LOCAL_ADDRESS);
+
+ sendChannel.emulateBound(LOCAL_ADDRESS, sendChannelEvent.getFuture());
+ assertFalse(bindFuture.isDone());
+ pollChannel.emulateBound(LOCAL_ADDRESS, pollChannelEvent.getFuture());
+ assertTrue(bindFuture.isDone());
+ assertTrue(bindFuture.isSuccess());
+ }
+
+ @Test
+ public void testBind_sendBindFails() {
+ ChannelFuture bindFuture = Channels.bind(channel, LOCAL_ADDRESS);
+ assertFalse(bindFuture.isDone());
+
+ Exception bindFailureReason = new Exception("could not bind");
+ ((ChannelStateEvent) sendSink.events.poll()).getFuture().setFailure(bindFailureReason);
+ assertTrue(bindFuture.isDone());
+ assertFalse(bindFuture.isSuccess());
+ assertSame(bindFailureReason, bindFuture.getCause());
+ }
+
+ @Test
+ public void testBind_pollBindFails() {
+ ChannelFuture bindFuture = Channels.bind(channel, LOCAL_ADDRESS);
+ assertFalse(bindFuture.isDone());
+
+ Exception bindFailureReason = new Exception("could not bind");
+ ((ChannelStateEvent) pollSink.events.poll()).getFuture().setFailure(bindFailureReason);
+ assertTrue(bindFuture.isDone());
+ assertFalse(bindFuture.isSuccess());
+ assertSame(bindFailureReason, bindFuture.getCause());
+ }
+}

Added: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientPollHandlerTest.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientPollHandlerTest.java (rev 0)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientPollHandlerTest.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,91 @@
+package org.jboss.netty.channel.socket.httptunnel;
+
+
+import static org.junit.Assert.*;
+
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.UnknownHostException;
+
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.channel.DownstreamMessageEvent;
+import org.jboss.netty.handler.codec.http.HttpRequest;
+import org.jboss.netty.handler.codec.http.HttpResponse;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * @author [hidden email]
+ */
+public class HttpTunnelClientPollHandlerTest {
+
+ private static final String TUNNEL_ID = "1";
+ private static final InetSocketAddress SERVER_ADDRESS = createAddress(new byte[] { 10, 0, 0, 3}, 12345);
+ private static final InetSocketAddress PROXY_ADDRESS = createAddress(new byte[] { 10, 0, 0, 2 }, 8888);
+ private static final InetSocketAddress LOCAL_ADDRESS = createAddress(new byte[] { 10, 0, 0, 1 }, 54321);
+
+
+ private FakeSocketChannel channel;
+ private FakeChannelSink sink;
+ private HttpTunnelClientPollHandler handler;
+ private MockChannelStateListener listener;
+
+ private static InetSocketAddress createAddress(byte[] addr, int port) {
+ try {
+ return new InetSocketAddress(InetAddress.getByAddress(addr), port);
+ } catch (UnknownHostException e) {
+ throw new RuntimeException("Bad address in test");
+ }
+ }
+
+ @Before
+ public void setUp() throws Exception {
+ sink = new FakeChannelSink();
+
+ ChannelPipeline pipeline = Channels.pipeline();
+ listener = new MockChannelStateListener();
+ listener.serverHostName = HttpTunnelMessageUtils.convertToHostString(SERVER_ADDRESS);
+ handler = new HttpTunnelClientPollHandler(listener);
+ handler.setTunnelId(TUNNEL_ID);
+ pipeline.addLast(HttpTunnelClientPollHandler.NAME, handler);
+
+ channel = new FakeSocketChannel(null, null, pipeline, sink);
+ channel.remoteAddress = PROXY_ADDRESS;
+ channel.localAddress = LOCAL_ADDRESS;
+ }
+
+ @Test
+ public void testSendsRequestOnConnect() {
+ Channels.fireChannelConnected(channel, PROXY_ADDRESS);
+ assertEquals(1, sink.events.size());
+ HttpRequest request = checkIsMessageEventContainingHttpRequest(sink.events.poll());
+ assertTrue(HttpTunnelMessageUtils.isServerToClientRequest(request));
+ assertTrue(HttpTunnelMessageUtils.checkHost(request, SERVER_ADDRESS));
+ assertTrue(listener.fullyEstablished);
+ }
+
+ @Test
+ public void testSendsReceivedDataSentUpstream() {
+ HttpResponse response = HttpTunnelMessageUtils.createRecvDataResponse(NettyTestUtils.createData(1234L));
+ Channels.fireMessageReceived(channel, response);
+ assertEquals(1, listener.messages.size());
+ assertEquals(1234L, listener.messages.get(0).readLong());
+ }
+
+ @Test
+ public void testSendsAnotherRequestAfterResponse() {
+ HttpResponse response = HttpTunnelMessageUtils.createRecvDataResponse(NettyTestUtils.createData(1234L));
+ Channels.fireMessageReceived(channel, response);
+ assertEquals(1, sink.events.size());
+ checkIsMessageEventContainingHttpRequest(sink.events.poll());
+ }
+
+ private HttpRequest checkIsMessageEventContainingHttpRequest(ChannelEvent event) {
+ assertTrue(event instanceof DownstreamMessageEvent);
+ DownstreamMessageEvent messageEvent = (DownstreamMessageEvent) event;
+ assertTrue(messageEvent.getMessage() instanceof HttpRequest);
+ return (HttpRequest) messageEvent.getMessage();
+ }
+}

Added: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientSendHandlerTest.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientSendHandlerTest.java (rev 0)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelClientSendHandlerTest.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,172 @@
+package org.jboss.netty.channel.socket.httptunnel;
+
+import static org.junit.Assert.*;
+
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.UnknownHostException;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelState;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.channel.DownstreamMessageEvent;
+import org.jboss.netty.handler.codec.http.HttpRequest;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * @author [hidden email]
+ */
+public class HttpTunnelClientSendHandlerTest {
+
+ private static final InetSocketAddress SERVER_ADDRESS = createAddress(new byte[] { 10, 0, 0, 3 }, 12345);
+ private static final InetSocketAddress PROXY_ADDRESS = createAddress(new byte[] { 10, 0, 0, 2 }, 8888);
+ private static final InetSocketAddress LOCAL_ADDRESS = createAddress(new byte[] { 10, 0, 0, 1 }, 54321);
+ private FakeSocketChannel channel;
+ private FakeChannelSink sink;
+ private HttpTunnelClientSendHandler handler;
+
+ private MockChannelStateListener listener;
+
+ @Before
+ public void setUp() {
+ sink = new FakeChannelSink();
+ ChannelPipeline pipeline = Channels.pipeline();
+ listener = new MockChannelStateListener();
+ listener.serverHostName = HttpTunnelMessageUtils.convertToHostString(SERVER_ADDRESS);
+ handler = new HttpTunnelClientSendHandler(listener);
+ pipeline.addLast(HttpTunnelClientSendHandler.NAME, handler);
+ channel = new FakeSocketChannel(null, null, pipeline, sink);
+ channel.remoteAddress = PROXY_ADDRESS;
+ channel.localAddress = LOCAL_ADDRESS;
+ }
+
+ private static InetSocketAddress createAddress(byte[] addr, int port) {
+ try {
+ return new InetSocketAddress(InetAddress.getByAddress(addr), port);
+ } catch (UnknownHostException e) {
+ throw new RuntimeException("Bad address in test");
+ }
+ }
+
+ @Test
+ public void testSendsTunnelOpen() throws Exception {
+ Channels.fireChannelConnected(channel, PROXY_ADDRESS);
+ assertEquals(1, sink.events.size());
+ HttpRequest request = NettyTestUtils.checkIsDownstreamMessageEvent(sink.events.poll(), HttpRequest.class);
+ assertTrue(HttpTunnelMessageUtils.isOpenTunnelRequest(request));
+ assertTrue(HttpTunnelMessageUtils.checkHost(request, SERVER_ADDRESS));
+ }
+
+ @Test
+ public void testStoresTunnelId() throws Exception {
+ emulateConnect();
+ Channels.fireMessageReceived(channel, HttpTunnelMessageUtils.createTunnelOpenResponse("newTunnel"));
+ assertEquals("newTunnel", handler.getTunnelId());
+ assertEquals("newTunnel", listener.tunnelId);
+ }
+
+ @Test
+ public void testSendData() {
+ emulateConnectAndOpen();
+ channel.write(NettyTestUtils.createData(1234L));
+ assertEquals(1, sink.events.size());
+ ChannelEvent sentEvent = sink.events.poll();
+ checkIsSendDataRequestWithData(sentEvent, "10.0.0.2:12345", NettyTestUtils.createData(1234L));
+ }
+
+ @Test
+ public void testWillNotSendDataUntilTunnelIdSet() {
+ emulateConnect();
+ channel.write(NettyTestUtils.createData(1234L));
+
+ assertEquals(0, sink.events.size());
+
+ Channels.fireChannelConnected(channel, PROXY_ADDRESS);
+ assertEquals(1, sink.events.size());
+ }
+
+ @Test
+ public void testOnlyOneRequestAtATime() {
+ emulateConnectAndOpen();
+
+ channel.write(NettyTestUtils.createData(1234L));
+ assertEquals(1, sink.events.size());
+ checkIsSendDataRequestWithData(sink.events.poll(), "10.0.0.2:12345", NettyTestUtils.createData(1234L));
+
+ channel.write(NettyTestUtils.createData(5678L));
+ assertEquals(0, sink.events.size());
+
+ Channels.fireMessageReceived(channel, HttpTunnelMessageUtils.createSendDataResponse());
+ assertEquals(1, sink.events.size());
+ checkIsSendDataRequestWithData(sink.events.poll(), "10.0.0.2:12345", NettyTestUtils.createData(5678L));
+ }
+
+ @Test
+ public void testDisconnect() {
+ emulateConnectAndOpen();
+
+ channel.write(NettyTestUtils.createData(1234L));
+ assertEquals(1, sink.events.size());
+ checkIsSendDataRequestWithData(sink.events.poll(), "10.0.0.2:12345", NettyTestUtils.createData(1234L));
+
+ channel.disconnect();
+ Channels.fireMessageReceived(channel, HttpTunnelMessageUtils.createSendDataResponse());
+ assertEquals(1, sink.events.size());
+
+ HttpRequest request = NettyTestUtils.checkIsDownstreamMessageEvent(sink.events.poll(), HttpRequest.class);
+ assertTrue(HttpTunnelMessageUtils.isCloseTunnelRequest(request));
+ assertEquals("newTunnel", HttpTunnelMessageUtils.extractTunnelId(request));
+ Channels.fireMessageReceived(channel, HttpTunnelMessageUtils.createTunnelCloseResponse());
+ assertEquals(1, sink.events.size());
+ NettyTestUtils.checkIsStateEvent(sink.events.poll(), ChannelState.CONNECTED, null);
+ }
+
+ @Test
+ public void testClose() {
+ emulateConnectAndOpen();
+
+ channel.close();
+ assertEquals(1, sink.events.size());
+ HttpRequest request = NettyTestUtils.checkIsDownstreamMessageEvent(sink.events.poll(), HttpRequest.class);
+ assertTrue(HttpTunnelMessageUtils.isCloseTunnelRequest(request));
+ assertEquals("newTunnel", HttpTunnelMessageUtils.extractTunnelId(request));
+ Channels.fireMessageReceived(channel, HttpTunnelMessageUtils.createTunnelCloseResponse());
+ assertEquals(1, sink.events.size());
+ NettyTestUtils.checkIsStateEvent(sink.events.poll(), ChannelState.OPEN, false);
+ }
+
+ @Test
+ public void testWritesAfterCloseAreRejected() {
+ emulateConnectAndOpen();
+
+ channel.close();
+ assertFalse(channel.write(NettyTestUtils.createData(1234L)).isSuccess());
+ }
+
+ private void checkIsSendDataRequestWithData(ChannelEvent event, String expectedHost, ChannelBuffer data) {
+ assertTrue(event instanceof DownstreamMessageEvent);
+ DownstreamMessageEvent messageEvent = (DownstreamMessageEvent) event;
+ assertTrue(messageEvent.getMessage() instanceof HttpRequest);
+ HttpRequest request = (HttpRequest) messageEvent.getMessage();
+ assertTrue(HttpTunnelMessageUtils.isSendDataRequest(request));
+ assertEquals(data.readableBytes(), request.getContentLength());
+
+ ChannelBuffer content = request.getContent();
+ NettyTestUtils.assertEquals(data, content);
+ }
+
+ private void emulateConnect() {
+ channel.emulateConnected(LOCAL_ADDRESS, PROXY_ADDRESS, null);
+ sink.events.clear();
+ }
+
+ private void emulateConnectAndOpen() {
+ emulateConnect();
+ Channels.fireMessageReceived(channel, HttpTunnelMessageUtils.createTunnelOpenResponse("newTunnel"));
+
+ sink.events.clear();
+ }
+}

Added: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelFactoryTest.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelFactoryTest.java (rev 0)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelFactoryTest.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,76 @@
+package org.jboss.netty.channel.socket.httptunnel;
+
+
+import static org.junit.Assert.*;
+
+import org.jboss.netty.channel.ChannelException;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.channel.socket.ServerSocketChannel;
+import org.jboss.netty.channel.socket.ServerSocketChannelFactory;
+import org.jmock.Expectations;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * @author [hidden email]
+ */
+@RunWith(JMock.class)
+public class HttpTunnelServerChannelFactoryTest {
+
+ private JUnit4Mockery mockContext = new JUnit4Mockery();
+ private ServerSocketChannelFactory realChannelFactory;
+ private HttpTunnelServerChannelFactory factory;
+
+ private ServerSocketChannel realChannel;
+
+ @Before
+ public void setUp() throws Exception {
+ realChannelFactory = mockContext.mock(ServerSocketChannelFactory.class);
+ factory = new HttpTunnelServerChannelFactory(realChannelFactory);
+ ChannelPipeline pipeline = Channels.pipeline();
+ realChannel = new FakeServerSocketChannel(factory, pipeline, new FakeChannelSink());
+ }
+
+ @Test
+ public void testNewChannel() {
+ mockContext.checking(new Expectations() {{
+ one(realChannelFactory).newChannel(with(any(ChannelPipeline.class))); will(returnValue(realChannel));
+ }});
+ ChannelPipeline pipeline = Channels.pipeline();
+ HttpTunnelServerChannel newChannel = factory.newChannel(pipeline);
+ assertNotNull(newChannel);
+ assertSame(pipeline, newChannel.getPipeline());
+ }
+
+ @Test
+ public void testNewChannel_forwardsWrappedFactoryFailure() {
+ final ChannelException innerException = new ChannelException();
+ mockContext.checking(new Expectations() {{
+ one(realChannelFactory).newChannel(with(any(ChannelPipeline.class))); will(throwException(innerException));
+ }});
+
+ try {
+ factory.newChannel(Channels.pipeline());
+ fail("Expected ChannelException");
+ } catch(ChannelException e) {
+ assertSame(innerException, e);
+ }
+ }
+
+// @Test
+// public void testChannelCreation_withServerBootstrap() {
+// mockContext.checking(new Expectations() {{
+// one(realChannelFactory).newChannel(with(any(ChannelPipeline.class))); will(returnValue(realChannel));
+// }});
+//
+// ServerBootstrap bootstrap = new ServerBootstrap(factory);
+// Channel newChannel = bootstrap.bind(new InetSocketAddress(80));
+// assertNotNull(newChannel);
+//
+// }
+
+}

Added: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelSinkTest.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelSinkTest.java (rev 0)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelSinkTest.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,124 @@
+package org.jboss.netty.channel.socket.httptunnel;
+
+import static org.junit.Assert.*;
+
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.channel.ExceptionEvent;
+import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import org.jboss.netty.channel.socket.ServerSocketChannel;
+import org.jmock.Expectations;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * @author [hidden email]
+ */
+@RunWith(JMock.class)
+public class HttpTunnelServerChannelSinkTest {
+
+ private JUnit4Mockery mockContext = new JUnit4Mockery();
+
+ private HttpTunnelServerChannelSink sink;
+ private ChannelPipeline pipeline;
+ private FakeSocketChannel channel;
+ private ServerSocketChannel realChannel;
+
+ private ChannelFuture realFuture;
+ private Throwable exceptionInPipeline;
+
+ @Before
+ public void setUp() throws Exception {
+ realChannel = mockContext.mock(ServerSocketChannel.class);
+ pipeline = Channels.pipeline();
+ pipeline.addLast("exceptioncatcher", new ExceptionCatcher());
+ sink = new HttpTunnelServerChannelSink();
+ sink.setRealChannel(realChannel);
+ channel = new FakeSocketChannel(null, null, pipeline, sink);
+ realFuture = Channels.future(realChannel);
+ }
+
+ @After
+ public void teardown() throws Exception {
+ assertTrue("exception caught in pipeline: " + exceptionInPipeline, exceptionInPipeline == null);
+ }
+
+ @Test
+ public void testCloseRequest() throws Exception {
+ mockContext.checking(new Expectations() {{
+ one(realChannel).close(); will(returnValue(realFuture));
+ }});
+
+ ChannelFuture virtualFuture1 = Channels.close(channel);
+ mockContext.assertIsSatisfied();
+ ChannelFuture virtualFuture = virtualFuture1;
+ realFuture.setSuccess();
+ assertTrue(virtualFuture.isSuccess());
+ }
+
+ @Test
+ public void testUnbindRequest_withSuccess() throws Exception {
+ ChannelFuture virtualFuture = checkUnbind();
+ realFuture.setSuccess();
+ assertTrue(virtualFuture.isSuccess());
+ }
+
+ @Test
+ public void testUnbindRequest_withFailure() throws Exception {
+ ChannelFuture virtualFuture = checkUnbind();
+ realFuture.setFailure(new Exception("Something bad happened"));
+ assertFalse(virtualFuture.isSuccess());
+ }
+
+ private ChannelFuture checkUnbind() {
+ mockContext.checking(new Expectations() {{
+ one(realChannel).unbind(); will(returnValue(realFuture));
+ }});
+
+ ChannelFuture virtualFuture = Channels.unbind(channel);
+ mockContext.assertIsSatisfied();
+ return virtualFuture;
+ }
+
+ @Test
+ public void testBindRequest_withSuccess() {
+ ChannelFuture virtualFuture = checkBind();
+ realFuture.setSuccess();
+ assertTrue(virtualFuture.isSuccess());
+ }
+
+ @Test
+ public void testBindRequest_withFailure() {
+ ChannelFuture virtualFuture = checkBind();
+ realFuture.setFailure(new Exception("Something bad happened"));
+ assertFalse(virtualFuture.isSuccess());
+ }
+
+ private ChannelFuture checkBind() {
+ final SocketAddress toAddress = new InetSocketAddress(80);
+ mockContext.checking(new Expectations() {{
+ one(realChannel).bind(toAddress); will(returnValue(realFuture));
+ }});
+
+ ChannelFuture virtualFuture = Channels.bind(channel, toAddress);
+ return virtualFuture;
+ }
+
+ @ChannelPipelineCoverage("one")
+ private final class ExceptionCatcher extends SimpleChannelUpstreamHandler {
+ @Override
+ public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e) throws Exception {
+ exceptionInPipeline = e.getCause();
+ }
+ }
+}

Added: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelTest.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelTest.java (rev 0)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelServerChannelTest.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,187 @@
+package org.jboss.netty.channel.socket.httptunnel;
+
+import static org.junit.Assert.*;
+
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.channel.ChannelState;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.channel.UpstreamChannelStateEvent;
+import org.jboss.netty.channel.socket.ServerSocketChannelConfig;
+import org.jmock.Expectations;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * @author [hidden email]
+ */
+@RunWith(JMock.class)
+public class HttpTunnelServerChannelTest {
+
+ JUnit4Mockery mockContext = new JUnit4Mockery();
+ private HttpTunnelServerChannel virtualChannel;
+ private UpstreamEventCatcher upstreamEvents;
+ private FakeServerSocketChannelFactory realChannelFactory;
+
+ @Before
+ public void setUp() throws Exception {
+ realChannelFactory = new FakeServerSocketChannelFactory();
+ realChannelFactory.sink = new FakeChannelSink();
+
+ HttpTunnelServerChannelFactory factory = new HttpTunnelServerChannelFactory(realChannelFactory);
+ virtualChannel = factory.newChannel(createVirtualChannelPipeline());
+ }
+
+ private ChannelPipeline createVirtualChannelPipeline() {
+ ChannelPipeline pipeline = Channels.pipeline();
+ upstreamEvents = new UpstreamEventCatcher();
+ pipeline.addLast(UpstreamEventCatcher.NAME, upstreamEvents);
+ return pipeline;
+ }
+
+ @Test
+ public void testGetLocalAddress_delegatedToRealChannel() {
+ realChannelFactory.createdChannel.localAddress = InetSocketAddress.createUnresolved("mycomputer", 80);
+ SocketAddress returned = virtualChannel.getLocalAddress();
+ assertSame(realChannelFactory.createdChannel.localAddress, returned);
+ }
+
+ @Test
+ public void testGetRemoteAddress_returnsNull() {
+ assertNull(virtualChannel.getRemoteAddress());
+ }
+
+ @Test
+ public void testIsBound_delegatedToRealChannel() {
+ realChannelFactory.createdChannel.bound = true;
+ assertTrue(virtualChannel.isBound());
+ realChannelFactory.createdChannel.bound = false;
+ assertFalse(virtualChannel.isBound());
+ }
+
+ @Test
+ public void testConstruction_firesOpenEvent() {
+ assertTrue(upstreamEvents.events.size() > 0);
+ checkIsUpstreamChannelStateEvent(upstreamEvents.events.poll(), virtualChannel, ChannelState.OPEN, Boolean.TRUE);
+ }
+
+ @Test
+ public void testChannelBoundEventFromReal_replicatedOnVirtual() {
+ upstreamEvents.events.clear();
+ InetSocketAddress boundAddr = InetSocketAddress.createUnresolved("mycomputer", 12345);
+ Channels.fireChannelBound(realChannelFactory.createdChannel, boundAddr);
+ assertEquals(1, upstreamEvents.events.size());
+ checkIsUpstreamChannelStateEvent(upstreamEvents.events.poll(), virtualChannel, ChannelState.BOUND, boundAddr);
+ }
+
+ @Test
+ public void testChannelUnboundEventFromReal_replicatedOnVirtual() {
+ upstreamEvents.events.clear();
+ Channels.fireChannelUnbound(realChannelFactory.createdChannel);
+ assertEquals(1, upstreamEvents.events.size());
+ checkIsUpstreamChannelStateEvent(upstreamEvents.events.poll(), virtualChannel, ChannelState.BOUND, null);
+ }
+
+ @Test
+ public void testChannelClosedEventFromReal_replicatedOnVirtual() {
+ upstreamEvents.events.clear();
+ Channels.fireChannelClosed(realChannelFactory.createdChannel);
+ assertEquals(1, upstreamEvents.events.size());
+ checkIsUpstreamChannelStateEvent(upstreamEvents.events.poll(), virtualChannel, ChannelState.OPEN, Boolean.FALSE);
+ }
+
+ @Test
+ public void testHasConfiguration() {
+ assertNotNull(virtualChannel.getConfig());
+ }
+
+ @Test
+ public void testChangePipelineFactoryDoesNotAffectRealChannel() {
+ ChannelPipelineFactory realPipelineFactory = realChannelFactory.createdChannel.getConfig().getPipelineFactory();
+ ChannelPipelineFactory virtualPipelineFactory = mockContext.mock(ChannelPipelineFactory.class);
+ virtualChannel.getConfig().setPipelineFactory(virtualPipelineFactory);
+ assertSame(virtualPipelineFactory, virtualChannel.getConfig().getPipelineFactory());
+
+ // channel pipeline factory is a special case: we do not want it set on the configuration
+ // of the underlying factory
+ assertSame(realPipelineFactory, realChannelFactory.createdChannel.getConfig().getPipelineFactory());
+ }
+
+ @Test
+ public void testChangingBacklogAffectsRealChannel() {
+ virtualChannel.getConfig().setBacklog(1234);
+ assertEquals(1234, realChannelFactory.createdChannel.getConfig().getBacklog());
+ }
+
+ @Test
+ public void testChangingConnectTimeoutMillisAffectsRealChannel() {
+ virtualChannel.getConfig().setConnectTimeoutMillis(54321);
+ assertEquals(54321, realChannelFactory.createdChannel.getConfig().getConnectTimeoutMillis());
+ }
+
+ @Test
+ public void testChangingPerformancePreferencesAffectsRealChannel() {
+ final ServerSocketChannelConfig mockConfig = mockContext.mock(ServerSocketChannelConfig.class);
+ realChannelFactory.createdChannel.config = mockConfig;
+ mockContext.checking(new Expectations() {{
+ one(mockConfig).setPerformancePreferences(100, 200, 300);
+ }});
+ virtualChannel.getConfig().setPerformancePreferences(100, 200, 300);
+ mockContext.assertIsSatisfied();
+ }
+
+ @Test
+ public void testChangingReceiveBufferSizeAffectsRealChannel() {
+ virtualChannel.getConfig().setReceiveBufferSize(10101);
+ assertEquals(10101, realChannelFactory.createdChannel.getConfig().getReceiveBufferSize());
+ }
+
+ @Test
+ public void testChangingReuseAddressAffectsRealChannel() {
+ virtualChannel.getConfig().setReuseAddress(true);
+ assertEquals(true, realChannelFactory.createdChannel.getConfig().isReuseAddress());
+ }
+
+ @Test
+ public void testSetChannelPipelineFactoryViaOption() {
+ final ServerSocketChannelConfig mockConfig = mockContext.mock(ServerSocketChannelConfig.class);
+ realChannelFactory.createdChannel.config = mockConfig;
+
+ mockContext.checking(new Expectations() {{
+ never(mockConfig);
+ }});
+
+ ChannelPipelineFactory factory = mockContext.mock(ChannelPipelineFactory.class);
+ virtualChannel.getConfig().setOption("pipelineFactory", factory);
+ assertSame(factory, virtualChannel.getConfig().getPipelineFactory());
+ }
+
+ @Test
+ public void testSetOptionAffectsRealChannel() {
+ final ServerSocketChannelConfig mockConfig = mockContext.mock(ServerSocketChannelConfig.class);
+ realChannelFactory.createdChannel.config = mockConfig;
+
+ mockContext.checking(new Expectations() {{
+ one(mockConfig).setOption("testOption", "testValue");
+ }});
+
+ virtualChannel.getConfig().setOption("testOption", "testValue");
+ }
+
+ private void checkIsUpstreamChannelStateEvent(ChannelEvent ev, Channel expectedChannel, ChannelState expectedState, Object expectedValue) {
+ assertTrue(ev instanceof UpstreamChannelStateEvent);
+ UpstreamChannelStateEvent checkedEv = (UpstreamChannelStateEvent) ev;
+ assertSame(expectedChannel, checkedEv.getChannel());
+ assertEquals(expectedState, checkedEv.getState());
+ assertEquals(expectedValue, checkedEv.getValue());
+ }
+
+}

Added: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelSoakTester.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelSoakTester.java (rev 0)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelSoakTester.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,308 @@
+package org.jboss.netty.channel.socket.httptunnel;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.UnknownHostException;
+import java.util.Random;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.jboss.netty.bootstrap.ClientBootstrap;
+import org.jboss.netty.bootstrap.ServerBootstrap;
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.channel.ChannelStateEvent;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import org.jboss.netty.channel.group.ChannelGroup;
+import org.jboss.netty.channel.group.DefaultChannelGroup;
+import org.jboss.netty.channel.socket.ClientSocketChannelFactory;
+import org.jboss.netty.channel.socket.ServerSocketChannelFactory;
+import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+
+/**
+ * @author [hidden email]
+ */
+public class HttpTunnelSoakTester {
+
+ private static final int SERVER_PORT = 20100;
+
+ private static final Logger LOG = Logger.getLogger(HttpTunnelSoakTester.class.getName());
+
+ private ServerBootstrap serverBootstrap;
+ private ClientBootstrap clientBootstrap;
+ private ChannelGroup channels;
+
+ int expectedNextByte = 0;
+ int nextWriteByte = 0;
+
+ private ExecutorService executor;
+ private ScheduledExecutorService scheduledExecutor;
+ private ConcurrentLinkedQueue<ChannelBuffer> verificationQueue;
+
+ public HttpTunnelSoakTester() {
+ try {
+ System.in.read();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ scheduledExecutor = Executors.newSingleThreadScheduledExecutor();
+ executor = Executors.newCachedThreadPool();
+ verificationQueue = new ConcurrentLinkedQueue<ChannelBuffer>();
+ ServerSocketChannelFactory serverChannelFactory = new NioServerSocketChannelFactory(executor, executor);
+ HttpTunnelServerChannelFactory serverTunnelFactory = new HttpTunnelServerChannelFactory(serverChannelFactory);
+
+ serverBootstrap = new ServerBootstrap(serverTunnelFactory);
+ serverBootstrap.setPipelineFactory(createServerPipelineFactory());
+
+ ClientSocketChannelFactory clientChannelFactory = new NioClientSocketChannelFactory(executor, executor);
+ HttpTunnelClientChannelFactory clientTunnelFactory = new HttpTunnelClientChannelFactory(clientChannelFactory);
+
+ clientBootstrap = new ClientBootstrap(clientTunnelFactory);
+ clientBootstrap.setPipelineFactory(createClientPipelineFactory());
+ configureProxy();
+
+ channels = new DefaultChannelGroup();
+ }
+
+ private void configureProxy() {
+ String proxyHost = System.getProperty("http.proxyHost");
+ if(proxyHost != null && !proxyHost.isEmpty()) {
+ int proxyPort = Integer.getInteger("http.proxyPort", 80);
+ InetAddress chosenAddress = chooseAddress(proxyHost);
+ InetSocketAddress proxyAddress = new InetSocketAddress(chosenAddress, proxyPort);
+ if(!proxyAddress.isUnresolved()) {
+ clientBootstrap.setOption(HttpTunnelClientChannelConfig.PROXY_ADDRESS_OPTION, proxyAddress);
+ System.out.println("Using " + proxyAddress + " as a proxy for this test run");
+ } else {
+ System.err.println("Failed to resolve proxy address " + proxyAddress);
+ }
+ } else {
+ System.out.println("No proxy specified, will connect to server directly");
+ }
+ }
+
+ private InetAddress chooseAddress(String proxyHost) {
+ try {
+ InetAddress[] allByName = InetAddress.getAllByName(proxyHost);
+ for(InetAddress address : allByName) {
+ if(address.isAnyLocalAddress() || address.isLinkLocalAddress()) {
+ continue;
+ }
+
+ return address;
+ }
+
+ return null;
+ } catch (UnknownHostException e) {
+ return null;
+ }
+ }
+
+ protected ChannelPipelineFactory createClientPipelineFactory() {
+ return new ChannelPipelineFactory() {
+
+ public ChannelPipeline getPipeline() throws Exception {
+ ChannelPipeline pipeline = Channels.pipeline();
+ pipeline.addLast("responseVerifier", new ResponseVerifier());
+ return pipeline;
+ }
+ };
+ }
+
+ protected ChannelPipelineFactory createServerPipelineFactory() {
+ return new ChannelPipelineFactory() {
+
+ public ChannelPipeline getPipeline() throws Exception {
+ ChannelPipeline pipeline = Channels.pipeline();
+ pipeline.addLast("echo", new EchoHandler());
+ return pipeline;
+ }
+ };
+ }
+
+ public void run() {
+ LOG.info("binding server channel");
+ Channel serverChannel = serverBootstrap.bind(new InetSocketAddress(SERVER_PORT));
+ channels.add(serverChannel);
+ LOG.log(Level.INFO, "server channel bound to {0}", serverChannel.getLocalAddress());
+
+
+ Channel clientChannel = createClientChannel();
+ if(clientChannel == null) {
+ LOG.severe("no client channel - bailing out");
+ return;
+ }
+ channels.add(clientChannel);
+
+ scheduledExecutor.execute(new VerificationTask());
+
+ if(!pushData(clientChannel)) {
+ LOG.severe("Data send cycle failed");
+ } else {
+ LOG.info("send cycle completed successfully");
+ }
+
+ LOG.info("closing channels");
+ closeChannel(clientChannel);
+ closeChannel(serverChannel);
+
+ LOG.info("done!");
+ }
+
+ private void closeChannel(Channel channel) {
+ try {
+ if(!channel.close().await(1000L, TimeUnit.SECONDS)) {
+ LOG.warning("Failed to close connection within reasonable amount of time");
+ }
+ } catch (InterruptedException e) {
+ LOG.severe("Interrupted while closing connection");
+ }
+ }
+
+ private boolean pushData(Channel clientChannel) {
+ long totalBytesSent = 0;
+ long runStartTime = System.currentTimeMillis();
+ for(int i=0; i < 10000; i++) {
+ byte[] randomBytesForSend = createRandomSizeByteArray();
+ totalBytesSent += randomBytesForSend.length;
+
+ long startTime = System.nanoTime();
+ ChannelFuture writeFuture = clientChannel.write(ChannelBuffers.wrappedBuffer(randomBytesForSend));
+ try {
+ if(!writeFuture.await(10, TimeUnit.SECONDS)) {
+ LOG.log(Level.SEVERE, "Failed to write random array of length {0} in acceptable time", randomBytesForSend.length);
+ return false;
+ }
+ long endTime = System.nanoTime();
+ long totalTime = endTime - startTime;
+ if(totalTime > 1000 * 1000000) {
+ LOG.log(Level.WARNING, "Took {0}ns to write {1} bytes", new Object[] { endTime - startTime, randomBytesForSend.length });
+ }
+ } catch(InterruptedException e) {
+ LOG.log(Level.SEVERE, "Interrupted while waiting for bytes to be written", e);
+ return false;
+ }
+
+ if(i % 100 == 0 && i > 0) {
+ LOG.log(Level.INFO, "{0} writes completed, totalling {1} bytes", new Object[] { i, totalBytesSent });
+ }
+ }
+
+ long runEndTime = System.currentTimeMillis();
+ long totalTime = runEndTime - runStartTime;
+ long totalKB = totalBytesSent / 1024;
+ double rate = totalKB / (totalTime / 1000.0);
+ LOG.log(Level.INFO, "Average throughput: {0} KB/s", rate);
+
+ return true;
+ }
+
+ private Channel createClientChannel() {
+ InetSocketAddress serverAddress = new InetSocketAddress("10.0.1.22", SERVER_PORT);
+ ChannelFuture clientChannelFuture = clientBootstrap.connect(serverAddress);
+ try {
+ if(!clientChannelFuture.await(1000, TimeUnit.MILLISECONDS)) {
+ LOG.severe("did not connect within acceptable time period");
+ return null;
+ }
+ } catch (InterruptedException e) {
+ LOG.severe("Interrupted while waiting for client connect to be established");
+ return null;
+ }
+
+ if(!clientChannelFuture.isSuccess()) {
+ LOG.log(Level.SEVERE, "did not connect successfully", clientChannelFuture.getCause());
+ return null;
+ }
+
+ return clientChannelFuture.getChannel();
+ }
+
+ private byte[] createRandomSizeByteArray() {
+ Random random = new Random();
+ int arraySize = random.nextInt(64 * 1024) + 1;
+ byte[] randomBytes = new byte[arraySize];
+ for(int i=0; i < randomBytes.length; i++) {
+ randomBytes[i] = (byte)nextWriteByte;
+ nextWriteByte = (nextWriteByte + 1) % 127;
+ }
+
+ return randomBytes;
+ }
+
+ public static void main(String[] args) throws UnknownHostException {
+ HttpTunnelSoakTester soakTester = new HttpTunnelSoakTester();
+ try {
+ soakTester.run();
+ } finally {
+ soakTester.shutdown();
+ }
+ }
+
+ private void shutdown() {
+ serverBootstrap.releaseExternalResources();
+ clientBootstrap.releaseExternalResources();
+ executor.shutdownNow();
+ scheduledExecutor.shutdownNow();
+ }
+
+ @ChannelPipelineCoverage("one")
+ private class EchoHandler extends SimpleChannelUpstreamHandler {
+ @Override
+ public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
+ Channels.write(ctx.getChannel(), e.getMessage());
+ }
+ }
+
+ @ChannelPipelineCoverage("one")
+ private class ResponseVerifier extends SimpleChannelUpstreamHandler {
+ @Override
+ public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
+ final ChannelBuffer receivedBytes = (ChannelBuffer) e.getMessage();
+ verificationQueue.offer(receivedBytes);
+ }
+
+ @Override
+ public void channelOpen(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
+ channels.add(ctx.getChannel());
+ }
+ }
+
+ private class VerificationTask implements Runnable {
+ public void run() {
+ ChannelBuffer bytesToVerify = verificationQueue.poll();
+ if(bytesToVerify == null) {
+ scheduledExecutor.schedule(this, 10, TimeUnit.MILLISECONDS);
+ }
+
+
+ while(bytesToVerify.readable()) {
+ if(bytesToVerify.readByte() != expectedNextByte) {
+ LOG.severe("received a byte out of sequence");
+ System.exit(-1);
+ return;
+ }
+
+ expectedNextByte = (expectedNextByte + 1) % 127;
+ }
+
+ scheduledExecutor.execute(this);
+ }
+ }
+}

Added: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelTest.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelTest.java (rev 0)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/HttpTunnelTest.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,186 @@
+package org.jboss.netty.channel.socket.httptunnel;
+
+import static org.junit.Assert.*;
+
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.UnknownHostException;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import org.jboss.netty.bootstrap.ClientBootstrap;
+import org.jboss.netty.bootstrap.ServerBootstrap;
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelHandler;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.channel.ChannelStateEvent;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import org.jboss.netty.channel.group.ChannelGroup;
+import org.jboss.netty.channel.group.DefaultChannelGroup;
+import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * @author [hidden email]
+ */
+public class HttpTunnelTest {
+
+ private HttpTunnelClientChannelFactory clientFactory;
+ private HttpTunnelServerChannelFactory serverFactory;
+ private ClientBootstrap clientBootstrap;
+ private ServerBootstrap serverBootstrap;
+
+ private ChannelGroup activeConnections;
+ private ChannelHandler clientCaptureHandler;
+ private ServerEndHandler connectionCaptureHandler;
+
+ private Channel serverEnd;
+ private CountDownLatch serverEndLatch;
+
+ private ChannelBuffer receivedBytes;
+ private CountDownLatch messageReceivedLatch;
+
+ private ChannelBuffer clientReceivedBytes;
+ private CountDownLatch clientMessageReceivedLatch;
+ private Channel serverChannel;
+
+ @Before
+ public void setUp() throws UnknownHostException {
+ activeConnections = new DefaultChannelGroup();
+ clientFactory = new HttpTunnelClientChannelFactory(new NioClientSocketChannelFactory(Executors.newCachedThreadPool(), Executors.newCachedThreadPool()));
+ serverFactory = new HttpTunnelServerChannelFactory(new NioServerSocketChannelFactory(Executors.newCachedThreadPool(), Executors.newCachedThreadPool()));
+
+ clientBootstrap = new ClientBootstrap(clientFactory);
+
+ clientCaptureHandler = new ClientEndHandler();
+ clientBootstrap.setPipelineFactory(new ChannelPipelineFactory() {
+
+ public ChannelPipeline getPipeline() throws Exception {
+ ChannelPipeline pipeline = Channels.pipeline();
+ pipeline.addLast("clientCapture", clientCaptureHandler);
+ return pipeline;
+ }
+ });
+
+ clientReceivedBytes = ChannelBuffers.dynamicBuffer();
+ clientMessageReceivedLatch = new CountDownLatch(1);
+
+ serverBootstrap = new ServerBootstrap(serverFactory);
+
+ connectionCaptureHandler = new ServerEndHandler();
+ serverBootstrap.setPipelineFactory(new ChannelPipelineFactory() {
+
+ public ChannelPipeline getPipeline() throws Exception {
+ ChannelPipeline pipeline = Channels.pipeline();
+ pipeline.addLast("capture", connectionCaptureHandler);
+ return pipeline;
+ }
+ });
+
+ serverEndLatch = new CountDownLatch(1);
+ receivedBytes = ChannelBuffers.dynamicBuffer();
+ messageReceivedLatch = new CountDownLatch(1);
+
+ serverChannel = serverBootstrap.bind(new InetSocketAddress(InetAddress.getLocalHost(), 12345));
+ activeConnections.add(serverChannel);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ activeConnections.disconnect().await(1000L);
+ clientBootstrap.releaseExternalResources();
+ serverBootstrap.releaseExternalResources();
+ }
+
+ @Test(timeout=2000)
+ public void testConnectClientToServer() throws Exception {
+ ChannelFuture connectFuture = clientBootstrap.connect(new InetSocketAddress(InetAddress.getLocalHost(), 12345));
+ assertTrue(connectFuture.await(1000L));
+ assertTrue(connectFuture.isSuccess());
+ assertNotNull(connectFuture.getChannel());
+
+ Channel clientChannel = connectFuture.getChannel();
+ activeConnections.add(clientChannel);
+ assertEquals(serverChannel.getLocalAddress(), clientChannel.getRemoteAddress());
+
+ assertTrue(serverEndLatch.await(1000, TimeUnit.MILLISECONDS));
+ assertNotNull(serverEnd);
+ assertEquals(clientChannel.getLocalAddress(), serverEnd.getRemoteAddress());
+ }
+
+ @Test
+ public void testSendDataFromClientToServer() throws Exception {
+ ChannelFuture connectFuture = clientBootstrap.connect(new InetSocketAddress(InetAddress.getLocalHost(), 12345));
+ assertTrue(connectFuture.await(1000L));
+
+ Channel clientEnd = connectFuture.getChannel();
+ activeConnections.add(clientEnd);
+
+ assertTrue(serverEndLatch.await(1000, TimeUnit.MILLISECONDS));
+
+ ChannelFuture writeFuture = Channels.write(clientEnd, NettyTestUtils.createData(100L));
+ assertTrue(writeFuture.await(1000L));
+ assertTrue(writeFuture.isSuccess());
+
+ assertTrue(messageReceivedLatch.await(1000L, TimeUnit.MILLISECONDS));
+ assertEquals(100L, receivedBytes.readLong());
+ }
+
+ @Test
+ public void testSendDataFromServerToClient() throws Exception {
+ ChannelFuture connectFuture = clientBootstrap.connect(new InetSocketAddress(InetAddress.getLocalHost(), 12345));
+ assertTrue(connectFuture.await(1000L));
+
+ Channel clientEnd = connectFuture.getChannel();
+ activeConnections.add(clientEnd);
+
+ assertTrue(serverEndLatch.await(1000, TimeUnit.MILLISECONDS));
+
+ ChannelFuture writeFuture = Channels.write(serverEnd, NettyTestUtils.createData(4321L));
+ assertTrue(writeFuture.await(1000L));
+ assertTrue(writeFuture.isSuccess());
+
+ assertTrue(clientMessageReceivedLatch.await(1000, TimeUnit.MILLISECONDS));
+ assertEquals(4321L, clientReceivedBytes.readLong());
+ }
+
+ @ChannelPipelineCoverage("one")
+ class ServerEndHandler extends SimpleChannelUpstreamHandler {
+
+ @Override
+ public void channelConnected(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
+ serverEnd = e.getChannel();
+ activeConnections.add(serverEnd);
+ serverEndLatch.countDown();
+ super.channelConnected(ctx, e);
+ }
+
+ @Override
+ public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
+ receivedBytes.writeBytes((ChannelBuffer) e.getMessage());
+ messageReceivedLatch.countDown();
+ }
+ }
+
+ @ChannelPipelineCoverage("one")
+ class ClientEndHandler extends SimpleChannelUpstreamHandler {
+
+ @Override
+ public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
+ clientReceivedBytes.writeBytes((ChannelBuffer) e.getMessage());
+ clientMessageReceivedLatch.countDown();
+ }
+ }
+}

Added: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/MockChannelStateListener.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/MockChannelStateListener.java (rev 0)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/MockChannelStateListener.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,40 @@
+package org.jboss.netty.channel.socket.httptunnel;
+
+import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.channel.ChannelFuture;
+
+/**
+ * @author [hidden email]
+ */
+public class MockChannelStateListener implements HttpTunnelClientWorkerOwner {
+
+ public boolean fullyEstablished = false;
+ public List<ChannelBuffer> messages = new ArrayList<ChannelBuffer>();
+ public String tunnelId = null;
+ public String serverHostName = null;
+
+ public void fullyEstablished() {
+ fullyEstablished = true;
+ }
+
+ public void onConnectRequest(ChannelFuture connectFuture, InetSocketAddress remoteAddress) {
+ // not relevant for test
+ }
+
+ public void onMessageReceived(ChannelBuffer content) {
+ messages.add(content);
+ }
+
+ public void onTunnelOpened(String tunnelId) {
+ this.tunnelId = tunnelId;
+ }
+
+ public String getServerHostName() {
+ return serverHostName;
+ }
+
+}

Added: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/NettyTestUtils.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/NettyTestUtils.java (rev 0)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/NettyTestUtils.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,155 @@
+package org.jboss.netty.channel.socket.httptunnel;
+
+import static org.junit.Assert.*;
+
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.UnknownHostException;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import junit.framework.Assert;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelState;
+import org.jboss.netty.channel.ChannelStateEvent;
+import org.jboss.netty.channel.DownstreamMessageEvent;
+import org.jboss.netty.channel.ExceptionEvent;
+import org.jboss.netty.channel.UpstreamMessageEvent;
+
+/**
+ * @author [hidden email]
+ */
+public class NettyTestUtils {
+
+ public static ByteBuffer convertReadable(ChannelBuffer b) {
+ int startIndex = b.readerIndex();
+ ByteBuffer converted = ByteBuffer.allocate(b.readableBytes());
+ b.readBytes(converted);
+ b.readerIndex(startIndex);
+ converted.flip();
+ return converted;
+ }
+
+ public static void assertEquals(ChannelBuffer expected, ChannelBuffer actual) {
+ if(expected.readableBytes() != actual.readableBytes()) {
+ Assert.failNotEquals("channel buffers have differing readable sizes", expected.readableBytes(), actual.readableBytes());
+ }
+
+ int startPositionExpected = expected.readerIndex();
+ int startPositionActual = actual.readerIndex();
+ int position = 0;
+ while(expected.readable()) {
+ byte expectedByte = expected.readByte();
+ byte actualByte = actual.readByte();
+ if(expectedByte != actualByte) {
+ Assert.failNotEquals("channel buffers differ at position " + position, expectedByte, actualByte);
+ }
+
+ position++;
+ }
+
+ expected.readerIndex(startPositionExpected);
+ actual.readerIndex(startPositionActual);
+ }
+
+ public static boolean checkEquals(ChannelBuffer expected, ChannelBuffer actual) {
+ if(expected.readableBytes() != actual.readableBytes()) {
+ return false;
+ }
+
+ int position = 0;
+ while(expected.readable()) {
+ byte expectedByte = expected.readByte();
+ byte actualByte = actual.readByte();
+ if(expectedByte != actualByte) {
+ return false;
+ }
+
+ position++;
+ }
+
+ return true;
+ }
+
+ public static List<ChannelBuffer> splitIntoChunks(int chunkSize, ChannelBuffer... buffers) {
+ LinkedList<ChannelBuffer> chunks = new LinkedList<ChannelBuffer>();
+
+ ArrayList<ChannelBuffer> sourceBuffers = new ArrayList<ChannelBuffer>();
+ Collections.addAll(sourceBuffers, buffers);
+ Iterator<ChannelBuffer> sourceIter = sourceBuffers.iterator();
+ ChannelBuffer chunk = ChannelBuffers.buffer(chunkSize);
+ while(sourceIter.hasNext()) {
+ ChannelBuffer source = sourceIter.next();
+
+ int index = source.readerIndex();
+ while(source.writerIndex() > index) {
+ int fragmentSize = Math.min(source.writerIndex() - index, chunk.writableBytes());
+ chunk.writeBytes(source, index, fragmentSize);
+ if(!chunk.writable()) {
+ chunks.add(chunk);
+ chunk = ChannelBuffers.buffer(chunkSize);
+ }
+ index += fragmentSize;
+ }
+ }
+
+ if(chunk.readable()) {
+ chunks.add(chunk);
+ }
+
+ return chunks;
+ }
+
+ public static ChannelBuffer createData(long containedNumber) {
+ ChannelBuffer data = ChannelBuffers.dynamicBuffer();
+ data.writeLong(containedNumber);
+ return data;
+ }
+
+ public static void checkIsUpstreamMessageEventContainingData(ChannelEvent event, ChannelBuffer expectedData) {
+ ChannelBuffer data = checkIsUpstreamMessageEvent(event, ChannelBuffer.class);
+ assertEquals(expectedData, data);
+ }
+
+ public static <T> T checkIsUpstreamMessageEvent(ChannelEvent event, Class<T> expectedMessageType) {
+ assertTrue(event instanceof UpstreamMessageEvent);
+ UpstreamMessageEvent messageEvent = (UpstreamMessageEvent) event;
+ assertTrue(expectedMessageType.isInstance(messageEvent.getMessage()));
+ return expectedMessageType.cast(messageEvent.getMessage());
+ }
+
+ public static <T> T checkIsDownstreamMessageEvent(ChannelEvent event, Class<T> expectedMessageType) {
+ assertTrue(event instanceof DownstreamMessageEvent);
+ DownstreamMessageEvent messageEvent = (DownstreamMessageEvent) event;
+ assertTrue(expectedMessageType.isInstance(messageEvent.getMessage()));
+ return expectedMessageType.cast(messageEvent.getMessage());
+ }
+
+ public static InetSocketAddress createAddress(byte[] addr, int port) {
+ try {
+ return new InetSocketAddress(InetAddress.getByAddress(addr), port);
+ } catch (UnknownHostException e) {
+ throw new RuntimeException("Bad address in test");
+ }
+ }
+
+ public static Throwable checkIsExceptionEvent(ChannelEvent ev) {
+ assertTrue(ev instanceof ExceptionEvent);
+ ExceptionEvent exceptionEv = (ExceptionEvent)ev;
+ return exceptionEv.getCause();
+ }
+
+ public static void checkIsStateEvent(ChannelEvent event, ChannelState expectedState, Object expectedValue) {
+ assertTrue(event instanceof ChannelStateEvent);
+ ChannelStateEvent stateEvent = (ChannelStateEvent) event;
+ Assert.assertEquals(expectedState, stateEvent.getState());
+ Assert.assertEquals(expectedValue, stateEvent.getValue());
+ }
+}

Added: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/NettyTestUtilsTest.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/NettyTestUtilsTest.java (rev 0)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/NettyTestUtilsTest.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,103 @@
+package org.jboss.netty.channel.socket.httptunnel;
+
+import static org.junit.Assert.*;
+
+import java.util.List;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.junit.Test;
+
+/**
+ * @author [hidden email]
+ */
+public class NettyTestUtilsTest {
+
+ @Test
+ public void testSplitIntoChunks() {
+ ChannelBuffer a = createFullBuffer(20, (byte)0);
+ ChannelBuffer b = createFullBuffer(20, (byte)1);
+ ChannelBuffer c = createFullBuffer(20, (byte)2);
+
+ List<ChannelBuffer> chunks = NettyTestUtils.splitIntoChunks(10, a, b, c);
+ assertEquals(6, chunks.size());
+ for(ChannelBuffer chunk : chunks) {
+ assertEquals(10, chunk.readableBytes());
+ }
+
+ // reader index should not be modified by splitIntoChunks()
+ assertEquals(0, a.readerIndex());
+ assertEquals(0, b.readerIndex());
+ assertEquals(0, c.readerIndex());
+ }
+
+ @Test
+ public void testSplitIntoChunks_chunksCrossBoundaries() {
+ ChannelBuffer a = createFullBuffer(5, (byte)0);
+ ChannelBuffer b = createFullBuffer(5, (byte)1);
+ ChannelBuffer c = createFullBuffer(5, (byte)2);
+
+ List<ChannelBuffer> chunks = NettyTestUtils.splitIntoChunks(4, a, b, c);
+ assertEquals(4, chunks.size());
+ checkBufferContains(chunks.get(0), new byte[] { 0, 0, 0, 0 });
+ checkBufferContains(chunks.get(1), new byte[] { 0, 1, 1, 1 });
+ checkBufferContains(chunks.get(2), new byte[] { 1, 1, 2, 2 });
+ checkBufferContains(chunks.get(3), new byte[] { 2, 2, 2 });
+ }
+
+ @Test
+ public void testSplitIntoChunks_smallestChunksPossible() {
+ ChannelBuffer a = createFullBuffer(5, (byte)0);
+ ChannelBuffer b = createFullBuffer(5, (byte)1);
+ ChannelBuffer c = createFullBuffer(5, (byte)2);
+
+ List<ChannelBuffer> chunks = NettyTestUtils.splitIntoChunks(1, a, b, c);
+ assertEquals(15, chunks.size());
+ checkBufferContains(chunks.get(0), new byte[] { 0 });
+ checkBufferContains(chunks.get(5), new byte[] { 1 });
+ checkBufferContains(chunks.get(10), new byte[] { 2 });
+ }
+
+ @Test
+ public void testSplitIntoChunks_sourceBuffersArePartiallyRead() {
+ ChannelBuffer a = createFullBuffer(5, (byte)0);
+ a.readerIndex(1);
+ ChannelBuffer b = createFullBuffer(5, (byte)1);
+ b.readerIndex(2);
+ ChannelBuffer c = createFullBuffer(5, (byte)2);
+
+ // will be ignored, as fully read
+ ChannelBuffer d = createFullBuffer(5, (byte)3);
+ d.readerIndex(5);
+ ChannelBuffer e = createFullBuffer(5, (byte)4);
+ e.readerIndex(4);
+
+ List<ChannelBuffer> chunks = NettyTestUtils.splitIntoChunks(3, a, b, c, d, e);
+ checkBufferContains(chunks.get(0), new byte[] { 0, 0, 0 });
+ checkBufferContains(chunks.get(1), new byte[] { 0, 1, 1 });
+ checkBufferContains(chunks.get(2), new byte[] { 1, 2, 2 });
+ checkBufferContains(chunks.get(3), new byte[] { 2, 2, 2 });
+ checkBufferContains(chunks.get(4), new byte[] { 4 });
+ }
+
+ private void checkBufferContains(ChannelBuffer channelBuffer, byte[] bs) {
+ if(channelBuffer.readableBytes() != bs.length) {
+ fail("buffer does not have enough bytes");
+ }
+
+ for(int i=0; i < bs.length; i++) {
+ assertEquals("byte at position " + i + " does not match", bs[i], channelBuffer.getByte(i));
+ }
+ }
+
+ private ChannelBuffer createFullBuffer(int size, byte value) {
+ ChannelBuffer buffer = ChannelBuffers.buffer(size);
+ byte[] contents = new byte[size];
+ for(int i=0; i < contents.length; i++) {
+ contents[i] = value;
+ }
+ buffer.writeBytes(contents);
+ return buffer;
+ }
+
+}

Added: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/NullChannelHandler.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/NullChannelHandler.java (rev 0)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/NullChannelHandler.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,21 @@
+package org.jboss.netty.channel.socket.httptunnel;
+
+import org.jboss.netty.channel.ChannelDownstreamHandler;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelUpstreamHandler;
+
+/**
+ * @author [hidden email]
+ */
+public class NullChannelHandler implements ChannelUpstreamHandler, ChannelDownstreamHandler {
+
+ public void handleUpstream(ChannelHandlerContext ctx, ChannelEvent e) throws Exception {
+ ctx.sendUpstream(e);
+ }
+
+ public void handleDownstream(ChannelHandlerContext ctx, ChannelEvent e) throws Exception {
+ ctx.sendDownstream(e);
+ }
+
+}

Added: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitchTest.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitchTest.java (rev 0)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/ServerMessageSwitchTest.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,138 @@
+package org.jboss.netty.channel.socket.httptunnel;
+
+import static org.junit.Assert.*;
+
+import java.net.InetSocketAddress;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.handler.codec.http.HttpResponse;
+import org.jmock.Expectations;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * @author [hidden email]
+ */
+@RunWith(JMock.class)
+@Ignore
+public class ServerMessageSwitchTest {
+
+ public static final InetSocketAddress REMOTE_ADDRESS = InetSocketAddress.createUnresolved("test.client.com", 52354);
+
+ private JUnit4Mockery mockContext = new JUnit4Mockery();
+
+ private ServerMessageSwitch messageSwitch;
+ private HttpTunnelAcceptedChannelFactory newChannelFactory;
+
+ private UpstreamEventCatcher htunEventCatcher;
+ private FakeChannelSink responseCatcher;
+
+ private FakeSocketChannel htunChannel;
+ private FakeSocketChannel requesterChannel;
+
+ @Before
+ public void setUp() throws Exception {
+ newChannelFactory = mockContext.mock(HttpTunnelAcceptedChannelFactory.class);
+ messageSwitch = new ServerMessageSwitch(newChannelFactory);
+
+ final Channel htunAcceptedChannel = createTunnelChannel();
+ createRequesterChannel();
+
+ mockContext.checking(new Expectations() {{
+ one(newChannelFactory).newChannel(with(any(String.class)), with(equal(REMOTE_ADDRESS))); will(returnValue(htunAcceptedChannel));
+ }});
+ }
+
+ private Channel createTunnelChannel() {
+ ChannelPipeline acceptedChannelPipeline = Channels.pipeline();
+ htunEventCatcher = new UpstreamEventCatcher();
+ acceptedChannelPipeline.addLast(UpstreamEventCatcher.NAME, htunEventCatcher);
+ FakeSocketChannel htunAcceptedChannel = new FakeSocketChannel(null, null, acceptedChannelPipeline, new FakeChannelSink());
+ htunEventCatcher.events.clear();
+
+ return htunAcceptedChannel;
+ }
+
+ private FakeSocketChannel createRequesterChannel() {
+ ChannelPipeline requesterChannelPipeline = Channels.pipeline();
+ responseCatcher = new FakeChannelSink();
+ requesterChannel = new FakeSocketChannel(null, null, requesterChannelPipeline, responseCatcher);
+ responseCatcher.events.clear();
+
+ return requesterChannel;
+ }
+
+ @Test
+ public void testRouteInboundData() {
+ ChannelBuffer inboundData = ChannelBuffers.dynamicBuffer();
+ inboundData.writeLong(1234L);
+
+ String tunnelId = messageSwitch.createTunnel(REMOTE_ADDRESS);
+ messageSwitch.routeInboundData(tunnelId, inboundData);
+ assertEquals(1, htunEventCatcher.events.size());
+ ChannelBuffer receivedData = NettyTestUtils.checkIsUpstreamMessageEvent(htunEventCatcher.events.poll(), ChannelBuffer.class);
+ assertSame(receivedData, inboundData);
+ }
+
+ @Test
+ public void testRouteOutboundData_onPoll() {
+ ChannelBuffer outboundData = ChannelBuffers.dynamicBuffer();
+ outboundData.writeLong(1234L);
+
+ String tunnelId = messageSwitch.createTunnel(REMOTE_ADDRESS);
+ messageSwitch.routeOutboundData(tunnelId, outboundData, Channels.future(htunChannel));
+ messageSwitch.pollOutboundData(tunnelId, requesterChannel);
+
+ assertEquals(1, responseCatcher.events.size());
+ HttpResponse response = NettyTestUtils.checkIsDownstreamMessageEvent(responseCatcher.events.poll(), HttpResponse.class);
+ assertSame(outboundData, response.getContent());
+ }
+
+ @Test
+ public void testRouteOutboundData_withDanglingRequest() {
+ String tunnelId = messageSwitch.createTunnel(REMOTE_ADDRESS);
+ messageSwitch.pollOutboundData(tunnelId, requesterChannel);
+ assertEquals(0, responseCatcher.events.size());
+
+ ChannelBuffer outboundData = ChannelBuffers.dynamicBuffer();
+ outboundData.writeLong(1234L);
+
+ messageSwitch.routeOutboundData(tunnelId, outboundData, Channels.future(htunChannel));
+ assertEquals(1, responseCatcher.events.size());
+ HttpResponse response = NettyTestUtils.checkIsDownstreamMessageEvent(responseCatcher.events.poll(), HttpResponse.class);
+ assertSame(outboundData, response.getContent());
+ }
+
+ @Test
+ public void testCloseTunnel() {
+ String tunnelId = messageSwitch.createTunnel(REMOTE_ADDRESS);
+ messageSwitch.closeTunnel(tunnelId);
+ assertFalse(messageSwitch.isOpenTunnel(tunnelId));
+ }
+
+ @Test
+ public void testRouteInboundDataIgnoredAfterClose() {
+ ChannelBuffer data = NettyTestUtils.createData(1234L);
+ String tunnelId = messageSwitch.createTunnel(REMOTE_ADDRESS);
+ messageSwitch.closeTunnel(tunnelId);
+ messageSwitch.routeInboundData(tunnelId, data);
+ assertEquals(0, htunEventCatcher.events.size());
+ }
+
+ @Test
+ public void testRouteOutboundDataIgnoredAfterClose() {
+ ChannelBuffer data = NettyTestUtils.createData(1234L);
+ String tunnelId = messageSwitch.createTunnel(REMOTE_ADDRESS);
+ messageSwitch.closeTunnel(tunnelId);
+ messageSwitch.routeOutboundData(tunnelId, data, Channels.future(htunChannel));
+ assertEquals(0, responseCatcher.events.size());
+ }
+}

Added: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/UpstreamEventCatcher.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/UpstreamEventCatcher.java (rev 0)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/UpstreamEventCatcher.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,24 @@
+package org.jboss.netty.channel.socket.httptunnel;
+
+import java.util.LinkedList;
+import java.util.Queue;
+
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.ChannelUpstreamHandler;
+
+/**
+ * @author [hidden email]
+ */
+@ChannelPipelineCoverage("one")
+public class UpstreamEventCatcher implements ChannelUpstreamHandler {
+
+ public static final String NAME = "upstreamCatcher";
+ public Queue<ChannelEvent> events = new LinkedList<ChannelEvent>();
+
+ public void handleUpstream(ChannelHandlerContext ctx, ChannelEvent e) throws Exception {
+ events.add(e);
+ }
+
+}

Added: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/WriteFragmenterTest.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/WriteFragmenterTest.java (rev 0)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/WriteFragmenterTest.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,117 @@
+package org.jboss.netty.channel.socket.httptunnel;
+
+
+import static org.junit.Assert.*;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.channel.MessageEvent;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * @author [hidden email]
+ */
+public class WriteFragmenterTest {
+
+ private FakeSocketChannel channel;
+ private WriteFragmenter fragmenter;
+ private FakeChannelSink downstreamCatcher;
+
+ @Before
+ public void setUp() throws Exception {
+ fragmenter = new WriteFragmenter(100);
+
+ ChannelPipeline pipeline = Channels.pipeline();
+ pipeline.addLast(WriteFragmenter.NAME, fragmenter);
+ downstreamCatcher = new FakeChannelSink();
+ channel = new FakeSocketChannel(null, null, pipeline, downstreamCatcher);
+ }
+
+ @Test
+ public void testLeavesWritesBeneathThresholdUntouched() {
+ ChannelBuffer data = ChannelBuffers.wrappedBuffer(new byte[99]);
+ Channels.write(channel, data);
+
+ assertEquals(1, downstreamCatcher.events.size());
+ ChannelBuffer sentData = NettyTestUtils.checkIsDownstreamMessageEvent(downstreamCatcher.events.poll(), ChannelBuffer.class);
+ assertSame(data, sentData);
+ }
+
+ @Test
+ public void testLeavesMessagesOnThresholdUntouched() {
+ ChannelBuffer data = ChannelBuffers.wrappedBuffer(new byte[100]);
+ Channels.write(channel, data);
+
+ assertEquals(1, downstreamCatcher.events.size());
+ ChannelBuffer sentData = NettyTestUtils.checkIsDownstreamMessageEvent(downstreamCatcher.events.poll(), ChannelBuffer.class);
+ assertSame(data, sentData);
+ }
+
+ @Test
+ public void testSplitsMessagesAboveThreshold_twoChunks() {
+ ChannelBuffer data = ChannelBuffers.wrappedBuffer(new byte[101]);
+ Channels.write(channel, data);
+
+ assertEquals(2, downstreamCatcher.events.size());
+ ChannelBuffer chunk1 = NettyTestUtils.checkIsDownstreamMessageEvent(downstreamCatcher.events.poll(), ChannelBuffer.class);
+ ChannelBuffer chunk2 = NettyTestUtils.checkIsDownstreamMessageEvent(downstreamCatcher.events.poll(), ChannelBuffer.class);
+ assertEquals(100, chunk1.readableBytes());
+ assertEquals(1, chunk2.readableBytes());
+ }
+
+ @Test
+ public void testSplitsMessagesAboveThreshold_multipleChunks() {
+ ChannelBuffer data = ChannelBuffers.wrappedBuffer(new byte[2540]);
+ Channels.write(channel, data);
+
+ assertEquals(26, downstreamCatcher.events.size());
+ for(int i=0; i < 25; i++) {
+ ChannelBuffer chunk = NettyTestUtils.checkIsDownstreamMessageEvent(downstreamCatcher.events.poll(), ChannelBuffer.class);
+ assertEquals(100, chunk.readableBytes());
+ }
+
+ ChannelBuffer endChunk = NettyTestUtils.checkIsDownstreamMessageEvent(downstreamCatcher.events.poll(), ChannelBuffer.class);
+ assertEquals(40, endChunk.readableBytes());
+ }
+
+ @Test
+ public void testChannelFutureTriggeredOnlyWhenAllChunksWritten() {
+ ChannelBuffer data = ChannelBuffers.wrappedBuffer(new byte[2540]);
+ ChannelFuture mainWriteFuture = Channels.write(channel, data);
+
+ assertEquals(26, downstreamCatcher.events.size());
+ for(int i=0; i < 25; i++) {
+ ((MessageEvent) downstreamCatcher.events.poll()).getFuture().setSuccess();
+ assertFalse(mainWriteFuture.isDone());
+ }
+
+ ((MessageEvent) downstreamCatcher.events.poll()).getFuture().setSuccess();
+ assertTrue(mainWriteFuture.isDone());
+ assertTrue(mainWriteFuture.isSuccess());
+ }
+
+ @Test
+ public void testChannelFutureFailsOnFirstWriteFailure() {
+ ChannelBuffer data = ChannelBuffers.wrappedBuffer(new byte[2540]);
+ ChannelFuture mainWriteFuture = Channels.write(channel, data);
+
+ assertEquals(26, downstreamCatcher.events.size());
+ for(int i=0; i < 10; i++) {
+ ((MessageEvent) downstreamCatcher.events.poll()).getFuture().setSuccess();
+ assertFalse(mainWriteFuture.isDone());
+ }
+
+ ((MessageEvent) downstreamCatcher.events.poll()).getFuture().setFailure(new Exception("Something bad happened"));
+ assertTrue(mainWriteFuture.isDone());
+ assertFalse(mainWriteFuture.isSuccess());
+
+ // check all the subsequent writes got cancelled
+ for(int i=0; i < 15; i++) {
+ assertTrue(((MessageEvent) downstreamCatcher.events.poll()).getFuture().isCancelled());
+ }
+ }
+}

Added: branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/WriteSplitterTest.java
===================================================================
--- branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/WriteSplitterTest.java (rev 0)
+++ branches/httptunnel/src/test/java/org/jboss/netty/channel/socket/httptunnel/WriteSplitterTest.java 2009-11-23 11:47:40 UTC (rev 1914)
@@ -0,0 +1,81 @@
+package org.jboss.netty.channel.socket.httptunnel;
+
+
+import static org.junit.Assert.*;
+
+import java.util.List;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.junit.Before;
+import org.junit.Test;
+
+public class WriteSplitterTest {
+
+ private static final int SPLIT_THRESHOLD = 1024;
+
+ private WriteSplitter splitter;
+
+ @Before
+ public void setUp() throws Exception {
+ splitter = new WriteSplitter(SPLIT_THRESHOLD);
+ }
+
+ @Test
+ public void testSplit_bufferUnderThreshold() {
+ ChannelBuffer buffer = createBufferWithContents(800);
+ List<ChannelBuffer> fragments = splitter.split(buffer);
+ assertNotNull(fragments);
+ assertEquals(1, fragments.size());
+ }
+
+ @Test
+ public void testSplit_bufferMatchesThreshold() {
+ ChannelBuffer buffer = createBufferWithContents(SPLIT_THRESHOLD);
+ List<ChannelBuffer> fragments = splitter.split(buffer);
+ assertNotNull(fragments);
+ assertEquals(1, fragments.size());
+ }
+
+ @Test
+ public void testSplit_bufferOverThreshold() {
+ ChannelBuffer buffer = createBufferWithContents((int)(SPLIT_THRESHOLD * 1.5));
+ List<ChannelBuffer> fragments = splitter.split(buffer);
+ assertNotNull(fragments);
+ assertEquals(2, fragments.size());
+
+ ChannelBuffer fragment1 = fragments.get(0);
+ checkMatches(buffer, fragment1);
+ ChannelBuffer fragment2 = fragments.get(1);
+ checkMatches(buffer, fragment2);
+ }
+
+ @Test
+ public void testSplit_largeNumberOfFragments() {
+ ChannelBuffer buffer = createBufferWithContents(SPLIT_THRESHOLD * 250);
+ List<ChannelBuffer> fragments = splitter.split(buffer);
+ assertNotNull(fragments);
+ assertEquals(250, fragments.size());
+
+ for(ChannelBuffer fragment : fragments) {
+ checkMatches(buffer, fragment);
+ }
+ }
+
+ private void checkMatches(ChannelBuffer mainBuffer, ChannelBuffer fragment) {
+ assertTrue(mainBuffer.readableBytes() >= fragment.readableBytes());
+ while(fragment.readable()) {
+ assertEquals(mainBuffer.readByte(), fragment.readByte());
+ }
+ }
+
+ private ChannelBuffer createBufferWithContents(int size) {
+ byte[] contents = new byte[size];
+ for(int i=0; i < contents.length; i++) {
+ contents[i] = (byte)(i % 10);
+ }
+
+ return ChannelBuffers.copiedBuffer(contents);
+ }
+
+}

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits

r1913 - branches.

2009-11-23T03:13:48Z

Author: trustin
Date: 2009-11-23 06:13:48 -0500 (Mon, 23 Nov 2009)
New Revision: 1913

Added:
branches/httptunnel/
Log:
Created a branch for the HTTP tunneling transport

Copied: branches/httptunnel (from rev 1910, trunk)

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits

r1910 - trunk/src/test/java/org/jboss/netty/util/internal.

2009-11-22T21:38:50Z

Author: trustin
Date: 2009-11-23 00:38:50 -0500 (Mon, 23 Nov 2009)
New Revision: 1910

Modified:
trunk/src/test/java/org/jboss/netty/util/internal/StringUtilTest.java
Log:
Set svn properties

Property changes on: trunk/src/test/java/org/jboss/netty/util/internal/StringUtilTest.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits

r1909 - trunk/src/main/java/org/jboss/netty/channel/xnio.

2009-11-22T21:37:57Z

Author: trustin
Date: 2009-11-23 00:37:56 -0500 (Mon, 23 Nov 2009)
New Revision: 1909

Modified:
trunk/src/main/java/org/jboss/netty/channel/xnio/BaseXnioChannel.java
Log:
Set svn properties

Modified: trunk/src/main/java/org/jboss/netty/channel/xnio/BaseXnioChannel.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/channel/xnio/BaseXnioChannel.java 2009-11-23 05:37:35 UTC (rev 1908)
+++ trunk/src/main/java/org/jboss/netty/channel/xnio/BaseXnioChannel.java 2009-11-23 05:37:56 UTC (rev 1909)
@@ -41,7 +41,7 @@
/**
* @author The Netty Project ([hidden email])
* @author Trustin Lee ([hidden email])
- * @version $Rev: 937 $, $Date: 2009-02-25 19:43:03 +0900 (Wed, 25 Feb 2009) $
+ * @version $Rev$, $Date$
*/
@SuppressWarnings("unchecked")
class BaseXnioChannel extends AbstractChannel implements XnioChannel {

Property changes on: trunk/src/main/java/org/jboss/netty/channel/xnio/BaseXnioChannel.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits

r1908 - in trunk/src/main/java/org/jboss/netty/example: uptime and 1 other directory.

2009-11-22T21:37:35Z

Author: trustin
Date: 2009-11-23 00:37:35 -0500 (Mon, 23 Nov 2009)
New Revision: 1908

Modified:
trunk/src/main/java/org/jboss/netty/example/echo/EchoServerHandler.java
trunk/src/main/java/org/jboss/netty/example/uptime/UptimeClient.java
trunk/src/main/java/org/jboss/netty/example/uptime/UptimeClientHandler.java
Log:
Set svn properties

Modified: trunk/src/main/java/org/jboss/netty/example/echo/EchoServerHandler.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/example/echo/EchoServerHandler.java 2009-11-23 05:37:07 UTC (rev 1907)
+++ trunk/src/main/java/org/jboss/netty/example/echo/EchoServerHandler.java 2009-11-23 05:37:35 UTC (rev 1908)
@@ -32,7 +32,7 @@
* @author The Netty Project ([hidden email])
* @author Trustin Lee ([hidden email])
*
- * @version $Rev: 1685 $, $Date: 2009-08-28 16:15:49 +0900 (Fri, 28 Aug 2009) $
+ * @version $Rev$, $Date$
*/
@ChannelPipelineCoverage("all")
public class EchoServerHandler extends SimpleChannelUpstreamHandler {

Property changes on: trunk/src/main/java/org/jboss/netty/example/echo/EchoServerHandler.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Modified: trunk/src/main/java/org/jboss/netty/example/uptime/UptimeClient.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/example/uptime/UptimeClient.java 2009-11-23 05:37:07 UTC (rev 1907)
+++ trunk/src/main/java/org/jboss/netty/example/uptime/UptimeClient.java 2009-11-23 05:37:35 UTC (rev 1908)
@@ -33,7 +33,7 @@
* @author The Netty Project ([hidden email])
* @author Trustin Lee ([hidden email])
*
- * @version $Rev: 1685 $, $Date: 2009-08-28 16:15:49 +0900 (Fri, 28 Aug 2009) $
+ * @version $Rev$, $Date$
*/
public class UptimeClient {

Property changes on: trunk/src/main/java/org/jboss/netty/example/uptime/UptimeClient.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Modified: trunk/src/main/java/org/jboss/netty/example/uptime/UptimeClientHandler.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/example/uptime/UptimeClientHandler.java 2009-11-23 05:37:07 UTC (rev 1907)
+++ trunk/src/main/java/org/jboss/netty/example/uptime/UptimeClientHandler.java 2009-11-23 05:37:35 UTC (rev 1908)
@@ -36,7 +36,7 @@
* @author The Netty Project ([hidden email])
* @author Trustin Lee ([hidden email])
*
- * @version $Rev: 1685 $, $Date: 2009-08-28 16:15:49 +0900 (Fri, 28 Aug 2009) $
+ * @version $Rev$, $Date$
*/
@ChannelPipelineCoverage("one")
public class UptimeClientHandler extends SimpleChannelUpstreamHandler {

Property changes on: trunk/src/main/java/org/jboss/netty/example/uptime/UptimeClientHandler.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits

r1907 - trunk/src/main/java/org/jboss/netty/handler/codec/base64.

2009-11-22T21:37:07Z

Author: trustin
Date: 2009-11-23 00:37:07 -0500 (Mon, 23 Nov 2009)
New Revision: 1907

Modified:
trunk/src/main/java/org/jboss/netty/handler/codec/base64/Base64.java
Log:
Removed a tab

Modified: trunk/src/main/java/org/jboss/netty/handler/codec/base64/Base64.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/codec/base64/Base64.java 2009-11-23 05:35:43 UTC (rev 1906)
+++ trunk/src/main/java/org/jboss/netty/handler/codec/base64/Base64.java 2009-11-23 05:37:07 UTC (rev 1907)
@@ -360,7 +360,7 @@

// Example: DkLE
else {
- int outBuff;
+ int outBuff;
try {
outBuff =
(DECODABET[src[srcOffset ]] & 0xFF) << 18 |

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits

r1906 - trunk/src/main/java/org/jboss/netty/handler/timeout.

2009-11-22T21:35:44Z

Author: trustin
Date: 2009-11-23 00:35:43 -0500 (Mon, 23 Nov 2009)
New Revision: 1906

Modified:
trunk/src/main/java/org/jboss/netty/handler/timeout/DefaultIdleStateEvent.java
Log:
Set svn properties

Property changes on: trunk/src/main/java/org/jboss/netty/handler/timeout/DefaultIdleStateEvent.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits

r1905 - trunk/src/main/java/org/jboss/netty/util/internal/jzlib.

2009-11-22T21:34:22Z

Author: trustin
Date: 2009-11-23 00:34:22 -0500 (Mon, 23 Nov 2009)
New Revision: 1905

Modified:
trunk/src/main/java/org/jboss/netty/util/internal/jzlib/Deflate.java
Log:
Removed a tab

Modified: trunk/src/main/java/org/jboss/netty/util/internal/jzlib/Deflate.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/util/internal/jzlib/Deflate.java 2009-11-22 11:06:50 UTC (rev 1904)
+++ trunk/src/main/java/org/jboss/netty/util/internal/jzlib/Deflate.java 2009-11-23 05:34:22 UTC (rev 1905)
@@ -984,7 +984,7 @@
ins_h = (ins_h << hash_shift ^ window[strstart + MIN_MATCH - 1] & 0xff) &
hash_mask;

- // prev[strstart&w_mask]=hash_head=head[ins_h];
+ // prev[strstart&w_mask]=hash_head=head[ins_h];
hash_head = head[ins_h] & 0xffff;
prev[strstart & w_mask] = head[ins_h];
head[ins_h] = (short) strstart;
@@ -1021,7 +1021,7 @@
ins_h = (ins_h << hash_shift ^ window[strstart +
MIN_MATCH - 1] & 0xff) &
hash_mask;
- // prev[strstart&w_mask]=hash_head=head[ins_h];
+ // prev[strstart&w_mask]=hash_head=head[ins_h];
hash_head = head[ins_h] & 0xffff;
prev[strstart & w_mask] = head[ins_h];
head[ins_h] = (short) strstart;
@@ -1098,7 +1098,7 @@
if (lookahead >= MIN_MATCH) {
ins_h = (ins_h << hash_shift ^ window[strstart + MIN_MATCH - 1] & 0xff) &
hash_mask;
- // prev[strstart&w_mask]=hash_head=head[ins_h];
+ // prev[strstart&w_mask]=hash_head=head[ins_h];
hash_head = head[ins_h] & 0xffff;
prev[strstart & w_mask] = head[ins_h];
head[ins_h] = (short) strstart;

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits

r1904 - branches/httpPost/src/main/java/org/jboss/netty/handler/codec/http.

2009-11-22T03:06:50Z

Author: fredbregier
Date: 2009-11-22 06:06:50 -0500 (Sun, 22 Nov 2009)
New Revision: 1904

Modified:
branches/httpPost/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageDecoder.java
Log:
Fix from trunk the common http codec (last one was message doesn't need to be protected)

Modified: branches/httpPost/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageDecoder.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageDecoder.java 2009-11-21 15:51:21 UTC (rev 1903)
+++ branches/httpPost/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageDecoder.java 2009-11-22 11:06:50 UTC (rev 1904)
@@ -109,7 +109,7 @@
private final int maxInitialLineLength;
private final int maxHeaderSize;
private final int maxChunkSize;
- protected volatile HttpMessage message;
+ private volatile HttpMessage message;
private volatile ChannelBuffer content;
private volatile long chunkSize;
private int headerSize;

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits

r1903 - trunk/src/main/java/org/jboss/netty/handler/codec/http.

2009-11-21T07:51:21Z

Author: trustin
Date: 2009-11-21 10:51:21 -0500 (Sat, 21 Nov 2009)
New Revision: 1903

Modified:
trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageDecoder.java
Log:
HttpMessageDecoder.message doesn't need to be 'protected'

Modified: trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageDecoder.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageDecoder.java 2009-11-21 11:56:42 UTC (rev 1902)
+++ trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageDecoder.java 2009-11-21 15:51:21 UTC (rev 1903)
@@ -109,7 +109,7 @@
private final int maxInitialLineLength;
private final int maxHeaderSize;
private final int maxChunkSize;
- protected volatile HttpMessage message;
+ private volatile HttpMessage message;
private volatile ChannelBuffer content;
private volatile long chunkSize;
private int headerSize;

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits