From 557de415d7f23e8a76147605f852214c99b4b216 Mon Sep 17 00:00:00 2001
From: Will Greenberg <willg@eff.org>
Date: Wed, 13 Dec 2023 16:51:21 -0800
Subject: [PATCH] More reorganization, renamed to Wave Hunter

---
 Cargo.lock                                    | 30 +++++++++----------
 Cargo.toml                                    | 14 +++++++--
 README.md                                     | 26 ++++++++++++++++
 src/{main.rs => bin/wavehunter.rs}            | 13 ++------
 .../wavehunter_reader.rs}                     | 14 +++------
 src/diag.rs                                   |  7 -----
 src/lib.rs                                    |  6 ++++
 7 files changed, 65 insertions(+), 45 deletions(-)
 rename src/{main.rs => bin/wavehunter.rs} (67%)
 rename src/{debug_reader.rs => bin/wavehunter_reader.rs} (67%)
 create mode 100644 src/lib.rs

diff --git a/Cargo.lock b/Cargo.lock
index 0077895..b720e2e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -197,21 +197,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "diag"
-version = "0.1.0"
-dependencies = [
- "bytes",
- "chrono",
- "crc",
- "deku",
- "env_logger",
- "libc",
- "log",
- "pcap-file",
- "thiserror",
-]
-
 [[package]]
 name = "env_logger"
 version = "0.10.1"
@@ -596,6 +581,21 @@ version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f"
 
+[[package]]
+name = "wavehunter"
+version = "0.1.0"
+dependencies = [
+ "bytes",
+ "chrono",
+ "crc",
+ "deku",
+ "env_logger",
+ "libc",
+ "log",
+ "pcap-file",
+ "thiserror",
+]
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
diff --git a/Cargo.toml b/Cargo.toml
index fccbdd4..10c1465 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,13 +1,21 @@
 [package]
-name = "diag"
+name = "wavehunter"
 version = "0.1.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[lib]
+name = "wavehunter"
+path = "src/lib.rs"
+
 [[bin]]
-name = "debug_reader"
-path = "src/debug_reader.rs"
+name = "wavehunter-reader"
+path = "src/bin/wavehunter_reader.rs"
+
+[[bin]]
+name = "wavehunter"
+path = "src/bin/wavehunter.rs"
 
 [dependencies]
 bytes = "1.5.0"
diff --git a/README.md b/README.md
index 26a8172..d10ff20 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,27 @@
+# Wave Hunter
+
+```
+@@@  @@@  @@@  @@@@@@  @@@  @@@ @@@@@@@@    @@@  @@@ @@@  @@@ @@@  @@@ @@@@@@@ @@@@@@@@ @@@@@@@  
+@@!  @@!  @@! @@!  @@@ @@!  @@@ @@!         @@!  @@@ @@!  @@@ @@!@!@@@   @!!   @@!      @@!  @@@ 
+@!!  !!@  @!@ @!@!@!@! @!@  !@! @!!!:!      @!@!@!@! @!@  !@! @!@@!!@!   @!!   @!!!:!   @!@!!@!  
+ !:  !!:  !!  !!:  !!!  !: .:!  !!:         !!:  !!! !!:  !!! !!:  !!!   !!:   !!:      !!: :!!  
+  ::.:  :::    :   : :    ::    : :: ::      :   : :  :.:: :  ::    :     :    : :: ::   :   : : 
+                                                                                                 
+_      _      _      _      _      _      _      _
+)`'-.,_)`'-.,_)`'-.,_)`'-.,_)`'-.,_)`'-.,_)`'-.,_)`'-.,_
+
+                O          .
+             O            ' '
+               o         '   .
+             o         .'
+          __________.-'       '...___
+       .-'                      ###  '''...__
+      /   a###                 ##            ''--.._ ______
+      '.                      #     ########        '   .-'
+        '-._          ..**********####  ___...---'''\   '
+            '-._     __________...---'''             \   l
+                \   |                         apc     '._|
+                 \__;
+```
+
 diag helper binary for the Orbic mobile hotspot. Based on code from [QCSuper](https://github.com/P1sec/QCSuper)
diff --git a/src/main.rs b/src/bin/wavehunter.rs
similarity index 67%
rename from src/main.rs
rename to src/bin/wavehunter.rs
index 9ed718f..c0e8b66 100644
--- a/src/main.rs
+++ b/src/bin/wavehunter.rs
@@ -1,14 +1,7 @@
-mod hdlc;
-mod diag;
-mod diag_device;
-mod diag_reader;
-mod debug_file;
-mod log_codes;
+use wavehunter::diag_device::{DiagDevice, DiagResult};
+use wavehunter::diag_reader::DiagReader;
 
-use crate::diag_device::DiagDevice;
-use crate::diag_reader::DiagReader;
-
-fn main() -> diag_device::DiagResult<()> {
+fn main() -> DiagResult<()> {
     // this should eventually be removed for prod
     env_logger::init();
 
diff --git a/src/debug_reader.rs b/src/bin/wavehunter_reader.rs
similarity index 67%
rename from src/debug_reader.rs
rename to src/bin/wavehunter_reader.rs
index ad64432..cbb99c1 100644
--- a/src/debug_reader.rs
+++ b/src/bin/wavehunter_reader.rs
@@ -1,14 +1,8 @@
-mod hdlc;
-mod diag;
-mod diag_device;
-mod diag_reader;
-mod debug_file;
-mod log_codes;
+use wavehunter::debug_file::DebugFileReader;
+use wavehunter::diag_reader::DiagReader;
+use wavehunter::diag_device::DiagResult;
 
-use crate::debug_file::DebugFileReader;
-use crate::diag_reader::DiagReader;
-
-fn main() -> diag_device::DiagResult<()> {
+fn main() -> DiagResult<()> {
     // this should eventually be removed for prod
     env_logger::init();
     let args: Vec<String> = std::env::args().collect();
diff --git a/src/diag.rs b/src/diag.rs
index 4eb19c3..fd8136b 100644
--- a/src/diag.rs
+++ b/src/diag.rs
@@ -391,11 +391,4 @@ mod test {
             },
         });
     }
-
-    #[test]
-    fn test_fuck() {
-        env_logger::init();
-        let data = vec![32, 0, 0, 0, 1, 0, 0, 0, 122, 1, 0, 0, 16, 0, 38, 0, 38, 0, 192, 176, 153, 128, 249, 211, 218, 62, 2, 1, 20, 14, 48, 0, 160, 0, 14, 6, 1, 0, 217, 39, 5, 0, 0, 0, 0, 7, 0, 64, 2, 14, 213, 72, 153, 192, 168, 216, 126];
-        dbg!(MessagesContainer::from_bytes((&data, 0)).unwrap());
-    }
 }
diff --git a/src/lib.rs b/src/lib.rs
new file mode 100644
index 0000000..e288db4
--- /dev/null
+++ b/src/lib.rs
@@ -0,0 +1,6 @@
+pub mod hdlc;
+pub mod diag;
+pub mod diag_device;
+pub mod diag_reader;
+pub mod debug_file;
+pub mod log_codes;