Merge pull request #35 from EFForg/generic-dirs

Generic dirs
EFForg · Jan 30, 2024 · b495c5b · b495c5b
2 parents c3d9fb7 + ed9d2b4
commit b495c5b
Show file tree

Hide file tree

Showing 26 changed files with 38 additions and 36 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [workspace]
 
 members = [
-    "orca",
-    "rayhunter",
+    "lib",
+    "bin",
 ]
 resolver = "2"
diff --git a/rayhunter/Cargo.toml → bin/Cargo.toml b/rayhunter/Cargo.toml → bin/Cargo.toml
@@ -1,12 +1,14 @@
 [package]
-name = "rayhunter"
+name = "rayhunter-daemon"
 version = "0.1.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[[bin]]
+name = "rayhunter"
+path = "src/main.rs"
 
 [dependencies]
-orca = { path = "../orca" }
+rayhunter = { path = "../lib" }
 toml = "0.8.8"
 serde = { version = "1.0.193", features = ["derive"] }
 tokio = { version = "1.35.1", features = ["full"] }

diff --git a/rayhunter/src/config.rs → bin/src/config.rs b/rayhunter/src/config.rs → bin/src/config.rs
diff --git a/rayhunter/src/diag.rs → bin/src/diag.rs b/rayhunter/src/diag.rs → bin/src/diag.rs
@@ -2,11 +2,11 @@ use std::sync::Arc;
 
 use axum::extract::State;
 use axum::http::StatusCode;
-use orca::diag_device::DiagDevice;
-use orca::diag_reader::DiagReader;
+use rayhunter::diag_device::DiagDevice;
+use rayhunter::diag_reader::DiagReader;
 use tokio::sync::RwLock;
 use tokio::sync::mpsc::{Receiver, self};
-use orca::qmdl::QmdlWriter;
+use rayhunter::qmdl::QmdlWriter;
 use log::{debug, info};
 use tokio::sync::mpsc::error::TryRecvError;
 use tokio::task::JoinHandle;

diff --git a/rayhunter/src/error.rs → bin/src/error.rs b/rayhunter/src/error.rs → bin/src/error.rs
@@ -1,5 +1,5 @@
 use thiserror::Error;
-use orca::diag_device::DiagDeviceError;
+use rayhunter::diag_device::DiagDeviceError;
 
 use crate::qmdl_store::QmdlStoreError;
 

diff --git a/rayhunter/src/main.rs → bin/src/main.rs b/rayhunter/src/main.rs → bin/src/main.rs
@@ -17,10 +17,10 @@ use crate::error::RayhunterError;
 use axum::response::Redirect;
 use diag::{DiagDeviceCtrlMessage, start_recording, stop_recording};
 use log::{info, error};
-use orca::diag_device::DiagDevice;
+use rayhunter::diag_device::DiagDevice;
 use axum::routing::{get, post};
 use axum::Router;
-use orca::qmdl::QmdlWriter;
+use rayhunter::qmdl::QmdlWriter;
 use stats::get_qmdl_manifest;
 use tokio::sync::mpsc::{self, Sender};
 use tokio::task::JoinHandle;

diff --git a/rayhunter/src/pcap.rs → bin/src/pcap.rs b/rayhunter/src/pcap.rs → bin/src/pcap.rs
@@ -1,9 +1,9 @@
 use crate::ServerState;
 
-use orca::gsmtap_parser::GsmtapParser;
-use orca::pcap::GsmtapPcapWriter;
-use orca::qmdl::{QmdlReader, QmdlReaderError};
-use orca::diag_reader::DiagReader;
+use rayhunter::gsmtap_parser::GsmtapParser;
+use rayhunter::pcap::GsmtapPcapWriter;
+use rayhunter::qmdl::{QmdlReader, QmdlReaderError};
+use rayhunter::diag_reader::DiagReader;
 use axum::body::Body;
 use axum::http::header::CONTENT_TYPE;
 use axum::extract::{State, Path};

diff --git a/rayhunter/src/qmdl_store.rs → bin/src/qmdl_store.rs b/rayhunter/src/qmdl_store.rs → bin/src/qmdl_store.rs
diff --git a/rayhunter/src/server.rs → bin/src/server.rs b/rayhunter/src/server.rs → bin/src/server.rs
diff --git a/rayhunter/src/stats.rs → bin/src/stats.rs b/rayhunter/src/stats.rs → bin/src/stats.rs
diff --git a/rayhunter/static/css/style.css → bin/static/css/style.css b/rayhunter/static/css/style.css → bin/static/css/style.css
diff --git a/rayhunter/static/index.html → bin/static/index.html b/rayhunter/static/index.html → bin/static/index.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <title>ORCA</title>
+    <title>rayhunter</title>
     <link rel="stylesheet" type="text/css" href="css/style.css">
     <script src="js/main.js"></script>
     <script>

diff --git a/rayhunter/static/js/main.js → bin/static/js/main.js b/rayhunter/static/js/main.js → bin/static/js/main.js
diff --git a/orca/Cargo.toml → lib/Cargo.toml b/orca/Cargo.toml → lib/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
-name = "orca"
+name = "rayhunter"
 version = "0.1.0"
 edition = "2021"
-description = "Orbic Realtime Cellular Analysis"
+description = "Realtime cellular data decoding and analysis for IMSI catcher detection"
 
 [dependencies]
 bytes = "1.5.0"

diff --git a/orca/src/diag.rs → lib/src/diag.rs b/orca/src/diag.rs → lib/src/diag.rs
diff --git a/orca/src/diag_device.rs → lib/src/diag_device.rs b/orca/src/diag_device.rs → lib/src/diag_device.rs
diff --git a/orca/src/diag_reader.rs → lib/src/diag_reader.rs b/orca/src/diag_reader.rs → lib/src/diag_reader.rs
diff --git a/orca/src/gsmtap.rs → lib/src/gsmtap.rs b/orca/src/gsmtap.rs → lib/src/gsmtap.rs
diff --git a/orca/src/gsmtap_parser.rs → lib/src/gsmtap_parser.rs b/orca/src/gsmtap_parser.rs → lib/src/gsmtap_parser.rs
diff --git a/orca/src/hdlc.rs → lib/src/hdlc.rs b/orca/src/hdlc.rs → lib/src/hdlc.rs
diff --git a/orca/src/lib.rs → lib/src/lib.rs b/orca/src/lib.rs → lib/src/lib.rs
diff --git a/orca/src/log_codes.rs → lib/src/log_codes.rs b/orca/src/log_codes.rs → lib/src/log_codes.rs
diff --git a/orca/src/pcap.rs → lib/src/pcap.rs b/orca/src/pcap.rs → lib/src/pcap.rs
diff --git a/orca/src/qmdl.rs → lib/src/qmdl.rs b/orca/src/qmdl.rs → lib/src/qmdl.rs
diff --git a/orca/tests/test_lte_parsing.rs → lib/tests/test_lte_parsing.rs b/orca/tests/test_lte_parsing.rs → lib/tests/test_lte_parsing.rs
@@ -1,10 +1,10 @@
-use orca::diag::{
+use rayhunter::diag::{
     Message,
     LogBody,
     LteRrcOtaPacket,
     Timestamp,
 };
-use orca::gsmtap_parser::GsmtapParser;
+use rayhunter::gsmtap_parser::GsmtapParser;
 use deku::prelude::*;
 
 // Tests here are based on https://github.com/fgsect/scat/blob/97442580e628de414c9f7c2a185f4e28d0ee7523/tests/test_diagltelogparser.py