summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--talpid-core/src/offline/windows.rs12
-rw-r--r--talpid-core/src/split_tunnel/windows/mod.rs6
-rw-r--r--talpid-core/src/tunnel/wireguard/wireguard_go.rs8
-rw-r--r--talpid-core/src/winnet.rs3
-rw-r--r--windows/winnet/src/winnet/routing/defaultroutemonitor.cpp26
-rw-r--r--windows/winnet/src/winnet/routing/defaultroutemonitor.h6
-rw-r--r--windows/winnet/src/winnet/winnet.cpp14
-rw-r--r--windows/winnet/src/winnet/winnet.h6
8 files changed, 67 insertions, 14 deletions
diff --git a/talpid-core/src/offline/windows.rs b/talpid-core/src/offline/windows.rs
index 15b5d47169..3c603cf7e9 100644
--- a/talpid-core/src/offline/windows.rs
+++ b/talpid-core/src/offline/windows.rs
@@ -122,11 +122,15 @@ impl BroadcastListener {
_default_route: winnet::WinNetDefaultRoute,
ctx: *mut c_void,
) {
+ use winnet::WinNetDefaultRouteChangeEventType::*;
+
+ if event_type == DefaultRouteUpdatedDetails {
+ // ignore changes that don't affect the route
+ return;
+ }
+
let state_lock: &mut Arc<Mutex<SystemState>> = &mut *(ctx as *mut _);
- let connectivity = match event_type {
- winnet::WinNetDefaultRouteChangeEventType::DefaultRouteChanged => true,
- winnet::WinNetDefaultRouteChangeEventType::DefaultRouteRemoved => false,
- };
+ let connectivity = event_type != DefaultRouteRemoved;
let change = match family {
winnet::WinNetAddrFamily::IPV4 => StateChange::NetworkV4Connectivity(connectivity),
winnet::WinNetAddrFamily::IPV6 => StateChange::NetworkV6Connectivity(connectivity),
diff --git a/talpid-core/src/split_tunnel/windows/mod.rs b/talpid-core/src/split_tunnel/windows/mod.rs
index efdd75ecf9..5102039e47 100644
--- a/talpid-core/src/split_tunnel/windows/mod.rs
+++ b/talpid-core/src/split_tunnel/windows/mod.rs
@@ -640,6 +640,8 @@ unsafe extern "system" fn split_tunnel_default_route_change_handler(
default_route: winnet::WinNetDefaultRoute,
ctx: *mut libc::c_void,
) {
+ use winnet::WinNetDefaultRouteChangeEventType::*;
+
// Update the "internet interface" IP when best default route changes
let ctx_mutex = &mut *(ctx as *mut Arc<Mutex<SplitTunnelDefaultRouteChangeHandlerContext>>);
let mut ctx = ctx_mutex.lock().expect("ST route handler mutex poisoned");
@@ -652,7 +654,7 @@ unsafe extern "system" fn split_tunnel_default_route_change_handler(
};
let result = match event_type {
- winnet::WinNetDefaultRouteChangeEventType::DefaultRouteChanged => {
+ DefaultRouteChanged | DefaultRouteUpdatedDetails => {
match interface_luid_to_ip(address_family, default_route.interface_luid) {
Ok(Some(ip)) => match IpAddr::from(ip) {
IpAddr::V4(addr) => ctx.internet_ipv4 = Some(addr),
@@ -684,7 +686,7 @@ unsafe extern "system" fn split_tunnel_default_route_change_handler(
ctx.register_ips()
}
// no default route
- winnet::WinNetDefaultRouteChangeEventType::DefaultRouteRemoved => {
+ DefaultRouteRemoved => {
match address_family {
WinNetAddrFamily::IPV4 => {
ctx.internet_ipv4 = None;
diff --git a/talpid-core/src/tunnel/wireguard/wireguard_go.rs b/talpid-core/src/tunnel/wireguard/wireguard_go.rs
index 28666b6506..a3d34acc0e 100644
--- a/talpid-core/src/tunnel/wireguard/wireguard_go.rs
+++ b/talpid-core/src/tunnel/wireguard/wireguard_go.rs
@@ -197,8 +197,10 @@ impl WgGoTunnel {
_ctx: *mut libc::c_void,
) {
use winapi::shared::{ifdef::NET_LUID, netioapi::ConvertInterfaceLuidToIndex};
+ use winnet::WinNetDefaultRouteChangeEventType::*;
+
let iface_idx: u32 = match event_type {
- winnet::WinNetDefaultRouteChangeEventType::DefaultRouteChanged => {
+ DefaultRouteChanged => {
let mut iface_idx = 0u32;
let iface_luid = NET_LUID {
Value: default_route.interface_luid,
@@ -216,7 +218,9 @@ impl WgGoTunnel {
iface_idx
}
// if there is no new default route, specify 0 as the interface index
- winnet::WinNetDefaultRouteChangeEventType::DefaultRouteRemoved => 0,
+ DefaultRouteRemoved => 0,
+ // ignore interface updates that don't affect the interface to use
+ DefaultRouteUpdatedDetails => return,
};
wgRebindTunnelSocket(address_family.to_windows_proto_enum(), iface_idx);
diff --git a/talpid-core/src/winnet.rs b/talpid-core/src/winnet.rs
index 7c9489ecfb..7f31082541 100644
--- a/talpid-core/src/winnet.rs
+++ b/talpid-core/src/winnet.rs
@@ -311,7 +311,8 @@ impl Drop for WinNetCallbackHandle {
#[repr(u16)]
pub enum WinNetDefaultRouteChangeEventType {
DefaultRouteChanged = 0,
- DefaultRouteRemoved = 1,
+ DefaultRouteUpdatedDetails = 1,
+ DefaultRouteRemoved = 2,
}
pub type DefaultRouteChangedCallback = unsafe extern "system" fn(
diff --git a/windows/winnet/src/winnet/routing/defaultroutemonitor.cpp b/windows/winnet/src/winnet/routing/defaultroutemonitor.cpp
index 523c2d7ba0..56521ec9d8 100644
--- a/windows/winnet/src/winnet/routing/defaultroutemonitor.cpp
+++ b/windows/winnet/src/winnet/routing/defaultroutemonitor.cpp
@@ -47,6 +47,16 @@ DefaultRouteMonitor::DefaultRouteMonitor
THROW_WINDOWS_ERROR(status, "Register for network interface change notifications");
}
+ status = NotifyUnicastIpAddressChange(AF_UNSPEC, AddressChangeCallback, this,
+ FALSE, &m_addressNotificationHandle);
+
+ if (NO_ERROR != status)
+ {
+ CancelMibChangeNotify2(m_routeNotificationHandle);
+ CancelMibChangeNotify2(m_interfaceNotificationHandle);
+ THROW_WINDOWS_ERROR(status, "Register for unicast address change notifications");
+ }
+
try
{
m_bestRoute = GetBestDefaultRoute(m_family);
@@ -62,6 +72,7 @@ DefaultRouteMonitor::~DefaultRouteMonitor()
// Cancel notifications to stop triggering the BurstGuard.
//
+ CancelMibChangeNotify2(m_addressNotificationHandle);
CancelMibChangeNotify2(m_interfaceNotificationHandle);
CancelMibChangeNotify2(m_routeNotificationHandle);
@@ -105,6 +116,17 @@ void NETIOAPI_API_ DefaultRouteMonitor::InterfaceChangeCallback
reinterpret_cast<DefaultRouteMonitor *>(context)->m_evaluateRoutesGuard->trigger();
}
+//static
+void NETIOAPI_API_ DefaultRouteMonitor::AddressChangeCallback
+(
+ void* context,
+ MIB_UNICASTIPADDRESS_ROW*,
+ MIB_NOTIFICATION_TYPE
+)
+{
+ reinterpret_cast<DefaultRouteMonitor*>(context)->m_evaluateRoutesGuard->trigger();
+}
+
void DefaultRouteMonitor::evaluateRoutes()
{
std::scoped_lock<std::mutex> lock(m_evaluationLock);
@@ -173,6 +195,10 @@ void DefaultRouteMonitor::evaluateRoutesInner()
m_bestRoute = currentBestRoute;
m_callback(EventType::Updated, m_bestRoute);
}
+ else
+ {
+ m_callback(EventType::UpdatedDetails, m_bestRoute);
+ }
}
}
diff --git a/windows/winnet/src/winnet/routing/defaultroutemonitor.h b/windows/winnet/src/winnet/routing/defaultroutemonitor.h
index 5575685a82..24be69a835 100644
--- a/windows/winnet/src/winnet/routing/defaultroutemonitor.h
+++ b/windows/winnet/src/winnet/routing/defaultroutemonitor.h
@@ -22,6 +22,10 @@ public:
// The best default route changed.
Updated,
+ // Interface details changed; the associated interface and
+ // gateway did not.
+ UpdatedDetails,
+
// No default routes exist.
Removed,
};
@@ -56,11 +60,13 @@ private:
HANDLE m_routeNotificationHandle;
HANDLE m_interfaceNotificationHandle;
+ HANDLE m_addressNotificationHandle;
std::mutex m_evaluationLock;
static void NETIOAPI_API_ RouteChangeCallback(void *context, MIB_IPFORWARD_ROW2 *row, MIB_NOTIFICATION_TYPE notificationType);
static void NETIOAPI_API_ InterfaceChangeCallback(void *context, MIB_IPINTERFACE_ROW *row, MIB_NOTIFICATION_TYPE notificationType);
+ static void NETIOAPI_API_ AddressChangeCallback(void *context, MIB_UNICASTIPADDRESS_ROW *row, MIB_NOTIFICATION_TYPE notificationType);
void evaluateRoutes();
void evaluateRoutesInner();
diff --git a/windows/winnet/src/winnet/winnet.cpp b/windows/winnet/src/winnet/winnet.cpp
index c1b864612e..2e35830c96 100644
--- a/windows/winnet/src/winnet/winnet.cpp
+++ b/windows/winnet/src/winnet/winnet.cpp
@@ -395,6 +395,7 @@ WinNet_RegisterDefaultRouteChangedCallback(
static const std::pair<from_t, to_t> eventTypeMap[] =
{
{ from_t::Updated, WINNET_DEFAULT_ROUTE_CHANGED_EVENT_TYPE_UPDATED },
+ { from_t::UpdatedDetails, WINNET_DEFAULT_ROUTE_CHANGED_EVENT_TYPE_UPDATED_DETAILS },
{ from_t::Removed, WINNET_DEFAULT_ROUTE_CHANGED_EVENT_TYPE_REMOVED }
};
@@ -418,11 +419,16 @@ WinNet_RegisterDefaultRouteChangedCallback(
// Determine which LUID and gateway to forward.
//
- if (RouteManager::DefaultRouteChangedEventType::Updated == eventType)
+ switch (eventType)
{
- const auto ips = winnet::ConvertNativeAddresses(&route.value().gateway, 1);
- defaultRoute.gateway = ips[0];
- defaultRoute.interfaceLuid = route.value().iface.Value;
+ case RouteManager::DefaultRouteChangedEventType::Updated:
+ case RouteManager::DefaultRouteChangedEventType::UpdatedDetails:
+ {
+ const auto ips = winnet::ConvertNativeAddresses(&route.value().gateway, 1);
+ defaultRoute.gateway = ips[0];
+ defaultRoute.interfaceLuid = route.value().iface.Value;
+ break;
+ }
}
//
diff --git a/windows/winnet/src/winnet/winnet.h b/windows/winnet/src/winnet/winnet.h
index 3f2f80a5e5..f6f8d56074 100644
--- a/windows/winnet/src/winnet/winnet.h
+++ b/windows/winnet/src/winnet/winnet.h
@@ -168,8 +168,12 @@ enum WINNET_DEFAULT_ROUTE_CHANGED_EVENT_TYPE
// Best default route changed.
WINNET_DEFAULT_ROUTE_CHANGED_EVENT_TYPE_UPDATED = 0,
+ // The route (gateway or interface) did not change, but
+ // interface details may have changed.
+ WINNET_DEFAULT_ROUTE_CHANGED_EVENT_TYPE_UPDATED_DETAILS = 1,
+
// No default routes exist.
- WINNET_DEFAULT_ROUTE_CHANGED_EVENT_TYPE_REMOVED = 1,
+ WINNET_DEFAULT_ROUTE_CHANGED_EVENT_TYPE_REMOVED = 2,
};
typedef void (WINNET_API *WinNetDefaultRouteChangedCallback)
Copyright © 2025 - 2026 Wayne Cole. WTFPL. Attribution appreciated. No warranty. Not liable for bodily damages.