X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FPeerManager.java;h=e24a5356726d526e4806d75c1165db130a68c747;hb=c6bac88847b7c09560af81f00ba8dd3c2ebe3a19;hp=c78e85e79cf0976c3fefeb19783c5b6d4057eeed;hpb=ba1af51214a8ea2de62b84cd23b6145173c71752;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/PeerManager.java b/src/main/java/org/ldk/structs/PeerManager.java
index c78e85e7..e24a5356 100644
--- a/src/main/java/org/ldk/structs/PeerManager.java
+++ b/src/main/java/org/ldk/structs/PeerManager.java
@@ -42,14 +42,15 @@ public class PeerManager extends CommonBase {
 	 * ephemeral_random_data is used to derive per-connection ephemeral keys and must be
 	 * 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) {
-		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);
-		if (ret < 1024) { return null; }
-		PeerManager ret_hu_conv = new PeerManager(null, ret);
+	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 >= 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);
 		ret_hu_conv.ptrs_to.add(logger);
+		ret_hu_conv.ptrs_to.add(custom_message_handler);
 		return ret_hu_conv;
 	}
 
@@ -79,7 +80,7 @@ public class PeerManager extends CommonBase {
 	 */
 	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; }
+		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;
@@ -100,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;
@@ -122,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;
 	}
 
@@ -146,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;
 	}
 
@@ -160,6 +159,9 @@ public class PeerManager extends CommonBase {
 	 * May call [`send_data`] on [`SocketDescriptor`]s. Thus, be very careful with reentrancy
 	 * issues!
 	 * 
+	 * You don't have to call this function explicitly if you are using [`lightning-net-tokio`]
+	 * or one of the other clients provided in our language bindings.
+	 * 
 	 * [`send_payment`]: crate::ln::channelmanager::ChannelManager::send_payment
 	 * [`ChannelManager::process_pending_htlc_forwards`]: crate::ln::channelmanager::ChannelManager::process_pending_htlc_forwards
 	 * [`send_data`]: SocketDescriptor::send_data
@@ -173,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,9 +193,21 @@ public class PeerManager extends CommonBase {
 	}
 
 	/**
-	 * This function should be called roughly once every 30 seconds.
-	 * It will send pings to each peer and disconnect those which did not respond to the last
-	 * round of pings.
+	 * 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);
+	}
+
+	/**
+	 * Send pings to each peer and disconnect those which did not respond to the last round of
+	 * pings.
+	 * 
+	 * This may be called on any timescale you want, however, roughly once every five to ten
+	 * seconds is preferred. The call rate determines both how often we send a ping to our peers
+	 * and how much time they have to respond before we disconnect them.
 	 * 
 	 * May call [`send_data`] on all [`SocketDescriptor`]s. Thus, be very careful with reentrancy
 	 * issues!