Bindings updates

[ldk-java] / src / main / java / org / ldk / structs / ChannelMessageHandler.java

diff --git a/src/main/java/org/ldk/structs/ChannelMessageHandler.java b/src/main/java/org/ldk/structs/ChannelMessageHandler.java
index 5dc8103c30e56c5af069bf7f702bd7338a7ea7b5..060133855ae1117c56add57e5cf0a659e0bf9cdf 100644 (file)
--- a/src/main/java/org/ldk/structs/ChannelMessageHandler.java
+++ b/src/main/java/org/ldk/structs/ChannelMessageHandler.java
@@ -41,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);
                        }
@@ -120,10 +124,37 @@ 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;
        }
-       // Skipped ChannelMessageHandler_handle_open_channel
-       // Skipped ChannelMessageHandler_handle_accept_channel
+       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);
+               // Due to rust's strict-ownership memory model, in some cases we need to "move"
+               // an object to pass exclusive ownership to the function being called.
+               // In most cases, we avoid this being visible in GC'd languages by cloning the object
+               // at the FFI layer, creating a new object which Rust can claim ownership of
+               // However, in some cases (eg here), there is no way to clone an object, and thus
+               // we actually have to pass full ownership to Rust.
+               // Thus, after this call, their_features is reset to null and is now a dummy object.
+               their_features.ptr = 0;
+               this.ptrs_to.add(msg);
+       }
+
+       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);
+               // Due to rust's strict-ownership memory model, in some cases we need to "move"
+               // an object to pass exclusive ownership to the function being called.
+               // In most cases, we avoid this being visible in GC'd languages by cloning the object
+               // at the FFI layer, creating a new object which Rust can claim ownership of
+               // However, in some cases (eg here), there is no way to clone an object, and thus
+               // we actually have to pass full ownership to Rust.
+               // Thus, after this call, their_features is reset to null and is now a dummy object.
+               their_features.ptr = 0;
+               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);