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

diff --git a/src/main/java/org/ldk/structs/ErrorAction.java b/src/main/java/org/ldk/structs/ErrorAction.java
index da9ce629..fbbc2384 100644
--- a/src/main/java/org/ldk/structs/ErrorAction.java
+++ b/src/main/java/org/ldk/structs/ErrorAction.java
@@ -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);
 		}
@@ -60,6 +63,22 @@ public class ErrorAction extends CommonBase {
 			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;
+		}
+	}
 	/**
 	 * The peer did something harmless that we weren't able to process, just log and ignore
 	 */
@@ -150,7 +169,20 @@ public class ErrorAction extends CommonBase {
 	 * Utility method to constructs a new DisconnectPeer-variant ErrorAction
 	 */
 	public static ErrorAction disconnect_peer(org.ldk.structs.ErrorMessage msg) {
-		long ret = bindings.ErrorAction_disconnect_peer(msg == null ? 0 : msg.ptr);
+		long ret = bindings.ErrorAction_disconnect_peer(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 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);
@@ -197,7 +229,7 @@ public class ErrorAction extends CommonBase {
 	 * Utility method to constructs a new SendErrorMessage-variant ErrorAction
 	 */
 	public static ErrorAction send_error_message(org.ldk.structs.ErrorMessage msg) {
-		long ret = bindings.ErrorAction_send_error_message(msg == null ? 0 : msg.ptr);
+		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);
@@ -210,7 +242,7 @@ public class ErrorAction extends CommonBase {
 	 * 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 == null ? 0 : msg.ptr, 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; }
@@ -220,4 +252,16 @@ public class ErrorAction extends CommonBase {
 		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();
+	}
 }