[Openvpn-devel,v1] openvpnserv: keep NRPT exclude data if one address family fails
Commit Message
From: Heiko Hund <heiko@ist.eigentlich.net>
GetNrptExcludeData() skipped an interface completely if reading its
IPv4 or IPv6 name servers error'd, even if the other address family
had servers.
Use the name servers that could be read instead.
Change-Id: Id346f35f6ce371b177af7454cd73d3eeccb8ed6c
Signed-off-by: Heiko Hund <heiko@ist.eigentlich.net>
Acked-by: Razvan Cojocaru <razvanc@mailbox.org>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/2235
---
This change was reviewed on Gerrit and approved by at least one
developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/2235
This mail reflects revision 1 of this Change.
Acked-by according to Gerrit (reflected above):
Razvan Cojocaru <razvanc@mailbox.org>
@@ -2580,11 +2580,15 @@
/* Get the IPv4 DNS servers */
DWORD v4_addrs_size = sizeof(data[0].addresses);
err = GetItfDnsServersV4(v4_itf, data[i].addresses, &v4_addrs_size);
- if (err && err != ERROR_FILE_NOT_FOUND)
+ if (err)
{
- MsgToEventLog(M_SYSERR, L"%S: could not read interface %s v4 name servers (%ld)",
- __func__, itf_guid, err);
- goto next_itf;
+ if (err != ERROR_FILE_NOT_FOUND)
+ {
+ MsgToEventLog(M_SYSERR, L"%S: could not read interface %s v4 name servers (%ld)",
+ __func__, itf_guid, err);
+ }
+ data[i].addresses[0] = '\0';
+ v4_addrs_size = 0;
}
/* Get the IPv6 DNS servers, if there's space left */
@@ -2593,19 +2597,21 @@
if (v6_addrs_size > NRPT_ADDR_SIZE)
{
HKEY v6_itf;
- if (RegOpenKeyExW(v6_itfs, itf_guid, 0, KEY_READ, &v6_itf) != NO_ERROR)
+ err = RegOpenKeyExW(v6_itfs, itf_guid, 0, KEY_READ, &v6_itf);
+ if (!err)
{
- MsgToEventLog(M_SYSERR, L"%S: could not open interface %s v6 registry key",
- __func__, itf_guid);
- goto next_itf;
+ err = GetItfDnsServersV6(v6_itf, v6_addrs, &v6_addrs_size);
+ RegCloseKey(v6_itf);
}
- err = GetItfDnsServersV6(v6_itf, v6_addrs, &v6_addrs_size);
- RegCloseKey(v6_itf);
- if (err && err != ERROR_FILE_NOT_FOUND)
+ if (err)
{
- MsgToEventLog(M_SYSERR, L"%S: could not read interface %s v6 name servers (%ld)",
- __func__, itf_guid, err);
- goto next_itf;
+ if (err != ERROR_FILE_NOT_FOUND)
+ {
+ MsgToEventLog(M_SYSERR, L"%S: could not read interface %s v6 name servers (%ld)",
+ __func__, itf_guid, err);
+ }
+ v6_addrs[0] = '\0';
+ v6_addrs_size = 0;
}
if (v4_addrs_size && v6_addrs_size)
{