Attention is currently required from: flichtenheld, plaisthos, stipa.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/733?usp=email
to look at the new patch set (#2).
Change subject: dco-win: factor out getting dco version info own function
......................................................................
dco-win: factor out getting dco version info own function
Instead of having duplicated code to get dco version
for data_v3 checks and for version info, have it in
one place and store the version in dco context - the
latter is a preparation for dco v2 support (multi-peer).
Change-Id: I8e8ddd35bd3cc3334faf7f57118d1892512ae9f7
Signed-off-by: Lev Stipakov <l...@openvpn.net>
---
M src/openvpn/dco_win.c
M src/openvpn/dco_win.h
2 files changed, 71 insertions(+), 58 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/33/733/2
diff --git a/src/openvpn/dco_win.c b/src/openvpn/dco_win.c
index 189864b..349b45a 100644
--- a/src/openvpn/dco_win.c
+++ b/src/openvpn/dco_win.c
@@ -52,10 +52,70 @@
return tt;
}
+/**
+ * Gets version of dco-win driver
+ *
+ * Fills Major/Minor/Patch fields in a passes OVPN_VERSION
+ * struct. If version cannot be obtained, fields are set to 0.
+ *
+ * @param version pointer to OVPN_VERSION struct
+ * @returns true if version has been obtained, false otherwise
+ */
+static bool
+dco_get_version(OVPN_VERSION *version)
+{
+ CLEAR(*version);
+
+ bool res = false;
+
+ HANDLE h = CreateFile("\\\\.\\ovpn-dco-ver", GENERIC_READ,
+ 0, NULL, OPEN_EXISTING, 0, NULL);
+
+ if (h == INVALID_HANDLE_VALUE)
+ {
+ /* fallback to a "normal" device, this will fail if device is already
in use */
+ h = CreateFile("\\\\.\\ovpn-dco", GENERIC_READ,
+ 0, NULL, OPEN_EXISTING, 0, NULL);
+ }
+
+ if (h == INVALID_HANDLE_VALUE)
+ {
+ goto done;
+ }
+
+ DWORD bytes_returned = 0;
+ if (!DeviceIoControl(h, OVPN_IOCTL_GET_VERSION, NULL, 0,
+ version, sizeof(*version), &bytes_returned, NULL))
+ {
+ goto done;
+ }
+
+ res = true;
+
+done:
+ if (h != INVALID_HANDLE_VALUE)
+ {
+ CloseHandle(h);
+ }
+
+ msg(D_DCO_DEBUG, "dco version: %ld.%ld.%ld", version->Major,
version->Minor, version->Patch);
+
+ return res;
+}
+
+static inline
+bool
+dco_version_supports_data_v3(OVPN_VERSION *version)
+{
+ return (version->Major > 1) || (version->Minor >= 4);
+}
+
bool
ovpn_dco_init(int mode, dco_context_t *dco)
{
- dco->supports_data_v3 = dco_supports_data_v3(NULL);
+ (void)dco_get_version(&dco->version);
+ dco->supports_data_v3 = dco_version_supports_data_v3(&dco->version);
+
msg(D_DCO_DEBUG, "dco supports data_v3: %d", dco->supports_data_v3);
return true;
@@ -427,39 +487,17 @@
const char *
dco_version_string(struct gc_arena *gc)
{
- OVPN_VERSION version;
- ZeroMemory(&version, sizeof(OVPN_VERSION));
-
- /* first, try a non-exclusive control device, available from 1.3.0 */
- HANDLE h = CreateFile("\\\\.\\ovpn-dco-ver", GENERIC_READ,
- 0, NULL, OPEN_EXISTING, 0, NULL);
-
- if (h == INVALID_HANDLE_VALUE)
+ OVPN_VERSION version = {0};
+ if (dco_get_version(&version))
{
- /* fallback to a "normal" device, this will fail if device is already
in use */
- h = CreateFile("\\\\.\\ovpn-dco", GENERIC_READ,
- 0, NULL, OPEN_EXISTING, 0, NULL);
+ struct buffer out = alloc_buf_gc(256, gc);
+ buf_printf(&out, "%ld.%ld.%ld", version.Major, version.Minor,
version.Patch);
+ return BSTR(&out);
}
-
- if (h == INVALID_HANDLE_VALUE)
+ else
{
return "N/A";
}
-
- DWORD bytes_returned = 0;
- if (!DeviceIoControl(h, OVPN_IOCTL_GET_VERSION, NULL, 0,
- &version, sizeof(version), &bytes_returned, NULL))
- {
- CloseHandle(h);
- return "N/A";
- }
-
- CloseHandle(h);
-
- struct buffer out = alloc_buf_gc(256, gc);
- buf_printf(&out, "%ld.%ld.%ld", version.Major, version.Minor,
version.Patch);
-
- return BSTR(&out);
}
int
@@ -538,36 +576,10 @@
bool
dco_supports_data_v3(struct context *c)
{
- bool res = false;
+ OVPN_VERSION version = {0};
+ (void)dco_get_version(&version);
- HANDLE h = CreateFile("\\\\.\\ovpn-dco-ver", GENERIC_READ,
- 0, NULL, OPEN_EXISTING, 0, NULL);
-
- if (h == INVALID_HANDLE_VALUE)
- {
- goto done;
- }
-
- OVPN_VERSION version;
- ZeroMemory(&version, sizeof(OVPN_VERSION));
-
- DWORD bytes_returned = 0;
- if (!DeviceIoControl(h, OVPN_IOCTL_GET_VERSION, NULL, 0,
- &version, sizeof(version), &bytes_returned, NULL))
- {
- goto done;
- }
-
- /* data_v3 is supported starting from 1.4 */
- res = (version.Major > 1) || (version.Minor >= 4);
-
-done:
- if (h != INVALID_HANDLE_VALUE)
- {
- CloseHandle(h);
- }
-
- return res;
+ return dco_version_supports_data_v3(&version);
}
#endif /* defined(_WIN32) */
diff --git a/src/openvpn/dco_win.h b/src/openvpn/dco_win.h
index f58488f..ce57817 100644
--- a/src/openvpn/dco_win.h
+++ b/src/openvpn/dco_win.h
@@ -34,6 +34,7 @@
struct dco_context {
struct tuntap *tt;
bool supports_data_v3;
+ OVPN_VERSION version;
};
typedef struct dco_context dco_context_t;
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/733?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I8e8ddd35bd3cc3334faf7f57118d1892512ae9f7
Gerrit-Change-Number: 733
Gerrit-PatchSet: 2
Gerrit-Owner: stipa <lstipa...@gmail.com>
Gerrit-Reviewer: flichtenheld <fr...@lichtenheld.com>
Gerrit-Reviewer: plaisthos <arne-open...@rfc2549.org>
Gerrit-CC: cron2 <g...@greenie.muc.de>
Gerrit-CC: openvpn-devel <openvpn-devel@lists.sourceforge.net>
Gerrit-Attention: plaisthos <arne-open...@rfc2549.org>
Gerrit-Attention: flichtenheld <fr...@lichtenheld.com>
Gerrit-Attention: stipa <lstipa...@gmail.com>
Gerrit-MessageType: newpatchset
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
