X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FMessageHandler.java;h=aeb3d04fc517aceccdae0442d038239f31cb76b4;hb=890e35a4387758c0447aab34166caa579bbf3a08;hp=88cb0e2b8915c0140ffb7da6ad19062383379259;hpb=32692e00046b7ec16b6a2e20bd54800b2b48d4c0;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/MessageHandler.java b/src/main/java/org/ldk/structs/MessageHandler.java
index 88cb0e2b..aeb3d04f 100644
--- a/src/main/java/org/ldk/structs/MessageHandler.java
+++ b/src/main/java/org/ldk/structs/MessageHandler.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;
 
 
@@ -27,9 +28,10 @@ public class MessageHandler extends CommonBase {
 	 */
 	public ChannelMessageHandler get_chan_handler() {
 		long ret = bindings.MessageHandler_get_chan_handler(this.ptr);
-		if (ret >= 0 && ret < 1024) { return null; }
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		ChannelMessageHandler ret_hu_conv = new ChannelMessageHandler(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;
 	}
 
@@ -41,46 +43,77 @@ public class MessageHandler extends CommonBase {
 	 */
 	public void set_chan_handler(ChannelMessageHandler val) {
 		bindings.MessageHandler_set_chan_handler(this.ptr, val == null ? 0 : val.ptr);
-		this.ptrs_to.add(val);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
 	}
 
 	/**
 	 * A message handler which handles messages updating our knowledge of the network channel
-	 * graph. Usually this is just a [`NetGraphMsgHandler`] object or an
-	 * [`IgnoringMessageHandler`].
+	 * graph. Usually this is just a [`P2PGossipSync`] object or an [`IgnoringMessageHandler`].
 	 * 
-	 * [`NetGraphMsgHandler`]: crate::routing::network_graph::NetGraphMsgHandler
+	 * [`P2PGossipSync`]: crate::routing::gossip::P2PGossipSync
 	 */
 	public RoutingMessageHandler get_route_handler() {
 		long ret = bindings.MessageHandler_get_route_handler(this.ptr);
-		if (ret >= 0 && ret < 1024) { return null; }
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		RoutingMessageHandler ret_hu_conv = new RoutingMessageHandler(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;
 	}
 
 	/**
 	 * A message handler which handles messages updating our knowledge of the network channel
-	 * graph. Usually this is just a [`NetGraphMsgHandler`] object or an
-	 * [`IgnoringMessageHandler`].
+	 * graph. Usually this is just a [`P2PGossipSync`] object or an [`IgnoringMessageHandler`].
 	 * 
-	 * [`NetGraphMsgHandler`]: crate::routing::network_graph::NetGraphMsgHandler
+	 * [`P2PGossipSync`]: crate::routing::gossip::P2PGossipSync
 	 */
 	public void set_route_handler(RoutingMessageHandler val) {
 		bindings.MessageHandler_set_route_handler(this.ptr, val == null ? 0 : val.ptr);
-		this.ptrs_to.add(val);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
+	}
+
+	/**
+	 * A message handler which handles onion messages. For now, this can only be an
+	 * [`IgnoringMessageHandler`].
+	 */
+	public OnionMessageHandler get_onion_message_handler() {
+		long ret = bindings.MessageHandler_get_onion_message_handler(this.ptr);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		OnionMessageHandler ret_hu_conv = new OnionMessageHandler(null, ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
+		return ret_hu_conv;
+	}
+
+	/**
+	 * A message handler which handles onion messages. For now, this can only be an
+	 * [`IgnoringMessageHandler`].
+	 */
+	public void set_onion_message_handler(OnionMessageHandler val) {
+		bindings.MessageHandler_set_onion_message_handler(this.ptr, val == null ? 0 : val.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
 	}
 
 	/**
 	 * Constructs a new MessageHandler given each field
 	 */
-	public static MessageHandler of(ChannelMessageHandler chan_handler_arg, RoutingMessageHandler route_handler_arg) {
-		long ret = bindings.MessageHandler_new(chan_handler_arg == null ? 0 : chan_handler_arg.ptr, route_handler_arg == null ? 0 : route_handler_arg.ptr);
-		if (ret >= 0 && ret < 1024) { return null; }
-		MessageHandler ret_hu_conv = new MessageHandler(null, ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
-		ret_hu_conv.ptrs_to.add(chan_handler_arg);
-		ret_hu_conv.ptrs_to.add(route_handler_arg);
+	public static MessageHandler of(ChannelMessageHandler chan_handler_arg, RoutingMessageHandler route_handler_arg, OnionMessageHandler onion_message_handler_arg) {
+		long ret = bindings.MessageHandler_new(chan_handler_arg == null ? 0 : chan_handler_arg.ptr, route_handler_arg == null ? 0 : route_handler_arg.ptr, onion_message_handler_arg == null ? 0 : onion_message_handler_arg.ptr);
+		Reference.reachabilityFence(chan_handler_arg);
+		Reference.reachabilityFence(route_handler_arg);
+		Reference.reachabilityFence(onion_message_handler_arg);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.MessageHandler ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.MessageHandler(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(chan_handler_arg); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(route_handler_arg); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(onion_message_handler_arg); };
 		return ret_hu_conv;
 	}