X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FUnsignedNodeAnnouncement.java;h=afecabf15d4a4de34792ed6e8d0ca33ebe81d056;hb=8aa8a96fc6d8fcdd3fbb419b4b4c12482af14938;hp=237e4010ce9df90afcf73e85cd44a24b0174d671;hpb=ba1af51214a8ea2de62b84cd23b6145173c71752;p=ldk-java diff --git a/src/main/java/org/ldk/structs/UnsignedNodeAnnouncement.java b/src/main/java/org/ldk/structs/UnsignedNodeAnnouncement.java index 237e4010..afecabf1 100644 --- a/src/main/java/org/ldk/structs/UnsignedNodeAnnouncement.java +++ b/src/main/java/org/ldk/structs/UnsignedNodeAnnouncement.java @@ -4,6 +4,7 @@ import org.ldk.impl.bindings; import org.ldk.enums.*; import org.ldk.util.*; import java.util.Arrays; +import java.lang.ref.Reference; import javax.annotation.Nullable; @@ -24,18 +25,21 @@ public class UnsignedNodeAnnouncement extends CommonBase { */ public NodeFeatures get_features() { long ret = bindings.UnsignedNodeAnnouncement_get_features(this.ptr); - if (ret < 1024) { return null; } - NodeFeatures ret_hu_conv = new NodeFeatures(null, ret); - ret_hu_conv.ptrs_to.add(this); + Reference.reachabilityFence(this); + if (ret >= 0 && ret <= 4096) { return null; } + org.ldk.structs.NodeFeatures ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.NodeFeatures(null, ret); } + if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); }; return ret_hu_conv; } /** * The advertised features */ - public void set_features(NodeFeatures val) { - bindings.UnsignedNodeAnnouncement_set_features(this.ptr, val == null ? 0 : val.ptr & ~1); - this.ptrs_to.add(val); + public void set_features(org.ldk.structs.NodeFeatures val) { + bindings.UnsignedNodeAnnouncement_set_features(this.ptr, val == null ? 0 : val.ptr); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); + if (this != null) { this.ptrs_to.add(val); }; } /** @@ -43,6 +47,7 @@ public class UnsignedNodeAnnouncement extends CommonBase { */ public int get_timestamp() { int ret = bindings.UnsignedNodeAnnouncement_get_timestamp(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -51,6 +56,8 @@ public class UnsignedNodeAnnouncement extends CommonBase { */ public void set_timestamp(int val) { bindings.UnsignedNodeAnnouncement_set_timestamp(this.ptr, val); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -59,6 +66,7 @@ public class UnsignedNodeAnnouncement extends CommonBase { */ public byte[] get_node_id() { byte[] ret = bindings.UnsignedNodeAnnouncement_get_node_id(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -67,7 +75,9 @@ public class UnsignedNodeAnnouncement extends CommonBase { * to this node). */ public void set_node_id(byte[] val) { - bindings.UnsignedNodeAnnouncement_set_node_id(this.ptr, val); + bindings.UnsignedNodeAnnouncement_set_node_id(this.ptr, InternalUtils.check_arr_len(val, 33)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -75,6 +85,7 @@ public class UnsignedNodeAnnouncement extends CommonBase { */ public byte[] get_rgb() { byte[] ret = bindings.UnsignedNodeAnnouncement_get_rgb(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -82,7 +93,9 @@ public class UnsignedNodeAnnouncement extends CommonBase { * An RGB color for UI purposes */ public void set_rgb(byte[] val) { - bindings.UnsignedNodeAnnouncement_set_rgb(this.ptr, val); + bindings.UnsignedNodeAnnouncement_set_rgb(this.ptr, InternalUtils.check_arr_len(val, 3)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -91,6 +104,7 @@ public class UnsignedNodeAnnouncement extends CommonBase { */ public byte[] get_alias() { byte[] ret = bindings.UnsignedNodeAnnouncement_get_alias(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -99,7 +113,28 @@ public class UnsignedNodeAnnouncement extends CommonBase { * of uniqueness. */ public void set_alias(byte[] val) { - bindings.UnsignedNodeAnnouncement_set_alias(this.ptr, val); + bindings.UnsignedNodeAnnouncement_set_alias(this.ptr, InternalUtils.check_arr_len(val, 32)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); + } + + /** + * List of addresses on which this node is reachable + * + * Returns a copy of the field. + */ + public NetAddress[] get_addresses() { + long[] ret = bindings.UnsignedNodeAnnouncement_get_addresses(this.ptr); + Reference.reachabilityFence(this); + int ret_conv_12_len = ret.length; + NetAddress[] ret_conv_12_arr = new NetAddress[ret_conv_12_len]; + for (int m = 0; m < ret_conv_12_len; m++) { + long ret_conv_12 = ret[m]; + org.ldk.structs.NetAddress ret_conv_12_hu_conv = org.ldk.structs.NetAddress.constr_from_ptr(ret_conv_12); + if (ret_conv_12_hu_conv != null) { ret_conv_12_hu_conv.ptrs_to.add(this); }; + ret_conv_12_arr[m] = ret_conv_12_hu_conv; + } + return ret_conv_12_arr; } /** @@ -107,7 +142,14 @@ public class UnsignedNodeAnnouncement extends CommonBase { */ public void set_addresses(NetAddress[] val) { bindings.UnsignedNodeAnnouncement_set_addresses(this.ptr, val != null ? Arrays.stream(val).mapToLong(val_conv_12 -> val_conv_12.ptr).toArray() : null); - /* TODO 2 NetAddress */; + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); + } + + long clone_ptr() { + long ret = bindings.UnsignedNodeAnnouncement_clone_ptr(this.ptr); + Reference.reachabilityFence(this); + return ret; } /** @@ -115,17 +157,36 @@ public class UnsignedNodeAnnouncement extends CommonBase { */ public UnsignedNodeAnnouncement clone() { long ret = bindings.UnsignedNodeAnnouncement_clone(this.ptr); - if (ret < 1024) { return null; } - UnsignedNodeAnnouncement ret_hu_conv = new UnsignedNodeAnnouncement(null, ret); - ret_hu_conv.ptrs_to.add(this); + Reference.reachabilityFence(this); + if (ret >= 0 && ret <= 4096) { return null; } + org.ldk.structs.UnsignedNodeAnnouncement ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.UnsignedNodeAnnouncement(null, ret); } + if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); }; return ret_hu_conv; } + /** + * Checks if two UnsignedNodeAnnouncements contain equal inner contents. + * This ignores pointers and is_owned flags and looks at the values in fields. + * Two objects with NULL inner values will be considered "equal" here. + */ + public boolean eq(org.ldk.structs.UnsignedNodeAnnouncement b) { + boolean ret = bindings.UnsignedNodeAnnouncement_eq(this.ptr, b == null ? 0 : b.ptr); + Reference.reachabilityFence(this); + Reference.reachabilityFence(b); + if (this != null) { this.ptrs_to.add(b); }; + return ret; + } + + @Override public boolean equals(Object o) { + if (!(o instanceof UnsignedNodeAnnouncement)) return false; + return this.eq((UnsignedNodeAnnouncement)o); + } /** * Serialize the UnsignedNodeAnnouncement object into a byte array which can be read by UnsignedNodeAnnouncement_read */ public byte[] write() { byte[] ret = bindings.UnsignedNodeAnnouncement_write(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -134,7 +195,8 @@ public class UnsignedNodeAnnouncement extends CommonBase { */ public static Result_UnsignedNodeAnnouncementDecodeErrorZ read(byte[] ser) { long ret = bindings.UnsignedNodeAnnouncement_read(ser); - if (ret < 1024) { return null; } + Reference.reachabilityFence(ser); + if (ret >= 0 && ret <= 4096) { return null; } Result_UnsignedNodeAnnouncementDecodeErrorZ ret_hu_conv = Result_UnsignedNodeAnnouncementDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; }