X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelUpdate.java;h=918a146de2d55259db4850bee11712cbaff12930;hb=890e35a4387758c0447aab34166caa579bbf3a08;hp=13afaffc4c5560c0b9c6f87d7e58f6ddea90cdc2;hpb=32692e00046b7ec16b6a2e20bd54800b2b48d4c0;p=ldk-java diff --git a/src/main/java/org/ldk/structs/ChannelUpdate.java b/src/main/java/org/ldk/structs/ChannelUpdate.java index 13afaffc..918a146d 100644 --- a/src/main/java/org/ldk/structs/ChannelUpdate.java +++ b/src/main/java/org/ldk/structs/ChannelUpdate.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,6 +25,7 @@ public class ChannelUpdate extends CommonBase { */ public byte[] get_signature() { byte[] ret = bindings.ChannelUpdate_get_signature(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -31,7 +33,9 @@ public class ChannelUpdate extends CommonBase { * A signature of the channel update */ public void set_signature(byte[] val) { - bindings.ChannelUpdate_set_signature(this.ptr, val); + bindings.ChannelUpdate_set_signature(this.ptr, InternalUtils.check_arr_len(val, 64)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -39,9 +43,10 @@ public class ChannelUpdate extends CommonBase { */ public UnsignedChannelUpdate get_contents() { long ret = bindings.ChannelUpdate_get_contents(this.ptr); - if (ret >= 0 && ret < 1024) { return null; } - UnsignedChannelUpdate ret_hu_conv = new UnsignedChannelUpdate(null, ret); - ret_hu_conv.ptrs_to.add(this); + Reference.reachabilityFence(this); + if (ret >= 0 && ret <= 4096) { return null; } + org.ldk.structs.UnsignedChannelUpdate ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.UnsignedChannelUpdate(null, ret); } + if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); }; return ret_hu_conv; } @@ -49,28 +54,41 @@ public class ChannelUpdate extends CommonBase { * The actual channel update */ public void set_contents(UnsignedChannelUpdate val) { - bindings.ChannelUpdate_set_contents(this.ptr, val == null ? 0 : val.ptr & ~1); + bindings.ChannelUpdate_set_contents(this.ptr, val == null ? 0 : val.ptr); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); + if (this != null) { this.ptrs_to.add(val); }; } /** * Constructs a new ChannelUpdate given each field */ public static ChannelUpdate of(byte[] signature_arg, UnsignedChannelUpdate contents_arg) { - long ret = bindings.ChannelUpdate_new(signature_arg, contents_arg == null ? 0 : contents_arg.ptr & ~1); - if (ret >= 0 && ret < 1024) { return null; } - ChannelUpdate ret_hu_conv = new ChannelUpdate(null, ret); - ret_hu_conv.ptrs_to.add(ret_hu_conv); + long ret = bindings.ChannelUpdate_new(InternalUtils.check_arr_len(signature_arg, 64), contents_arg == null ? 0 : contents_arg.ptr); + Reference.reachabilityFence(signature_arg); + Reference.reachabilityFence(contents_arg); + if (ret >= 0 && ret <= 4096) { return null; } + org.ldk.structs.ChannelUpdate ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelUpdate(null, ret); } + if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); }; + if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(contents_arg); }; return ret_hu_conv; } + long clone_ptr() { + long ret = bindings.ChannelUpdate_clone_ptr(this.ptr); + Reference.reachabilityFence(this); + return ret; + } + /** * Creates a copy of the ChannelUpdate */ public ChannelUpdate clone() { long ret = bindings.ChannelUpdate_clone(this.ptr); - if (ret >= 0 && ret < 1024) { return null; } - ChannelUpdate ret_hu_conv = new ChannelUpdate(null, ret); - ret_hu_conv.ptrs_to.add(this); + Reference.reachabilityFence(this); + if (ret >= 0 && ret <= 4096) { return null; } + org.ldk.structs.ChannelUpdate ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelUpdate(null, ret); } + if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); }; return ret_hu_conv; } @@ -79,6 +97,7 @@ public class ChannelUpdate extends CommonBase { */ public byte[] write() { byte[] ret = bindings.ChannelUpdate_write(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -87,7 +106,8 @@ public class ChannelUpdate extends CommonBase { */ public static Result_ChannelUpdateDecodeErrorZ read(byte[] ser) { long ret = bindings.ChannelUpdate_read(ser); - if (ret >= 0 && ret < 1024) { return null; } + Reference.reachabilityFence(ser); + if (ret >= 0 && ret <= 4096) { return null; } Result_ChannelUpdateDecodeErrorZ ret_hu_conv = Result_ChannelUpdateDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; }