Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
This repository was archived by the owner on Nov 26, 2020. It is now read-only.
/JxnetPublic archive

Commite3553bb

Browse files
committed
Use common-memory instead of netty-buffer (remove netty-buffer)
1 parentdddfc7f commite3553bb

File tree

25 files changed

+45
-613
lines changed

25 files changed

+45
-613
lines changed

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.5.4.RELEASE
1+
1.5.5.RC2

‎gradle/configure.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ext {
77

88
NAME='Jxnet'
99
GROUP='com.ardikars.jxnet'
10-
VERSION='1.5.5.RC1'
10+
VERSION=file('VERSION').text
1111
DESCRIPTION='Jxnet is a java library for capturing and sending network packet.'
1212

1313
NDK_HOME="${System.env.NDK_HOME}"
@@ -31,9 +31,8 @@ ext {
3131
PMD_VERION='6.10.0'
3232
JACOCO_VERSION='0.8.2'
3333

34-
COMMON_VERSION='1.2.6.RELEASE'
35-
JXPACKET_VERSION='1.2.2.RELEASE'
36-
NETTY_VERSION='4.1.31.Final'
34+
COMMON_VERSION='1.2.7.RC2'
35+
JXPACKET_VERSION='1.2.3.RC'
3736
REACTOR_VERSION='Californium-RELEASE'
3837
JNR_VERSION='2.1.9'
3938

‎jxnet-core/src/main/java/com/ardikars/jxnet/util/DefaultLibraryLoader.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,25 @@ public class DefaultLibraryLoader implements Loader<Void> {
5353
*/
5454
@Override
5555
publicvoidload(finalCallback<Void>callback) {
56+
doLoad(callback);
57+
}
58+
59+
/**
60+
* Loadd classes then perform load native library.
61+
*/
62+
@Override
63+
publicvoidload(Callback<Void>callback,Class[]loadClasses) {
64+
for (Classclazzes :loadClasses) {
65+
try {
66+
Class.forName(clazzes.getName());
67+
doLoad(callback);
68+
}catch (ClassNotFoundExceptione) {
69+
callback.onFailure(e);
70+
}
71+
}
72+
}
73+
74+
privatevoiddoLoad(finalCallback<Void>callback) {
5675
if (USE_SYSTEM_LIBRARY) {
5776
try {
5877
System.loadLibrary("jxnet");

‎jxnet-spring-boot-autoconfigure/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ dependencyManagement {
99
imports {
1010
mavenBom("org.springframework.boot:spring-boot-dependencies:${SPRING_BOOT_VERSION}")
1111
mavenBom("com.ardikars.jxpacket:jxpacket:${JXPACKET_VERSION}")
12-
mavenBom("io.netty:netty-bom:${NETTY_VERSION}")
1312
}
1413
}
1514

@@ -19,8 +18,7 @@ dependencies {
1918
compile ("com.ardikars.common:common-tuple")
2019
compile ("com.ardikars.common:common-util")
2120
compile ("com.ardikars.common:common-net")
22-
compile ("io.netty:netty-common")
23-
compile ("io.netty:netty-buffer")
21+
compile ("com.ardikars.common:common-memory")
2422
compile ("org.springframework.boot:spring-boot-autoconfigure")
2523
compile ("org.springframework.boot:spring-boot-configuration-processor")
2624
compile ("com.ardikars.jxpacket:jxpacket-common")

‎jxnet-spring-boot-autoconfigure/src/main/java/com/ardikars/jxnet/spring/boot/autoconfigure/HandlerConfigurer.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
packagecom.ardikars.jxnet.spring.boot.autoconfigure;
1919

2020
importcom.ardikars.common.annotation.Incubating;
21+
importcom.ardikars.common.memory.Memories;
22+
importcom.ardikars.common.memory.Memory;
2123
importcom.ardikars.jxnet.DataLinkType;
2224
importcom.ardikars.jxnet.context.Context;
2325
importcom.ardikars.jxnet.spring.boot.autoconfigure.constant.JxnetObjectName;
2426
importcom.ardikars.jxpacket.common.Packet;
2527
importcom.ardikars.jxpacket.common.UnknownPacket;
2628
importcom.ardikars.jxpacket.core.ethernet.Ethernet;
27-
importio.netty.buffer.ByteBuf;
28-
importio.netty.buffer.Unpooled;
2929
importjava.nio.ByteBuffer;
3030
importjava.util.concurrent.ExecutorService;
3131
importorg.springframework.beans.factory.annotation.Autowired;
@@ -61,7 +61,7 @@ public class HandlerConfigurer<T, V> {
6161
* @return returns {@link Packet}.
6262
*/
6363
publicPacketdecode(ByteBufferbytes) {
64-
returnprocessPacket(Unpooled.wrappedBuffer(bytes));
64+
returnprocessPacket(Memories.wrap(bytes,false));
6565
}
6666

6767
/**
@@ -71,11 +71,12 @@ public Packet decode(ByteBuffer bytes) {
7171
* @return returns {@link Packet}.
7272
*/
7373
publicPacketdecodeRawBuffer(longaddress,intlength) {
74-
returnprocessPacket(Unpooled.wrappedBuffer(address,length,false));
74+
returnprocessPacket(Memories.wrap(address,length));
7575
}
7676

77-
privatePacketprocessPacket(ByteBufbuf) {
77+
privatePacketprocessPacket(Memorybuf) {
7878
Packetpacket;
79+
buf.writerIndex(buf.capacity());
7980
if (dataLinkType.getValue() ==1) {
8081
packet =Ethernet.newPacket(buf);
8182
}else {

‎jxnet-spring-boot-autoconfigure/src/main/java/com/ardikars/jxnet/spring/boot/autoconfigure/NettyAsyncBufferHandler.java

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎jxnet-spring-boot-autoconfigure/src/main/java/com/ardikars/jxnet/spring/boot/autoconfigure/NettyBufferHandler.java

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎jxnet-spring-boot-autoconfigure/src/main/java/com/ardikars/jxnet/spring/boot/autoconfigure/NettyRawBufferAsyncHandler.java

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎jxnet-spring-boot-autoconfigure/src/main/java/com/ardikars/jxnet/spring/boot/autoconfigure/NettyRawBufferHandler.java

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎jxnet-spring-boot-autoconfigure/src/main/java/com/ardikars/jxnet/spring/boot/autoconfigure/NioAsyncBufferHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
importcom.ardikars.common.tuple.Pair;
2121
importcom.ardikars.jxnet.PcapPktHdr;
22-
importio.netty.buffer.ByteBuf;
2322

23+
importjava.nio.ByteBuffer;
2424
importjava.util.concurrent.Future;
2525

2626
/**
@@ -29,6 +29,6 @@
2929
* @author <a href="mailto:contact@ardikars.com">Ardika Rommy Sanjaya</a>
3030
* @since 1.5.4
3131
*/
32-
publicinterfaceNioAsyncBufferHandler<T>extendsHandler<T,Future<Pair<PcapPktHdr,ByteBuf>>> {
32+
publicinterfaceNioAsyncBufferHandler<T>extendsHandler<T,Future<Pair<PcapPktHdr,ByteBuffer>>> {
3333

3434
}

‎jxnet-spring-boot-autoconfigure/src/main/java/com/ardikars/jxnet/spring/boot/autoconfigure/annotation/EnablePacket.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@
4141
* Packet handler type.
4242
* @return a {@link PacketHandlerType} object.
4343
*/
44-
PacketHandlerTypepacketHandlerType()defaultPacketHandlerType.JXPACKET;
44+
PacketHandlerTypepacketHandlerType()defaultPacketHandlerType.JXPACKET_RAW;
4545

4646
}

‎jxnet-spring-boot-autoconfigure/src/main/java/com/ardikars/jxnet/spring/boot/autoconfigure/constant/PacketHandlerType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
*/
2626
publicenumPacketHandlerType {
2727

28-
JXPACKET,JXPACKET_ASYNC,JXPACKET_RAW,NETTY_BUFFER,NETTY_BUFFER_ASYNC,NETTY_RAW_BUFFER,NETTY_RAW_BUFFER_ASYNC,NIO_BUFFER,NIO_BUFFER_ASYNC
28+
JXPACKET,JXPACKET_ASYNC,JXPACKET_RAW,NIO_BUFFER,NIO_BUFFER_ASYNC
2929

3030
}

‎jxnet-spring-boot-autoconfigure/src/main/java/com/ardikars/jxnet/spring/boot/autoconfigure/jxpacket/JxpacketAsyncHandlerConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@
2121

2222
importcom.ardikars.common.logging.Logger;
2323
importcom.ardikars.common.logging.LoggerFactory;
24+
importcom.ardikars.common.memory.Memory;
2425
importcom.ardikars.common.tuple.Pair;
2526
importcom.ardikars.common.tuple.Tuple;
2627
importcom.ardikars.jxnet.PcapHandler;
2728
importcom.ardikars.jxnet.PcapPktHdr;
2829
importcom.ardikars.jxnet.spring.boot.autoconfigure.HandlerConfigurer;
2930
importcom.ardikars.jxpacket.common.Packet;
30-
importio.netty.buffer.ByteBuf;
3131
importjava.nio.ByteBuffer;
3232
importjava.util.concurrent.ExecutionException;
3333
importorg.springframework.boot.autoconfigure.condition.ConditionalOnClass;
3434
importorg.springframework.context.annotation.Configuration;
3535

36-
@ConditionalOnClass({Packet.class,ByteBuf.class})
36+
@ConditionalOnClass({Packet.class,Memory.class})
3737
@Configuration(JXPACKET_ASYNC_HANDLER_CONFIGURATION_BEAN_NAME)
3838
publicclassJxpacketAsyncHandlerConfiguration<T>extendsHandlerConfigurer<T,Pair<PcapPktHdr,Packet>>implementsPcapHandler<T> {
3939

‎jxnet-spring-boot-autoconfigure/src/main/java/com/ardikars/jxnet/spring/boot/autoconfigure/jxpacket/JxpacketAutoconfiguration.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424

2525
importcom.ardikars.common.logging.Logger;
2626
importcom.ardikars.common.logging.LoggerFactory;
27+
importcom.ardikars.common.memory.Memories;
28+
importcom.ardikars.common.memory.Memory;
2729
importcom.ardikars.common.tuple.Pair;
2830
importcom.ardikars.common.tuple.Tuple;
2931
importcom.ardikars.jxnet.DataLinkType;
@@ -48,8 +50,6 @@
4850
importcom.ardikars.jxpacket.core.ip.ip6.Routing;
4951
importcom.ardikars.jxpacket.core.tcp.Tcp;
5052
importcom.ardikars.jxpacket.core.udp.Udp;
51-
importio.netty.buffer.ByteBuf;
52-
importio.netty.buffer.ByteBufAllocator;
5353
importjava.nio.ByteBuffer;
5454
importjava.util.concurrent.Callable;
5555
importjava.util.concurrent.ExecutorService;
@@ -138,8 +138,8 @@ public Pair<PcapPktHdr, Packet> call() throws Exception {
138138
while (bytes ==null) {
139139
bytes =context.pcapNext(pktHdr);
140140
}
141-
ByteBufbuffer =ByteBufAllocator.DEFAULT.directBuffer(bytes.capacity());
142-
buffer.setBytes(0,bytes);
141+
Memorybuffer =Memories.allocator().allocate(bytes.capacity());
142+
buffer.setBytes(0,Memories.wrap(bytes,false));
143143
Packetpacket;
144144
if (rawDataLinkType ==1) {
145145
packet =Ethernet.newPacket(buffer);

‎jxnet-spring-boot-autoconfigure/src/main/java/com/ardikars/jxnet/spring/boot/autoconfigure/jxpacket/JxpacketHandlerConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121

2222
importcom.ardikars.common.logging.Logger;
2323
importcom.ardikars.common.logging.LoggerFactory;
24+
importcom.ardikars.common.memory.Memory;
2425
importcom.ardikars.common.tuple.Pair;
2526
importcom.ardikars.common.tuple.Tuple;
2627
importcom.ardikars.jxnet.PcapHandler;
2728
importcom.ardikars.jxnet.PcapPktHdr;
2829
importcom.ardikars.jxnet.spring.boot.autoconfigure.HandlerConfigurer;
2930
importcom.ardikars.jxpacket.common.Packet;
30-
importio.netty.buffer.ByteBuf;
3131
importjava.nio.ByteBuffer;
3232
importjava.util.concurrent.Callable;
3333
importjava.util.concurrent.ExecutionException;
@@ -41,7 +41,7 @@
4141
* @author <a href="mailto:contact@ardikars.com">Ardika Rommy Sanjaya</a>
4242
* @since 1.4.9
4343
*/
44-
@ConditionalOnClass({Packet.class,ByteBuf.class})
44+
@ConditionalOnClass({Packet.class,Memory.class})
4545
@Configuration(JXPACKET_HANDLER_CONFIGURATION_BEAN_NAME)
4646
publicclassJxpacketHandlerConfiguration<T>extendsHandlerConfigurer<T,Future<Pair<PcapPktHdr,Packet>>>implementsPcapHandler<T> {
4747

‎jxnet-spring-boot-autoconfigure/src/main/java/com/ardikars/jxnet/spring/boot/autoconfigure/jxpacket/JxpacketRawHandlerConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121

2222
importcom.ardikars.common.logging.Logger;
2323
importcom.ardikars.common.logging.LoggerFactory;
24+
importcom.ardikars.common.memory.Memory;
2425
importcom.ardikars.common.tuple.Pair;
2526
importcom.ardikars.common.tuple.Tuple;
2627
importcom.ardikars.jxnet.PcapPktHdr;
2728
importcom.ardikars.jxnet.RawPcapHandler;
2829
importcom.ardikars.jxnet.spring.boot.autoconfigure.HandlerConfigurer;
2930
importcom.ardikars.jxpacket.common.Packet;
30-
importio.netty.buffer.ByteBuf;
3131
importjava.util.concurrent.Callable;
3232
importjava.util.concurrent.ExecutionException;
3333
importjava.util.concurrent.Future;
@@ -40,7 +40,7 @@
4040
* @author <a href="mailto:contact@ardikars.com">Ardika Rommy Sanjaya</a>
4141
* @since 1.4.9
4242
*/
43-
@ConditionalOnClass({Packet.class,ByteBuf.class})
43+
@ConditionalOnClass({Packet.class,Memory.class})
4444
@Configuration(JXPACKET_RAW_HANDLER_CONFIGURATION_BEAN_NAME)
4545
publicclassJxpacketRawHandlerConfiguration<T>extendsHandlerConfigurer<T,Future<Pair<PcapPktHdr,Packet>>>implementsRawPcapHandler<T> {
4646

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp