X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FErrorAction.java;h=fbbc23840358e0fefba364a434e7bc256399934d;hb=ffdd56c967087cba7548599934585b8a9a3102e2;hp=b7e592dd9d630c6628a6ab1e19f50b900f906e1c;hpb=d2925e24ac4643ec22eb73495f0424e27def2545;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ErrorAction.java b/src/main/java/org/ldk/structs/ErrorAction.java
index b7e592dd..fbbc2384 100644
--- a/src/main/java/org/ldk/structs/ErrorAction.java
+++ b/src/main/java/org/ldk/structs/ErrorAction.java
@@ -9,7 +9,7 @@ import javax.annotation.Nullable;
 
 
 /**
- * Used to put an error message in a LightningError
+ * Used to put an error message in a [`LightningError`].
  */
 @SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class ErrorAction extends CommonBase {
@@ -24,6 +24,9 @@ public class ErrorAction extends CommonBase {
 		if (raw_val.getClass() == bindings.LDKErrorAction.DisconnectPeer.class) {
 			return new DisconnectPeer(ptr, (bindings.LDKErrorAction.DisconnectPeer)raw_val);
 		}
+		if (raw_val.getClass() == bindings.LDKErrorAction.DisconnectPeerWithWarning.class) {
+			return new DisconnectPeerWithWarning(ptr, (bindings.LDKErrorAction.DisconnectPeerWithWarning)raw_val);
+		}
 		if (raw_val.getClass() == bindings.LDKErrorAction.IgnoreError.class) {
 			return new IgnoreError(ptr, (bindings.LDKErrorAction.IgnoreError)raw_val);
 		}
@@ -36,6 +39,9 @@ public class ErrorAction extends CommonBase {
 		if (raw_val.getClass() == bindings.LDKErrorAction.SendErrorMessage.class) {
 			return new SendErrorMessage(ptr, (bindings.LDKErrorAction.SendErrorMessage)raw_val);
 		}
+		if (raw_val.getClass() == bindings.LDKErrorAction.SendWarningMessage.class) {
+			return new SendWarningMessage(ptr, (bindings.LDKErrorAction.SendWarningMessage)raw_val);
+		}
 		assert false; return null; // Unreachable without extending the (internal) bindings interface
 	}
 
@@ -48,12 +54,28 @@ public class ErrorAction extends CommonBase {
 		 * 
 		 * Note that this (or a relevant inner pointer) may be NULL or all-0s to represent None
 		*/
-		@Nullable public final ErrorMessage msg;
+		@Nullable public final org.ldk.structs.ErrorMessage msg;
 		private DisconnectPeer(long ptr, bindings.LDKErrorAction.DisconnectPeer obj) {
 			super(null, ptr);
 			long msg = obj.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);
+			org.ldk.structs.ErrorMessage msg_hu_conv = null; if (msg < 0 || msg > 4096) { msg_hu_conv = new org.ldk.structs.ErrorMessage(null, msg); }
+			if (msg_hu_conv != null) { msg_hu_conv.ptrs_to.add(this); };
+			this.msg = msg_hu_conv;
+		}
+	}
+	/**
+	 * The peer did something incorrect. Tell them without closing any channels and disconnect them.
+	 */
+	public final static class DisconnectPeerWithWarning extends ErrorAction {
+		/**
+		 * A warning message which we should make an effort to send before we disconnect.
+		*/
+		public final org.ldk.structs.WarningMessage msg;
+		private DisconnectPeerWithWarning(long ptr, bindings.LDKErrorAction.DisconnectPeerWithWarning obj) {
+			super(null, ptr);
+			long msg = obj.msg;
+			org.ldk.structs.WarningMessage msg_hu_conv = null; if (msg < 0 || msg > 4096) { msg_hu_conv = new org.ldk.structs.WarningMessage(null, msg); }
+			if (msg_hu_conv != null) { msg_hu_conv.ptrs_to.add(this); };
 			this.msg = msg_hu_conv;
 		}
 	}
@@ -70,7 +92,7 @@ public class ErrorAction extends CommonBase {
 	 * If the error is logged, log it at the given level.
 	 */
 	public final static class IgnoreAndLog extends ErrorAction {
-		public final Level ignore_and_log;
+		public final org.ldk.enums.Level ignore_and_log;
 		private IgnoreAndLog(long ptr, bindings.LDKErrorAction.IgnoreAndLog obj) {
 			super(null, ptr);
 			this.ignore_and_log = obj.ignore_and_log;
@@ -93,13 +115,36 @@ public class ErrorAction extends CommonBase {
 		/**
 		 * The message to send.
 		*/
-		public final ErrorMessage msg;
+		public final org.ldk.structs.ErrorMessage msg;
 		private SendErrorMessage(long ptr, bindings.LDKErrorAction.SendErrorMessage obj) {
 			super(null, ptr);
 			long msg = obj.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);
+			org.ldk.structs.ErrorMessage msg_hu_conv = null; if (msg < 0 || msg > 4096) { msg_hu_conv = new org.ldk.structs.ErrorMessage(null, msg); }
+			if (msg_hu_conv != null) { msg_hu_conv.ptrs_to.add(this); };
+			this.msg = msg_hu_conv;
+		}
+	}
+	/**
+	 * The peer did something incorrect. Tell them without closing any channels.
+	 */
+	public final static class SendWarningMessage extends ErrorAction {
+		/**
+		 * The message to send.
+		*/
+		public final org.ldk.structs.WarningMessage msg;
+		/**
+		 * The peer may have done something harmless that we weren't able to meaningfully process,
+		 * though we should still tell them about it.
+		 * If this event is logged, log it at the given level.
+		*/
+		public final org.ldk.enums.Level log_level;
+		private SendWarningMessage(long ptr, bindings.LDKErrorAction.SendWarningMessage obj) {
+			super(null, ptr);
+			long msg = obj.msg;
+			org.ldk.structs.WarningMessage msg_hu_conv = null; if (msg < 0 || msg > 4096) { msg_hu_conv = new org.ldk.structs.WarningMessage(null, msg); }
+			if (msg_hu_conv != null) { msg_hu_conv.ptrs_to.add(this); };
 			this.msg = msg_hu_conv;
+			this.log_level = obj.log_level;
 		}
 	}
 	long clone_ptr() {
@@ -115,20 +160,34 @@ public class ErrorAction extends CommonBase {
 		long ret = bindings.ErrorAction_clone(this.ptr);
 		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		ErrorAction ret_hu_conv = ErrorAction.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(this);
+		org.ldk.structs.ErrorAction ret_hu_conv = org.ldk.structs.ErrorAction.constr_from_ptr(ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
 	/**
 	 * Utility method to constructs a new DisconnectPeer-variant ErrorAction
 	 */
-	public static ErrorAction disconnect_peer(ErrorMessage msg) {
-		long ret = bindings.ErrorAction_disconnect_peer(msg == null ? 0 : msg.ptr & ~1);
+	public static ErrorAction disconnect_peer(org.ldk.structs.ErrorMessage msg) {
+		long ret = bindings.ErrorAction_disconnect_peer(msg.ptr);
 		Reference.reachabilityFence(msg);
 		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);
+		org.ldk.structs.ErrorAction ret_hu_conv = org.ldk.structs.ErrorAction.constr_from_ptr(ret);
+		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(msg); };
+		return ret_hu_conv;
+	}
+
+	/**
+	 * Utility method to constructs a new DisconnectPeerWithWarning-variant ErrorAction
+	 */
+	public static ErrorAction disconnect_peer_with_warning(org.ldk.structs.WarningMessage msg) {
+		long ret = bindings.ErrorAction_disconnect_peer_with_warning(msg.ptr);
+		Reference.reachabilityFence(msg);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.ErrorAction ret_hu_conv = org.ldk.structs.ErrorAction.constr_from_ptr(ret);
+		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(msg); };
 		return ret_hu_conv;
 	}
 
@@ -138,8 +197,8 @@ public class ErrorAction extends CommonBase {
 	public static ErrorAction ignore_error() {
 		long ret = bindings.ErrorAction_ignore_error();
 		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);
+		org.ldk.structs.ErrorAction ret_hu_conv = org.ldk.structs.ErrorAction.constr_from_ptr(ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 
@@ -150,8 +209,8 @@ public class ErrorAction extends CommonBase {
 		long ret = bindings.ErrorAction_ignore_and_log(a);
 		Reference.reachabilityFence(a);
 		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);
+		org.ldk.structs.ErrorAction ret_hu_conv = org.ldk.structs.ErrorAction.constr_from_ptr(ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 
@@ -161,21 +220,48 @@ public class ErrorAction extends CommonBase {
 	public static ErrorAction ignore_duplicate_gossip() {
 		long ret = bindings.ErrorAction_ignore_duplicate_gossip();
 		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);
+		org.ldk.structs.ErrorAction ret_hu_conv = org.ldk.structs.ErrorAction.constr_from_ptr(ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 
 	/**
 	 * Utility method to constructs a new SendErrorMessage-variant ErrorAction
 	 */
-	public static ErrorAction send_error_message(ErrorMessage msg) {
-		long ret = bindings.ErrorAction_send_error_message(msg == null ? 0 : msg.ptr & ~1);
+	public static ErrorAction send_error_message(org.ldk.structs.ErrorMessage msg) {
+		long ret = bindings.ErrorAction_send_error_message(msg.ptr);
+		Reference.reachabilityFence(msg);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.ErrorAction ret_hu_conv = org.ldk.structs.ErrorAction.constr_from_ptr(ret);
+		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(msg); };
+		return ret_hu_conv;
+	}
+
+	/**
+	 * Utility method to constructs a new SendWarningMessage-variant ErrorAction
+	 */
+	public static ErrorAction send_warning_message(org.ldk.structs.WarningMessage msg, org.ldk.enums.Level log_level) {
+		long ret = bindings.ErrorAction_send_warning_message(msg.ptr, log_level);
 		Reference.reachabilityFence(msg);
+		Reference.reachabilityFence(log_level);
 		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);
+		org.ldk.structs.ErrorAction ret_hu_conv = org.ldk.structs.ErrorAction.constr_from_ptr(ret);
+		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(msg); };
 		return ret_hu_conv;
 	}
 
+	/**
+	 * Generates a non-cryptographic 64-bit hash of the ErrorAction.
+	 */
+	public long hash() {
+		long ret = bindings.ErrorAction_hash(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
+	@Override public int hashCode() {
+		return (int)this.hash();
+	}
 }