| Commit message (Collapse) | Author | Age | Files | Lines |
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
Query the service state with `sc query windivert` at startup, as this
is observed to resolve the bad state described in commit 168a88b8
("windows: fix some kind of race").
This is a defensive measure against the driver uninstall introduced by
that commit. Normally the uninstall is attempted only after all
handles opened by the current process are closed, but if another
process still holds an open WinDivert handle at that point, the driver
can remain stuck in a bad state on subsequent runs.
Link: https://github.com/basil00/WinDivert/issues/406
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Uninstalling before all handles were closed resulted in a os error
1058 when try to open windivert. (sc stop windivert fixed it)
Assumed the uninstallation would fail if the handle was still
active, but it seems the initial uninstallation actually succeeded,
while the subsequent attempt to close the remaining handles failed.
Closing send handle that hadn't been closed previously and then
explicitly performed the uninstallation fixes the issue.
|
| |
|
|
|
|
|
| |
This allows the WinDivert.sys can be removed after the program
terminates, without needing to run `sc stop windivert`.
Bug: https://github.com/dilluti0n/dpibreak/issues/21
|
| | |
|
| |
|
|
|
| |
This inturrupts blocking recv() calls resulting WinDivert service can
be safely removed.
|
| |
|
|
| |
See error message
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
This size is for windivert buffer, not internal pkt buffer capacity.
|
| |
|
|
|
|
|
|
|
| |
Replace generic spawn_recv with recv_loop macro that encapsulates the
buffer allocation and receive loop. Divert handle now runs directly on
the main thread, while sniff handle spawns a dedicated thread only when
fake_autottl is enabled. This eliminates the mpsc channel, Event enum,
and the race condition where concurrent open_handle calls during driver
initialization could cause error 1058.
|
| |
|
|
|
|
| |
Non-daemon mode exits via process::exit(0) on Ctrl-C, and daemon mode
is managed by SCM, so the RUNNING atomic flag and graceful shutdown
loop are both unnecessary. Remove them along with the ctrlc handler.
|
| |
|
|
|
|
|
|
|
|
| |
In non-daemon mode, WinDivert driver closes all handles on process
exit, so explicit cleanup is unnecessary. Call std::process::exit(0)
directly from the Ctrl-C handler instead of relying on RUNNING flag
and graceful shutdown loop.
Also move trap_exit() call before spawn_recv() to ensure the handler
is registered before any threads are spawned.
|
| |
|
|
|
|
|
|
| |
- Remove global RUNNING, trap_exit, EnsureCleanup, MESSAGE_AT_RUN from main.rs
- Move each into platform-specific modules (linux.rs, windows.rs)
- Move MESSAGE_AT_RUN to platform.rs
- Inline cleanup logic into run() instead of separate cleanup() fn
- Remove service_run_1() indirection in windows.rs
|
| | |
|
| |
|
|
|
|
| |
Move handle lifecycle into spawn_recv so each handle is properly
closed when RUNNING becomes false. Filter and flags are passed in
instead of a pre-opened handle.
|
| | |
|
| |
|
|
|
|
| |
windows: add cleanup for SEND_HANDLE
windows: fix every packet goes to send-only handle
|
| |
|
|
|
|
| |
Pass destination address from PktView::daddr() at call site instead of
re-extracting it from raw bytes inside send_to_raw. Windows side
ignores the argument. Also add #[inline] to PktView accessor methods.
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
set_opt() was logging each option as it set them, which created a
tight coupling between option initialization and log output timing.
This was particularly problematic for daemon mode: daemonize must
happen after set_opt() (to know whether -D was passed) but before
logging (so output goes to the log file, not stdout).
Split into set_opt() -> InitializedOpts and InitializedOpts::log(),
using a typestate pattern to enforce at compile time that log() cannot
be called before set_opt(). This lets each platform's bootstrap()
handle daemonization between the two steps:
let initialized = opt.set_opt()?;
platform::bootstrap()?; // daemonize here if needed
initialized.log(); // now safe to log
Also:
- Move daemonize_1() into platform::bootstrap() on both platforms
- Make daemonize_1() / service_main() private to their platform modules
- Fix the long-standing TODO about using log_println in daemonize()
|
| | |
|
| |
|
|
|
|
|
|
|
| |
Revert lock_handle()
send_to_raw cannot get a mutex since lock is not released per
iteration.
commit e08b57d281d8368dc02f06e3b6cd43edf88b2438
|
| |
|
|
|
| |
Closes: #2
Link: https://github.com/dilluti0n/dpibreak/issues/2
|
| |
|
|
|
|
|
| |
Build WinDivert filter at runtime:
- Default: outbound TLS ClientHello packets
- --fake-autottl: also capture inbound SYN/ACK from tcp sport 443
Keep !impostor to avoid recapture.
|
| |
|
|
| |
For --fake-badsum work; Anyway, it is already calculated
|
| |
|
|
|
| |
- linux: fix infinite NFQUEUE loop by marking injected packets
- windows: by marking packet to impostor
|
| |
|
|
|
|
|
| |
`CloseAction::Uninstall` triggers ERROR_INVALID_NAME (0x8007007B) on Windows,
likely due to the crate passing a non–NUL-terminated "WinDivert" string to
`OpenServiceA`. For now, skip uninstallation and just close the handle
normally. Added a FIXME comment with details.
|
| | |
|
| | |
|
| |
|
|
| |
This removes unnecessary allocations per packet handling.
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
* Introduce: `splash!` macro in `log.rs` to print startup messages
conditionally, based on `--no-splash` flag.
* Move: `NO_SPLASH` management into `log.rs` with helper
functions: (`set_no_splash`, `no_splash`).
* Remove: old `splash()` function in `main.rs` and replace with
`splash!` macro usage.
* Set: default `LogLevel` according to build profile (Debug → Debug,
Release → Warning).
* Print: unified startup messages across Linux and Windows, including
`MESSAGE_AT_RUN`.
|
| | |
|
| | |
|
| |
|
|
|
|
| |
* Remove: unused `Fatal` variant from `LogLevel`.
* Update: comment on `Error` to indicate it represents unrecoverable
errors.
|
| | |
|
| | |
|
| |
|
|
|
|
| |
Define the TCP:443 outbound filter as a constant and reuse it in
WinDivert::network. Add a log message when the handle is successfully
constructed for better visibility during runtime.
|
| | |
|
| |
|
|
|
|
|
| |
* Remove Arc<AtomicBool> indirection and introduce global RUNNING.
* Rename plant_handler() to trap_exit() for clarity.
* Update run() implementations on Linux and Windows to use RUNNING directly.
* Drop unused imports in main.rs, linux.rs, and windows.rs.
|
| | |
|
| |
|
|
|
|
|
| |
* Extracted: `handle_packet!` macro to deduplicate match logic in both
Linux and Windows backend.
* Changed: `send_to_raw()` to return Result and propagate errors with
`anyhow!`.
|
| |
|
|
|
|
|
|
| |
Configured incompatible iptables errors to be propagated using
map_err into the anyhow type
* refactored: split_packet and handle_packet to return Result<>
instead of Option<>
|
| |
|
|
|
|
|
| |
modify to have a simmilar flow with windows build
* change ordering
* debug messages
|