X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FDefaultRouter.java;h=57d785688fb45968f6d7b40c4d050e8ada13e57d;hb=2bb592fb946e316dba9f4d1123f8ac72ff4e9bf8;hp=ae3fb4c7173cbe89490ae0173e3c961f3d4f6961;hpb=99d1a3bd6dc5c7ed1499b30bfc2b4c66ffaf858a;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/DefaultRouter.java b/src/main/java/org/ldk/structs/DefaultRouter.java
index ae3fb4c7..57d78568 100644
--- a/src/main/java/org/ldk/structs/DefaultRouter.java
+++ b/src/main/java/org/ldk/structs/DefaultRouter.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;
 
 
@@ -20,15 +21,23 @@ public class DefaultRouter extends CommonBase {
 	}
 
 	/**
-	 * Creates a new router using the given [`NetworkGraph`] and  [`Logger`].
+	 * Creates a new router.
 	 */
-	public static DefaultRouter of(NetworkGraph network_graph, Logger logger) {
-		long ret = bindings.DefaultRouter_new(network_graph == null ? 0 : network_graph.ptr & ~1, logger == null ? 0 : logger.ptr);
+	public static DefaultRouter of(org.ldk.structs.NetworkGraph network_graph, org.ldk.structs.Logger logger, org.ldk.structs.EntropySource entropy_source, org.ldk.structs.LockableScore scorer, org.ldk.structs.ProbabilisticScoringFeeParameters score_params) {
+		long ret = bindings.DefaultRouter_new(network_graph == null ? 0 : network_graph.ptr, logger.ptr, entropy_source.ptr, scorer.ptr, score_params == null ? 0 : score_params.ptr);
+		Reference.reachabilityFence(network_graph);
+		Reference.reachabilityFence(logger);
+		Reference.reachabilityFence(entropy_source);
+		Reference.reachabilityFence(scorer);
+		Reference.reachabilityFence(score_params);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		DefaultRouter ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new DefaultRouter(null, ret); }
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
-		ret_hu_conv.ptrs_to.add(network_graph);
-		ret_hu_conv.ptrs_to.add(logger);
+		org.ldk.structs.DefaultRouter ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.DefaultRouter(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(network_graph); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(logger); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(entropy_source); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(scorer); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(score_params); };
 		return ret_hu_conv;
 	}
 
@@ -38,9 +47,23 @@ public class DefaultRouter extends CommonBase {
 	 */
 	public Router as_Router() {
 		long ret = bindings.DefaultRouter_as_Router(this.ptr);
+		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		Router ret_hu_conv = new Router(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
+		return ret_hu_conv;
+	}
+
+	/**
+	 * Constructs a new MessageRouter which calls the relevant methods on this_arg.
+	 * This copies the `inner` pointer in this_arg and thus the returned MessageRouter must be freed before this_arg is
+	 */
+	public MessageRouter as_MessageRouter() {
+		long ret = bindings.DefaultRouter_as_MessageRouter(this.ptr);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		MessageRouter ret_hu_conv = new MessageRouter(null, ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}