X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FErrorAction.java;h=ec2ae18f0843b36773230af1fadaebd13106dd08;hb=f3e670e9341decac613d33fc52febf19cea32f20;hp=3ff8ed72d3e4f0c8373cc9554d95dc964ad3ccd9;hpb=ba1af51214a8ea2de62b84cd23b6145173c71752;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ErrorAction.java b/src/main/java/org/ldk/structs/ErrorAction.java
index 3ff8ed72..ec2ae18f 100644
--- a/src/main/java/org/ldk/structs/ErrorAction.java
+++ b/src/main/java/org/ldk/structs/ErrorAction.java
@@ -35,6 +35,9 @@ public class ErrorAction extends CommonBase {
 		assert false; return null; // Unreachable without extending the (internal) bindings interface
 	}
 
+	/**
+	 * The peer took some action which made us think they were useless. Disconnect them.
+	 */
 	public final static class DisconnectPeer extends ErrorAction {
 		/**
 		 * An error message which we should make an effort to send before we disconnect.
@@ -45,16 +48,23 @@ public class ErrorAction extends CommonBase {
 		private DisconnectPeer(long ptr, bindings.LDKErrorAction.DisconnectPeer obj) {
 			super(null, ptr);
 			long msg = obj.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); }
 			msg_hu_conv.ptrs_to.add(this);
 			this.msg = msg_hu_conv;
 		}
 	}
+	/**
+	 * The peer did something harmless that we weren't able to process, just log and ignore
+	 */
 	public final static class IgnoreError extends ErrorAction {
 		private IgnoreError(long ptr, bindings.LDKErrorAction.IgnoreError obj) {
 			super(null, ptr);
 		}
 	}
+	/**
+	 * The peer did something harmless that we weren't able to meaningfully process.
+	 * If the error is logged, log it at the given level.
+	 */
 	public final static class IgnoreAndLog extends ErrorAction {
 		public final Level ignore_and_log;
 		private IgnoreAndLog(long ptr, bindings.LDKErrorAction.IgnoreAndLog obj) {
@@ -62,6 +72,9 @@ public class ErrorAction extends CommonBase {
 			this.ignore_and_log = obj.ignore_and_log;
 		}
 	}
+	/**
+	 * The peer did something incorrect. Tell them.
+	 */
 	public final static class SendErrorMessage extends ErrorAction {
 		/**
 		 * The message to send.
@@ -70,17 +83,22 @@ public class ErrorAction extends CommonBase {
 		private SendErrorMessage(long ptr, bindings.LDKErrorAction.SendErrorMessage obj) {
 			super(null, ptr);
 			long msg = obj.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); }
 			msg_hu_conv.ptrs_to.add(this);
 			this.msg = msg_hu_conv;
 		}
 	}
+	long clone_ptr() {
+		long ret = bindings.ErrorAction_clone_ptr(this.ptr);
+		return ret;
+	}
+
 	/**
 	 * Creates a copy of the ErrorAction
 	 */
 	public ErrorAction clone() {
 		long ret = bindings.ErrorAction_clone(this.ptr);
-		if (ret < 1024) { return null; }
+		if (ret >= 0 && ret <= 4096) { return null; }
 		ErrorAction ret_hu_conv = ErrorAction.constr_from_ptr(ret);
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
@@ -91,10 +109,9 @@ public class ErrorAction extends CommonBase {
 	 */
 	public static ErrorAction disconnect_peer(ErrorMessage msg) {
 		long ret = bindings.ErrorAction_disconnect_peer(msg == null ? 0 : msg.ptr & ~1);
-		if (ret < 1024) { return null; }
+		if (ret >= 0 && ret <= 4096) { return null; }
 		ErrorAction ret_hu_conv = ErrorAction.constr_from_ptr(ret);
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
-		ret_hu_conv.ptrs_to.add(msg);
 		return ret_hu_conv;
 	}
 
@@ -103,7 +120,7 @@ public class ErrorAction extends CommonBase {
 	 */
 	public static ErrorAction ignore_error() {
 		long ret = bindings.ErrorAction_ignore_error();
-		if (ret < 1024) { return null; }
+		if (ret >= 0 && ret <= 4096) { return null; }
 		ErrorAction ret_hu_conv = ErrorAction.constr_from_ptr(ret);
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
 		return ret_hu_conv;
@@ -114,7 +131,7 @@ public class ErrorAction extends CommonBase {
 	 */
 	public static ErrorAction ignore_and_log(org.ldk.enums.Level a) {
 		long ret = bindings.ErrorAction_ignore_and_log(a);
-		if (ret < 1024) { return null; }
+		if (ret >= 0 && ret <= 4096) { return null; }
 		ErrorAction ret_hu_conv = ErrorAction.constr_from_ptr(ret);
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
 		return ret_hu_conv;
@@ -125,10 +142,9 @@ public class ErrorAction extends CommonBase {
 	 */
 	public static ErrorAction send_error_message(ErrorMessage msg) {
 		long ret = bindings.ErrorAction_send_error_message(msg == null ? 0 : msg.ptr & ~1);
-		if (ret < 1024) { return null; }
+		if (ret >= 0 && ret <= 4096) { return null; }
 		ErrorAction ret_hu_conv = ErrorAction.constr_from_ptr(ret);
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
-		ret_hu_conv.ptrs_to.add(msg);
 		return ret_hu_conv;
 	}