Skip to content
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

fix: set adapter search suffixes correctly with DCO #306

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

fix: set adapter search suffixes correctly with DCO #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
198749e
fix: set adapter search suffixes correctly with DCO
Apr 3, 2024
a48d634
Merge branch 'master' into domain-search
savely-krasovsky Jun 25, 2024
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
8 changes: 8 additions & 0 deletions openvpn/tun/win/client/tunsetup.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,6 +765,14 @@ class Setup : public SetupBase
destroy.add(new NRPT::ActionDelete(pid));
}
}

// DCO doesn't support DHCP (and so option 119), so we have to manually set domain search list.
// "dhcp-option DOMAIN-SEARCH mycompany.com mycompany.org" directive.
if (tun_type_ == OvpnDco && !pull.search_domains.empty())
{
create.add(new Util::ActionSetSearchList(tap.guid, pull.search_domains));
destroy.add(new Util::ActionSetSearchList(tap.guid));
}

// Set a default TAP-adapter domain suffix using
// "dhcp-option ADAPTER_DOMAIN_SUFFIX mycompany.com" directive.
Expand Down
57 changes: 57 additions & 0 deletions openvpn/tun/win/tunutil.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -956,6 +956,63 @@ class ActionSetAdapterDomainSuffix : public Action
const std::string tap_guid;
};

// An action to set the DNS Suffix Search Order
class ActionSetSearchList : public Action
{
public:
ActionSetSearchList(const std::string &tap_guid_arg,
const std::vector<TunBuilderCapture::SearchDomain> &search_domains_arg = std::vector<TunBuilderCapture::SearchDomain>())
: search_domains(search_domains_arg),
tap_guid(tap_guid_arg)
{
for (const auto& domain : search_domains)
{
this->search_domains_str += domain.to_string();
if (&domain != &search_domains.back())
this->search_domains_str += ",";
}
}

virtual void execute(std::ostream &os) override
{
os << to_string() << std::endl;

LONG status;
Win::RegKey key;
const std::string reg_key_name = "SYSTEM\\CurrentControlSet\\services\\Tcpip\\Parameters\\Interfaces\\" + tap_guid;
status = ::RegOpenKeyExA(HKEY_LOCAL_MACHINE,
reg_key_name.c_str(),
0,
KEY_READ | KEY_WRITE,
key.ref());
if (status != ERROR_SUCCESS)
{
const Win::Error err(status);
OPENVPN_THROW(tun_win_util, "ActionSetSearchList: error opening registry key: " << reg_key_name << " : " << err.message());
}

Win::UTF16 dom(Win::utf16(search_domains_str));
status = ::RegSetValueExW(key(),
L"SearchList",
0,
REG_SZ,
(const BYTE *)dom.get(),
(Win::utf16_strlen(dom.get()) + 1) * 2);
if (status != ERROR_SUCCESS)
OPENVPN_THROW(tun_win_util, "ActionSetSearchList: error writing SearchList registry key: " << reg_key_name);
}

virtual std::string to_string() const override
{
return "Set adapter suffix search order: '" + search_domains_str + "' " + tap_guid;
}

private:
std::string search_domains_str;
const std::vector<TunBuilderCapture::SearchDomain> search_domains;
const std::string tap_guid;
};

// get the Windows IPv4 routing table
inline const MIB_IPFORWARDTABLE *windows_routing_table()
{
Expand Down