X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FErrorAction.java;h=c13b9e519198f5066b68ddef4b855057f135b571;hb=c6bac88847b7c09560af81f00ba8dd3c2ebe3a19;hp=e5ccec8d4c8606978893365203868c49adfbadfb;hpb=371e82300e5de678404f0addc47a20636077df5d;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ErrorAction.java b/src/main/java/org/ldk/structs/ErrorAction.java
index e5ccec8d..c13b9e51 100644
--- a/src/main/java/org/ldk/structs/ErrorAction.java
+++ b/src/main/java/org/ldk/structs/ErrorAction.java
@@ -4,16 +4,20 @@ import org.ldk.impl.bindings;
 import org.ldk.enums.*;
 import org.ldk.util.*;
 import java.util.Arrays;
+import javax.annotation.Nullable;
 
+
+/**
+ * Used to put an error message in a LightningError
+ */
 @SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class ErrorAction extends CommonBase {
 	private ErrorAction(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
 		super.finalize();
-		bindings.ErrorAction_free(ptr);
+		if (ptr != 0) { bindings.ErrorAction_free(ptr); }
 	}
-	long conv_to_c() { assert false; return 0; /* Should only be called on subclasses */ }
 	static ErrorAction constr_from_ptr(long ptr) {
 		bindings.LDKErrorAction raw_val = bindings.LDKErrorAction_ref_from_ptr(ptr);
 		if (raw_val.getClass() == bindings.LDKErrorAction.DisconnectPeer.class) {
@@ -22,6 +26,9 @@ public class ErrorAction extends CommonBase {
 		if (raw_val.getClass() == bindings.LDKErrorAction.IgnoreError.class) {
 			return new IgnoreError(ptr, (bindings.LDKErrorAction.IgnoreError)raw_val);
 		}
+		if (raw_val.getClass() == bindings.LDKErrorAction.IgnoreAndLog.class) {
+			return new IgnoreAndLog(ptr, (bindings.LDKErrorAction.IgnoreAndLog)raw_val);
+		}
 		if (raw_val.getClass() == bindings.LDKErrorAction.SendErrorMessage.class) {
 			return new SendErrorMessage(ptr, (bindings.LDKErrorAction.SendErrorMessage)raw_val);
 		}
@@ -29,29 +36,98 @@ public class ErrorAction extends CommonBase {
 	}
 
 	public final static class DisconnectPeer extends ErrorAction {
-		public ErrorMessage msg;
+		/**
+		 * An error message which we should make an effort to send before we disconnect.
+		 * 
+		 * Note that this (or a relevant inner pointer) may be NULL or all-0s to represent None
+		*/
+		@Nullable public final ErrorMessage msg;
 		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;
 		}
-		@Override long conv_to_c() { return 0; /*XXX*/ }
 	}
 	public final static class IgnoreError extends ErrorAction {
 		private IgnoreError(long ptr, bindings.LDKErrorAction.IgnoreError obj) {
 			super(null, ptr);
 		}
-		@Override long conv_to_c() { return 0; /*XXX*/ }
+	}
+	public final static class IgnoreAndLog extends ErrorAction {
+		public final Level ignore_and_log;
+		private IgnoreAndLog(long ptr, bindings.LDKErrorAction.IgnoreAndLog obj) {
+			super(null, ptr);
+			this.ignore_and_log = obj.ignore_and_log;
+		}
 	}
 	public final static class SendErrorMessage extends ErrorAction {
-		public ErrorMessage msg;
+		/**
+		 * The message to send.
+		*/
+		public final ErrorMessage msg;
 		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;
 		}
-		@Override long conv_to_c() { return 0; /*XXX*/ }
 	}
+	/**
+	 * Creates a copy of the ErrorAction
+	 */
+	public ErrorAction clone() {
+		long ret = bindings.ErrorAction_clone(this.ptr);
+		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;
+	}
+
+	/**
+	 * 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);
+		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;
+	}
+
+	/**
+	 * Utility method to constructs a new IgnoreError-variant ErrorAction
+	 */
+	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);
+		return ret_hu_conv;
+	}
+
+	/**
+	 * Utility method to constructs a new IgnoreAndLog-variant ErrorAction
+	 */
+	public static ErrorAction ignore_and_log(org.ldk.enums.Level a) {
+		long ret = bindings.ErrorAction_ignore_and_log(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);
+		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);
+		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;
+	}
+
 }