Remove unused test code.

- make naming consistent with the kernel module.
- better distribution of functionality from src/wireguard.rs
- more consistent "import pattern" throughout the project.
- remove unused test code.

1 files changed, 6 insertions, 4 deletions

diff --git a/src/configuration/config.rs b/src/configuration/config.rs
index 94b79f7..ac6e9a1 100644
--- a/src/configuration/config.rs
+++ b/src/configuration/config.rs
@@ -288,13 +288,15 @@ impl<T: tun::Tun, B: udp::PlatformUDP> Configuration for WireguardConfig<T, B> {
 
     fn set_fwmark(&self, mark: Option<u32>) -> Result<(), ConfigError> {
         log::trace!("Config, Set fwmark: {:?}", mark);
-
         match self.lock().bind.as_mut() {
             Some(bind) => {
-                bind.set_fwmark(mark).unwrap(); // TODO: handle
-                Ok(())
+                if bind.set_fwmark(mark).is_err() {
+                    Err(ConfigError::IOError)
+                } else {
+                    Ok(())
+                }
             }
-            None => Err(ConfigError::NotListening),
+            None => Ok(()),
         }
     }