1. openvpn
  2. Commit f45a8d80b8ce2f73026d5330a6664c4a78e9afc2
Browse code

Rename dco_get_peer_stats to dco_get_peer_stats_multi

Existing API and implementation (FreeBSD only) are designed for
server usage. Rename it to *_multi to indicate that and not to mix
with upcoming client API/implementation.

Signed-off-by: Lev Stipakov <lev@openvpn.net>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20221214132835.1010-1-lstipakov@gmail.com>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg25690.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit 6dbf8352ef2151dfdee7f02ccbdd9560b3e2be75)

Lev Stipakov authored on 2022/12/14 22:28:35
Showing 5 changed files
src/openvpn/dco.h
History View file @ f45a8d8
... ... 
@@ -233,7 +233,7 @@ void dco_delete_iroutes(struct multi_context *m, struct multi_instance *mi);
233 233 
  * @param dco   DCO device context
234 234 
  * @param m     the server context
235 235 
  **/
236 
-int dco_get_peer_stats(dco_context_t *dco, struct multi_context *m);
236 
+int dco_get_peer_stats_multi(dco_context_t *dco, struct multi_context *m);
237 237
238 238 
 /**
239 239 
  * Retrieve the list of ciphers supported by the current platform
... ... 
@@ -357,7 +357,7 @@ dco_delete_iroutes(struct multi_context *m, struct multi_instance *mi)
357 357 
 }
358 358
359 359 
 static inline int
360 
-dco_get_peer_stats(dco_context_t *dco, struct multi_context *m)
360 
+dco_get_peer_stats_multi(dco_context_t *dco, struct multi_context *m)
361 361 
 {
362 362 
     return 0;
363 363 
 }
src/openvpn/dco_freebsd.c
History View file @ f45a8d8
... ... 
@@ -691,7 +691,7 @@ dco_update_peer_stat(struct multi_context *m, uint32_t peerid, const nvlist_t *n
691 691 
 }
692 692
693 693 
 int
694 
-dco_get_peer_stats(dco_context_t *dco, struct multi_context *m)
694 
+dco_get_peer_stats_multi(dco_context_t *dco, struct multi_context *m)
695 695 
 {
696 696
697 697 
     struct ifdrv drv;
src/openvpn/dco_linux.c
History View file @ f45a8d8
... ... 
@@ -918,7 +918,7 @@ nla_put_failure:
918 918 
 }
919 919
920 920 
 int
921 
-dco_get_peer_stats(dco_context_t *dco, struct multi_context *m)
921 
+dco_get_peer_stats_multi(dco_context_t *dco, struct multi_context *m)
922 922 
 {
923 923 
     /* Not implemented. */
924 924 
     return 0;
src/openvpn/dco_win.c
History View file @ f45a8d8
... ... 
@@ -400,7 +400,7 @@ dco_do_write(dco_context_t *dco, int peer_id, struct buffer *buf)
400 400 
 }
401 401
402 402 
 int
403 
-dco_get_peer_stats(dco_context_t *dco, struct multi_context *m)
403 
+dco_get_peer_stats_multi(dco_context_t *dco, struct multi_context *m)
404 404 
 {
405 405 
     /* Not implemented. */
406 406 
     return 0;
src/openvpn/multi.c
History View file @ f45a8d8
... ... 
@@ -540,7 +540,7 @@ multi_del_iroutes(struct multi_context *m,
540 540 
 static void
541 541 
 setenv_stats(struct multi_context *m, struct context *c)
542 542 
 {
543 
-    dco_get_peer_stats(&m->top.c1.tuntap->dco, m);
543 
+    dco_get_peer_stats_multi(&m->top.c1.tuntap->dco, m);
544 544
545 545 
     setenv_counter(c->c2.es, "bytes_received", c->c2.link_read_bytes + c->c2.dco_read_bytes);
546 546 
     setenv_counter(c->c2.es, "bytes_sent", c->c2.link_write_bytes + c->c2.dco_write_bytes);
... ... 
@@ -839,7 +839,7 @@ multi_print_status(struct multi_context *m, struct status_output *so, const int
839 839
840 840 
         status_reset(so);
841 841
842 
-        dco_get_peer_stats(&m->top.c1.tuntap->dco, m);
842 
+        dco_get_peer_stats_multi(&m->top.c1.tuntap->dco, m);
843 843
844 844 
         if (version == 1)
845 845 
         {