Fixed a little bug that wouldn't allow one to create a client or serv…

…er without creating a session listener. Fixed a problem with the packet class. The byte buffer was being passed incorrectly, which would cause encoding and decoding problems. Also added an option for the server to distribute packets via a selection of algorithms. Algorithms are going to come by time. In the next commit the examples are going to be adjusted to the changes. Bumped to version 1.6.0.

README.md

@@ -36,7 +36,7 @@ like a [simple chat application](https://github.com/DataSecs/Hydra/wiki/Building
 <dependency>
     <groupId>de.datasecs</groupId>
     <artifactId>hydra-all</artifactId>
-    <version>1.5.5</version>
+    <version>1.6.0</version>
 </dependency>
 ```
 

all/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>hydra</artifactId>
         <groupId>de.datasecs</groupId>
-        <version>1.5.5</version>
+        <version>1.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -16,14 +16,14 @@
         <dependency>
             <groupId>de.datasecs</groupId>
             <artifactId>hydra-client</artifactId>
-            <version>1.5.5</version>
+            <version>1.6.0</version>
         </dependency>
 
         <!-- Hydra server -->
         <dependency>
             <groupId>de.datasecs</groupId>
             <artifactId>hydra-server</artifactId>
-            <version>1.5.5</version>
+            <version>1.6.0</version>
         </dependency>
     </dependencies>
 

client/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>hydra</artifactId>
         <groupId>de.datasecs</groupId>
-        <version>1.5.5</version>
+        <version>1.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>de.datasecs</groupId>
             <artifactId>hydra-shared</artifactId>
-            <version>1.5.5</version>
+            <version>1.6.0</version>
         </dependency>
     </dependencies>
 

example/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>hydra</artifactId>
         <groupId>de.datasecs</groupId>
-        <version>1.5.5</version>
+        <version>1.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>de.datasecs</groupId>
             <artifactId>hydra-all</artifactId>
-            <version>1.5.5</version>
+            <version>1.6.0</version>
         </dependency>
     </dependencies>
 

pom.xml

@@ -7,7 +7,7 @@
     <groupId>de.datasecs</groupId>
     <artifactId>hydra</artifactId>
     <packaging>pom</packaging>
-    <version>1.5.5</version>
+    <version>1.6.0</version>
 
     <modules>
         <module>all</module>

server/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>hydra</artifactId>
         <groupId>de.datasecs</groupId>
-        <version>1.5.5</version>
+        <version>1.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>de.datasecs</groupId>
             <artifactId>hydra-shared</artifactId>
-            <version>1.5.5</version>
+            <version>1.6.0</version>
         </dependency>
     </dependencies>
 

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

@@ -1,11 +1,14 @@
 package de.datasecs.hydra.server;
 
+import de.datasecs.hydra.shared.distribution.Distribution;
 import de.datasecs.hydra.shared.handler.HydraSession;
 import de.datasecs.hydra.shared.handler.Session;
 import de.datasecs.hydra.shared.protocol.HydraProtocol;
+import de.datasecs.hydra.shared.protocol.packets.Packet;
 import io.netty.channel.Channel;
 import io.netty.channel.EventLoopGroup;
 import io.netty.util.concurrent.EventExecutorGroup;
+import io.netty.util.internal.ConcurrentSet;
 
 import java.net.SocketAddress;
 import java.util.Arrays;
@@ -105,4 +108,20 @@ public SocketAddress getLocalAdress() {
     public Set<Session> getSessions() {
         return protocol.getSessions();
     }
+
+    /**
+     * Sends a packet to all clients that are connected to the server with the specified distribution type.
+     *
+     * @param packet the packet that is supposed to be send to all connected clients.
+     * @param distributionType the type of distribution that is supposed to be used.
+     */
+    public void send(Packet packet, Distribution distributionType) {
+        switch (distributionType) {
+            case SIMPLE_BROADCAST:
+                ConcurrentSet<Session> sessions = new ConcurrentSet<>();
+                sessions.addAll(protocol.getSessions());
+                sessions.forEach(session -> session.send(packet));
+                break;
+        }
+    }
 }

shared/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>hydra</artifactId>
         <groupId>de.datasecs</groupId>
-        <version>1.5.5</version>
+        <version>1.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

shared/src/main/java/de/datasecs/hydra/shared/distribution/Distribution.java

@@ -0,0 +1,6 @@
+package de.datasecs.hydra.shared.distribution;
+
+//TODO: Add explanation
+public enum Distribution {
+    SIMPLE_BROADCAST
+}

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

@@ -26,12 +26,17 @@ public HydraSession(Channel channel, HydraProtocol protocol) {
 
     @Override
     protected void channelRead0(ChannelHandlerContext context, Packet packet) {
-        protocol.callPacketListener(packet, this);
+        if (protocol.getPacketListener() != null) {
+            protocol.callPacketListener(packet, this);
+        }
     }
 
     @Override
     public void handlerRemoved(ChannelHandlerContext context) {
-        protocol.callSessionListener(false, this);
+        if (protocol.getSessionListener() != null) {
+            protocol.callSessionListener(false, this);
+        }
+
         protocol.removeSession(this);
     }
 

shared/src/main/java/de/datasecs/hydra/shared/initializer/HydraChannelInitializer.java

@@ -46,7 +46,9 @@ protected void initChannel(SocketChannel channel) {
             protocol.setClientSession(session);
         }
 
-        // Inform SessionListener about new session
-        protocol.callSessionListener(true, session);
+        if (protocol.getSessionListener() != null) {
+            // Inform SessionListener about new session
+            protocol.callSessionListener(true, session);
+        }
     }
 }

shared/src/main/java/de/datasecs/hydra/shared/protocol/HydraProtocol.java

@@ -150,4 +150,12 @@ public void removeSession(Session session) {
     public Set<Session> getSessions() {
         return sessions;
     }
+
+    public HydraSessionListener getSessionListener() {
+        return sessionListener;
+    }
+
+    public HydraPacketListener getPacketListener() {
+        return packetListener;
+    }
 }