Release 1.2.1

hirsivaja · hirsivaja · commit e8b247ae508e · 2025-09-25T14:36:48.000+03:00
diff --git a/README.md b/README.md
@@ -2,7 +2,9 @@
 
 The `jipcs` contains the following codecs:
 * IPv4 header [(Internet Protocol version 4)](https://en.wikipedia.org/wiki/Internet_Protocol_version_4) [(RFC 791)](https://datatracker.ietf.org/doc/html/rfc791#page-11)
+  * [IP Options](https://www.iana.org/assignments/ip-parameters/ip-parameters.xhtml#ip-parameters-1)
 * IPv6 header [(Internet Protocol version 6)](https://en.wikipedia.org/wiki/Internet_Protocol_version_6) [(RFC 8200)](https://datatracker.ietf.org/doc/html/rfc8200#page-6)
+  * [Extension headers](https://www.iana.org/assignments/ipv6-parameters/ipv6-parameters.xhtml#extension-header) and [options](https://www.iana.org/assignments/ipv6-parameters/ipv6-parameters.xhtml#ipv6-parameters-2)
 * TCP header [(Transmission Control Protocol)](https://en.wikipedia.org/wiki/Transmission_Control_Protocol) [(RFC 9293)](https://datatracker.ietf.org/doc/html/rfc9293#name-header-format)
 * UDP header [(User Datagram Protocol)](https://en.wikipedia.org/wiki/User_Datagram_Protocol) [(RFC 768)](https://datatracker.ietf.org/doc/html/rfc768)
 * ARP [(Address Resolution Protocol)](https://en.wikipedia.org/wiki/Address_Resolution_Protocol) [(RFC 826)](https://datatracker.ietf.org/doc/html/rfc826)
@@ -25,6 +27,7 @@ The `jipcs` contains the following codecs:
   * SEND [(Secure Neighbor Discovery)](https://en.wikipedia.org/wiki/Secure_Neighbor_Discovery) [(RFC 3971)](https://datatracker.ietf.org/doc/html/rfc3971)
   * MRD [(Multicast Router Discovery)](https://en.wikipedia.org/wiki/Multicast_router_discovery) [(RFC 4286)](https://datatracker.ietf.org/doc/html/rfc4286)
   * RPL [(Routing Protocol for Low-Power and Lossy Networks)](https://en.wikipedia.org/wiki/IPv6_Routing_Protocol_for_Low-Power_and_Lossy_Networks) [(RFC 6550)](https://datatracker.ietf.org/doc/html/rfc6550)
+  * MPL (Multicast Protocol for Low-Power and Lossy Networks) [(RFC 7731)](https://datatracker.ietf.org/doc/html/rfc7731)
   * PROBE [(RFC 8335)](https://datatracker.ietf.org/doc/html/rfc8335)
 
 Requirements:
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = 'io.github.hirsivaja'
-version = '1.2.0'
+version = '1.2.1'
 
 repositories {
     mavenCentral()
diff --git a/src/main/java/com/github/hirsivaja/ip/icmpv6/Icmpv6Message.java b/src/main/java/com/github/hirsivaja/ip/icmpv6/Icmpv6Message.java
@@ -1,6 +1,5 @@
 package com.github.hirsivaja.ip.icmpv6;
 
-import com.github.hirsivaja.ip.icmpv6.ndp.ExperimentalMobilitySubtype;
 import com.github.hirsivaja.ip.icmpv6.mld.GenericMldMessage;
 import com.github.hirsivaja.ip.icmpv6.mld.MulticastListenerQueryMessage;
 import com.github.hirsivaja.ip.icmpv6.mld.MulticastListenerReportV2Message;
diff --git a/src/main/java/com/github/hirsivaja/ip/icmpv6/ndp/option/DomainName.java b/src/main/java/com/github/hirsivaja/ip/icmpv6/ndp/option/DomainName.java
@@ -8,9 +8,9 @@
 public record DomainName(List<ByteArray> labels) {
 
     public void encode(ByteBuffer out) {
-        for(int i = 0; i < labels.size(); i++) {
-            out.put((byte) labels.get(i).length());
-            out.put(labels.get(i).array());
+        for (ByteArray label : labels) {
+            out.put((byte) label.length());
+            out.put(label.array());
         }
         out.put((byte) 0);
     }
@@ -21,7 +21,7 @@ public int length() {
 
     public static DomainName decode(ByteBuffer in) {
         List<ByteArray> labels = new ArrayList<>();
-        int len = 0;
+        int len;
         do {
             len = Byte.toUnsignedInt(in.get());
             if(len > 0) {
diff --git a/src/main/java/com/github/hirsivaja/ip/icmpv6/rpl/option/RplOptionType.java b/src/main/java/com/github/hirsivaja/ip/icmpv6/rpl/option/RplOptionType.java
@@ -10,7 +10,15 @@ public enum RplOptionType {
     TRANSIT_INFORMATION((byte) 0x06),
     SOLICITED_INFORMATION((byte) 0x07),
     PREFIX_INFORMATION((byte) 0x08),
-    RPL_TARGET_DESCRIPTOR((byte) 0x09);
+    RPL_TARGET_DESCRIPTOR((byte) 0x09),
+    P2P_ROUTE_DISCOVERY((byte) 0x0A),
+    RREQ((byte) 0x0B),
+    RREP((byte) 0x0C),
+    ART((byte) 0x0D),
+    RNFD((byte) 0x0E),
+    STATEFUL_VIO((byte) 0x0F),
+    SOURCE_ROUTED_VIO((byte) 0x10),
+    SIBLING_INFORMATION((byte) 0x11);
 
     private final byte type;
 
diff --git a/src/main/java/com/github/hirsivaja/ip/ipv4/option/IpOption.java b/src/main/java/com/github/hirsivaja/ip/ipv4/option/IpOption.java
@@ -3,10 +3,10 @@
 import java.nio.ByteBuffer;
 
 public interface IpOption {
-    static byte CONTROL = 0;
-    static byte RESERVED_1 = 1;
-    static byte DEBUG = 2;
-    static byte RESERVED_2 = 3;
+    byte CONTROL = 0;
+    byte RESERVED_1 = 1;
+    byte DEBUG = 2;
+    byte RESERVED_2 = 3;
 
     void encode(ByteBuffer out);
 
diff --git a/src/main/java/com/github/hirsivaja/ip/ipv4/option/IpOptionType.java b/src/main/java/com/github/hirsivaja/ip/ipv4/option/IpOptionType.java
@@ -26,7 +26,11 @@ public enum IpOptionType {
     // 0x16 is unassigned
     DYNAMIC_PACKET_STATE((byte) 0x17, IpOption.CONTROL, true),
     UPSTREAM_MULTICAST_PACKET((byte) 0x18, IpOption.CONTROL, true),
-    QUICK_START((byte) 0x19, IpOption.CONTROL, false);
+    QUICK_START((byte) 0x19, IpOption.CONTROL, false),
+    EXPERIMENT_1((byte) 0x1E, IpOption.CONTROL, false),
+    EXPERIMENT_2((byte) 0x1E, IpOption.DEBUG, false),
+    EXPERIMENT_3((byte) 0x1E, IpOption.CONTROL, true),
+    EXPERIMENT_4((byte) 0x1E, IpOption.DEBUG, true);
 
     private final byte number;
     private final byte optionClass;
diff --git a/src/main/java/com/github/hirsivaja/ip/ipv4/option/Timestamp.java b/src/main/java/com/github/hirsivaja/ip/ipv4/option/Timestamp.java
@@ -12,7 +12,7 @@ public void encode(ByteBuffer out) {
         out.put((byte) (length()));
         out.put(pointer);
         out.put(flags);
-        ipOrTimestamp.forEach(i -> out.putInt(i));
+        ipOrTimestamp.forEach(out::putInt);
     }
 
     @Override
diff --git a/src/main/java/com/github/hirsivaja/ip/ipv6/extension/HipExtension.java b/src/main/java/com/github/hirsivaja/ip/ipv6/extension/HipExtension.java
@@ -4,6 +4,7 @@
 import com.github.hirsivaja.ip.IpProtocol;
 
 import java.nio.ByteBuffer;
+import java.util.logging.Logger;
 
 public record HipExtension(
         IpProtocol nextHeader,
@@ -14,6 +15,7 @@ public record HipExtension(
         ByteArray senderHit,
         ByteArray receiverHit,
         ByteArray hipParameters) implements ExtensionHeader {
+    private static final Logger logger = Logger.getLogger("HipExtension");
 
     public HipExtension(IpProtocol nextHeader, byte packetType, byte flags, short checksum, short controls, byte[] senderHit, byte[] receiverHit, byte[] hipParameters) {
         this(nextHeader, packetType, flags, checksum, controls, new ByteArray(senderHit), new ByteArray(receiverHit), new ByteArray(hipParameters));
@@ -48,9 +50,9 @@ public static ExtensionHeader decode(ByteBuffer in, boolean ensureChecksum) {
         byte flags = in.get();
         short checksum = in.getShort();
         if(ensureChecksum) {
-            // TODO
+            logger.warning("Checksum verification for HipExtension is not implemented!");
         } else {
-            // TODO
+            logger.finer("Skipped checksum verification for HipExtension!");
         }
         short controls = in.getShort();
         byte[] senderHit = new byte[16];
diff --git a/src/main/java/com/github/hirsivaja/ip/ipv6/extension/MobilityHeaderExtension.java b/src/main/java/com/github/hirsivaja/ip/ipv6/extension/MobilityHeaderExtension.java
@@ -5,11 +5,13 @@
 import com.github.hirsivaja.ip.ipv6.extension.mobility.MobilityMessageType;
 
 import java.nio.ByteBuffer;
+import java.util.logging.Logger;
 
 public record MobilityHeaderExtension(
         IpProtocol nextHeader,
         short checksum,
         MobilityMessage mobilityMessage) implements ExtensionHeader {
+    private static final Logger logger = Logger.getLogger("MobilityHeaderExtension");
 
     @Override
     public void encode(ByteBuffer out) {
@@ -36,9 +38,9 @@ public static ExtensionHeader decode(ByteBuffer in, boolean ensureChecksum) {
         in.get(); // RESERVED
         short checksum = in.getShort();
         if(ensureChecksum) {
-            // TODO
+            logger.warning("Checksum verification for MobilityHeaderExtension is not implemented!");
         } else {
-            // TODO
+            logger.finer("Skipped checksum verification for MobilityHeaderExtension!");
         }
         byte[] messageBytes = new byte[headerLen + 2];
         in.get(messageBytes);
diff --git a/src/main/java/com/github/hirsivaja/ip/ipv6/extension/destination/DestinationOption.java b/src/main/java/com/github/hirsivaja/ip/ipv6/extension/destination/DestinationOption.java
@@ -3,10 +3,10 @@
 import java.nio.ByteBuffer;
 
 public interface DestinationOption {
-    static byte SKIP = 0;
-    static byte DISCARD = 1;
-    static byte DISCARD_AND_SEND_ERROR = 2;
-    static byte DISCARD_AND_SEND_ERROR_IF_NOT_MULTICAST = 3;
+    byte SKIP = 0;
+    byte DISCARD = 1;
+    byte DISCARD_AND_SEND_ERROR = 2;
+    byte DISCARD_AND_SEND_ERROR_IF_NOT_MULTICAST = 3;
 
     void encode(ByteBuffer out);
 
diff --git a/src/main/java/com/github/hirsivaja/ip/ipv6/extension/destination/DestinationOptionType.java b/src/main/java/com/github/hirsivaja/ip/ipv6/extension/destination/DestinationOptionType.java
@@ -22,7 +22,15 @@ public enum DestinationOptionType {
     MINIMUM_PATH_MTU((byte) 0x10, true, DestinationOption.SKIP), // 0x30
     IOAM((byte) 0x11, false, DestinationOption.SKIP), // 0x11
     IOAM_CHANGEABLE((byte) 0x11, true, DestinationOption.SKIP), // 0x31
-    ALTMARK((byte) 0x12, false, DestinationOption.SKIP); // 0x12
+    ALTMARK((byte) 0x12, false, DestinationOption.SKIP), // 0x31
+    EXPERIMENT_1((byte) 0x1E, false, DestinationOption.SKIP), // 0x1E
+    EXPERIMENT_2((byte) 0x1E, true, DestinationOption.SKIP), // 0x3E
+    EXPERIMENT_3((byte) 0x1E, false, DestinationOption.DISCARD), // 0x5E
+    EXPERIMENT_4((byte) 0x1E, true, DestinationOption.DISCARD), // 0x7E
+    EXPERIMENT_5((byte) 0x1E, false, DestinationOption.DISCARD_AND_SEND_ERROR), // 0x9E
+    EXPERIMENT_6((byte) 0x1E, true, DestinationOption.DISCARD_AND_SEND_ERROR), // 0xBE
+    EXPERIMENT_7((byte) 0x1E, false, DestinationOption.DISCARD_AND_SEND_ERROR_IF_NOT_MULTICAST), // 0xDE
+    EXPERIMENT_8((byte) 0x1E, true, DestinationOption.DISCARD_AND_SEND_ERROR_IF_NOT_MULTICAST); // 0xFE
 
     private final byte rest;
     private final boolean changeable;
diff --git a/src/main/java/com/github/hirsivaja/ip/ipv6/extension/mobility/MobilityMessageType.java b/src/main/java/com/github/hirsivaja/ip/ipv6/extension/mobility/MobilityMessageType.java
@@ -8,7 +8,23 @@ public enum MobilityMessageType {
     CARE_OF_TEST((byte) 0x04),
     BINDING_UPDATE((byte) 0x05),
     BINDING_ACKNOWLEDGEMENT((byte) 0x06),
-    BINDING_ERROR((byte) 0x07);
+    BINDING_ERROR((byte) 0x07),
+    FAST_BINDING_UPDATE((byte) 0x08),
+    FAST_BINDING_ACKNOWLEDGEMENT((byte) 0x09),
+    FAST_NEIGHBOR_ADVERTISEMENT((byte) 0x0A),
+    EXPERIMENTAL_MOBILITY_HEADER((byte) 0x0B),
+    HOME_AGENT_SWITCH_MESSAGE((byte) 0x0C),
+    HEARTBEAT_MESSAGE((byte) 0x0D),
+    HANDOVER_INITIATE_MESSAGE((byte) 0x0E),
+    HANDOVER_ACKNOWLEDGE_MESSAGE((byte) 0x0F),
+    BINDING_REVOCATION_MESSAGE((byte) 0x10),
+    LOCALIZED_ROUTING_INITIATION((byte) 0x11),
+    LOCALIZED_ROUTING_ACKNOWLEDGEMENT((byte) 0x12),
+    UPDATE_NOTIFICATION((byte) 0x13),
+    UPDATE_NOTIFICATION_ACKNOWLEDGEMENT((byte) 0x14),
+    FLOW_BINDING_MESSAGE((byte) 0x15),
+    SUBSCRIPTION_QUERY((byte) 0x16),
+    SUBSCRIPTION_RESPONSE((byte) 0x17);
 
     private final byte type;
 
diff --git a/src/main/java/com/github/hirsivaja/ip/ipv6/extension/mobility/MobilityOptionType.java b/src/main/java/com/github/hirsivaja/ip/ipv6/extension/mobility/MobilityOptionType.java
@@ -6,7 +6,72 @@ public enum MobilityOptionType {
     BINDING_REFRESH_ADVICE((byte) 0x02),
     ALTERNATE_CARE_OF_ADDRESS((byte) 0x03),
     NONCE_INDICES((byte) 0x04),
-    BINDING_AUTHORIZATION_DATA((byte) 0x05);
+    BINDING_AUTHORIZATION_DATA((byte) 0x05),
+    MOBILE_NETWORK_PREFIX((byte) 0x06),
+    MOBILITY_HEADER_LINK_LAYER_ADDRESS((byte) 0x07),
+    MN_ID((byte) 0x08),
+    AUTH((byte) 0x09),
+    MESG_ID((byte) 0x0A),
+    CGA_PARAMETERS_REQUEST((byte) 0x0B),
+    CGA_PARAMETERS((byte) 0x0C),
+    SIGNATURE((byte) 0x0D),
+    PERMANENT_HOME_KEYGEN_TOKEN((byte) 0x0E),
+    CARE_OF_TEST_INIT((byte) 0x0F),
+    CARE_OF_TEST((byte) 0x10),
+    DNS_UPDATE((byte) 0x11),
+    EXPERIMENTAL((byte) 0x12),
+    VENDOR_SPECIFIC((byte) 0x13),
+    SERVICE_SELECTION((byte) 0x14),
+    BINDING_AUTHORIZATION_DATA_FOR_FMIPV6((byte) 0x15),
+    HOME_NETWORK_PREFIX((byte) 0x16),
+    HANDOFF_INDICATOR((byte) 0x17),
+    ACCESS_TECHNOLOGY_TYPE((byte) 0x18),
+    MOBILE_NODE_LINK_LAYER_IDENTIFIER((byte) 0x19),
+    LINK_LOCAL_ADDRESS((byte) 0x1A),
+    TIMESTAMP((byte) 0x1B),
+    RESTART_COUNTER((byte) 0x1C),
+    IPV4_HOME_ADDRESS((byte) 0x1D),
+    IPV4_ADDRESS_ACKNOWLEDGEMENT((byte) 0x1E),
+    NAT_DETECTION((byte) 0x1F),
+    IPV4_CARE_OF_ADDRESS((byte) 0x20),
+    GRE_KEY((byte) 0x21),
+    MOBILITY_HEADER_IPV6_ADDRESS_OR_PREFIX((byte) 0x22),
+    BINDING_IDENTIFIER((byte) 0x23),
+    IPV4_HOME_ADDRESS_REQUEST((byte) 0x24),
+    IPV4_HOME_ADDRESS_REPLY((byte) 0x25),
+    IPV4_DEFAULT_ROUTER_ADDRESS((byte) 0x26),
+    IPV4_DHCP_SUPPORT_MODE((byte) 0x27),
+    CONTEXT_REQUEST((byte) 0x28),
+    LOCAL_MOBILITY_ANCHOR_ADDRESS((byte) 0x29),
+    MOBILE_NODE_LINK_LOCAL_ADDRESS_INTERFACE_IDENTIFIER((byte) 0x2A),
+    TRANSIENT_BINDING((byte) 0x2B),
+    FLOW_SUMMARY((byte) 0x2C),
+    FLOW_IDENTIFICATION((byte) 0x2D),
+    REDIRECT_CAPABILITY((byte) 0x2E),
+    REDIRECT((byte) 0x2F),
+    LOAD_INFORMATION((byte) 0x30),
+    ALTERNATE_IPV4_CARE_OF_ADDRESS((byte) 0x31),
+    MOBILE_NODE_GROUP_IDENTIFIER((byte) 0x32),
+    MAG_IPV6_ADDRESS((byte) 0x33),
+    ACCESS_NETWORK_IDENTIFIER((byte) 0x34),
+    IPV4_TRAFFIC_OFFLOAD_SELECTOR((byte) 0x35),
+    DYNAMIC_IP_MULTICAST_SELECTOR((byte) 0x36),
+    DELEGATED_MOBILE_NETWORK_PREFIX((byte) 0x37),
+    ACTIVE_MULTICAST_SUBSCRIPTION_IPV4((byte) 0x38),
+    ACTIVE_MULTICAST_SUBSCRIPTION_IPV6((byte) 0x39),
+    QUALITY_OF_SERVICE((byte) 0x3A),
+    LMA_USER_PLANE_ADDRESS((byte) 0x3B),
+    MULTICAST((byte) 0x3C),
+    MULTICAST_ACKNOWLEDGEMENT((byte) 0x3D),
+    LMA_CONTROLLED_MAG_PARAMETERS((byte) 0x3E),
+    MAG_MULTIPATH_BINDING((byte) 0x3F),
+    MAG_IDENTIFIER((byte) 0x40),
+    ANCHORED_PREFIX((byte) 0x41),
+    LOCAL_PREFIX((byte) 0x42),
+    PREVIOUS_MAAR((byte) 0x43),
+    SERVING_MAAR((byte) 0x44),
+    DLIF_LINK_LOCAL_ADDRESS((byte) 0x45),
+    DLIF_LINK_LAYER_ADDRESS((byte) 0x46);
 
     private final byte type;
 

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ plugins {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`group = 'io.github.hirsivaja'`
`8`		`-version = '1.2.0'`
	`8`	`+version = '1.2.1'`
`9`	`9`
`10`	`10`	`repositories {`
`11`	`11`	`mavenCentral()`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public void encode(ByteBuffer out) {`
`12`	`12`	`out.put((byte) (length()));`
`13`	`13`	`out.put(pointer);`
`14`	`14`	`out.put(flags);`
`15`		`- ipOrTimestamp.forEach(i -> out.putInt(i));`
	`15`	`+ ipOrTimestamp.forEach(out::putInt);`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`@Override`