X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=c_sharp%2Fsrc%2Forg%2Fldk%2Fstructs%2FCustomMessageReader.cs;h=fad16dbe0b402216280c477adf9276b6fa12cc6f;hb=8de7213fbf663ff60322896282dad51e8ab2f001;hp=0b230d54b8261427a41499dc12f0df959d713c59;hpb=afc50e5d491a11364849383b75a8f939df703bac;p=ldk-java

diff --git a/c_sharp/src/org/ldk/structs/CustomMessageReader.cs b/c_sharp/src/org/ldk/structs/CustomMessageReader.cs
index 0b230d54..fad16dbe 100644
--- a/c_sharp/src/org/ldk/structs/CustomMessageReader.cs
+++ b/c_sharp/src/org/ldk/structs/CustomMessageReader.cs
@@ -1,3 +1,4 @@
+
 using org.ldk.impl;
 using org.ldk.enums;
 using org.ldk.util;
@@ -5,47 +6,57 @@ using System;
 
 namespace org { namespace ldk { namespace structs {
 
+
+
+/** An implementation of CustomMessageReader */
+public interface CustomMessageReaderInterface {
+	/**Decodes a custom message to `CustomMessageType`. If the given message type is known to the
+	 * implementation and the message could be decoded, must return `Ok(Some(message))`. If the
+	 * message type is unknown to the implementation, must return `Ok(None)`. If a decoding error
+	 * occur, must return `Err(DecodeError::X)` where `X` details the encountered error.
+	 */
+	Result_COption_TypeZDecodeErrorZ read(short message_type, byte[] buffer);
+}
+
 /**
  * Trait to be implemented by custom message (unrelated to the channel/gossip LN layers)
  * decoders.
  */
 public class CustomMessageReader : CommonBase {
-	internal readonly bindings.LDKCustomMessageReader bindings_instance;
+	internal bindings.LDKCustomMessageReader bindings_instance;
+	internal long instance_idx;
+
 	internal CustomMessageReader(object _dummy, long ptr) : base(ptr) { bindings_instance = null; }
-	private CustomMessageReader(bindings.LDKCustomMessageReader arg) : base(bindings.LDKCustomMessageReader_new(arg)) {
-		this.ptrs_to.AddLast(arg);
-		this.bindings_instance = arg;
-	}
 	~CustomMessageReader() {
 		if (ptr != 0) { bindings.CustomMessageReader_free(ptr); }
 	}
 
-	public interface CustomMessageReaderInterface {
-		/**
-		 * Decodes a custom message to `CustomMessageType`. If the given message type is known to the
-		 * implementation and the message could be decoded, must return `Ok(Some(message))`. If the
-		 * message type is unknown to the implementation, must return `Ok(None)`. If a decoding error
-		 * occur, must return `Err(DecodeError::X)` where `X` details the encountered error.
-		 */
-		Result_COption_TypeZDecodeErrorZ read(short _message_type, byte[] _buffer);
-	}
 	private class LDKCustomMessageReaderHolder { internal CustomMessageReader held; }
 	private class LDKCustomMessageReaderImpl : bindings.LDKCustomMessageReader {
 		internal LDKCustomMessageReaderImpl(CustomMessageReaderInterface arg, LDKCustomMessageReaderHolder impl_holder) { this.arg = arg; this.impl_holder = impl_holder; }
 		private CustomMessageReaderInterface arg;
 		private LDKCustomMessageReaderHolder impl_holder;
-		public long read(short _message_type, byte[] _buffer) {
-			Result_COption_TypeZDecodeErrorZ ret = arg.read(_message_type, _buffer);
+		public long read(short _message_type, long _buffer) {
+			byte[] _buffer_conv = InternalUtils.decodeUint8Array(_buffer);
+			Result_COption_TypeZDecodeErrorZ ret = arg.read(_message_type, _buffer_conv);
 				GC.KeepAlive(arg);
 			long result = ret == null ? 0 : ret.clone_ptr();
 			return result;
 		}
 	}
+
+	/** Creates a new instance of CustomMessageReader from a given implementation */
 	public static CustomMessageReader new_impl(CustomMessageReaderInterface arg) {
 		LDKCustomMessageReaderHolder impl_holder = new LDKCustomMessageReaderHolder();
-		impl_holder.held = new CustomMessageReader(new LDKCustomMessageReaderImpl(arg, impl_holder));
+		LDKCustomMessageReaderImpl impl = new LDKCustomMessageReaderImpl(arg, impl_holder);
+		long[] ptr_idx = bindings.LDKCustomMessageReader_new(impl);
+
+		impl_holder.held = new CustomMessageReader(null, ptr_idx[0]);
+		impl_holder.held.instance_idx = ptr_idx[1];
+		impl_holder.held.bindings_instance = impl;
 		return impl_holder.held;
 	}
+
 	/**
 	 * Decodes a custom message to `CustomMessageType`. If the given message type is known to the
 	 * implementation and the message could be decoded, must return `Ok(Some(message))`. If the
@@ -53,7 +64,7 @@ public class CustomMessageReader : CommonBase {
 	 * occur, must return `Err(DecodeError::X)` where `X` details the encountered error.
 	 */
 	public Result_COption_TypeZDecodeErrorZ read(short message_type, byte[] buffer) {
-		long ret = bindings.CustomMessageReader_read(this.ptr, message_type, buffer);
+		long ret = bindings.CustomMessageReader_read(this.ptr, message_type, InternalUtils.encodeUint8Array(buffer));
 		GC.KeepAlive(this);
 		GC.KeepAlive(message_type);
 		GC.KeepAlive(buffer);