X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelMessageHandler.java;h=2b9aebe4680264b50744ed174afee298448ee6a4;hb=276893d3b8bd3fcb2bb10e3cab73a69d34831909;hp=d920f2d49697fd70003c19d85d13cc88c1280e80;hpb=aa0e2aade37133339f4113a0cd7465b111f0a0d0;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ChannelMessageHandler.java b/src/main/java/org/ldk/structs/ChannelMessageHandler.java
index d920f2d4..2b9aebe4 100644
--- a/src/main/java/org/ldk/structs/ChannelMessageHandler.java
+++ b/src/main/java/org/ldk/structs/ChannelMessageHandler.java
@@ -12,6 +12,7 @@ public class ChannelMessageHandler extends CommonBase {
 	private ChannelMessageHandler(bindings.LDKChannelMessageHandler arg, bindings.LDKMessageSendEventsProvider MessageSendEventsProvider) {
 		super(bindings.LDKChannelMessageHandler_new(arg, MessageSendEventsProvider));
 		this.ptrs_to.add(arg);
+		this.ptrs_to.add(MessageSendEventsProvider);
 		this.bindings_instance = arg;
 	}
 	@Override @SuppressWarnings("deprecation")
@@ -25,7 +26,7 @@ public class ChannelMessageHandler extends CommonBase {
 		void handle_funding_created(byte[] their_node_id, FundingCreated msg);
 		void handle_funding_signed(byte[] their_node_id, FundingSigned msg);
 		void handle_funding_locked(byte[] their_node_id, FundingLocked msg);
-		void handle_shutdown(byte[] their_node_id, Shutdown msg);
+		void handle_shutdown(byte[] their_node_id, InitFeatures their_features, Shutdown msg);
 		void handle_closing_signed(byte[] their_node_id, ClosingSigned msg);
 		void handle_update_add_htlc(byte[] their_node_id, UpdateAddHTLC msg);
 		void handle_update_fulfill_htlc(byte[] their_node_id, UpdateFulfillHTLC msg);
@@ -40,15 +41,19 @@ public class ChannelMessageHandler extends CommonBase {
 		void handle_channel_reestablish(byte[] their_node_id, ChannelReestablish msg);
 		void handle_error(byte[] their_node_id, ErrorMessage msg);
 	}
-	public ChannelMessageHandler(ChannelMessageHandlerInterface arg, MessageSendEventsProvider.MessageSendEventsProviderInterface MessageSendEventsProvider) {
-		this(new bindings.LDKChannelMessageHandler() {
+	private static class LDKChannelMessageHandlerHolder { ChannelMessageHandler held; }
+	public static ChannelMessageHandler new_impl(ChannelMessageHandlerInterface arg, MessageSendEventsProvider.MessageSendEventsProviderInterface MessageSendEventsProvider_impl) {
+		final LDKChannelMessageHandlerHolder impl_holder = new LDKChannelMessageHandlerHolder();
+		impl_holder.held = new ChannelMessageHandler(new bindings.LDKChannelMessageHandler() {
 			@Override public void handle_open_channel(byte[] their_node_id, long their_features, long msg) {
 				InitFeatures their_features_hu_conv = new InitFeatures(null, their_features);
+				their_features_hu_conv.ptrs_to.add(this);
 				OpenChannel msg_hu_conv = new OpenChannel(null, msg);
 				arg.handle_open_channel(their_node_id, their_features_hu_conv, msg_hu_conv);
 			}
 			@Override public void handle_accept_channel(byte[] their_node_id, long their_features, long msg) {
 				InitFeatures their_features_hu_conv = new InitFeatures(null, their_features);
+				their_features_hu_conv.ptrs_to.add(this);
 				AcceptChannel msg_hu_conv = new AcceptChannel(null, msg);
 				arg.handle_accept_channel(their_node_id, their_features_hu_conv, msg_hu_conv);
 			}
@@ -64,9 +69,10 @@ public class ChannelMessageHandler extends CommonBase {
 				FundingLocked msg_hu_conv = new FundingLocked(null, msg);
 				arg.handle_funding_locked(their_node_id, msg_hu_conv);
 			}
-			@Override public void handle_shutdown(byte[] their_node_id, long msg) {
+			@Override public void handle_shutdown(byte[] their_node_id, long their_features, long msg) {
+				InitFeatures their_features_hu_conv = new InitFeatures(null, their_features);
 				Shutdown msg_hu_conv = new Shutdown(null, msg);
-				arg.handle_shutdown(their_node_id, msg_hu_conv);
+				arg.handle_shutdown(their_node_id, their_features_hu_conv, msg_hu_conv);
 			}
 			@Override public void handle_closing_signed(byte[] their_node_id, long msg) {
 				ClosingSigned msg_hu_conv = new ClosingSigned(null, msg);
@@ -119,10 +125,21 @@ public class ChannelMessageHandler extends CommonBase {
 				ErrorMessage msg_hu_conv = new ErrorMessage(null, msg);
 				arg.handle_error(their_node_id, msg_hu_conv);
 			}
-		}, new MessageSendEventsProvider(MessageSendEventsProvider).bindings_instance);
+		}, MessageSendEventsProvider.new_impl(MessageSendEventsProvider_impl).bindings_instance);
+		return impl_holder.held;
+	}
+	public void handle_open_channel(byte[] their_node_id, InitFeatures their_features, OpenChannel msg) {
+		bindings.ChannelMessageHandler_handle_open_channel(this.ptr, their_node_id, their_features == null ? 0 : their_features.ptr & ~1, msg == null ? 0 : msg.ptr & ~1);
+		this.ptrs_to.add(their_features);
+		this.ptrs_to.add(msg);
 	}
-	// Skipped ChannelMessageHandler_handle_open_channel
-	// Skipped ChannelMessageHandler_handle_accept_channel
+
+	public void handle_accept_channel(byte[] their_node_id, InitFeatures their_features, AcceptChannel msg) {
+		bindings.ChannelMessageHandler_handle_accept_channel(this.ptr, their_node_id, their_features == null ? 0 : their_features.ptr & ~1, msg == null ? 0 : msg.ptr & ~1);
+		this.ptrs_to.add(their_features);
+		this.ptrs_to.add(msg);
+	}
+
 	public void handle_funding_created(byte[] their_node_id, FundingCreated msg) {
 		bindings.ChannelMessageHandler_handle_funding_created(this.ptr, their_node_id, msg == null ? 0 : msg.ptr & ~1);
 		this.ptrs_to.add(msg);
@@ -138,8 +155,9 @@ public class ChannelMessageHandler extends CommonBase {
 		this.ptrs_to.add(msg);
 	}
 
-	public void handle_shutdown(byte[] their_node_id, Shutdown msg) {
-		bindings.ChannelMessageHandler_handle_shutdown(this.ptr, their_node_id, msg == null ? 0 : msg.ptr & ~1);
+	public void handle_shutdown(byte[] their_node_id, InitFeatures their_features, Shutdown msg) {
+		bindings.ChannelMessageHandler_handle_shutdown(this.ptr, their_node_id, their_features == null ? 0 : their_features.ptr & ~1, msg == null ? 0 : msg.ptr & ~1);
+		this.ptrs_to.add(their_features);
 		this.ptrs_to.add(msg);
 	}