The variable has no useful function (anymore?).
There is only one place where this variable was checked
else if (!c->c2.push_reply_deferred && c->c2.context_auth == CAS_SUCCEEDED)
This condition also depends on context_auth == CAS_SUCCEEDED but the only
code path that sets context_auth = CAS_SUCCEEDED also sets
push_reply_deferred = false;
Signed-off-by: Arne Schwabe <a...@rfc2549.org>
---
src/openvpn/multi.c | 7 -------
src/openvpn/openvpn.h | 1 -
src/openvpn/push.c | 2 +-
3 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c
index 95b16744..138701a9 100644
--- a/src/openvpn/multi.c
+++ b/src/openvpn/multi.c
@@ -828,8 +828,6 @@ multi_create_instance(struct multi_context *m, const struct
mroute_addr *real)
mi->did_cid_hash = true;
#endif
- mi->context.c2.push_reply_deferred = true;
-
#ifdef ENABLE_ASYNC_PUSH
mi->context.c2.push_request_received = false;
mi->inotify_watch = -1;
@@ -2109,11 +2107,6 @@ script_failed:
gc_free(&gc);
}
-
- /*
- * Reply now to client's PUSH_REQUEST query
- */
- mi->context.c2.push_reply_deferred = false;
}
#ifdef ENABLE_ASYNC_PUSH
diff --git a/src/openvpn/openvpn.h b/src/openvpn/openvpn.h
index 1afc3a92..4609af3e 100644
--- a/src/openvpn/openvpn.h
+++ b/src/openvpn/openvpn.h
@@ -432,7 +432,6 @@ struct context_2
#if P2MP
/* --ifconfig endpoints to be pushed to client */
- bool push_reply_deferred;
#ifdef ENABLE_ASYNC_PUSH
bool push_request_received;
#endif
diff --git a/src/openvpn/push.c b/src/openvpn/push.c
index 369cd6a4..56d652a3 100644
--- a/src/openvpn/push.c
+++ b/src/openvpn/push.c
@@ -803,7 +803,7 @@ process_incoming_push_request(struct context *c)
send_auth_failed(c, client_reason);
ret = PUSH_MSG_AUTH_FAILURE;
}
- else if (!c->c2.push_reply_deferred && c->c2.context_auth == CAS_SUCCEEDED)
+ else if (c->c2.context_auth == CAS_SUCCEEDED)
{
time_t now;
--
2.26.2
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
