Merge pull request 'restructure code from lib to mod' (#2) from testing into main

Reviewed-on: #2

src/main.rs

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

src/rsnmplib/mod.rs

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

src/rsnmplib/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,12 +111,13 @@ 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 {