Fixed a problem with the session, that would make the session inaccessible. There is going to be a new release due to this issue. The rest were just small improvements.

Next is the implementation of custom class serialization.

Author: marcluque

client/src/main/java/de/datasec/hydra/client/HydraClient.java

@@ -54,22 +54,21 @@ public Session build() {
         private Session setUpClient() {
             HydraChannelInitializer initializer = new HydraChannelInitializer(protocol, new NioEventLoopGroup[]{workerGroup = new NioEventLoopGroup(workerThreads)});
 
-            try {
-                Bootstrap bootstrap = new Bootstrap()
-                        .group(workerGroup)
-                        .channel(NioSocketChannel.class)
-                        .remoteAddress(host, port)
-                        .handler(initializer);
+            Bootstrap bootstrap = new Bootstrap()
+                    .group(workerGroup)
+                    .channel(NioSocketChannel.class)
+                    .remoteAddress(host, port)
+                    .handler(initializer);
 
-                // TODO: THINK OF DIFFERENT SOLUTION FOR CHANNELOPTION
-                options.forEach((option, value) -> bootstrap.option(ChannelOption.valueOf(option.name()), value));
+            options.forEach((option, value) -> bootstrap.option(ChannelOption.valueOf(option.name()), value));
 
+            try {
                 bootstrap.connect().sync();
-            } catch (Exception e) {
+            } catch (InterruptedException e) {
                 e.printStackTrace();
             }
 
             return initializer.getSession();
         }
     }
-}
+}

server/src/main/java/de/datasec/hydra/server/HydraServer.java

@@ -1,9 +1,11 @@
 package de.datasec.hydra.server;
 
+import de.datasec.hydra.shared.handler.HydraSession;
 import de.datasec.hydra.shared.handler.Session;
 import de.datasec.hydra.shared.initializer.HydraChannelInitializer;
 import de.datasec.hydra.shared.protocol.HydraProtocol;
 import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.Channel;
 import io.netty.channel.ChannelOption;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.nio.NioServerSocketChannel;
@@ -68,23 +70,26 @@ public Session build() {
         }
 
         private Session setUpClient() {
-            HydraChannelInitializer initializer = new HydraChannelInitializer(protocol, new NioEventLoopGroup[]{bossGroup = new NioEventLoopGroup(bossThreads), workerGroup = new NioEventLoopGroup(workerThreads)});
+            NioEventLoopGroup[] loopGroups = new NioEventLoopGroup[]{bossGroup = new NioEventLoopGroup(bossThreads), workerGroup = new NioEventLoopGroup(workerThreads)};
+            Channel channel = null;
 
-            try {
-                ServerBootstrap serverBootstrap = new ServerBootstrap()
-                        .group(bossGroup, workerGroup)
-                        .channel(NioServerSocketChannel.class)
-                        .childHandler(initializer);
+            ServerBootstrap serverBootstrap = new ServerBootstrap()
+                    .group(bossGroup, workerGroup)
+                    .channel(NioServerSocketChannel.class)
+                    .childHandler(new HydraChannelInitializer(protocol, loopGroups));
 
-                options.forEach((option, value) -> serverBootstrap.option(ChannelOption.valueOf(option.name()), value));
-                childOptions.forEach((option, value) -> serverBootstrap.childOption(ChannelOption.valueOf(option.name()), value));
+            options.forEach((option, value) -> serverBootstrap.option(ChannelOption.valueOf(option.name()), value));
+            childOptions.forEach((option, value) -> serverBootstrap.childOption(ChannelOption.valueOf(option.name()), value));
 
-                serverBootstrap.bind(host, port).sync().channel().closeFuture().sync();
-            } catch (Exception e) {
+            try {
+                channel = serverBootstrap.bind(host, port).sync().channel();
+            } catch (InterruptedException e) {
                 e.printStackTrace();
             }
 
-            return initializer.getSession();
+            // Needs to be created here already and overridden in the channel initializer,
+            // as the channel is not immediately initialized
+            return new HydraSession(channel, protocol, loopGroups);
         }
     }
 }

shared/src/main/java/de/datasec/hydra/shared/handler/HydraSession.java

@@ -6,8 +6,10 @@
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.util.concurrent.AbstractEventExecutorGroup;
 
 import java.net.SocketAddress;
+import java.util.Arrays;
 
 /**
  * Created by DataSec on 29.09.2017.
@@ -39,16 +41,14 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E
 
     @Override
     public void send(Packet packet) {
+        // TODO: Implement custom class serialization
         channel.writeAndFlush(packet);
     }
 
     @Override
     public void close() {
         channel.disconnect();
-
-        for (NioEventLoopGroup group : loopGroups) {
-            group.shutdownGracefully();
-        }
+        Arrays.stream(loopGroups).forEach(AbstractEventExecutorGroup::shutdownGracefully);
     }
 
     @Override
@@ -63,6 +63,7 @@ public HydraProtocol getProtocol() {
 
     @Override
     public SocketAddress getRemoteAddress() {
-        return channel.remoteAddress();
+        SocketAddress address = channel.remoteAddress();
+        return address == null ? channel.localAddress() : address;
     }
 }