do not drop PeerManager::message_handler in PeerManager destructor

Author: joemphilips

bindings/src/adaptors/mod.rs

@@ -410,7 +410,7 @@ pub mod routing_msg_descriptor_fn {
     /// Return type is binary serialized `Vec<NodeAnnouncement>` .
     pub type GetNextNodeAnnouncements = extern "cdecl" fn (starting_point: Option<*const Bytes33>, batch_amount: u8) -> FFIBytes;
     /// Returns whether a full sync should be requested from a peer.
-    pub type ShouldRequestFullSync = extern "cdecl" fn (node_id: NonNull<Bytes33>) -> Bool;
+    pub type ShouldRequestFullSync = extern "cdecl" fn (node_id: Bytes33) -> Bool;
 }
 
 pub struct FFIRoutingMsgHandler {
@@ -437,17 +437,7 @@ impl Writer for VecWriter {
 
 impl RoutingMessageHandler for FFIRoutingMsgHandler {
     fn handle_node_announcement(&self, msg: &NodeAnnouncement) -> Result<bool, LightningError> {
-        let mut w = VecWriter(Vec::new());
-        msg.write(&mut w);
-        let bytes = FFIBytes::from(w.0.into_boxed_slice());
-        let e = std::ptr::null_mut();
-        let is_success = (self.handle_node_announcement_ptr)(&bytes as *const _, e);
-        if e.is_null() {
-            Ok(is_success.to_bool())
-        } else {
-            let e = unsafe_block!("we know the error is not a null pointer" => (*e).clone());
-            Err(e.into())
-        }
+        unimplemented!()
     }
 
     fn handle_channel_announcement(&self, msg: &ChannelAnnouncement) -> Result<bool, LightningError> {

bindings/src/peermanager.rs

@@ -188,8 +188,9 @@ ffi! {
 
     fn release_peer_manager(handle: FFIArcPeerManagerHandle) -> FFIResult {
         unsafe_block!("The upstream caller guarantees the handle will not be accessed after being freed" => FFIArcPeerManagerHandle::dealloc(handle, |mut handle| {
+            // dropping message handler is not or job.
+            std::mem::forget(handle.message_handler);
             FFIResult::ok()
         }))
     }
-
 }

lightning/src/ln/peer_handler.rs

@@ -190,7 +190,8 @@ pub type SimpleRefPeerManager<'a, 'b, 'c, 'd, 'e, SD, M, T, F, L> = PeerManager<
 /// SimpleArcPeerManager when you require a PeerManager with a static lifetime, such as when
 /// you're using lightning-net-tokio.
 pub struct PeerManager<Descriptor: SocketDescriptor, CM: Deref, L: Deref> where CM::Target: msgs::ChannelMessageHandler, L::Target: Logger {
-	message_handler: MessageHandler<CM>,
+	/// Message handler
+	pub message_handler: MessageHandler<CM>,
 	peers: Mutex<PeerHolder<Descriptor>>,
 	our_node_secret: SecretKey,
 	ephemeral_key_midstate: Sha256Engine,