X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.api.uuid%2Fsrc%2Forg%2Fargeo%2Fapi%2Fuuid%2FNodeIdSupplier.java;h=1a3cd5673e17d1504277c7c1428de4795ed30490;hb=4f899ffcfd5652eb13748535353d2bd09f568bbc;hp=ae9686c7042781348643295ef29f58a302b510b6;hpb=e846ef84146b66ae543c29c5f17b2991ff0f5973;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.api.uuid/src/org/argeo/api/uuid/NodeIdSupplier.java b/org.argeo.api.uuid/src/org/argeo/api/uuid/NodeIdSupplier.java
index ae9686c70..1a3cd5673 100644
--- a/org.argeo.api.uuid/src/org/argeo/api/uuid/NodeIdSupplier.java
+++ b/org.argeo.api.uuid/src/org/argeo/api/uuid/NodeIdSupplier.java
@@ -1,15 +1,13 @@
 package org.argeo.api.uuid;
 
+import java.security.SecureRandom;
 import java.util.function.Supplier;
 
 /** A factory for node id base */
 public interface NodeIdSupplier extends Supplier<Long> {
-	long LEAST_SIG_RFC4122_VARIANT = (1l << 63);
-
 	static long toNodeIdBase(byte[] node) {
 		assert node.length == 6;
-		return LEAST_SIG_RFC4122_VARIANT // base for Leach–Salz UUID
-				| (node[0] & 0xFFL) //
+		return UuidFactory.LEAST_SIG_RFC4122_VARIANT | (node[0] & 0xFFL) //
 				| ((node[1] & 0xFFL) << 8) //
 				| ((node[2] & 0xFFL) << 16) //
 				| ((node[3] & 0xFFL) << 24) //
@@ -17,4 +15,38 @@ public interface NodeIdSupplier extends Supplier<Long> {
 				| ((node[5] & 0xFFL) << 40); //
 	}
 
+	static boolean isNoMacAddressNodeId(byte[] nodeId) {
+		return (nodeId[0] & 1) != 0;
+	}
+
+	static byte[] randomNodeId() {
+		SecureRandom random = new SecureRandom();
+		byte[] nodeId = new byte[6];
+		random.nextBytes(nodeId);
+		return nodeId;
+	}
+
+	/**
+	 * Force this node id to be identified as no MAC address.
+	 * 
+	 * @see "https://datatracker.ietf.org/doc/html/rfc4122#section-4.5"
+	 */
+	static void forceToNoMacAddress(byte[] nodeId, int offset) {
+		assert nodeId != null && offset < nodeId.length;
+		nodeId[offset] = (byte) (nodeId[offset] | 1);
+	}
+
+	/*
+	 * SPI UTILITIES
+	 */
+	/** Guarantees that a byte array of length 6 will be returned. */
+	static byte[] toNodeIdBytes(byte[] source, int offset) {
+		if (source == null)
+			return null;
+		if (offset < 0 || offset + 6 > source.length)
+			throw new ArrayIndexOutOfBoundsException(offset);
+		byte[] nodeId = new byte[6];
+		System.arraycopy(source, offset, nodeId, 0, 6);
+		return nodeId;
+	}
 }