X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FPrivateRoute.java;h=ef7a6d94c9c2678a9ea341b0cb06ab82acb1c75a;hb=13cdf8bde340072288b39a5e29f0946d3e095ad4;hp=ae2872a10d688f897ecd696fe94310bfe2b0f689;hpb=7d6be8a5ef72a4ebfe07660cce55f43f6cc30b80;p=ldk-java diff --git a/src/main/java/org/ldk/structs/PrivateRoute.java b/src/main/java/org/ldk/structs/PrivateRoute.java index ae2872a1..ef7a6d94 100644 --- a/src/main/java/org/ldk/structs/PrivateRoute.java +++ b/src/main/java/org/ldk/structs/PrivateRoute.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; @@ -22,13 +23,20 @@ public class PrivateRoute extends CommonBase { if (ptr != 0) { bindings.PrivateRoute_free(ptr); } } + long clone_ptr() { + long ret = bindings.PrivateRoute_clone_ptr(this.ptr); + Reference.reachabilityFence(this); + return ret; + } + /** * Creates a copy of the PrivateRoute */ public PrivateRoute clone() { long ret = bindings.PrivateRoute_clone(this.ptr); - if (ret < 1024) { return null; } - PrivateRoute ret_hu_conv = new PrivateRoute(null, ret); + Reference.reachabilityFence(this); + if (ret >= 0 && ret <= 4096) { return null; } + org.ldk.structs.PrivateRoute ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.PrivateRoute(null, ret); } ret_hu_conv.ptrs_to.add(this); return ret_hu_conv; } @@ -38,26 +46,37 @@ public class PrivateRoute extends CommonBase { */ public long hash() { long ret = bindings.PrivateRoute_hash(this.ptr); + Reference.reachabilityFence(this); return ret; } + @Override public int hashCode() { + return (int)this.hash(); + } /** * Checks if two PrivateRoutes 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(PrivateRoute b) { - boolean ret = bindings.PrivateRoute_eq(this.ptr, b == null ? 0 : b.ptr & ~1); + boolean ret = bindings.PrivateRoute_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 PrivateRoute)) return false; + return this.eq((PrivateRoute)o); + } /** * Creates a new (partial) route from a list of hops */ public static Result_PrivateRouteCreationErrorZ of(RouteHint hops) { - long ret = bindings.PrivateRoute_new(hops == null ? 0 : hops.ptr & ~1); - if (ret < 1024) { return null; } + long ret = bindings.PrivateRoute_new(hops == null ? 0 : hops.ptr); + Reference.reachabilityFence(hops); + if (ret >= 0 && ret <= 4096) { return null; } Result_PrivateRouteCreationErrorZ ret_hu_conv = Result_PrivateRouteCreationErrorZ.constr_from_ptr(ret); ret_hu_conv.ptrs_to.add(hops); return ret_hu_conv; @@ -68,8 +87,9 @@ public class PrivateRoute extends CommonBase { */ public RouteHint into_inner() { long ret = bindings.PrivateRoute_into_inner(this.ptr); - if (ret < 1024) { return null; } - RouteHint ret_hu_conv = new RouteHint(null, ret); + Reference.reachabilityFence(this); + if (ret >= 0 && ret <= 4096) { return null; } + org.ldk.structs.RouteHint ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.RouteHint(null, ret); } ret_hu_conv.ptrs_to.add(this); this.ptrs_to.add(this); return ret_hu_conv;