When the buffer spans the entire backing array (i.e., {@code start == 0} and {@code length == * data.length}), {@link #getData()} returns the backing array directly. In all other cases it @@ -43,16 +43,17 @@ public final class Buffer implements WritableToDataOutputStream { * * @param dis source to read the framed data from. * @throws IllegalArgumentException if the length is negative or greater than {@link - * Serializer#MAX_ARRAY_LENGTH}. The historical behavior is to signal invalid length with this - * exception type rather than {@link IOException}. + * SerializationLimits#MAX_ARRAY_LENGTH}. The historical behavior is to signal invalid length + * with this exception type rather than {@link IOException}. * @throws IOException if {@code dis} cannot provide the requested bytes. */ public Buffer(DataInput dis) throws IOException { length = dis.readInt(); if (length < 0) throw new IllegalArgumentException("Negative Length: " + length); - if (length > Serializer.MAX_ARRAY_LENGTH) { + if (length > SerializationLimits.MAX_ARRAY_LENGTH) { // Preserve historical behavior: signal invalid length with IllegalArgumentException. - throw new IllegalArgumentException("Length larger than " + Serializer.MAX_ARRAY_LENGTH); + throw new IllegalArgumentException( + "Length larger than " + SerializationLimits.MAX_ARRAY_LENGTH); } data = new byte[length]; // Allocate exactly the announced length. @@ -140,7 +141,7 @@ public byte byteAt(int pos) { * Write this buffer to a {@link DataOutputStream} using the standard framing format. * *
The method writes a 4-byte signed length followed by the visible bytes. The length is equal - * to {@link #getLength()} and must not exceed {@link Serializer#MAX_ARRAY_LENGTH}. + * to {@link #getLength()} and must not exceed {@link SerializationLimits#MAX_ARRAY_LENGTH}. * * @param stream destination stream. * @throws IOException if an I/O error occurs while writing to {@code stream}. diff --git a/src/main/java/network/crypta/support/ByteBufferInputStream.java b/foundation-support/src/main/java/network/crypta/support/ByteBufferInputStream.java similarity index 100% rename from src/main/java/network/crypta/support/ByteBufferInputStream.java rename to foundation-support/src/main/java/network/crypta/support/ByteBufferInputStream.java diff --git a/src/main/java/network/crypta/support/LRUCache.java b/foundation-support/src/main/java/network/crypta/support/LRUCache.java similarity index 100% rename from src/main/java/network/crypta/support/LRUCache.java rename to foundation-support/src/main/java/network/crypta/support/LRUCache.java diff --git a/src/main/java/network/crypta/support/SentTimeCache.java b/foundation-support/src/main/java/network/crypta/support/SentTimeCache.java similarity index 100% rename from src/main/java/network/crypta/support/SentTimeCache.java rename to foundation-support/src/main/java/network/crypta/support/SentTimeCache.java diff --git a/foundation-support/src/main/java/network/crypta/support/SerializationLimits.java b/foundation-support/src/main/java/network/crypta/support/SerializationLimits.java new file mode 100644 index 0000000000..8f1785adbc --- /dev/null +++ b/foundation-support/src/main/java/network/crypta/support/SerializationLimits.java @@ -0,0 +1,36 @@ +package network.crypta.support; + +/** + * Centralized size limits for generic support-side serialization helpers. + * + *
This class gives `:foundation-support` a small, stable home for limits that belong to + * low-level value types and deserialization helpers rather than to a specific runtime subsystem or + * packet-format implementation. The goal is to let classes such as {@code Buffer} and {@code + * BitArray} enforce the same bounds without importing root-owned networking code. + * + *
Keep this class intentionally narrow. It is for reusable serialization bounds that apply to + * support-owned helpers across the tree, not for broader protocol constants, transport tuning, or + * runtime configuration. If a limit is specific to one wire format or one daemon subsystem, it + * should stay with that owner instead of being added here. + */ +public final class SerializationLimits { + /** + * Maximum permitted length, in bytes, for generic array-backed payloads accepted by support-side + * deserialization helpers. + * + *
Use this bound when reading variable-length byte content whose validation belongs to generic + * support code rather than to a higher-level wire-format implementation. + */ + public static final int MAX_ARRAY_LENGTH = 4092; + + /** + * Maximum permitted logical size, in bits, for a {@code BitArray} accepted during + * deserialization. + * + *
This limit prevents oversized bit-array allocations in generic support code while keeping + * the shared bound explicit and easy to reuse from compatibility aliases. + */ + public static final int MAX_BITARRAY_SIZE = 2048 * 8; + + private SerializationLimits() {} +} diff --git a/src/main/java/network/crypta/support/ShortBuffer.java b/foundation-support/src/main/java/network/crypta/support/ShortBuffer.java similarity index 100% rename from src/main/java/network/crypta/support/ShortBuffer.java rename to foundation-support/src/main/java/network/crypta/support/ShortBuffer.java diff --git a/src/main/java/network/crypta/support/SparseBitmap.java b/foundation-support/src/main/java/network/crypta/support/SparseBitmap.java similarity index 100% rename from src/main/java/network/crypta/support/SparseBitmap.java rename to foundation-support/src/main/java/network/crypta/support/SparseBitmap.java diff --git a/src/main/java/network/crypta/support/io/InetAddressIpv6FirstComparator.java b/foundation-support/src/main/java/network/crypta/support/io/InetAddressIpv6FirstComparator.java similarity index 91% rename from src/main/java/network/crypta/support/io/InetAddressIpv6FirstComparator.java rename to foundation-support/src/main/java/network/crypta/support/io/InetAddressIpv6FirstComparator.java index 80c1bf3226..1df74ed958 100644 --- a/src/main/java/network/crypta/support/io/InetAddressIpv6FirstComparator.java +++ b/foundation-support/src/main/java/network/crypta/support/io/InetAddressIpv6FirstComparator.java @@ -9,8 +9,6 @@ import network.crypta.support.Fields; import network.crypta.support.LRUCache; -import static network.crypta.node.NodeStats.DEFAULT_MAX_PING_TIME; - /** * Comparator for {@link InetAddress} values that prefers IPv6 over IPv4 and applies * scope/reachability heuristics to produce a stable total ordering. @@ -30,9 +28,8 @@ * total order. * * - *
Reachability checks use {@link InetAddress#isReachable(int)} with the default node ping time - * (see {@link network.crypta.node.NodeStats#DEFAULT_MAX_PING_TIME}) and are cached to avoid - * repeated probes during sorting. + *
Reachability checks use {@link InetAddress#isReachable(int)} with a bounded default timeout + * and are cached to avoid repeated probes during sorting. * *
Side effects and performance:
*
@@ -49,6 +46,7 @@
* @author toad
*/
public class InetAddressIpv6FirstComparator implements Comparator May perform a reachability probe for site-local addresses and therefore may block up to
- * {@link network.crypta.node.NodeStats#DEFAULT_MAX_PING_TIME} milliseconds on a first encounter;
- * results are cached to mitigate repeated calls.
+ * {@value #DEFAULT_REACHABILITY_TIMEOUT_MILLIS} milliseconds on a first encounter; results are
+ * cached to mitigate repeated calls.
*
* @param arg0 the first address; may be {@code null}
* @param arg1 the second address; may be {@code null}
@@ -104,7 +102,7 @@ private boolean isReachable(InetAddress inetAddress) {
Boolean reachable = reachabilityCache.get(hashCode);
if (reachable == null) {
try {
- reachable = inetAddress.isReachable((int) DEFAULT_MAX_PING_TIME);
+ reachable = inetAddress.isReachable((int) DEFAULT_REACHABILITY_TIMEOUT_MILLIS);
} catch (IOException _) {
reachable = false;
}
diff --git a/src/main/java/network/crypta/support/transport/ip/HostnameSyntaxException.java b/foundation-support/src/main/java/network/crypta/support/transport/ip/HostnameSyntaxException.java
similarity index 100%
rename from src/main/java/network/crypta/support/transport/ip/HostnameSyntaxException.java
rename to foundation-support/src/main/java/network/crypta/support/transport/ip/HostnameSyntaxException.java
diff --git a/src/main/java/network/crypta/support/transport/ip/HostnameUtil.java b/foundation-support/src/main/java/network/crypta/support/transport/ip/HostnameUtil.java
similarity index 100%
rename from src/main/java/network/crypta/support/transport/ip/HostnameUtil.java
rename to foundation-support/src/main/java/network/crypta/support/transport/ip/HostnameUtil.java
diff --git a/src/main/java/network/crypta/support/transport/ip/IPUtil.java b/foundation-support/src/main/java/network/crypta/support/transport/ip/IPUtil.java
similarity index 100%
rename from src/main/java/network/crypta/support/transport/ip/IPUtil.java
rename to foundation-support/src/main/java/network/crypta/support/transport/ip/IPUtil.java
diff --git a/src/main/java/network/crypta/support/Serializer.java b/src/main/java/network/crypta/support/Serializer.java
index 2ec30a6532..5e59971161 100644
--- a/src/main/java/network/crypta/support/Serializer.java
+++ b/src/main/java/network/crypta/support/Serializer.java
@@ -10,7 +10,6 @@
import network.crypta.keys.Key;
import network.crypta.keys.NodeCHK;
import network.crypta.keys.NodeSSK;
-import network.crypta.node.NewPacketFormat;
/**
* Utility for serializing and deserializing a constrained set of value types to and from {@link
@@ -42,16 +41,10 @@ private Serializer() {}
* Upper bound, in bits, used when deserializing {@link BitArray} to prevent pathological
* allocations.
*/
- public static final int MAX_BITARRAY_SIZE = 2048 * 8;
+ public static final int MAX_BITARRAY_SIZE = SerializationLimits.MAX_BITARRAY_SIZE;
- /**
- * Maximum allowed inbound variable-length payload, in bytes.
- *
- * The limit equals {@link NewPacketFormat#MAX_MESSAGE_SIZE} minus four bytes to account for a
- * leading length integer in the wire format.
- */
- // Max packet format size – 4 to account for starting size integer.
- public static final int MAX_ARRAY_LENGTH = NewPacketFormat.MAX_MESSAGE_SIZE - 4;
+ /** Maximum allowed inbound variable-length payload, in bytes. */
+ public static final int MAX_ARRAY_LENGTH = SerializationLimits.MAX_ARRAY_LENGTH;
/**
* Reads a {@link List} whose elements are of {@code elementType} from the given {@link