[eclipse-iceoryx#139] Fix uds does not corrupt notifier when listener goes out of scope

Author: elfenpiff

iceoryx2-bb/posix/src/unix_datagram_socket.rs

@@ -189,6 +189,7 @@ enum_gen! {
   entry:
     MessageTooLarge,
     ConnectionReset,
+    ConnectionRefused,
     Interrupt,
     IOerror,
     InsufficientPermissions,
@@ -694,6 +695,7 @@ impl UnixDatagramSender {
             handle_errno!(UnixDatagramSendError, from self,
                 success Errno::EAGAIN => false,
                 Errno::ECONNRESET => (ConnectionReset, "{} since the connection was reset by peer.", msg),
+                Errno::ECONNREFUSED => (ConnectionRefused, "{} since the connection was refused by peer.", msg),
                 Errno::EINTR => (Interrupt, "{} since an interrupt signal was received.", msg),
                 Errno::EMSGSIZE => (MessageTooLarge, "{} since the message size of {} bytes is too large to be send in one package.", msg, data.len()),
                 Errno::EIO => (IOerror, "{} since an I/O error occurred while writing to the file system.", msg),

iceoryx2-cal/src/event/mod.rs

@@ -28,6 +28,7 @@ pub use iceoryx2_bb_system_types::path::Path;
 pub enum NotifierNotifyError {
     FailedToDeliverSignal,
     TriggerIdOutOfBounds,
+    Disconnected,
     InternalFailure,
 }
 

iceoryx2-cal/src/event/unix_datagram_socket.rs

@@ -139,7 +139,13 @@ impl crate::event::Notifier for Notifier {
             Ok(true) => Ok(()),
             Ok(false) | Err(UnixDatagramSendError::MessagePartiallySend(_)) => {
                 fail!(from self, with NotifierNotifyError::FailedToDeliverSignal,
-                        "{} since the signal could not be delivered", msg);
+                        "{} since the signal could not be delivered.", msg);
+            }
+            Err(
+                UnixDatagramSendError::ConnectionReset | UnixDatagramSendError::ConnectionRefused,
+            ) => {
+                fail!(from self, with NotifierNotifyError::Disconnected,
+                        "{} since the notifier is no longer connected to the listener.", msg);
             }
             Err(v) => {
                 fail!(from self, with NotifierNotifyError::InternalFailure,

iceoryx2-cal/tests/event_tests.rs

@@ -612,6 +612,20 @@ mod event {
         });
     }
 
+    #[test]
+    fn out_of_scope_listener_shall_not_corrupt_notifier<Sut: Event>() {
+        let name = generate_name();
+
+        let sut_listener = Sut::ListenerBuilder::new(&name).create().unwrap();
+        let sut_notifier = Sut::NotifierBuilder::new(&name).open().unwrap();
+
+        drop(sut_listener);
+
+        let result = sut_notifier.notify(TriggerId::new(0));
+        assert_that!(result, is_err);
+        assert_that!(result.err().unwrap(), eq NotifierNotifyError::Disconnected);
+    }
+
     #[instantiate_tests(<iceoryx2_cal::event::unix_datagram_socket::EventImpl>)]
     mod unix_datagram {}
 

iceoryx2/tests/service_event_tests.rs

@@ -431,7 +431,6 @@ mod service_event {
     }
 
     #[test]
-    // TODO iox2-139, enable when bitset is integrated into events
     fn concurrent_reconnecting_notifier_can_trigger_waiting_listener<Sut: Service>() {
         let _watch_dog = Watchdog::new();