Skip to content

fix a pairing issue #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 12, 2019
Merged

fix a pairing issue #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/beowulfe/hap/HomekitServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public class HomekitServer {
*/
public HomekitServer(InetAddress localAddress, int port, int nThreads) throws IOException {
this.localAddress = localAddress;
http = new HomekitHttpServer(port, nThreads);
http = new HomekitHttpServer(localAddress, port, nThreads);
}

/**
Expand Down
7 changes: 5 additions & 2 deletions src/main/java/com/beowulfe/hap/impl/http/impl/HomekitHttpServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@

import com.beowulfe.hap.impl.HomekitWebHandler;
import com.beowulfe.hap.impl.http.HomekitClientConnectionFactory;
import java.net.InetAddress;
import java.util.concurrent.CompletableFuture;

public class HomekitHttpServer implements HomekitWebHandler {

private NettyHomekitHttpService service = null;
private final InetAddress localAddress;
private final int port;
private final int nThreads;

Expand All @@ -17,15 +19,16 @@ public void stop() {
}
}

public HomekitHttpServer(int port, int nThreads) {
public HomekitHttpServer(InetAddress localAddress, int port, int nThreads) {
this.localAddress = localAddress;
this.port = port;
this.nThreads = nThreads;
}

@Override
public CompletableFuture<Integer> start(HomekitClientConnectionFactory clientConnectionFactory) {
if (service == null) {
this.service = NettyHomekitHttpService.create(port, nThreads);
this.service = NettyHomekitHttpService.create(localAddress, port, nThreads);
return this.service.create(clientConnectionFactory);
} else {
throw new RuntimeException("HomekitHttpServer can only be started once");
Expand Down
11 changes: 7 additions & 4 deletions src/main/java/com/beowulfe/hap/impl/http/impl/NettyHomekitHttpService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import io.netty.handler.logging.LogLevel;
import io.netty.handler.logging.LoggingHandler;
import io.netty.util.concurrent.*;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.util.concurrent.CompletableFuture;
Expand All @@ -23,16 +24,18 @@ class NettyHomekitHttpService {

private static final Logger logger = LoggerFactory.getLogger(NettyHomekitHttpService.class);
private final ChannelGroup allChannels = new DefaultChannelGroup(GlobalEventExecutor.INSTANCE);
private final InetAddress localAddress;
private final int port;
private final int nThreads;

public static NettyHomekitHttpService create(int port, int nThreads) {
return new NettyHomekitHttpService(port, nThreads);
public static NettyHomekitHttpService create(InetAddress localAddress, int port, int nThreads) {
return new NettyHomekitHttpService(localAddress, port, nThreads);
}

private NettyHomekitHttpService(int port, int nThreads) {
private NettyHomekitHttpService(InetAddress localAddress, int port, int nThreads) {
bossGroup = new NioEventLoopGroup();
workerGroup = new NioEventLoopGroup();
this.localAddress = localAddress;
this.port = port;
this.nThreads = nThreads;
}
Expand All @@ -46,7 +49,7 @@ public CompletableFuture<Integer> create(HomekitClientConnectionFactory connecti
.childHandler(new ServerInitializer(connectionFactory, allChannels, nThreads))
.option(ChannelOption.SO_BACKLOG, 128)
.childOption(ChannelOption.SO_KEEPALIVE, true);
final ChannelFuture bindFuture = b.bind(port);
final ChannelFuture bindFuture = b.bind(localAddress, port);
bindFuture.addListener(
new GenericFutureListener<Future<? super Void>>() {

Expand Down