Allow to specify the local address when connect. See #276

This commit is contained in:
Norman Maurer 2012-04-21 16:00:23 +02:00
parent ccf01d133a
commit 5f6b419bb9
2 changed files with 92 additions and 1 deletions

View File

@ -127,7 +127,10 @@ final class LocalClientChannelSink extends AbstractChannelSink {
DefaultLocalChannel acceptedChannel = DefaultLocalChannel.create(serverChannel, serverChannel.getFactory(), pipeline, this, channel);
channel.pairedChannel = acceptedChannel;
bind(channel, succeededFuture(channel), new LocalAddress(LocalAddress.EPHEMERAL));
// check if the channel was bound before. See #276
if (!channel.isBound()) {
bind(channel, succeededFuture(channel), new LocalAddress(LocalAddress.EPHEMERAL));
}
channel.remoteAddress = serverChannel.getLocalAddress();
channel.setConnected();
fireChannelConnected(channel, serverChannel.getLocalAddress());

View File

@ -0,0 +1,88 @@
/*
* Copyright 2011 The Netty Project
*
* The Netty Project 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 io.netty.channel.local;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import java.util.concurrent.CountDownLatch;
import io.netty.bootstrap.ClientBootstrap;
import io.netty.bootstrap.ServerBootstrap;
import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelPipeline;
import io.netty.channel.ChannelPipelineFactory;
import io.netty.channel.ChannelStateEvent;
import io.netty.channel.Channels;
import io.netty.channel.ExceptionEvent;
import io.netty.channel.SimpleChannelUpstreamHandler;
import org.junit.Test;
public class LocalClientTest {
@Test
public void testLocalAddressBind() throws InterruptedException {
ServerBootstrap sb = new ServerBootstrap(new DefaultLocalServerChannelFactory());
LocalAddress addr = new LocalAddress("Server");
LocalAddress addr2 = new LocalAddress("C1");
sb.bind(addr);
ClientBootstrap cb = new ClientBootstrap(new DefaultLocalClientChannelFactory());
final ExceptionHandler handler = new ExceptionHandler();
cb.setPipelineFactory(new ChannelPipelineFactory() {
@Override
public ChannelPipeline getPipeline() throws Exception {
return Channels.pipeline(handler);
}
});
ChannelFuture cf = cb.connect(addr, addr2).awaitUninterruptibly();
assertTrue(cf.isSuccess());
assertTrue(cf.getChannel().close().awaitUninterruptibly().isSuccess());
assertNull(handler.await());
sb.releaseExternalResources();
cb.releaseExternalResources();
}
final class ExceptionHandler extends SimpleChannelUpstreamHandler {
private final CountDownLatch latch = new CountDownLatch(1);
private Throwable t;
@Override
public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e) throws Exception {
super.exceptionCaught(ctx, e);
t = e.getCause();
}
@Override
public void channelClosed(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
super.channelClosed(ctx, e);
latch.countDown();
}
public Throwable await() throws InterruptedException {
latch.await();
return t;
}
}
}