This allows a UI client to display the correct state. Technically the
client is still waiting for PUSH_REPLY but for every practical concern
this is a different state as we are waiting for the pending
authentication to finish.
Signed-off-by: Arne Schwabe
---
src/openvpn/manage.c | 3 +++
src/openvpn/manage.h | 2 ++
src/openvpn/push.c | 18 ++
3 files changed, 23 insertions(+)
diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c
index 8df60d7a..58ff0155 100644
--- a/src/openvpn/manage.c
+++ b/src/openvpn/manage.c
@@ -171,6 +171,9 @@ man_state_name(const int state)
case OPENVPN_STATE_TCP_CONNECT:
return "TCP_CONNECT";
+case OPENVPN_STATE_AUTH_PENDING:
+return "AUTH_PENDING";
+
default:
return "?";
}
diff --git a/src/openvpn/manage.h b/src/openvpn/manage.h
index 1c497427..1681e141 100644
--- a/src/openvpn/manage.h
+++ b/src/openvpn/manage.h
@@ -506,6 +506,8 @@ management_enable_def_auth(const struct management *man)
#define OPENVPN_STATE_GET_CONFIG9 /* Downloading configuration from
server */
#define OPENVPN_STATE_RESOLVE 10 /* DNS lookup */
#define OPENVPN_STATE_TCP_CONNECT 11 /* Connecting to TCP server */
+#define OPENVPN_STATE_AUTH_PENDING 12 /* Waiting in auth-pending mode
+* techhnically variant of GET_CONFIG */
#define OPENVPN_STATE_CLIENT_BASE 7 /* Base index of client-only states */
diff --git a/src/openvpn/push.c b/src/openvpn/push.c
index ece63650..59f8f33c 100644
--- a/src/openvpn/push.c
+++ b/src/openvpn/push.c
@@ -248,12 +248,30 @@ parse_auth_pending_keywords(const struct buffer *buffer,
if (!buf_advance(, strlen("AUTH_PENDING"))
|| !(buf_read_u8() == ',') || !BLEN())
{
+#ifdef ENABLE_MANAGEMENT
+if (management)
+{
+management_set_state(management, OPENVPN_STATE_AUTH_PENDING,
+ "", NULL, NULL, NULL, NULL);
+}
+#endif
+
return;
}
/* parse the keywords in the same way that push options are parsed */
char line[OPTION_LINE_SIZE];
+#ifdef ENABLE_MANAGEMENT
+/* Need to do the management notification with the keywords before
+ * buf_parse is called, as it will insert \0 bytes into the buffer */
+if (management)
+{
+management_set_state(management, OPENVPN_STATE_AUTH_PENDING,
+ BSTR(), NULL, NULL, NULL, NULL);
+}
+#endif
+
while (buf_parse(, ',', line, sizeof(line)))
{
if (sscanf(line, "timeout %u", server_timeout) == 1)
--
2.26.2
___
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
