X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelMessageHandler.java;h=c6604d115130af0d2df7e6dc61b2a3b5003ecf42;hb=c6bac88847b7c09560af81f00ba8dd3c2ebe3a19;hp=c5bb627289593e065d271538cb4d413451edf62d;hpb=f8c25e52ce878136043ddc4dbfac6c6640f1d4f6;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ChannelMessageHandler.java b/src/main/java/org/ldk/structs/ChannelMessageHandler.java
index c5bb6272..c6604d11 100644
--- a/src/main/java/org/ldk/structs/ChannelMessageHandler.java
+++ b/src/main/java/org/ldk/structs/ChannelMessageHandler.java
@@ -4,6 +4,7 @@ import org.ldk.impl.bindings;
 import org.ldk.enums.*;
 import org.ldk.util.*;
 import java.util.Arrays;
+import javax.annotation.Nullable;
 
 /**
  * A trait to describe an object which can receive channel messages.
@@ -116,98 +117,107 @@ public class ChannelMessageHandler extends CommonBase {
 		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);
+				InitFeatures their_features_hu_conv = null; if (their_features < 0 || their_features > 4096) { 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);
+				OpenChannel msg_hu_conv = null; if (msg < 0 || msg > 4096) { 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);
+				InitFeatures their_features_hu_conv = null; if (their_features < 0 || their_features > 4096) { 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);
+				AcceptChannel msg_hu_conv = null; if (msg < 0 || msg > 4096) { msg_hu_conv = new AcceptChannel(null, msg); }
 				arg.handle_accept_channel(their_node_id, their_features_hu_conv, msg_hu_conv);
 			}
 			@Override public void handle_funding_created(byte[] their_node_id, long msg) {
-				FundingCreated msg_hu_conv = new FundingCreated(null, msg);
+				FundingCreated msg_hu_conv = null; if (msg < 0 || msg > 4096) { msg_hu_conv = new FundingCreated(null, msg); }
 				arg.handle_funding_created(their_node_id, msg_hu_conv);
 			}
 			@Override public void handle_funding_signed(byte[] their_node_id, long msg) {
-				FundingSigned msg_hu_conv = new FundingSigned(null, msg);
+				FundingSigned msg_hu_conv = null; if (msg < 0 || msg > 4096) { msg_hu_conv = new FundingSigned(null, msg); }
 				arg.handle_funding_signed(their_node_id, msg_hu_conv);
 			}
 			@Override public void handle_funding_locked(byte[] their_node_id, long msg) {
-				FundingLocked msg_hu_conv = new FundingLocked(null, msg);
+				FundingLocked msg_hu_conv = null; if (msg < 0 || msg > 4096) { 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 their_features, long msg) {
-				InitFeatures their_features_hu_conv = new InitFeatures(null, their_features);
-				Shutdown msg_hu_conv = new Shutdown(null, msg);
+				InitFeatures their_features_hu_conv = null; if (their_features < 0 || their_features > 4096) { their_features_hu_conv = new InitFeatures(null, their_features); }
+				Shutdown msg_hu_conv = null; if (msg < 0 || msg > 4096) { msg_hu_conv = new Shutdown(null, msg); }
 				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);
+				ClosingSigned msg_hu_conv = null; if (msg < 0 || msg > 4096) { msg_hu_conv = new ClosingSigned(null, msg); }
 				arg.handle_closing_signed(their_node_id, msg_hu_conv);
 			}
 			@Override public void handle_update_add_htlc(byte[] their_node_id, long msg) {
-				UpdateAddHTLC msg_hu_conv = new UpdateAddHTLC(null, msg);
+				UpdateAddHTLC msg_hu_conv = null; if (msg < 0 || msg > 4096) { msg_hu_conv = new UpdateAddHTLC(null, msg); }
 				arg.handle_update_add_htlc(their_node_id, msg_hu_conv);
 			}
 			@Override public void handle_update_fulfill_htlc(byte[] their_node_id, long msg) {
-				UpdateFulfillHTLC msg_hu_conv = new UpdateFulfillHTLC(null, msg);
+				UpdateFulfillHTLC msg_hu_conv = null; if (msg < 0 || msg > 4096) { msg_hu_conv = new UpdateFulfillHTLC(null, msg); }
 				arg.handle_update_fulfill_htlc(their_node_id, msg_hu_conv);
 			}
 			@Override public void handle_update_fail_htlc(byte[] their_node_id, long msg) {
-				UpdateFailHTLC msg_hu_conv = new UpdateFailHTLC(null, msg);
+				UpdateFailHTLC msg_hu_conv = null; if (msg < 0 || msg > 4096) { msg_hu_conv = new UpdateFailHTLC(null, msg); }
 				arg.handle_update_fail_htlc(their_node_id, msg_hu_conv);
 			}
 			@Override public void handle_update_fail_malformed_htlc(byte[] their_node_id, long msg) {
-				UpdateFailMalformedHTLC msg_hu_conv = new UpdateFailMalformedHTLC(null, msg);
+				UpdateFailMalformedHTLC msg_hu_conv = null; if (msg < 0 || msg > 4096) { msg_hu_conv = new UpdateFailMalformedHTLC(null, msg); }
 				arg.handle_update_fail_malformed_htlc(their_node_id, msg_hu_conv);
 			}
 			@Override public void handle_commitment_signed(byte[] their_node_id, long msg) {
-				CommitmentSigned msg_hu_conv = new CommitmentSigned(null, msg);
+				CommitmentSigned msg_hu_conv = null; if (msg < 0 || msg > 4096) { msg_hu_conv = new CommitmentSigned(null, msg); }
 				arg.handle_commitment_signed(their_node_id, msg_hu_conv);
 			}
 			@Override public void handle_revoke_and_ack(byte[] their_node_id, long msg) {
-				RevokeAndACK msg_hu_conv = new RevokeAndACK(null, msg);
+				RevokeAndACK msg_hu_conv = null; if (msg < 0 || msg > 4096) { msg_hu_conv = new RevokeAndACK(null, msg); }
 				arg.handle_revoke_and_ack(their_node_id, msg_hu_conv);
 			}
 			@Override public void handle_update_fee(byte[] their_node_id, long msg) {
-				UpdateFee msg_hu_conv = new UpdateFee(null, msg);
+				UpdateFee msg_hu_conv = null; if (msg < 0 || msg > 4096) { msg_hu_conv = new UpdateFee(null, msg); }
 				arg.handle_update_fee(their_node_id, msg_hu_conv);
 			}
 			@Override public void handle_announcement_signatures(byte[] their_node_id, long msg) {
-				AnnouncementSignatures msg_hu_conv = new AnnouncementSignatures(null, msg);
+				AnnouncementSignatures msg_hu_conv = null; if (msg < 0 || msg > 4096) { msg_hu_conv = new AnnouncementSignatures(null, msg); }
 				arg.handle_announcement_signatures(their_node_id, msg_hu_conv);
 			}
 			@Override public void peer_disconnected(byte[] their_node_id, boolean no_connection_possible) {
 				arg.peer_disconnected(their_node_id, no_connection_possible);
 			}
 			@Override public void peer_connected(byte[] their_node_id, long msg) {
-				Init msg_hu_conv = new Init(null, msg);
+				Init msg_hu_conv = null; if (msg < 0 || msg > 4096) { msg_hu_conv = new Init(null, msg); }
 				arg.peer_connected(their_node_id, msg_hu_conv);
 			}
 			@Override public void handle_channel_reestablish(byte[] their_node_id, long msg) {
-				ChannelReestablish msg_hu_conv = new ChannelReestablish(null, msg);
+				ChannelReestablish msg_hu_conv = null; if (msg < 0 || msg > 4096) { msg_hu_conv = new ChannelReestablish(null, msg); }
 				arg.handle_channel_reestablish(their_node_id, msg_hu_conv);
 			}
 			@Override public void handle_channel_update(byte[] their_node_id, long msg) {
-				ChannelUpdate msg_hu_conv = new ChannelUpdate(null, msg);
+				ChannelUpdate msg_hu_conv = null; if (msg < 0 || msg > 4096) { msg_hu_conv = new ChannelUpdate(null, msg); }
 				arg.handle_channel_update(their_node_id, msg_hu_conv);
 			}
 			@Override public void handle_error(byte[] their_node_id, long msg) {
-				ErrorMessage msg_hu_conv = new ErrorMessage(null, msg);
+				ErrorMessage msg_hu_conv = null; if (msg < 0 || msg > 4096) { msg_hu_conv = new ErrorMessage(null, msg); }
 				arg.handle_error(their_node_id, msg_hu_conv);
 			}
 		}, MessageSendEventsProvider.new_impl(MessageSendEventsProvider_impl).bindings_instance);
 		return impl_holder.held;
 	}
+
+	/**
+	 * Gets the underlying MessageSendEventsProvider.
+	 */
+	public MessageSendEventsProvider get_message_send_events_provider() {
+		MessageSendEventsProvider res = new MessageSendEventsProvider(null, bindings.LDKChannelMessageHandler_get_MessageSendEventsProvider(this.ptr));
+		this.ptrs_to.add(res);
+		return res;
+	}
+
 	/**
 	 * Handle an incoming open_channel message from the given peer.
 	 */
 	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);
 	}
 
@@ -216,7 +226,6 @@ public class ChannelMessageHandler extends CommonBase {
 	 */
 	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);
 	}