Attention is currently required from: flichtenheld, plaisthos.
Hello plaisthos, flichtenheld,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/1340?usp=email
to review the following change.
Change subject: PUSH_UPDATE server: update reporting_addr after ifconfig update
......................................................................
PUSH_UPDATE server: update reporting_addr after ifconfig update
Update mi->reporting_addr(_ipv6) for staus reporting purposes
after sending a PUSH_UPDATE containing an ifconfig(-ipv6) option.
Github: fixes OpenVPN/openvpn#889
Change-Id: Ie15977b44091445b9d1edebe885d92ec5cb5770a
Signed-off-by: Marco Baffo <[email protected]>
---
M src/openvpn/multi.c
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/40/1340/1
diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c
index 261209d..2b944667 100644
--- a/src/openvpn/multi.c
+++ b/src/openvpn/multi.c
@@ -4346,6 +4346,7 @@
multi_unlearn_in_addr_t(m, mi, old_addr);
mi->context.c2.push_ifconfig_defined = false;
mi->context.c2.push_ifconfig_local = 0;
+ mi->reporting_addr = 0;
}
/* Function to unlearn previous ifconfig-ipv6 of a client in the server
multi_context after a PUSH_UPDATE */
@@ -4358,6 +4359,7 @@
multi_unlearn_in6_addr(m, mi, old_addr6);
mi->context.c2.push_ifconfig_ipv6_defined = false;
CLEAR(mi->context.c2.push_ifconfig_ipv6_local);
+ CLEAR(mi->reporting_addr_ipv6);
}
/**
@@ -4389,6 +4391,8 @@
{
mi->context.c2.push_ifconfig_defined = true;
mi->context.c2.push_ifconfig_local = ntohl(new_addr.s_addr);
+ /* set our client's VPN endpoint for status reporting purposes */
+ mi->reporting_addr = mi->context.c2.push_ifconfig_local;
}
}
@@ -4408,6 +4412,8 @@
{
mi->context.c2.push_ifconfig_ipv6_defined = true;
mi->context.c2.push_ifconfig_ipv6_local = new_addr6;
+ /* set our client's VPN endpoint for status reporting purposes */
+ mi->reporting_addr_ipv6 = mi->context.c2.push_ifconfig_ipv6_local;
}
}
}
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1340?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ie15977b44091445b9d1edebe885d92ec5cb5770a
Gerrit-Change-Number: 1340
Gerrit-PatchSet: 1
Gerrit-Owner: mrbff <[email protected]>
Gerrit-Reviewer: flichtenheld <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
