From c5b0bd0e221b2ae11345151eeae2cba2afdc6426 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A9sz=C3=A1ros=20Mih=C3=A1ly?= Date: Thu, 27 Aug 2020 20:27:09 +0200 Subject: [PATCH] Update prometheus gcc 10 compatible --- src/apps/relay/prom_server.c | 22 ++++++++++++++++++++++ src/apps/relay/prom_server.h | 34 +++++++++++++++++----------------- 2 files changed, 39 insertions(+), 17 deletions(-) diff --git a/src/apps/relay/prom_server.c b/src/apps/relay/prom_server.c index ec395125..8bd82fa8 100644 --- a/src/apps/relay/prom_server.c +++ b/src/apps/relay/prom_server.c @@ -3,6 +3,28 @@ #include "mainrelay.h" #include "prom_server.h" +prom_gauge_t *turn_status; + +prom_gauge_t *turn_traffic_rcvp; +prom_gauge_t *turn_traffic_rcvb; +prom_gauge_t *turn_traffic_sentp; +prom_gauge_t *turn_traffic_sentb; + +prom_gauge_t *turn_total_traffic_rcvp; +prom_gauge_t *turn_total_traffic_rcvb; +prom_gauge_t *turn_total_traffic_sentp; +prom_gauge_t *turn_total_traffic_sentb; + +prom_gauge_t *turn_traffic_peer_rcvp; +prom_gauge_t *turn_traffic_peer_rcvb; +prom_gauge_t *turn_traffic_peer_sentp; +prom_gauge_t *turn_traffic_peer_sentb; + +prom_gauge_t *turn_total_traffic_peer_rcvp; +prom_gauge_t *turn_total_traffic_peer_rcvb; +prom_gauge_t *turn_total_traffic_peer_sentp; +prom_gauge_t *turn_total_traffic_peer_sentb; + int start_prometheus_server(void){ if (turn_params.prometheus == 0){ return 0; diff --git a/src/apps/relay/prom_server.h b/src/apps/relay/prom_server.h index 0211038d..cade4849 100644 --- a/src/apps/relay/prom_server.h +++ b/src/apps/relay/prom_server.h @@ -16,27 +16,27 @@ #define DEFAULT_PROM_SERVER_PORT (9641) -prom_gauge_t *turn_status; +extern prom_gauge_t *turn_status; -prom_gauge_t *turn_traffic_rcvp; -prom_gauge_t *turn_traffic_rcvb; -prom_gauge_t *turn_traffic_sentp; -prom_gauge_t *turn_traffic_sentb; +extern prom_gauge_t *turn_traffic_rcvp; +extern prom_gauge_t *turn_traffic_rcvb; +extern prom_gauge_t *turn_traffic_sentp; +extern prom_gauge_t *turn_traffic_sentb; -prom_gauge_t *turn_total_traffic_rcvp; -prom_gauge_t *turn_total_traffic_rcvb; -prom_gauge_t *turn_total_traffic_sentp; -prom_gauge_t *turn_total_traffic_sentb; +extern prom_gauge_t *turn_total_traffic_rcvp; +extern prom_gauge_t *turn_total_traffic_rcvb; +extern prom_gauge_t *turn_total_traffic_sentp; +extern prom_gauge_t *turn_total_traffic_sentb; -prom_gauge_t *turn_traffic_peer_rcvp; -prom_gauge_t *turn_traffic_peer_rcvb; -prom_gauge_t *turn_traffic_peer_sentp; -prom_gauge_t *turn_traffic_peer_sentb; +extern prom_gauge_t *turn_traffic_peer_rcvp; +extern prom_gauge_t *turn_traffic_peer_rcvb; +extern prom_gauge_t *turn_traffic_peer_sentp; +extern prom_gauge_t *turn_traffic_peer_sentb; -prom_gauge_t *turn_total_traffic_peer_rcvp; -prom_gauge_t *turn_total_traffic_peer_rcvb; -prom_gauge_t *turn_total_traffic_peer_sentp; -prom_gauge_t *turn_total_traffic_peer_sentb; +extern prom_gauge_t *turn_total_traffic_peer_rcvp; +extern prom_gauge_t *turn_total_traffic_peer_rcvb; +extern prom_gauge_t *turn_total_traffic_peer_sentp; +extern prom_gauge_t *turn_total_traffic_peer_sentb; #ifdef __cplusplus extern "C" {