Skip to content

VPN-6293 - Maybe fix ip assignment c: #10854

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

VPN-6293 - Maybe fix ip assignment c: #10854

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e696e27
VPN-6293 - Part 1: Fix Logic bug while adding ipv6 Addr to Adapter
strseb Nov 4, 2025
e2c32cc
VPN-6293 - Part 2: Combine lookups to device-index
strseb Nov 4, 2025
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
35 changes: 14 additions & 21 deletions src/platforms/windows/daemon/wireguardutilswindows.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,9 @@ static void CALLBACK WireGuardLogger(_In_ WIREGUARD_LOGGER_LEVEL Level,
* @return ulong - nteContext - Call DeleteIPAddress(nteContext) to remove the
* assignment.
*/
ulong setIPv4AddressAndMask(NET_LUID luid, const IPAddress address) {
ulong setIPv4AddressAndMask(NET_IFINDEX ifindex, const IPAddress address) {
ULONG nteContext = 0;
ULONG nteInstance = 0;
NET_IFINDEX ifIndex;
if (ConvertInterfaceLuidToIndex(&luid, &ifIndex) != NO_ERROR) {
return 0;
}
IN_ADDR ipAddrBinary, subnetMaskBinary;
if (InetPtonA(AF_INET, qPrintable(address.address().toString()),
&ipAddrBinary) != 1) {
Expand All @@ -83,7 +79,7 @@ ulong setIPv4AddressAndMask(NET_LUID luid, const IPAddress address) {
// Add IP address and subnet mask
DWORD dwResult =
AddIPAddress(ipAddrBinary.S_un.S_addr, subnetMaskBinary.S_un.S_addr,
ifIndex, &nteContext, &nteInstance);
ifindex, &nteContext, &nteInstance);
if (dwResult != NO_ERROR) {
WindowsUtils::windowsLog("WELP, failed to add ip address to adapter");
return 0;
Expand All @@ -93,19 +89,12 @@ ulong setIPv4AddressAndMask(NET_LUID luid, const IPAddress address) {
/**
* @brief
*
* @param luid - LUID of the Adapter
* @param ifindex - Index of the Adapter
* @param ipAddress - Address and NetMask of the Adapter
* @return bool - If the assignment was successful
*/
bool setIPv6AddressAndMask(NET_LUID luid, const IPAddress ipAddress) {
bool setIPv6AddressAndMask(NET_IFINDEX ifindex, const IPAddress ipAddress) {
MIB_UNICASTIPADDRESS_ROW row;

NET_IFINDEX ifIndex;
if (ConvertInterfaceLuidToIndex(&luid, &ifIndex) != NO_ERROR) {
logger.error()
<< "Failed to assign ivp6: Cannot Find Interface for this LUID";
return false;
}
SOCKADDR_IN6 sockaddr = {};
sockaddr.sin6_family = AF_INET6;
if (InetPtonA(AF_INET6, qPrintable(ipAddress.address().toString()),
Expand All @@ -116,9 +105,9 @@ bool setIPv6AddressAndMask(NET_LUID luid, const IPAddress ipAddress) {
}

InitializeUnicastIpAddressEntry(&row);
row.Address.Ipv6.sin6_family = AF_INET6;
row.Address.si_family = AF_INET6;
row.Address.Ipv6 = sockaddr;
row.InterfaceLuid = luid;
row.InterfaceIndex = ifindex;

// Calculate prefix length from subnet mask
unsigned int prefixLength = ipAddress.prefixLength();
Expand Down Expand Up @@ -320,21 +309,25 @@ bool WireguardUtilsWindows::addInterface(const InterfaceConfig& config) {
auto destroyRouteMonitorOnFailure =
qScopeGuard([this]() { m_routeMonitor->deleteLater(); });

NET_IFINDEX ifindex;
const auto res = ConvertInterfaceLuidToIndex(&luid, &ifindex);
if (res != NO_ERROR) {
logger.error() << "ConvertInterfaceLuidToIndex failed with error:" << res;
return false;
}
// Set the Adapters Address:
m_deviceIpv4_Handle =
setIPv4AddressAndMask(luid, IPAddress(config.m_deviceIpv4Address));
setIPv4AddressAndMask(ifindex, IPAddress(config.m_deviceIpv4Address));
if (m_deviceIpv4_Handle == 0) {
logger.error() << "Failed setIPv4AddressAndMask";
return false;
}
if (!setIPv6AddressAndMask(luid, IPAddress(config.m_deviceIpv6Address))) {
if (!setIPv6AddressAndMask(ifindex, IPAddress(config.m_deviceIpv6Address))) {
logger.error() << "Failed setIPv6AddressAndMask";
return false;
};

// Enable the windows firewall
NET_IFINDEX ifindex;
ConvertInterfaceLuidToIndex(&luid, &ifindex);
if (!m_firewall->enableInterface(ifindex)) {
logger.error() << "Failed enabling Killswitch";
m_firewall->disableKillSwitch();
Expand Down
Loading