cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1350?usp=email )
Change subject: dco_freebsd: implement dco_get_peer_stats() ...................................................................... dco_freebsd: implement dco_get_peer_stats() This is "fetch read/write statistics for a single peer", complementing dco_get_peer_stats_multi() "... for all peers", and it is called in --client mode, and (!) in p2mp mode to check if --inactive thresholds are reached. The FreeBSD DCO module has no "give me stats for a single peer" call, so we just call dco_get_peer_stats_multi() to get all of them - and that function is modified to handle p2p or p2mp mode by checking mode == CM_TOP. (dco_linux does about the same in dco_get_peer*() -> ovpn_handle_peer(), after a few iterations, except that it can query for "just one peer") "--inactive" still does not work on FreeBSD, because the code in forward.c looks at counters that are not set by FreeBSD DCO. v2: on AUTH_FAIL, 'dco' struct is not initialized yet -> SIGSEGV crash, verify that dco_peer_id is >= 0 before calling dco_get_peer_stats_multi() Github: OpenVPN/openvpn#898 Change-Id: I38a040a9bdcb44933d4ca538f746af5c61011d7c Signed-off-by: Gert Doering <[email protected]> Acked-by: Ralf Lici <[email protected]> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1350 Message-Id: <[email protected]> URL: https://www.mail-archive.com/[email protected]/msg34273.html Signed-off-by: Gert Doering <[email protected]> --- M src/openvpn/dco_freebsd.c 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/src/openvpn/dco_freebsd.c b/src/openvpn/dco_freebsd.c index f80b6df..21f0ac0 100644 --- a/src/openvpn/dco_freebsd.c +++ b/src/openvpn/dco_freebsd.c @@ -870,8 +870,20 @@ { const nvlist_t *peer = nvpeers[i]; uint32_t peerid = nvlist_get_number(peer, "peerid"); + const nvlist_t *bytes = nvlist_get_nvlist(peer, "bytes"); - dco_update_peer_stat(dco->c->multi, peerid, nvlist_get_nvlist(peer, "bytes")); + /* we can end here in p2mp mode, or in p2p mode via + * the call to "dco_get_peer_stat()" + */ + if (dco->c->mode == CM_TOP) + { + dco_update_peer_stat(dco->c->multi, peerid, bytes); + } + else + { + dco->c->c2.dco_read_bytes = nvlist_get_number(bytes, "in"); + dco->c->c2.dco_write_bytes = nvlist_get_number(bytes, "out"); + } } nvlist_destroy(nvl); @@ -882,12 +894,26 @@ #pragma GCC diagnostic pop #endif +/* get stats for a single peer + * we can get here for "the peer stats" in p2p client mode, or by + * being queried for a particular peer in p2mp mode, for --inactive + */ int dco_get_peer_stats(struct context *c, const bool raise_sigusr1_on_err) { - msg(D_DCO_DEBUG, __func__); - /* Not implemented. */ - return 0; + ASSERT(c->c2.tls_multi); + msg(D_DCO_DEBUG, "%s: peer-id %d", __func__, c->c2.tls_multi->dco_peer_id); + + if (c->c2.tls_multi->dco_peer_id < 0) + { + return -EINVAL; /* DCO not active yet */ + } + + /* unfortunately, the FreeBSD kernel has no peer-specific query - so + * we just get all the stats - and if we're there anyway, we can save it + * for all peers, too... + */ + return dco_get_peer_stats_multi(&c->c1.tuntap->dco, raise_sigusr1_on_err); } const char * -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1350?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I38a040a9bdcb44933d4ca538f746af5c61011d7c Gerrit-Change-Number: 1350 Gerrit-PatchSet: 4 Gerrit-Owner: cron2 <[email protected]> Gerrit-Reviewer: flichtenheld <[email protected]> Gerrit-Reviewer: plaisthos <[email protected]> Gerrit-Reviewer: ralf_lici <[email protected]> Gerrit-CC: openvpn-devel <[email protected]>
_______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
