Renamed library crate to rayhunter, binary to rayhunter-daemon

The produced binary is still called rayhunter though!
This commit is contained in:
Will Greenberg
2024-01-30 10:07:11 -08:00
parent 87f18c0c8b
commit ed9d2b41d7
10 changed files with 38 additions and 36 deletions
Generated
+16 -16
View File
@@ -750,21 +750,6 @@ version = "1.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
[[package]]
name = "orca"
version = "0.1.0"
dependencies = [
"bytes",
"chrono",
"crc",
"deku",
"env_logger",
"libc",
"log",
"pcap-file",
"thiserror",
]
[[package]] [[package]]
name = "parking_lot" name = "parking_lot"
version = "0.12.1" version = "0.12.1"
@@ -902,6 +887,21 @@ checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
[[package]] [[package]]
name = "rayhunter" name = "rayhunter"
version = "0.1.0" version = "0.1.0"
dependencies = [
"bytes",
"chrono",
"crc",
"deku",
"env_logger",
"libc",
"log",
"pcap-file",
"thiserror",
]
[[package]]
name = "rayhunter-daemon"
version = "0.1.0"
dependencies = [ dependencies = [
"axum", "axum",
"chrono", "chrono",
@@ -911,7 +911,7 @@ dependencies = [
"include_dir", "include_dir",
"log", "log",
"mime_guess", "mime_guess",
"orca", "rayhunter",
"serde", "serde",
"tempdir", "tempdir",
"thiserror", "thiserror",
+2 -2
View File
@@ -1,7 +1,7 @@
[workspace] [workspace]
members = [ members = [
"orca", "lib",
"rayhunter", "bin",
] ]
resolver = "2" resolver = "2"
+5 -3
View File
@@ -1,12 +1,14 @@
[package] [package]
name = "rayhunter" name = "rayhunter-daemon"
version = "0.1.0" version = "0.1.0"
edition = "2021" 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] [dependencies]
orca = { path = "../orca" } rayhunter = { path = "../lib" }
toml = "0.8.8" toml = "0.8.8"
serde = { version = "1.0.193", features = ["derive"] } serde = { version = "1.0.193", features = ["derive"] }
tokio = { version = "1.35.1", features = ["full"] } tokio = { version = "1.35.1", features = ["full"] }
+3 -3
View File
@@ -2,11 +2,11 @@ use std::sync::Arc;
use axum::extract::State; use axum::extract::State;
use axum::http::StatusCode; use axum::http::StatusCode;
use orca::diag_device::DiagDevice; use rayhunter::diag_device::DiagDevice;
use orca::diag_reader::DiagReader; use rayhunter::diag_reader::DiagReader;
use tokio::sync::RwLock; use tokio::sync::RwLock;
use tokio::sync::mpsc::{Receiver, self}; use tokio::sync::mpsc::{Receiver, self};
use orca::qmdl::QmdlWriter; use rayhunter::qmdl::QmdlWriter;
use log::{debug, info}; use log::{debug, info};
use tokio::sync::mpsc::error::TryRecvError; use tokio::sync::mpsc::error::TryRecvError;
use tokio::task::JoinHandle; use tokio::task::JoinHandle;
+1 -1
View File
@@ -1,5 +1,5 @@
use thiserror::Error; use thiserror::Error;
use orca::diag_device::DiagDeviceError; use rayhunter::diag_device::DiagDeviceError;
use crate::qmdl_store::QmdlStoreError; use crate::qmdl_store::QmdlStoreError;
+2 -2
View File
@@ -17,10 +17,10 @@ use crate::error::RayhunterError;
use axum::response::Redirect; use axum::response::Redirect;
use diag::{DiagDeviceCtrlMessage, start_recording, stop_recording}; use diag::{DiagDeviceCtrlMessage, start_recording, stop_recording};
use log::{info, error}; use log::{info, error};
use orca::diag_device::DiagDevice; use rayhunter::diag_device::DiagDevice;
use axum::routing::{get, post}; use axum::routing::{get, post};
use axum::Router; use axum::Router;
use orca::qmdl::QmdlWriter; use rayhunter::qmdl::QmdlWriter;
use stats::get_qmdl_manifest; use stats::get_qmdl_manifest;
use tokio::sync::mpsc::{self, Sender}; use tokio::sync::mpsc::{self, Sender};
use tokio::task::JoinHandle; use tokio::task::JoinHandle;
+4 -4
View File
@@ -1,9 +1,9 @@
use crate::ServerState; use crate::ServerState;
use orca::gsmtap_parser::GsmtapParser; use rayhunter::gsmtap_parser::GsmtapParser;
use orca::pcap::GsmtapPcapWriter; use rayhunter::pcap::GsmtapPcapWriter;
use orca::qmdl::{QmdlReader, QmdlReaderError}; use rayhunter::qmdl::{QmdlReader, QmdlReaderError};
use orca::diag_reader::DiagReader; use rayhunter::diag_reader::DiagReader;
use axum::body::Body; use axum::body::Body;
use axum::http::header::CONTENT_TYPE; use axum::http::header::CONTENT_TYPE;
use axum::extract::{State, Path}; use axum::extract::{State, Path};
+1 -1
View File
@@ -1,6 +1,6 @@
<html> <html>
<head> <head>
<title>ORCA</title> <title>rayhunter</title>
<link rel="stylesheet" type="text/css" href="css/style.css"> <link rel="stylesheet" type="text/css" href="css/style.css">
<script src="js/main.js"></script> <script src="js/main.js"></script>
<script> <script>
+2 -2
View File
@@ -1,8 +1,8 @@
[package] [package]
name = "orca" name = "rayhunter"
version = "0.1.0" version = "0.1.0"
edition = "2021" edition = "2021"
description = "Orbic Realtime Cellular Analysis" description = "Realtime cellular data decoding and analysis for IMSI catcher detection"
[dependencies] [dependencies]
bytes = "1.5.0" bytes = "1.5.0"
+2 -2
View File
@@ -1,10 +1,10 @@
use orca::diag::{ use rayhunter::diag::{
Message, Message,
LogBody, LogBody,
LteRrcOtaPacket, LteRrcOtaPacket,
Timestamp, Timestamp,
}; };
use orca::gsmtap_parser::GsmtapParser; use rayhunter::gsmtap_parser::GsmtapParser;
use deku::prelude::*; use deku::prelude::*;
// Tests here are based on https://github.com/fgsect/scat/blob/97442580e628de414c9f7c2a185f4e28d0ee7523/tests/test_diagltelogparser.py // Tests here are based on https://github.com/fgsect/scat/blob/97442580e628de414c9f7c2a185f4e28d0ee7523/tests/test_diagltelogparser.py