Skip to content

Commit

Permalink
Renamed library crate to rayhunter, binary to rayhunter-daemon
Browse files Browse the repository at this point in the history
The produced binary is still called rayhunter though!
  • Loading branch information
wgreenberg committed Jan 30, 2024
1 parent 87f18c0 commit ed9d2b4
Show file tree
Hide file tree
Showing 10 changed files with 38 additions and 36 deletions.
32 changes: 16 additions & 16 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[workspace]

members = [
"orca",
"rayhunter",
"lib",
"bin",
]
resolver = "2"
8 changes: 5 additions & 3 deletions bin/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"] }
Expand Down
6 changes: 3 additions & 3 deletions bin/src/diag.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion bin/src/error.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use thiserror::Error;
use orca::diag_device::DiagDeviceError;
use rayhunter::diag_device::DiagDeviceError;

use crate::qmdl_store::QmdlStoreError;

Expand Down
4 changes: 2 additions & 2 deletions bin/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions bin/src/pcap.rs
Original file line number Diff line number Diff line change
@@ -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};
Expand Down
2 changes: 1 addition & 1 deletion bin/static/index.html
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions lib/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions lib/tests/test_lte_parsing.rs
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit ed9d2b4

Please sign in to comment.