Add netty buffer and nio buffer spring configuration

jxnet · Dec 2, 2018 · 6ab9260 · 6ab9260
1 parent b16a177
commit 6ab9260
Show file tree

Hide file tree

Showing 17 changed files with 194 additions and 193 deletions.
diff --git a/README.md b/README.md
@@ -122,23 +122,31 @@ public class Application implements CommandLineRunner  {
   - ##### Pcap Packet Handler Configuration
 
 ```java
+@EnablePacket
 @Configuration
-public class DefaultPacketHandler implements PacketHandler<String> {
+public class DefaultJxpacketHandler implements JxpacketHandler<String> {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(DefaultPacketHandler.class.getName());
+    private static final Logger LOGGER = LoggerFactory.getLogger(DefaultJxpacketHandler.class.getName());
 
-    private static final String PRETTY_FOOTER = ""
-            + "+-----------------------------------------------------------------------------------------------------+";
+    private static final String PRETTY_FOOTER = "+---------------------------------------------------"
+            + "--------------------------------------------------+";
 
-    @Override
-    public void next(String argument, PcapPktHdr header, Future<Packet> packet) throws ExecutionException, InterruptedException {
-        Iterator<Packet> iterator = packet.get().iterator();
+    private void print(Pair<PcapPktHdr, Packet> packet) {
+        Iterator<Packet> iterator = packet.getRight().iterator();
+        LOGGER.info("Pcap packet header : {}", packet.getLeft());
+        LOGGER.info("Packet header      : ");
         while (iterator.hasNext()) {
-            LOGGER.info(iterator.next().toString());
+            LOGGER.info("{}", iterator.next());
         }
         LOGGER.info(PRETTY_FOOTER);
     }
 
+    @Override
+    public void next(String argument, Future<Pair<PcapPktHdr, Packet>> packet) throws ExecutionException, InterruptedException {
+        LOGGER.info("User argument      : {}", argument);
+        print(packet.get());
+    }
+
 }
 ```
 

diff --git a/gradle/configure.gradle b/gradle/configure.gradle
@@ -7,7 +7,7 @@ ext {
 
 	NAME = 'Jxnet'
 	GROUP = 'com.ardikars.jxnet'
-	VERSION = '1.4.9.RC1'
+	VERSION = '1.4.9.RC2'
 	DESCRIPTION = 'Jxnet is a java library for capturing and sending network packet.'
 
 	NDK_HOME = "${System.env.NDK_HOME}"

diff --git a/jxnet-spring-boot-autoconfigure/build.gradle b/jxnet-spring-boot-autoconfigure/build.gradle
@@ -10,7 +10,6 @@ dependencyManagement {
         mavenBom("org.springframework.boot:spring-boot-dependencies:${SPRING_BOOT_VERSION}")
         mavenBom("com.ardikars.jxpacket:jxpacket:${JXPACKET_VERSION}")
         mavenBom("io.netty:netty-bom:${NETTY_VERSION}")
-        mavenBom("io.projectreactor:reactor-bom:${REACTOR_VERSION}")
     }
 }
 
@@ -19,11 +18,13 @@ dependencies {
     implementation project (":jxnet-context")
     implementation ("org.springframework.boot:spring-boot-configuration-processor")
     implementation ("org.springframework.boot:spring-boot-autoconfigure")
+    implementation ("com.ardikars.common:common-annotation")
     implementation ("com.ardikars.common:common-net")
     implementation ("com.ardikars.common:common-util")
+    implementation ("com.ardikars.common:common-tuple")
+    implementation ("io.netty:netty-buffer")
     implementation ("com.ardikars.jxpacket:jxpacket-common")
     implementation ("com.ardikars.jxpacket:jxpacket-core")
-    implementation ("io.projectreactor:reactor-core")
     implementation ("org.slf4j:slf4j-api:${SLF4J_VERSION}")
     testImplementation ("junit:junit:${JUNIT_VERSION}")
     testImplementation ("org.mockito:mockito-core:${MOCKITO_VERSION}")

diff --git a/...ing/boot/autoconfigure/PacketHandler.java → ...g/boot/autoconfigure/JxpacketHandler.java b/...ing/boot/autoconfigure/PacketHandler.java → ...g/boot/autoconfigure/JxpacketHandler.java
@@ -17,6 +17,7 @@
 
 package com.ardikars.jxnet.spring.boot.autoconfigure;
 
+import com.ardikars.common.tuple.Pair;
 import com.ardikars.jxnet.PcapPktHdr;
 import com.ardikars.jxpacket.common.Packet;
 
@@ -27,18 +28,17 @@
  * Callback function used for capturing packets.
  *
  * @author <a href="mailto:[email protected]">Ardika Rommy Sanjaya</a>
- * @since 1.4.8
+ * @since 1.4.9
  */
-public interface PacketHandler<T> {
+public interface JxpacketHandler<T> {
 
     /**
      * Next available packet.
      * @param argument user argument.
-     * @param header pcap header.
-     * @param packet {@link Packet} object.
+     * @param packet a tuple of {@link PcapPktHdr} and {@link Packet}.
      * @throws ExecutionException execution exception.
      * @throws InterruptedException interrupted exception.
      */
-    void next(T argument, PcapPktHdr header, Future<Packet> packet) throws ExecutionException, InterruptedException;
+    void next(T argument, Future<Pair<PcapPktHdr, Packet>> packet) throws ExecutionException, InterruptedException;
 
 }
diff --git a/...figure/src/main/java/com/ardikars/jxnet/spring/boot/autoconfigure/NettyBufferHandler.java b/...figure/src/main/java/com/ardikars/jxnet/spring/boot/autoconfigure/NettyBufferHandler.java
@@ -17,8 +17,8 @@
 
 package com.ardikars.jxnet.spring.boot.autoconfigure;
 
+import com.ardikars.common.tuple.Pair;
 import com.ardikars.jxnet.PcapPktHdr;
-import com.ardikars.jxpacket.common.Packet;
 import io.netty.buffer.ByteBuf;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -34,11 +34,10 @@ public interface NettyBufferHandler<T> {
     /**
      * Next available packet.
      * @param argument user argument.
-     * @param header pcap header.
-     * @param packet {@link Packet} object.
+     * @param packet a taple of {@link PcapPktHdr} and {@link ByteBuf}.
      * @throws ExecutionException execution exception.
      * @throws InterruptedException interrupted exception.
      */
-    void next(T argument, PcapPktHdr header, Future<ByteBuf> packet) throws ExecutionException, InterruptedException;
+    void next(T argument, Future<Pair<PcapPktHdr, ByteBuf>> packet) throws ExecutionException, InterruptedException;
 
 }
diff --git a/...onfigure/src/main/java/com/ardikars/jxnet/spring/boot/autoconfigure/NioBufferHandler.java b/...onfigure/src/main/java/com/ardikars/jxnet/spring/boot/autoconfigure/NioBufferHandler.java
@@ -17,8 +17,8 @@
 
 package com.ardikars.jxnet.spring.boot.autoconfigure;
 
+import com.ardikars.common.tuple.Pair;
 import com.ardikars.jxnet.PcapPktHdr;
-import com.ardikars.jxpacket.common.Packet;
 import java.nio.ByteBuffer;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -34,11 +34,10 @@ public interface NioBufferHandler<T> {
     /**
      * Next available packet.
      * @param argument user argument.
-     * @param header pcap header.
-     * @param packet {@link Packet} object.
+     * @param packet a taple of {@link PcapPktHdr} and {@link ByteBuffer}.
      * @throws ExecutionException execution exception.
      * @throws InterruptedException interrupted exception.
      */
-    void next(T argument, PcapPktHdr header, Future<ByteBuffer> packet) throws ExecutionException, InterruptedException;
+    void next(T argument, Future<Pair<PcapPktHdr, ByteBuffer>> packet) throws ExecutionException, InterruptedException;
 
 }
diff --git a/...gure/src/main/java/com/ardikars/jxnet/spring/boot/autoconfigure/ReactorPacketHandler.java b/...gure/src/main/java/com/ardikars/jxnet/spring/boot/autoconfigure/ReactorPacketHandler.java
diff --git a/...rc/main/java/com/ardikars/jxnet/spring/boot/autoconfigure/constant/PacketHandlerType.java b/...rc/main/java/com/ardikars/jxnet/spring/boot/autoconfigure/constant/PacketHandlerType.java
@@ -25,6 +25,6 @@
  */
 public enum PacketHandlerType {
 
-    JXPACKET, NETTY_BUFFER, NIO_BUFFER, REACTOR, RXJAVA
+    JXPACKET, NETTY_BUFFER, NIO_BUFFER
 
 }
diff --git a/...a/com/ardikars/jxnet/spring/boot/autoconfigure/jxpacket/JxpacketHandlerConfiguration.java b/...a/com/ardikars/jxnet/spring/boot/autoconfigure/jxpacket/JxpacketHandlerConfiguration.java
@@ -17,10 +17,12 @@
 
 package com.ardikars.jxnet.spring.boot.autoconfigure.jxpacket;
 
+import com.ardikars.common.tuple.Pair;
+import com.ardikars.common.tuple.Tuple;
 import com.ardikars.jxnet.DataLinkType;
 import com.ardikars.jxnet.PcapHandler;
 import com.ardikars.jxnet.PcapPktHdr;
-import com.ardikars.jxnet.spring.boot.autoconfigure.PacketHandler;
+import com.ardikars.jxnet.spring.boot.autoconfigure.JxpacketHandler;
 import com.ardikars.jxpacket.common.Packet;
 import com.ardikars.jxpacket.common.UnknownPacket;
 import com.ardikars.jxpacket.core.ethernet.Ethernet;
@@ -42,7 +44,7 @@
  * Jxpacket handler.
  *
  * @author <a href="mailto:[email protected]">Ardika Rommy Sanjaya</a>
- * @since 1.4.8
+ * @since 1.4.9
  */
 @ConditionalOnClass({Packet.class, ByteBuf.class})
 @Configuration("com.ardikars.jxnet.spring.boot.autoconfigure.jxpacket.jxpacketHandler")
@@ -51,7 +53,7 @@ public class JxpacketHandlerConfiguration<T> implements PcapHandler<T> {
     private static final Log LOG = LogFactory.getLog(JxpacketHandlerConfiguration.class.getName());
 
     private final int rawDataLinkType;
-    private final PacketHandler<T> packetHandler;
+    private final JxpacketHandler<T> packetHandler;
     private final ExecutorService executorService;
 
     /**
@@ -62,17 +64,17 @@ public class JxpacketHandlerConfiguration<T> implements PcapHandler<T> {
      */
     public JxpacketHandlerConfiguration(@Qualifier("com.ardikars.jxnet.spring.boot.autoconfigure.executorService") ExecutorService executorService,
                                         DataLinkType dataLinkType,
-                                        PacketHandler<T> packetHandler) {
+                                        JxpacketHandler<T> packetHandler) {
         this.rawDataLinkType = dataLinkType != null ? dataLinkType.getValue() : 1;
         this.packetHandler = packetHandler;
         this.executorService = executorService;
     }
 
     @Override
     public void nextPacket(final T user, final PcapPktHdr h, final ByteBuffer bytes) {
-        Future<Packet> packet = executorService.submit(new Callable<Packet>() {
+        Future<Pair<PcapPktHdr, Packet>> packet = executorService.submit(new Callable<Pair<PcapPktHdr, Packet>>() {
             @Override
-            public Packet call() throws Exception {
+            public Pair<PcapPktHdr, Packet> call() throws Exception {
                 ByteBuf buffer = ByteBufAllocator.DEFAULT.directBuffer(bytes.capacity());
                 buffer.setBytes(0, bytes);
                 Packet packet;
@@ -81,11 +83,11 @@ public Packet call() throws Exception {
                 } else {
                     packet = UnknownPacket.newPacket(buffer);
                 }
-                return packet;
+                return Tuple.of(h, packet);
             }
         });
         try {
-            packetHandler.next(user, h, packet);
+            packetHandler.next(user, packet);
         } catch (ExecutionException | InterruptedException e) {
             LOG.warn(e.getMessage());
         }

diff --git a/...a/com/ardikars/jxnet/spring/boot/autoconfigure/netty/NettyBufferHandlerConfiguration.java b/...a/com/ardikars/jxnet/spring/boot/autoconfigure/netty/NettyBufferHandlerConfiguration.java
@@ -17,6 +17,8 @@
 
 package com.ardikars.jxnet.spring.boot.autoconfigure.netty;
 
+import com.ardikars.common.tuple.Pair;
+import com.ardikars.common.tuple.Tuple;
 import com.ardikars.jxnet.PcapHandler;
 import com.ardikars.jxnet.PcapPktHdr;
 import com.ardikars.jxnet.spring.boot.autoconfigure.NettyBufferHandler;
@@ -61,16 +63,16 @@ public NettyBufferHandlerConfiguration(@Qualifier("com.ardikars.jxnet.spring.boo
 
     @Override
     public void nextPacket(final T user, final PcapPktHdr h, final ByteBuffer bytes) {
-        Future<ByteBuf> packet = executorService.submit(new Callable<ByteBuf>() {
+        Future<Pair<PcapPktHdr, ByteBuf>> packet = executorService.submit(new Callable<Pair<PcapPktHdr, ByteBuf>>() {
             @Override
-            public ByteBuf call() throws Exception {
+            public Pair<PcapPktHdr, ByteBuf> call() throws Exception {
                 ByteBuf buffer = ByteBufAllocator.DEFAULT.directBuffer(bytes.capacity());
                 buffer.setBytes(0, bytes);
-                return buffer;
+                return Tuple.of(h.copy(), buffer);
             }
         });
         try {
-            packetHandler.next(user, h, packet);
+            packetHandler.next(user, packet);
         } catch (Exception e) {
             LOG.warn(e.getMessage());
         }

diff --git a/.../java/com/ardikars/jxnet/spring/boot/autoconfigure/nio/NioBufferHandlerConfiguration.java b/.../java/com/ardikars/jxnet/spring/boot/autoconfigure/nio/NioBufferHandlerConfiguration.java
@@ -17,6 +17,8 @@
 
 package com.ardikars.jxnet.spring.boot.autoconfigure.nio;
 
+import com.ardikars.common.tuple.Pair;
+import com.ardikars.common.tuple.Tuple;
 import com.ardikars.jxnet.PcapHandler;
 import com.ardikars.jxnet.PcapPktHdr;
 import com.ardikars.jxnet.spring.boot.autoconfigure.NioBufferHandler;
@@ -59,14 +61,14 @@ public NioBufferHandlerConfiguration(@Qualifier("com.ardikars.jxnet.spring.boot.
 
     @Override
     public void nextPacket(final T user, final PcapPktHdr h, final ByteBuffer bytes) {
-        Future<ByteBuffer> packet = executorService.submit(new Callable<ByteBuffer>() {
+        Future<Pair<PcapPktHdr, ByteBuffer>> packet = executorService.submit(new Callable<Pair<PcapPktHdr, ByteBuffer>>() {
             @Override
-            public ByteBuffer call() throws Exception {
-                return bytes;
+            public Pair<PcapPktHdr, ByteBuffer> call() throws Exception {
+                return Tuple.of(h, bytes);
             }
         });
         try {
-            packetHandler.next(user, h, packet);
+            packetHandler.next(user, packet);
         } catch (Exception e) {
             LOG.warn(e.getMessage());
         }