Merge pull request 'First working version' (#1) from testing into main

Reviewed-on: #1

src/lib.rs

@@ -16,13 +16,13 @@ pub mod helper;
 pub mod multipath;
 pub mod processes;
 pub mod snmp;
-use bonding::bonding_status;
+use crate::bonding::bonding_status;
-use config::DataFunctionsFilesum;
+use crate::config::DataFunctionsFilesum;
-use filesum::filesum_filtered;
+use crate::filesum::filesum_filtered;
-use helper::compile_re;
+use crate::helper::compile_re;
-use multipath::multipath_status;
+use crate::multipath::multipath_status;
-use processes::Ptypes;
+use crate::processes::Ptypes;
-use snmp::{Oid, OidData, SnmpData};
+use crate::snmp::{Oid, OidData, SnmpData};
 
 fn t_multipath(
     t_quit: Arc<(Mutex<bool>, Condvar)>,

src/main.rs

@@ -4,10 +4,9 @@ use std::sync::{Arc, Condvar, Mutex};
 use log::{debug, error, info, trace, warn};
 //use std::thread::{Builder, JoinHandle};
 
-mod rsnmplib;
+use rsnmpagent::config;
-use rsnmplib::config;
+use rsnmpagent::snmp::{Oid, OidData, SnmpCommands};
-use rsnmplib::snmp::{Oid, OidData, SnmpCommands};
+use rsnmpagent::start_workers;
-use rsnmplib::start_workers;
 
 const VERSION: &str = env!("CARGO_PKG_VERSION");
 

src/snmp.rs

@@ -49,11 +49,11 @@ impl Oid {
         x
     }
 
-/*     pub fn add_suffix(&self, o: &Oid) -> Oid {
+    pub fn add_suffix(&self, o: &Oid) -> Oid {
         let mut x = self.clone();
         x.0.extend(o.clone().0);
         x
-    } */
+    }
 
     pub fn add_suffix_int(&self, o: u32) -> Oid {
         let mut x = self.clone();
@@ -111,13 +111,12 @@ pub struct OidData {
 }
 
 impl OidData {
-    /*     
     pub fn new(base_oid: &str) -> Self {
         Self {
             base: base_oid.parse().expect("Unable to parse Oid"),
             data: BTreeMap::new(),
         }
-    } */
+    }
 
     pub fn new_oid(base_oid: &Oid) -> Self {
         Self {