Merge branch 'master' into v1

jxnet · Apr 27, 2019 · 54812f4 · 54812f4
2 parents 0cbd539 + b46b39c
commit 54812f4
Show file tree

Hide file tree

Showing 20 changed files with 21 additions and 21 deletions.
diff --git a/gradle/configure.gradle b/gradle/configure.gradle
@@ -7,7 +7,7 @@ ext {
 
 	NAME = 'Jxpacket'
 	GROUP = 'com.ardikars.jxpacket'
-	VERSION = '1.2.3.RC'
+	VERSION = '1.2.3.RC1'
 	DESCRIPTION = 'Jxpacket is a network packet crafting library for java.'
 
 	MAVEN_LOCAL_REPOSITORY = "${System.env.HOME}/.m2/repository"
@@ -24,7 +24,7 @@ ext {
 	PMD_VERION = '6.5.0'
 	JACOCO_VERSION = '0.8.2'
 
-	COMMON_VERSION = '1.2.7.RC2'
+	COMMON_VERSION = '1.2.7.RC5'
 	SPRING_BOOT_VERSION = '2.0.4.RELEASE'
 	PCAP4J_VERSION = '1.7.3'
 

diff --git a/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/arp/Arp.java b/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/arp/Arp.java
@@ -85,7 +85,7 @@ private Header(final Builder builder) {
 			this.senderProtocolAddress = builder.senderProtocolAddress;
 			this.targetHardwareAddress = builder.targetHardwareAddress;
 			this.targetProtocolAddress = builder.targetProtocolAddress;
-			this.buffer = builder.buffer.slice(0, getLength());
+			this.buffer = builder.buffer.slice(builder.buffer.readerIndex(), getLength());
 			this.builder = builder;
 		}
 

diff --git a/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/ethernet/Ethernet.java b/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/ethernet/Ethernet.java
@@ -67,7 +67,7 @@ private Header(final Builder builder) {
 			this.destinationMacAddress = builder.destinationMacAddress;
 			this.sourceMacAddress = builder.sourceMacAddress;
 			this.ethernetType = builder.ethernetType;
-			this.buffer = builder.buffer.slice(0, getLength());
+			this.buffer = builder.buffer.slice(builder.buffer.readerIndex(), getLength());
 			this.builder = builder;
 		}
 

diff --git a/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/ethernet/Vlan.java b/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/ethernet/Vlan.java
@@ -73,7 +73,7 @@ private Header(final Builder builder) {
 			this.canonicalFormatIndicator = builder.canonicalFormatIndicator;
 			this.vlanIdentifier = builder.vlanIdentifier;
 			this.type = builder.type;
-			this.buffer = builder.buffer.slice(0, getLength());
+			this.buffer = builder.buffer.slice(builder.buffer.readerIndex(), getLength());
 			this.builder = builder;
 		}
 

diff --git a/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/icmp/Icmp4.java b/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/icmp/Icmp4.java
@@ -70,7 +70,7 @@ public static class Header extends Icmp.AbstractPacketHeader {
         private Header(Builder builder) {
             typeAndCode = builder.typeAndCode;
             checksum = builder.checksum;
-            buffer = builder.buffer.slice(0, getLength());
+            buffer = builder.buffer.slice(builder.buffer.readerIndex(), getLength());
             this.builder = builder;
         }
 

diff --git a/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/icmp/Icmp6.java b/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/icmp/Icmp6.java
@@ -89,7 +89,7 @@ public static class Header extends Icmp.AbstractPacketHeader {
         private Header(Builder builder) {
             typeAndCode = builder.typeAndCode;
             checksum = builder.checksum;
-            buffer = builder.buffer.slice(0, getLength());
+            buffer = builder.buffer.slice(builder.buffer.readerIndex(), getLength());
             this.builder = builder;
         }
 

diff --git a/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/ip/Ip4.java b/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/ip/Ip4.java
@@ -85,7 +85,7 @@ protected Header(final Builder builder) {
 			this.sourceAddress = builder.sourceAddress;
 			this.destinationAddress = builder.destinationAddress;
 			this.options = builder.options;
-			this.buffer = builder.buffer.slice(0, getLength());
+			this.buffer = builder.buffer.slice(builder.buffer.readerIndex(), getLength());
 			this.builder = builder;
 		}
 

diff --git a/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/ip/Ip6.java b/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/ip/Ip6.java
@@ -71,7 +71,7 @@ protected Header(final Builder builder) {
 			this.hopLimit = builder.hopLimit;
 			this.sourceAddress = builder.sourceAddress;
 			this.destinationAddress = builder.destinationAddress;
-			this.buffer = builder.buffer.slice(0, getLength());
+			this.buffer = builder.buffer.slice(builder.buffer.readerIndex(), getLength());
 			this.builder = builder;
 		}
 

diff --git a/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/ip/ip6/Authentication.java b/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/ip/ip6/Authentication.java
@@ -68,7 +68,7 @@ private Header(final Builder builder) {
 			this.securityParameterIndex = builder.securityParameterIndex;
 			this.sequenceNumber = builder.sequenceNumber;
 			this.integrityCheckValue = builder.integrityCheckValue;
-			this.buffer = builder.buffer.slice(0, getLength());
+			this.buffer = builder.buffer.slice(builder.buffer.readerIndex(), getLength());
 			this.builder = builder;
 		}
 

diff --git a/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/ip/ip6/DestinationOptions.java b/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/ip/ip6/DestinationOptions.java
@@ -50,7 +50,7 @@ public static final class Header extends Options.Header {
 
 		protected Header(Builder builder) {
 			super(builder, builder.nextHeader);
-			this.buffer = builder.buffer.slice(0, getLength());
+			this.buffer = builder.buffer.slice(builder.buffer.readerIndex(), getLength());
 			this.builder = builder;
 		}
 

diff --git a/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/ip/ip6/Fragment.java b/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/ip/ip6/Fragment.java
@@ -65,7 +65,7 @@ private Header(final Builder builder) {
 			this.fragmentOffset = builder.fragmentOffset;
 			this.flagType = builder.flagType;
 			this.identification = builder.identification;
-			this.buffer = builder.buffer.slice(0, getLength());
+			this.buffer = builder.buffer.slice(builder.buffer.readerIndex(), getLength());
 			this.builder = builder;
 		}
 

diff --git a/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/ip/ip6/HopByHopOptions.java b/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/ip/ip6/HopByHopOptions.java
@@ -50,7 +50,7 @@ public static final class Header extends Options.Header {
 
 		protected Header(final HopByHopOptions.Builder builder) {
 			super(builder, builder.nextHeader);
-			this.buffer = builder.buffer.slice(0, getLength());
+			this.buffer = builder.buffer.slice(builder.buffer.readerIndex(), getLength());
 			this.builder = builder;
 		}
 

diff --git a/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/ip/ip6/Routing.java b/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/ip/ip6/Routing.java
@@ -71,7 +71,7 @@ private Header(final Builder builder) {
 			this.routingType = builder.routingType;
 			this.segmentLeft = builder.segmentLeft;
 			this.routingData = builder.routingData;
-			this.buffer = builder.buffer.slice(0, getLength());
+			this.buffer = builder.buffer.slice(builder.buffer.readerIndex(), getLength());
 			this.builder = builder;
 		}
 

diff --git a/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/ndp/NeighborAdvertisement.java b/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/ndp/NeighborAdvertisement.java
@@ -71,7 +71,7 @@ private Header(Builder builder) {
             this.overrideFlag = builder.overrideFlag;
             this.targetAddress = builder.targetAddress;
             this.options = builder.options;
-            this.buffer = builder.buffer.slice(0, getLength());
+            this.buffer = builder.buffer.slice(builder.buffer.readerIndex(), getLength());
             this.builder = builder;
         }
 

diff --git a/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/ndp/NeighborDiscoveryOptions.java b/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/ndp/NeighborDiscoveryOptions.java
@@ -68,7 +68,7 @@ public static class Header extends AbstractPacket.Header {
 
         private Header(Builder builder) {
             this.options = builder.options;
-            this.buffer = builder.buffer.slice(0, getLength());
+            this.buffer = builder.buffer.slice(builder.buffer.readerIndex(), getLength());
             this.builder = builder;
         }
 

diff --git a/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/ndp/NeighborSolicitation.java b/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/ndp/NeighborSolicitation.java
@@ -64,7 +64,7 @@ public static class Header extends AbstractPacket.Header {
         private Header(Builder builder) {
             this.targetAddress = builder.targetAddress;
             this.options = builder.options;
-            this.buffer = builder.buffer.slice(0, getLength());
+            this.buffer = builder.buffer.slice(builder.buffer.readerIndex(), getLength());
             this.builder = builder;
         }
 

diff --git a/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/ndp/Redirect.java b/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/ndp/Redirect.java
@@ -67,7 +67,7 @@ private Header(Builder builder) {
             this.targetAddress = builder.targetAddress;
             this.destinationAddress = builder.destinationAddress;
             this.options = builder.options;
-            this.buffer = builder.buffer.slice(0, getLength());
+            this.buffer = builder.buffer.slice(builder.buffer.readerIndex(), getLength());
             this.builder = builder;
         }
 

diff --git a/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/ndp/RouterAdvertisement.java b/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/ndp/RouterAdvertisement.java
@@ -73,7 +73,7 @@ private Header(Builder builder) {
             this.reachableTime = builder.reachableTime;
             this.retransmitTimer = builder.retransmitTimer;
             this.options = builder.options;
-            this.buffer = builder.buffer.slice(0, getLength());
+            this.buffer = builder.buffer.slice(builder.buffer.readerIndex(), getLength());
             this.builder = builder;
         }
 

diff --git a/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/tcp/Tcp.java b/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/tcp/Tcp.java
@@ -78,7 +78,7 @@ private Header(final Builder builder) {
             this.checksum = builder.checksum;
             this.urgentPointer = builder.urgentPointer;
             this.options = builder.options;
-            this.buffer = builder.buffer.slice(0, getLength());
+            this.buffer = builder.buffer.slice(builder.buffer.readerIndex(), getLength());
             this.builder = builder;
         }
 

diff --git a/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/udp/Udp.java b/jxpacket-core/src/main/java/com/ardikars/jxpacket/core/udp/Udp.java
@@ -61,7 +61,7 @@ private Header(final Builder builder) {
             this.destinationPort = builder.destinationPort;
             this.length = builder.length;
             this.checksum = builder.checksum;
-            this.buffer = builder.buffer.slice(0, getLength());
+            this.buffer = builder.buffer.slice(builder.buffer.readerIndex(), getLength());
             this.builder = builder;
         }