X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelReestablish.java;h=ae89ef232ed0cbd78edeff47327a260246e9961b;hb=300b54d26fe5ed89f472ef821ebf67d56c917e49;hp=914c8acc59c4ed2a640be67e4a218745faa84dbf;hpb=32692e00046b7ec16b6a2e20bd54800b2b48d4c0;p=ldk-java diff --git a/src/main/java/org/ldk/structs/ChannelReestablish.java b/src/main/java/org/ldk/structs/ChannelReestablish.java index 914c8acc..ae89ef23 100644 --- a/src/main/java/org/ldk/structs/ChannelReestablish.java +++ b/src/main/java/org/ldk/structs/ChannelReestablish.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 ChannelReestablish extends CommonBase { */ public byte[] get_channel_id() { byte[] ret = bindings.ChannelReestablish_get_channel_id(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -31,7 +33,9 @@ public class ChannelReestablish extends CommonBase { * The channel ID */ public void set_channel_id(byte[] val) { - bindings.ChannelReestablish_set_channel_id(this.ptr, val); + bindings.ChannelReestablish_set_channel_id(this.ptr, InternalUtils.check_arr_len(val, 32)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -39,6 +43,7 @@ public class ChannelReestablish extends CommonBase { */ public long get_next_local_commitment_number() { long ret = bindings.ChannelReestablish_get_next_local_commitment_number(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -47,6 +52,8 @@ public class ChannelReestablish extends CommonBase { */ public void set_next_local_commitment_number(long val) { bindings.ChannelReestablish_set_next_local_commitment_number(this.ptr, val); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -54,6 +61,7 @@ public class ChannelReestablish extends CommonBase { */ public long get_next_remote_commitment_number() { long ret = bindings.ChannelReestablish_get_next_remote_commitment_number(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -62,6 +70,14 @@ public class ChannelReestablish extends CommonBase { */ public void set_next_remote_commitment_number(long val) { bindings.ChannelReestablish_set_next_remote_commitment_number(this.ptr, val); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); + } + + long clone_ptr() { + long ret = bindings.ChannelReestablish_clone_ptr(this.ptr); + Reference.reachabilityFence(this); + return ret; } /** @@ -69,17 +85,36 @@ public class ChannelReestablish extends CommonBase { */ public ChannelReestablish clone() { long ret = bindings.ChannelReestablish_clone(this.ptr); - if (ret >= 0 && ret < 1024) { return null; } - ChannelReestablish ret_hu_conv = new ChannelReestablish(null, ret); - ret_hu_conv.ptrs_to.add(this); + Reference.reachabilityFence(this); + if (ret >= 0 && ret <= 4096) { return null; } + org.ldk.structs.ChannelReestablish ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelReestablish(null, ret); } + if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); }; return ret_hu_conv; } + /** + * Checks if two ChannelReestablishs 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(ChannelReestablish b) { + boolean ret = bindings.ChannelReestablish_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 ChannelReestablish)) return false; + return this.eq((ChannelReestablish)o); + } /** * Serialize the ChannelReestablish object into a byte array which can be read by ChannelReestablish_read */ public byte[] write() { byte[] ret = bindings.ChannelReestablish_write(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -88,7 +123,8 @@ public class ChannelReestablish extends CommonBase { */ public static Result_ChannelReestablishDecodeErrorZ read(byte[] ser) { long ret = bindings.ChannelReestablish_read(ser); - if (ret >= 0 && ret < 1024) { return null; } + Reference.reachabilityFence(ser); + if (ret >= 0 && ret <= 4096) { return null; } Result_ChannelReestablishDecodeErrorZ ret_hu_conv = Result_ChannelReestablishDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; }