X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FPeerManager.java;h=7038d5b84c998cd9d33a10d118822baa00d2be53;hb=f3e670e9341decac613d33fc52febf19cea32f20;hp=f5f40db8d7db6a2ff0946e39b0c8f8fccf5e220a;hpb=a7653cf8717b1f9df4d3f4c4bd0b1f50f3bbc230;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/PeerManager.java b/src/main/java/org/ldk/structs/PeerManager.java
index f5f40db8..7038d5b8 100644
--- a/src/main/java/org/ldk/structs/PeerManager.java
+++ b/src/main/java/org/ldk/structs/PeerManager.java
@@ -43,9 +43,9 @@ public class PeerManager extends CommonBase {
 	 * cryptographically secure random bytes.
 	 */
 	public static PeerManager of(ChannelMessageHandler message_handler_chan_handler_arg, RoutingMessageHandler message_handler_route_handler_arg, byte[] our_node_secret, byte[] ephemeral_random_data, Logger logger, CustomMessageHandler custom_message_handler) {
-		long ret = bindings.PeerManager_new(bindings.MessageHandler_new(message_handler_chan_handler_arg == null ? 0 : message_handler_chan_handler_arg.ptr, message_handler_route_handler_arg == null ? 0 : message_handler_route_handler_arg.ptr), our_node_secret, ephemeral_random_data, logger == null ? 0 : logger.ptr, custom_message_handler == null ? 0 : custom_message_handler.ptr);
-		if (ret < 1024) { return null; }
-		PeerManager ret_hu_conv = new PeerManager(null, ret);
+		long ret = bindings.PeerManager_new(bindings.MessageHandler_new(message_handler_chan_handler_arg == null ? 0 : message_handler_chan_handler_arg.ptr, message_handler_route_handler_arg == null ? 0 : message_handler_route_handler_arg.ptr), InternalUtils.check_arr_len(our_node_secret, 32), InternalUtils.check_arr_len(ephemeral_random_data, 32), logger == null ? 0 : logger.ptr, custom_message_handler == null ? 0 : custom_message_handler.ptr);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		PeerManager ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new PeerManager(null, ret); }
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
 		ret_hu_conv.ptrs_to.add(message_handler_chan_handler_arg);
 		ret_hu_conv.ptrs_to.add(message_handler_route_handler_arg);
@@ -79,8 +79,8 @@ public class PeerManager extends CommonBase {
 	 * [`socket_disconnected()`]: PeerManager::socket_disconnected
 	 */
 	public Result_CVec_u8ZPeerHandleErrorZ new_outbound_connection(byte[] their_node_id, SocketDescriptor descriptor) {
-		long ret = bindings.PeerManager_new_outbound_connection(this.ptr, their_node_id, descriptor == null ? 0 : descriptor.ptr);
-		if (ret < 1024) { return null; }
+		long ret = bindings.PeerManager_new_outbound_connection(this.ptr, InternalUtils.check_arr_len(their_node_id, 33), descriptor == null ? 0 : descriptor.ptr);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_CVec_u8ZPeerHandleErrorZ ret_hu_conv = Result_CVec_u8ZPeerHandleErrorZ.constr_from_ptr(ret);
 		this.ptrs_to.add(descriptor);
 		return ret_hu_conv;
@@ -101,7 +101,7 @@ public class PeerManager extends CommonBase {
 	 */
 	public Result_NonePeerHandleErrorZ new_inbound_connection(SocketDescriptor descriptor) {
 		long ret = bindings.PeerManager_new_inbound_connection(this.ptr, descriptor == null ? 0 : descriptor.ptr);
-		if (ret < 1024) { return null; }
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NonePeerHandleErrorZ ret_hu_conv = Result_NonePeerHandleErrorZ.constr_from_ptr(ret);
 		this.ptrs_to.add(descriptor);
 		return ret_hu_conv;
@@ -123,9 +123,8 @@ public class PeerManager extends CommonBase {
 	 */
 	public Result_NonePeerHandleErrorZ write_buffer_space_avail(SocketDescriptor descriptor) {
 		long ret = bindings.PeerManager_write_buffer_space_avail(this.ptr, descriptor == null ? 0 : descriptor.ptr);
-		if (ret < 1024) { return null; }
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NonePeerHandleErrorZ ret_hu_conv = Result_NonePeerHandleErrorZ.constr_from_ptr(ret);
-		this.ptrs_to.add(descriptor);
 		return ret_hu_conv;
 	}
 
@@ -147,9 +146,8 @@ public class PeerManager extends CommonBase {
 	 */
 	public Result_boolPeerHandleErrorZ read_event(SocketDescriptor peer_descriptor, byte[] data) {
 		long ret = bindings.PeerManager_read_event(this.ptr, peer_descriptor == null ? 0 : peer_descriptor.ptr, data);
-		if (ret < 1024) { return null; }
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_boolPeerHandleErrorZ ret_hu_conv = Result_boolPeerHandleErrorZ.constr_from_ptr(ret);
-		this.ptrs_to.add(peer_descriptor);
 		return ret_hu_conv;
 	}
 
@@ -177,7 +175,6 @@ public class PeerManager extends CommonBase {
 	 */
 	public void socket_disconnected(SocketDescriptor descriptor) {
 		bindings.PeerManager_socket_disconnected(this.ptr, descriptor == null ? 0 : descriptor.ptr);
-		this.ptrs_to.add(descriptor);
 	}
 
 	/**
@@ -192,7 +189,16 @@ public class PeerManager extends CommonBase {
 	 * [`disconnect_socket`]: SocketDescriptor::disconnect_socket
 	 */
 	public void disconnect_by_node_id(byte[] node_id, boolean no_connection_possible) {
-		bindings.PeerManager_disconnect_by_node_id(this.ptr, node_id, no_connection_possible);
+		bindings.PeerManager_disconnect_by_node_id(this.ptr, InternalUtils.check_arr_len(node_id, 33), no_connection_possible);
+	}
+
+	/**
+	 * Disconnects all currently-connected peers. This is useful on platforms where there may be
+	 * an indication that TCP sockets have stalled even if we weren't around to time them out
+	 * using regular ping/pongs.
+	 */
+	public void disconnect_all_peers() {
+		bindings.PeerManager_disconnect_all_peers(this.ptr);
 	}
 
 	/**