X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FRouteHop.java;h=bdd0669ee9276cd8e52c4bb91d8de6fc3325a6fc;hb=13cdf8bde340072288b39a5e29f0946d3e095ad4;hp=5d130ff2e107dda607e8b7042179e60ff1284c64;hpb=7d6be8a5ef72a4ebfe07660cce55f43f6cc30b80;p=ldk-java diff --git a/src/main/java/org/ldk/structs/RouteHop.java b/src/main/java/org/ldk/structs/RouteHop.java index 5d130ff2..bdd0669e 100644 --- a/src/main/java/org/ldk/structs/RouteHop.java +++ b/src/main/java/org/ldk/structs/RouteHop.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 RouteHop extends CommonBase { */ public byte[] get_pubkey() { byte[] ret = bindings.RouteHop_get_pubkey(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -31,7 +33,9 @@ public class RouteHop extends CommonBase { * The node_id of the node at this hop. */ public void set_pubkey(byte[] val) { - bindings.RouteHop_set_pubkey(this.ptr, val); + bindings.RouteHop_set_pubkey(this.ptr, InternalUtils.check_arr_len(val, 33)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -40,8 +44,9 @@ public class RouteHop extends CommonBase { */ public NodeFeatures get_node_features() { long ret = bindings.RouteHop_get_node_features(this.ptr); - if (ret < 1024) { return null; } - NodeFeatures ret_hu_conv = new NodeFeatures(null, ret); + 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); } ret_hu_conv.ptrs_to.add(this); return ret_hu_conv; } @@ -51,7 +56,9 @@ public class RouteHop extends CommonBase { * amended to match the features present in the invoice this node generated. */ public void set_node_features(NodeFeatures val) { - bindings.RouteHop_set_node_features(this.ptr, val == null ? 0 : val.ptr & ~1); + bindings.RouteHop_set_node_features(this.ptr, val == null ? 0 : val.ptr); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); this.ptrs_to.add(val); } @@ -60,6 +67,7 @@ public class RouteHop extends CommonBase { */ public long get_short_channel_id() { long ret = bindings.RouteHop_get_short_channel_id(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -68,6 +76,8 @@ public class RouteHop extends CommonBase { */ public void set_short_channel_id(long val) { bindings.RouteHop_set_short_channel_id(this.ptr, val); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -76,8 +86,9 @@ public class RouteHop extends CommonBase { */ public ChannelFeatures get_channel_features() { long ret = bindings.RouteHop_get_channel_features(this.ptr); - if (ret < 1024) { return null; } - ChannelFeatures ret_hu_conv = new ChannelFeatures(null, ret); + Reference.reachabilityFence(this); + if (ret >= 0 && ret <= 4096) { return null; } + org.ldk.structs.ChannelFeatures ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelFeatures(null, ret); } ret_hu_conv.ptrs_to.add(this); return ret_hu_conv; } @@ -87,7 +98,9 @@ public class RouteHop extends CommonBase { * to reach this node. */ public void set_channel_features(ChannelFeatures val) { - bindings.RouteHop_set_channel_features(this.ptr, val == null ? 0 : val.ptr & ~1); + bindings.RouteHop_set_channel_features(this.ptr, val == null ? 0 : val.ptr); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); this.ptrs_to.add(val); } @@ -98,6 +111,7 @@ public class RouteHop extends CommonBase { */ public long get_fee_msat() { long ret = bindings.RouteHop_get_fee_msat(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -108,6 +122,8 @@ public class RouteHop extends CommonBase { */ public void set_fee_msat(long val) { bindings.RouteHop_set_fee_msat(this.ptr, val); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -116,6 +132,7 @@ public class RouteHop extends CommonBase { */ public int get_cltv_expiry_delta() { int ret = bindings.RouteHop_get_cltv_expiry_delta(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -125,28 +142,43 @@ public class RouteHop extends CommonBase { */ public void set_cltv_expiry_delta(int val) { bindings.RouteHop_set_cltv_expiry_delta(this.ptr, val); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** * Constructs a new RouteHop given each field */ public static RouteHop of(byte[] pubkey_arg, NodeFeatures node_features_arg, long short_channel_id_arg, ChannelFeatures channel_features_arg, long fee_msat_arg, int cltv_expiry_delta_arg) { - long ret = bindings.RouteHop_new(pubkey_arg, node_features_arg == null ? 0 : node_features_arg.ptr & ~1, short_channel_id_arg, channel_features_arg == null ? 0 : channel_features_arg.ptr & ~1, fee_msat_arg, cltv_expiry_delta_arg); - if (ret < 1024) { return null; } - RouteHop ret_hu_conv = new RouteHop(null, ret); + long ret = bindings.RouteHop_new(InternalUtils.check_arr_len(pubkey_arg, 33), node_features_arg == null ? 0 : node_features_arg.ptr, short_channel_id_arg, channel_features_arg == null ? 0 : channel_features_arg.ptr, fee_msat_arg, cltv_expiry_delta_arg); + Reference.reachabilityFence(pubkey_arg); + Reference.reachabilityFence(node_features_arg); + Reference.reachabilityFence(short_channel_id_arg); + Reference.reachabilityFence(channel_features_arg); + Reference.reachabilityFence(fee_msat_arg); + Reference.reachabilityFence(cltv_expiry_delta_arg); + if (ret >= 0 && ret <= 4096) { return null; } + org.ldk.structs.RouteHop ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.RouteHop(null, ret); } ret_hu_conv.ptrs_to.add(ret_hu_conv); ret_hu_conv.ptrs_to.add(node_features_arg); ret_hu_conv.ptrs_to.add(channel_features_arg); return ret_hu_conv; } + long clone_ptr() { + long ret = bindings.RouteHop_clone_ptr(this.ptr); + Reference.reachabilityFence(this); + return ret; + } + /** * Creates a copy of the RouteHop */ public RouteHop clone() { long ret = bindings.RouteHop_clone(this.ptr); - if (ret < 1024) { return null; } - RouteHop ret_hu_conv = new RouteHop(null, ret); + Reference.reachabilityFence(this); + if (ret >= 0 && ret <= 4096) { return null; } + org.ldk.structs.RouteHop ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.RouteHop(null, ret); } ret_hu_conv.ptrs_to.add(this); return ret_hu_conv; } @@ -156,25 +188,36 @@ public class RouteHop extends CommonBase { */ public long hash() { long ret = bindings.RouteHop_hash(this.ptr); + Reference.reachabilityFence(this); return ret; } + @Override public int hashCode() { + return (int)this.hash(); + } /** * Checks if two RouteHops 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(RouteHop b) { - boolean ret = bindings.RouteHop_eq(this.ptr, b == null ? 0 : b.ptr & ~1); + boolean ret = bindings.RouteHop_eq(this.ptr, b == null ? 0 : b.ptr); + Reference.reachabilityFence(this); + Reference.reachabilityFence(b); this.ptrs_to.add(b); return ret; } + @Override public boolean equals(Object o) { + if (!(o instanceof RouteHop)) return false; + return this.eq((RouteHop)o); + } /** * Serialize the RouteHop object into a byte array which can be read by RouteHop_read */ public byte[] write() { byte[] ret = bindings.RouteHop_write(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -183,7 +226,8 @@ public class RouteHop extends CommonBase { */ public static Result_RouteHopDecodeErrorZ read(byte[] ser) { long ret = bindings.RouteHop_read(ser); - if (ret < 1024) { return null; } + Reference.reachabilityFence(ser); + if (ret >= 0 && ret <= 4096) { return null; } Result_RouteHopDecodeErrorZ ret_hu_conv = Result_RouteHopDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; }