X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FMessageHandler.java;h=0fa504bbeff4ff4567abaa5a9b20977963ed4004;hb=2bb592fb946e316dba9f4d1123f8ac72ff4e9bf8;hp=fa4c4b2117899609811ed778fb793a3644eb0e03;hpb=2a8741cb87eb2b82381a6220a98f80f741147837;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/MessageHandler.java b/src/main/java/org/ldk/structs/MessageHandler.java
index fa4c4b21..0fa504bb 100644
--- a/src/main/java/org/ldk/structs/MessageHandler.java
+++ b/src/main/java/org/ldk/structs/MessageHandler.java
@@ -31,7 +31,7 @@ public class MessageHandler extends CommonBase {
 		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,11 +41,11 @@ public class MessageHandler extends CommonBase {
 	 * 
 	 * [`ChannelManager`]: crate::ln::channelmanager::ChannelManager
 	 */
-	public void set_chan_handler(ChannelMessageHandler val) {
-		bindings.MessageHandler_set_chan_handler(this.ptr, val == null ? 0 : val.ptr);
+	public void set_chan_handler(org.ldk.structs.ChannelMessageHandler val) {
+		bindings.MessageHandler_set_chan_handler(this.ptr, val.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(val);
-		this.ptrs_to.add(val);
+		if (this != null) { this.ptrs_to.add(val); };
 	}
 
 	/**
@@ -59,7 +59,7 @@ public class MessageHandler extends CommonBase {
 		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;
 	}
 
@@ -69,25 +69,81 @@ public class MessageHandler extends CommonBase {
 	 * 
 	 * [`P2PGossipSync`]: crate::routing::gossip::P2PGossipSync
 	 */
-	public void set_route_handler(RoutingMessageHandler val) {
-		bindings.MessageHandler_set_route_handler(this.ptr, val == null ? 0 : val.ptr);
+	public void set_route_handler(org.ldk.structs.RoutingMessageHandler val) {
+		bindings.MessageHandler_set_route_handler(this.ptr, val.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(val);
-		this.ptrs_to.add(val);
+		if (this != null) { this.ptrs_to.add(val); };
+	}
+
+	/**
+	 * A message handler which handles onion messages. This should generally be an
+	 * [`OnionMessenger`], but can also be an [`IgnoringMessageHandler`].
+	 * 
+	 * [`OnionMessenger`]: crate::onion_message::messenger::OnionMessenger
+	 */
+	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. This should generally be an
+	 * [`OnionMessenger`], but can also be an [`IgnoringMessageHandler`].
+	 * 
+	 * [`OnionMessenger`]: crate::onion_message::messenger::OnionMessenger
+	 */
+	public void set_onion_message_handler(org.ldk.structs.OnionMessageHandler val) {
+		bindings.MessageHandler_set_onion_message_handler(this.ptr, val.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
+	}
+
+	/**
+	 * A message handler which handles custom messages. The only LDK-provided implementation is
+	 * [`IgnoringMessageHandler`].
+	 */
+	public CustomMessageHandler get_custom_message_handler() {
+		long ret = bindings.MessageHandler_get_custom_message_handler(this.ptr);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		CustomMessageHandler ret_hu_conv = new CustomMessageHandler(null, ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
+		return ret_hu_conv;
+	}
+
+	/**
+	 * A message handler which handles custom messages. The only LDK-provided implementation is
+	 * [`IgnoringMessageHandler`].
+	 */
+	public void set_custom_message_handler(org.ldk.structs.CustomMessageHandler val) {
+		bindings.MessageHandler_set_custom_message_handler(this.ptr, 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);
+	public static MessageHandler of(org.ldk.structs.ChannelMessageHandler chan_handler_arg, org.ldk.structs.RoutingMessageHandler route_handler_arg, org.ldk.structs.OnionMessageHandler onion_message_handler_arg, org.ldk.structs.CustomMessageHandler custom_message_handler_arg) {
+		long ret = bindings.MessageHandler_new(chan_handler_arg.ptr, route_handler_arg.ptr, onion_message_handler_arg.ptr, custom_message_handler_arg.ptr);
 		Reference.reachabilityFence(chan_handler_arg);
 		Reference.reachabilityFence(route_handler_arg);
+		Reference.reachabilityFence(onion_message_handler_arg);
+		Reference.reachabilityFence(custom_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); }
-		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);
+		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); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(custom_message_handler_arg); };
 		return ret_hu_conv;
 	}