X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FErrorMessage.java;h=84dcc822f5f622d39b40c2e6f8566b00bb307c32;hb=330ca992be304d0eac79bd59b411980dff294b03;hp=bf512b9a4924c42b1a3f5e47ec538e69fa44e1d9;hpb=17113550a5fefab21f39f27fbfe02646b8db53ae;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ErrorMessage.java b/src/main/java/org/ldk/structs/ErrorMessage.java
index bf512b9a..84dcc822 100644
--- a/src/main/java/org/ldk/structs/ErrorMessage.java
+++ b/src/main/java/org/ldk/structs/ErrorMessage.java
@@ -4,6 +4,8 @@ import org.ldk.impl.bindings;
 import org.ldk.enums.*;
 import org.ldk.util.*;
 import java.util.Arrays;
+import java.lang.ref.Reference;
+import javax.annotation.Nullable;
 
 
 /**
@@ -19,74 +21,117 @@ public class ErrorMessage extends CommonBase {
 	}
 
 	/**
-	 * The channel ID involved in the error
+	 * The channel ID involved in the error.
+	 * 
+	 * All-0s indicates a general error unrelated to a specific channel, after which all channels
+	 * with the sending peer should be closed.
 	 */
 	public byte[] get_channel_id() {
 		byte[] ret = bindings.ErrorMessage_get_channel_id(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
 	/**
-	 * The channel ID involved in the error
+	 * The channel ID involved in the error.
+	 * 
+	 * All-0s indicates a general error unrelated to a specific channel, after which all channels
+	 * with the sending peer should be closed.
 	 */
 	public void set_channel_id(byte[] val) {
-		bindings.ErrorMessage_set_channel_id(this.ptr, val);
+		bindings.ErrorMessage_set_channel_id(this.ptr, InternalUtils.check_arr_len(val, 32));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
 	 * A possibly human-readable error description.
-	 * The string should be sanitized before it is used (e.g. emitted to logs
-	 * or printed to stdout).  Otherwise, a well crafted error message may trigger a security
-	 * vulnerability in the terminal emulator or the logging subsystem.
+	 * The string should be sanitized before it is used (e.g. emitted to logs or printed to
+	 * stdout). Otherwise, a well crafted error message may trigger a security vulnerability in
+	 * the terminal emulator or the logging subsystem.
 	 */
 	public String get_data() {
 		String ret = bindings.ErrorMessage_get_data(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
 	/**
 	 * A possibly human-readable error description.
-	 * The string should be sanitized before it is used (e.g. emitted to logs
-	 * or printed to stdout).  Otherwise, a well crafted error message may trigger a security
-	 * vulnerability in the terminal emulator or the logging subsystem.
+	 * The string should be sanitized before it is used (e.g. emitted to logs or printed to
+	 * stdout). Otherwise, a well crafted error message may trigger a security vulnerability in
+	 * the terminal emulator or the logging subsystem.
 	 */
-	public void set_data(byte[] val) {
+	public void set_data(java.lang.String val) {
 		bindings.ErrorMessage_set_data(this.ptr, val);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
 	 * Constructs a new ErrorMessage given each field
 	 */
-	public static ErrorMessage constructor_new(byte[] channel_id_arg, byte[] data_arg) {
-		long ret = bindings.ErrorMessage_new(channel_id_arg, data_arg);
-		ErrorMessage ret_hu_conv = new ErrorMessage(null, ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+	public static ErrorMessage of(byte[] channel_id_arg, java.lang.String data_arg) {
+		long ret = bindings.ErrorMessage_new(InternalUtils.check_arr_len(channel_id_arg, 32), data_arg);
+		Reference.reachabilityFence(channel_id_arg);
+		Reference.reachabilityFence(data_arg);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.ErrorMessage ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ErrorMessage(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 
+	long clone_ptr() {
+		long ret = bindings.ErrorMessage_clone_ptr(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
 	/**
 	 * Creates a copy of the ErrorMessage
 	 */
 	public ErrorMessage clone() {
 		long ret = bindings.ErrorMessage_clone(this.ptr);
-		ErrorMessage ret_hu_conv = new ErrorMessage(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.ErrorMessage ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ErrorMessage(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
+	/**
+	 * Checks if two ErrorMessages contain equal inner contents.
+	 * This ignores pointers and is_owned flags and looks at the values in fields.
+	 * Two objects with NULL inner values will be considered "equal" here.
+	 */
+	public boolean eq(org.ldk.structs.ErrorMessage b) {
+		boolean ret = bindings.ErrorMessage_eq(this.ptr, b == null ? 0 : b.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(b);
+		if (this != null) { this.ptrs_to.add(b); };
+		return ret;
+	}
+
+	@Override public boolean equals(Object o) {
+		if (!(o instanceof ErrorMessage)) return false;
+		return this.eq((ErrorMessage)o);
+	}
 	/**
 	 * Serialize the ErrorMessage object into a byte array which can be read by ErrorMessage_read
 	 */
 	public byte[] write() {
 		byte[] ret = bindings.ErrorMessage_write(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
 	/**
 	 * Read a ErrorMessage from a byte array, created by ErrorMessage_write
 	 */
-	public static Result_ErrorMessageDecodeErrorZ constructor_read(byte[] ser) {
+	public static Result_ErrorMessageDecodeErrorZ read(byte[] ser) {
 		long ret = bindings.ErrorMessage_read(ser);
+		Reference.reachabilityFence(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_ErrorMessageDecodeErrorZ ret_hu_conv = Result_ErrorMessageDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}