Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ members = [
resolver = "2"

[workspace.package]
version = "0.0.0" # x-release-please-version
edition = "2024"
license = "MIT"
repository = "https://github.com/stealth-factory/traffic-ctrl"
Expand Down
2 changes: 1 addition & 1 deletion rust/traffic-ctrl-core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "traffic-ctrl-core"
version.workspace = true
version = "0.0.0"
edition.workspace = true
license.workspace = true
repository.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion rust/traffic-ctrl/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "traffic-ctrl"
version.workspace = true
version = "0.0.0"
edition.workspace = true
license.workspace = true
repository.workspace = true
Expand Down
4 changes: 4 additions & 0 deletions rust/traffic-ctrl/src/filter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use std::time::{Duration, Instant};

use serde::{Deserialize, Serialize};
use traffic_ctrl_core::ProcessId;
#[cfg(target_os = "macos")]
use uuid::Uuid;

#[derive(Clone, Copy, Debug, Deserialize, Eq, PartialEq)]
Expand Down Expand Up @@ -132,6 +133,7 @@ enum FilterAction {

#[derive(Serialize)]
#[serde(rename_all = "camelCase")]
#[cfg(target_os = "macos")]
struct FilterRequest {
protocol_version: u32,
request_id: Uuid,
Expand All @@ -141,6 +143,7 @@ struct FilterRequest {

#[derive(Clone, Debug, Deserialize, Serialize)]
#[serde(rename_all = "camelCase")]
#[cfg(target_os = "macos")]
struct FilterProcessIdentity {
pid: u32,
name: String,
Expand All @@ -150,6 +153,7 @@ struct FilterProcessIdentity {

#[derive(Deserialize)]
#[serde(rename_all = "camelCase")]
#[cfg(target_os = "macos")]
struct FilterResponse {
protocol_version: u32,
request_id: Uuid,
Expand Down
4 changes: 3 additions & 1 deletion rust/traffic-ctrl/src/inspector.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
use std::collections::{HashMap, HashSet};
use std::collections::HashMap;
use std::io::Write;
use std::process::{Command, Stdio};
use std::sync::mpsc::{self, Receiver, SyncSender};
use std::thread;

use traffic_ctrl_core::ProcessId;

#[cfg(target_os = "macos")]
use std::collections::HashSet;
#[cfg(target_os = "linux")]
use std::{fs, path::PathBuf};

Expand Down