From 61aedf201c2c4bf0e5aa4db32e74f4d860b88593 Mon Sep 17 00:00:00 2001
From: Federico Ceratto <federico.ceratto@gmail.com>
Date: Tue, 19 Dec 2017 23:39:21 +0000
Subject: New upstream version 1.9.0+dfsg

---
 src/proc_net_stat_synproxy.c | 78 ++++++++++++++++++++++++++++++++++----------
 1 file changed, 60 insertions(+), 18 deletions(-)

(limited to 'src/proc_net_stat_synproxy.c')

diff --git a/src/proc_net_stat_synproxy.c b/src/proc_net_stat_synproxy.c
index 5a1fc30eb..0d6f6ee03 100644
--- a/src/proc_net_stat_synproxy.c
+++ b/src/proc_net_stat_synproxy.c
@@ -53,18 +53,27 @@ int do_proc_net_stat_synproxy(int update_every, usec_t dt) {
 
     unsigned long long events = entries + syn_received + cookie_invalid + cookie_valid + cookie_retrans + conn_reopened;
 
-    RRDSET *st;
-
     // --------------------------------------------------------------------
 
     if((do_entries == CONFIG_BOOLEAN_AUTO && events) || do_entries == CONFIG_BOOLEAN_YES) {
         do_entries = CONFIG_BOOLEAN_YES;
 
-        st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_SYNPROXY "_entries");
+        static RRDSET *st = NULL;
         if(unlikely(!st)) {
-            st = rrdset_create_localhost(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_SYNPROXY "_entries", NULL
-                                         , RRD_TYPE_NET_STAT_SYNPROXY, NULL, "SYNPROXY Entries Used", "entries", 3304
-                                         , update_every, RRDSET_TYPE_LINE);
+            st = rrdset_create_localhost(
+                    RRD_TYPE_NET_STAT_NETFILTER
+                    , RRD_TYPE_NET_STAT_SYNPROXY "_entries"
+                    , NULL
+                    , RRD_TYPE_NET_STAT_SYNPROXY
+                    , NULL
+                    , "SYNPROXY Entries Used"
+                    , "entries"
+                    , "proc"
+                    , "net/stat/synproxy"
+                    , 3304
+                    , update_every
+                    , RRDSET_TYPE_LINE
+            );
 
             rrddim_add(st, "entries", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
         }
@@ -79,11 +88,22 @@ int do_proc_net_stat_synproxy(int update_every, usec_t dt) {
     if((do_syns == CONFIG_BOOLEAN_AUTO && events) || do_syns == CONFIG_BOOLEAN_YES) {
         do_syns = CONFIG_BOOLEAN_YES;
 
-        st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_SYNPROXY "_syn_received");
+        static RRDSET *st = NULL;
         if(unlikely(!st)) {
-            st = rrdset_create_localhost(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_SYNPROXY "_syn_received", NULL
-                                         , RRD_TYPE_NET_STAT_SYNPROXY, NULL, "SYNPROXY SYN Packets received", "SYN/s"
-                                         , 3301, update_every, RRDSET_TYPE_LINE);
+            st = rrdset_create_localhost(
+                    RRD_TYPE_NET_STAT_NETFILTER
+                    , RRD_TYPE_NET_STAT_SYNPROXY "_syn_received"
+                    , NULL
+                    , RRD_TYPE_NET_STAT_SYNPROXY
+                    , NULL
+                    , "SYNPROXY SYN Packets received"
+                    , "SYN/s"
+                    , "proc"
+                    , "net/stat/synproxy"
+                    , 3301
+                    , update_every
+                    , RRDSET_TYPE_LINE
+            );
 
             rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
         }
@@ -98,11 +118,22 @@ int do_proc_net_stat_synproxy(int update_every, usec_t dt) {
     if((do_reopened == CONFIG_BOOLEAN_AUTO && events) || do_reopened == CONFIG_BOOLEAN_YES) {
         do_reopened = CONFIG_BOOLEAN_YES;
 
-        st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_SYNPROXY "_conn_reopened");
+        static RRDSET *st = NULL;
         if(unlikely(!st)) {
-            st = rrdset_create_localhost(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_SYNPROXY "_conn_reopened", NULL
-                                         , RRD_TYPE_NET_STAT_SYNPROXY, NULL, "SYNPROXY Connections Reopened"
-                                         , "connections/s", 3303, update_every, RRDSET_TYPE_LINE);
+            st = rrdset_create_localhost(
+                    RRD_TYPE_NET_STAT_NETFILTER
+                    , RRD_TYPE_NET_STAT_SYNPROXY "_conn_reopened"
+                    , NULL
+                    , RRD_TYPE_NET_STAT_SYNPROXY
+                    , NULL
+                    , "SYNPROXY Connections Reopened"
+                    , "connections/s"
+                    , "proc"
+                    , "net/stat/synproxy"
+                    , 3303
+                    , update_every
+                    , RRDSET_TYPE_LINE
+            );
 
             rrddim_add(st, "reopened", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
         }
@@ -117,11 +148,22 @@ int do_proc_net_stat_synproxy(int update_every, usec_t dt) {
     if((do_cookies == CONFIG_BOOLEAN_AUTO && events) || do_cookies == CONFIG_BOOLEAN_YES) {
         do_cookies = CONFIG_BOOLEAN_YES;
 
-        st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_SYNPROXY "_cookies");
+        static RRDSET *st = NULL;
         if(unlikely(!st)) {
-            st = rrdset_create_localhost(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_SYNPROXY "_cookies", NULL
-                                         , RRD_TYPE_NET_STAT_SYNPROXY, NULL, "SYNPROXY TCP Cookies", "cookies/s", 3302
-                                         , update_every, RRDSET_TYPE_LINE);
+            st = rrdset_create_localhost(
+                    RRD_TYPE_NET_STAT_NETFILTER
+                    , RRD_TYPE_NET_STAT_SYNPROXY "_cookies"
+                    , NULL
+                    , RRD_TYPE_NET_STAT_SYNPROXY
+                    , NULL
+                    , "SYNPROXY TCP Cookies"
+                    , "cookies/s"
+                    , "proc"
+                    , "net/stat/synproxy"
+                    , 3302
+                    , update_every
+                    , RRDSET_TYPE_LINE
+            );
 
             rrddim_add(st, "valid", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
             rrddim_add(st, "invalid", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-- 
cgit v1.2.3