Attention is currently required from: d12fk, flichtenheld, plaisthos, stipa.
Hello flichtenheld, plaisthos, stipa,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/1363?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Code-Review-1 by stipa
Change subject: iservice: use saved iface index to restore metric
......................................................................
iservice: use saved iface index to restore metric
When adding block rules, the interface metric of the VPN adapter is
temporarily modified so that an old version of Windows 10 would pick
it up first when looking up stuff via DNS. These metrics are reverted to
the old value when the block is removed.
When reverting them, instead of using the stored interface index where
the original values were read from, we were using the interface index
passed to the service with the wfp block message. That index could
theoretically be different from the one stored, which would result in
the metric being set to the wrong interface.
Reported-by: [email protected]
Change-Id: Ia74a931c703d594bdf8ccada9b783b94608de278
Signed-off-by: Heiko Hund <[email protected]>
---
M src/openvpnserv/interactive.c
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/63/1363/2
diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c
index 0712986..33282c63 100644
--- a/src/openvpnserv/interactive.c
+++ b/src/openvpnserv/interactive.c
@@ -752,7 +752,7 @@
}
static DWORD
-DeleteWfpBlock(const wfp_block_message_t *msg, undo_lists_t *lists)
+DeleteWfpBlock(undo_lists_t *lists)
{
DWORD err = 0;
wfp_block_data_t *block_data = RemoveListItem(&(*lists)[wfp_block],
CmpAny, NULL);
@@ -762,11 +762,11 @@
err = delete_wfp_block_filters(block_data->engine);
if (block_data->metric_v4 >= 0)
{
- set_interface_metric(msg->iface.index, AF_INET,
block_data->metric_v4);
+ set_interface_metric(block_data->index, AF_INET,
block_data->metric_v4);
}
if (block_data->metric_v6 >= 0)
{
- set_interface_metric(msg->iface.index, AF_INET6,
block_data->metric_v6);
+ set_interface_metric(block_data->index, AF_INET6,
block_data->metric_v6);
}
free(block_data);
}
@@ -829,7 +829,7 @@
if (err)
{
/* delete the filters, remove undo item and free interface
data */
- DeleteWfpBlock(msg, lists);
+ DeleteWfpBlock(lists);
engine = NULL;
}
}
@@ -854,7 +854,7 @@
}
else
{
- return DeleteWfpBlock(msg, lists);
+ return DeleteWfpBlock(lists);
}
}
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1363?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia74a931c703d594bdf8ccada9b783b94608de278
Gerrit-Change-Number: 1363
Gerrit-PatchSet: 2
Gerrit-Owner: d12fk <[email protected]>
Gerrit-Reviewer: flichtenheld <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-Reviewer: stipa <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]>
Gerrit-Attention: d12fk <[email protected]>
Gerrit-Attention: stipa <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
