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/+/1276?usp=email
to review the following change.
Change subject: dco: remove dco_read/write_bytes from dco_context_t
......................................................................
dco: remove dco_read/write_bytes from dco_context_t
Remove dco_read_bytes and dco_write_bytes from all dco_context_t
structures, as peer statistics are now stored directly in the
corresponding c2 fields across all DCO interfaces.
Change-Id: I61f9d9bb26112eac0c0a47cb9d17982b075887ff
Signed-off-by: Ralf Lici <[email protected]>
---
M src/openvpn/dco_freebsd.h
M src/openvpn/dco_linux.h
M src/openvpn/dco_win.h
M src/openvpn/multi.c
4 files changed, 0 insertions(+), 11 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/76/1276/1
diff --git a/src/openvpn/dco_freebsd.h b/src/openvpn/dco_freebsd.h
index 2f486f0..0797b82 100644
--- a/src/openvpn/dco_freebsd.h
+++ b/src/openvpn/dco_freebsd.h
@@ -59,8 +59,6 @@
int dco_message_peer_id;
int dco_del_peer_reason;
struct sockaddr_storage dco_float_peer_ss;
- uint64_t dco_read_bytes;
- uint64_t dco_write_bytes;
struct context *c;
} dco_context_t;
diff --git a/src/openvpn/dco_linux.h b/src/openvpn/dco_linux.h
index 310d433..efd5b27 100644
--- a/src/openvpn/dco_linux.h
+++ b/src/openvpn/dco_linux.h
@@ -81,8 +81,6 @@
int dco_message_key_id;
int dco_del_peer_reason;
struct sockaddr_storage dco_float_peer_ss;
- uint64_t dco_read_bytes;
- uint64_t dco_write_bytes;
} dco_context_t;
#endif /* defined(ENABLE_DCO) && defined(TARGET_LINUX) */
diff --git a/src/openvpn/dco_win.h b/src/openvpn/dco_win.h
index 4f3f028..02b8389 100644
--- a/src/openvpn/dco_win.h
+++ b/src/openvpn/dco_win.h
@@ -55,9 +55,6 @@
int dco_del_peer_reason;
struct sockaddr_storage dco_float_peer_ss;
- uint64_t dco_read_bytes;
- uint64_t dco_write_bytes;
-
struct context *c;
};
diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c
index 2863ff1..053c54d 100644
--- a/src/openvpn/multi.c
+++ b/src/openvpn/multi.c
@@ -3266,8 +3266,6 @@
* installed, and we do not need to clean up the state in the kernel */
mi->context.c2.tls_multi->dco_peer_id = -1;
mi->context.sig->signal_text = reason;
- mi->context.c2.dco_read_bytes = dco->dco_read_bytes;
- mi->context.c2.dco_write_bytes = dco->dco_write_bytes;
multi_signal_instance(m, mi, SIGTERM);
}
@@ -3337,8 +3335,6 @@
dco->dco_message_type = 0;
dco->dco_message_peer_id = -1;
dco->dco_del_peer_reason = -1;
- dco->dco_read_bytes = 0;
- dco->dco_write_bytes = 0;
return ret > 0;
}
#endif /* if defined(ENABLE_DCO) */
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1276?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: I61f9d9bb26112eac0c0a47cb9d17982b075887ff
Gerrit-Change-Number: 1276
Gerrit-PatchSet: 1
Gerrit-Owner: ralf_lici <[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
