update

Author: joemphilips

bindings/src/peermanager.rs

@@ -20,6 +20,31 @@ lazy_static! {
     static ref SOCKET_DESC_INDEX: AtomicUsize = AtomicUsize::new(0);
 }
 
+fn construct_socket_desc (
+    index: usize,
+    send_data_ptr: Ref<socket_descriptor_fn::SendData>,
+    disconnect_socket_ptr: Ref<socket_descriptor_fn::DisconnectSocket>,
+) -> FFISocketDescriptor {
+    let send_data_ref = unsafe_block!("" =>  send_data_ptr.as_ref());
+    let disconnect_socket_ref = unsafe_block!("" =>  disconnect_socket_ptr.as_ref());
+    let socket = FFISocketDescriptor { index, send_data_ptr: *send_data_ref, disconnect_socket_ptr: *disconnect_socket_ref };
+    socket
+}
+
+fn read_event(
+    index: usize,
+    send_data_ptr: Ref<socket_descriptor_fn::SendData>,
+    disconnect_socket_ptr: Ref<socket_descriptor_fn::DisconnectSocket>,
+    data_ptr: Ref<FFIBytes>,
+    handle: FFIArcPeerManagerHandle
+) -> FFIResult {
+    let mut socket = construct_socket_desc(index, send_data_ptr, disconnect_socket_ptr);
+    let peer_man: &FFISimpleArcPeerManager = unsafe_block!("We know handle points to valid PeerManager" => handle.as_ref());
+    let data = unsafe_block!("We know it points to valid data" => data_ptr.as_ref());
+    peer_man.read_event(&mut socket, data.as_ref());
+    FFIResult::ok()
+}
+
 ffi! {
     fn create_peer_manager(
         seed_ptr: Ref<u8>,
@@ -100,29 +125,27 @@ ffi! {
     }
 
     fn new_inbound_connection(
+        index: usize,
         send_data_ptr: Ref<socket_descriptor_fn::SendData>,
         disconnect_socket_ptr: Ref<socket_descriptor_fn::DisconnectSocket>,
         handle: FFIArcPeerManagerHandle
         ) -> FFIResult {
         let send_data_ref = unsafe_block!("" =>  send_data_ptr.as_ref());
         let disconnect_socket_ref = unsafe_block!("" =>  disconnect_socket_ptr.as_ref());
-        let index = SOCKET_DESC_INDEX.fetch_add(1, Ordering::SeqCst);
         let socket = FFISocketDescriptor { index, send_data_ptr: *send_data_ref, disconnect_socket_ptr: *disconnect_socket_ref };
         let peer_man: &FFISimpleArcPeerManager = unsafe_block!("We know handle points to valid PeerManager" => handle.as_ref());
         peer_man.new_inbound_connection(socket)?;
         FFIResult::ok()
     }
 
     fn new_outbound_connection(
+        index: usize,
         send_data_ptr: Ref<socket_descriptor_fn::SendData>,
         disconnect_socket_ptr: Ref<socket_descriptor_fn::DisconnectSocket>,
         their_node_id: Ref<PublicKey>,
         handle: FFIArcPeerManagerHandle
     ) -> FFIResult {
-        let send_data_ref = unsafe_block!("" =>  send_data_ptr.as_ref());
-        let disconnect_socket_ref = unsafe_block!("" =>  disconnect_socket_ptr.as_ref());
-        let index = SOCKET_DESC_INDEX.fetch_add(1, Ordering::SeqCst);
-        let socket = FFISocketDescriptor { index, send_data_ptr: *send_data_ref, disconnect_socket_ptr: *disconnect_socket_ref };
+        let socket = construct_socket_desc(index, send_data_ptr, disconnect_socket_ptr);
         let peer_man: &FFISimpleArcPeerManager = unsafe_block!("We know handle points to valid PeerManager" => handle.as_ref());
         let their_node_id: &PublicKey = unsafe_block!("" => their_node_id.as_ref());
         let their_node_id: secp256k1::PublicKey = their_node_id.deep_copy().try_into()?;
@@ -136,6 +159,18 @@ ffi! {
         FFIResult::ok()
     }
 
+    fn write_buffer_space_avail(
+        index: usize,
+        send_data_ptr: Ref<socket_descriptor_fn::SendData>,
+        disconnect_socket_ptr: Ref<socket_descriptor_fn::DisconnectSocket>,
+        handle: FFIArcPeerManagerHandle
+    ) -> FFIResult {
+        let mut socket = construct_socket_desc(index, send_data_ptr, disconnect_socket_ptr);
+        let peer_man: &FFISimpleArcPeerManager = unsafe_block!("We know handle points to valid PeerManager" => handle.as_ref());
+        peer_man.write_buffer_space_avail(&mut socket)?;
+        FFIResult::ok()
+    }
+
     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| {
             FFIResult::ok()