From 41674f58f1b7232d3a0dc491a7f788d4eee619a9 Mon Sep 17 00:00:00 2001
From: Daniel Heule <daniel.heule@gmail.com>
Date: Tue, 23 Dec 2025 11:11:26 +0100
Subject: [PATCH] restructure code from lib to mod

---
 src/main.rs                     |  7 ++++---
 src/{ => rsnmplib}/bonding.rs   |  0
 src/{ => rsnmplib}/config.rs    |  0
 src/{ => rsnmplib}/filesum.rs   |  0
 src/{ => rsnmplib}/helper.rs    |  0
 src/{lib.rs => rsnmplib/mod.rs} | 14 +++++++-------
 src/{ => rsnmplib}/multipath.rs |  0
 src/{ => rsnmplib}/processes.rs |  0
 src/{ => rsnmplib}/snmp.rs      |  7 ++++---
 9 files changed, 15 insertions(+), 13 deletions(-)
 rename src/{ => rsnmplib}/bonding.rs (100%)
 rename src/{ => rsnmplib}/config.rs (100%)
 rename src/{ => rsnmplib}/filesum.rs (100%)
 rename src/{ => rsnmplib}/helper.rs (100%)
 rename src/{lib.rs => rsnmplib/mod.rs} (99%)
 rename src/{ => rsnmplib}/multipath.rs (100%)
 rename src/{ => rsnmplib}/processes.rs (100%)
 rename src/{ => rsnmplib}/snmp.rs (99%)

diff --git a/src/main.rs b/src/main.rs
index 8889486..7ce363c 100644
--- a/src/main.rs
+++ b/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;
-use rsnmpagent::snmp::{Oid, OidData, SnmpCommands};
-use rsnmpagent::start_workers;
+mod rsnmplib;
+use rsnmplib::config;
+use rsnmplib::snmp::{Oid, OidData, SnmpCommands};
+use rsnmplib::start_workers;
 
 const VERSION: &str = env!("CARGO_PKG_VERSION");
 
diff --git a/src/bonding.rs b/src/rsnmplib/bonding.rs
similarity index 100%
rename from src/bonding.rs
rename to src/rsnmplib/bonding.rs
diff --git a/src/config.rs b/src/rsnmplib/config.rs
similarity index 100%
rename from src/config.rs
rename to src/rsnmplib/config.rs
diff --git a/src/filesum.rs b/src/rsnmplib/filesum.rs
similarity index 100%
rename from src/filesum.rs
rename to src/rsnmplib/filesum.rs
diff --git a/src/helper.rs b/src/rsnmplib/helper.rs
similarity index 100%
rename from src/helper.rs
rename to src/rsnmplib/helper.rs
diff --git a/src/lib.rs b/src/rsnmplib/mod.rs
similarity index 99%
rename from src/lib.rs
rename to src/rsnmplib/mod.rs
index 5e5208a..7e00e84 100644
--- a/src/lib.rs
+++ b/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 crate::config::DataFunctionsFilesum;
-use crate::filesum::filesum_filtered;
-use crate::helper::compile_re;
-use crate::multipath::multipath_status;
-use crate::processes::Ptypes;
-use crate::snmp::{Oid, OidData, SnmpData};
+use bonding::bonding_status;
+use config::DataFunctionsFilesum;
+use filesum::filesum_filtered;
+use helper::compile_re;
+use multipath::multipath_status;
+use processes::Ptypes;
+use snmp::{Oid, OidData, SnmpData};
 
 fn t_multipath(
     t_quit: Arc<(Mutex<bool>, Condvar)>,
diff --git a/src/multipath.rs b/src/rsnmplib/multipath.rs
similarity index 100%
rename from src/multipath.rs
rename to src/rsnmplib/multipath.rs
diff --git a/src/processes.rs b/src/rsnmplib/processes.rs
similarity index 100%
rename from src/processes.rs
rename to src/rsnmplib/processes.rs
diff --git a/src/snmp.rs b/src/rsnmplib/snmp.rs
similarity index 99%
rename from src/snmp.rs
rename to src/rsnmplib/snmp.rs
index 87e86ac..87a36d0 100644
--- a/src/snmp.rs
+++ b/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 {
-- 
2.52.0