Adding upstream version 2.7.0.upstream/2.7.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 38 insertions, 4 deletions

diff --git a/src/net.c b/src/net.c
index 6bfe1fa..1fe21ba 100644
--- a/src/net.c
+++ b/src/net.c
@@ -39,6 +39,8 @@ enum perf_net_mode perf_net_parsemode(const char* mode)
         return sock_tcp;
     } else if (!strcmp(mode, "tls") || !strcmp(mode, "dot")) {
         return sock_dot;
+    } else if (!strcmp(mode, "doh")) {
+        return sock_doh;
     }
 
     perf_log_warning("invalid socket mode");
@@ -189,7 +191,7 @@ void perf_net_parselocal(int family, const char* name, unsigned int port,
     exit(1);
 }
 
-struct perf_net_socket* perf_net_opensocket(enum perf_net_mode mode, const perf_sockaddr_t* server, const perf_sockaddr_t* local, unsigned int offset, size_t bufsize)
+struct perf_net_socket* perf_net_opensocket(enum perf_net_mode mode, const perf_sockaddr_t* server, const perf_sockaddr_t* local, unsigned int offset, size_t bufsize, void* data, perf_net_sent_cb_t sent, perf_net_event_cb_t event)
 {
     int             port;
     perf_sockaddr_t tmp;
@@ -209,14 +211,46 @@ struct perf_net_socket* perf_net_opensocket(enum perf_net_mode mode, const perf_
 
     switch (mode) {
     case sock_udp:
-        return perf_net_udp_opensocket(server, &tmp, bufsize);
+        return perf_net_udp_opensocket(server, &tmp, bufsize, data, sent, event);
     case sock_tcp:
-        return perf_net_tcp_opensocket(server, &tmp, bufsize);
+        return perf_net_tcp_opensocket(server, &tmp, bufsize, data, sent, event);
     case sock_dot:
-        return perf_net_dot_opensocket(server, &tmp, bufsize);
+        return perf_net_dot_opensocket(server, &tmp, bufsize, data, sent, event);
+    case sock_doh:
+        return perf_net_doh_opensocket(server, &tmp, bufsize, data, sent, event);
     default:
         perf_log_fatal("perf_net_opensocket(): invalid mode");
     }
 
     return 0;
 }
+
+void perf_net_stats_init(enum perf_net_mode mode)
+{
+    switch (mode) {
+    case sock_doh:
+        perf_net_doh_stats_init();
+    default:
+        break;
+    }
+}
+
+void perf_net_stats_compile(enum perf_net_mode mode, struct perf_net_socket* sock)
+{
+    switch (mode) {
+    case sock_doh:
+        perf_net_doh_stats_compile(sock);
+    default:
+        break;
+    }
+}
+
+void perf_net_stats_print(enum perf_net_mode mode)
+{
+    switch (mode) {
+    case sock_doh:
+        perf_net_doh_stats_print();
+    default:
+        break;
+    }
+}