New upstream version 1.4.0+dfsgupstream/1.4.0+dfsg

1 files changed, 573 insertions, 152 deletions

diff --git a/src/proc_net_snmp.c b/src/proc_net_snmp.c
index a773f55f..a75c0a96 100644
--- a/src/proc_net_snmp.c
+++ b/src/proc_net_snmp.c
@@ -3,34 +3,368 @@
 #define RRD_TYPE_NET_SNMP           "ipv4"
 #define RRD_TYPE_NET_SNMP_LEN       strlen(RRD_TYPE_NET_SNMP)
 
+#define NETSTAT_PRESENT 0x00000001
+
+struct netstat_columns {
+    char *name;
+    uint32_t hash;
+    unsigned long long value;
+    int multiplier;     // not needed everywhere
+    char *label;        // not needed everywhere
+};
+
+static struct netstat_columns ip_data[] = {
+//    { "Forwarding", 0, 0, 1, NULL },
+//    { "DefaultTTL", 0, 0, 1, NULL },
+    { "InReceives", 0, 0, 1, NULL },
+    { "InHdrErrors", 0, 0, 1, NULL },
+    { "InAddrErrors", 0, 0, 1, NULL },
+    { "ForwDatagrams", 0, 0, 1, NULL },
+    { "InUnknownProtos", 0, 0, 1, NULL },
+    { "InDiscards", 0, 0, 1, NULL },
+    { "InDelivers", 0, 0, 1, NULL },
+    { "OutRequests", 0, 0, 1, NULL },
+    { "OutDiscards", 0, 0, 1, NULL },
+    { "OutNoRoutes", 0, 0, 1, NULL },
+//    { "ReasmTimeout", 0, 0, 1, NULL },
+    { "ReasmReqds", 0, 0, 1, NULL },
+    { "ReasmOKs", 0, 0, 1, NULL },
+    { "ReasmFails", 0, 0, 1, NULL },
+    { "FragOKs", 0, 0, 1, NULL },
+    { "FragFails", 0, 0, 1, NULL },
+    { "FragCreates", 0, 0, 1, NULL },
+    { NULL, 0, 0, 0, NULL }
+};
+
+static struct netstat_columns icmp_data[] = {
+    { "InMsgs", 0, 0, 1, NULL },
+    { "OutMsgs", 0, 0, -1, NULL },
+    { "InErrors", 0, 0, 1, NULL },
+    { "OutErrors", 0, 0, -1, NULL },
+    { "InCsumErrors", 0, 0, 1, NULL },
+
+    // all these are available in icmpmsg
+//    { "InDestUnreachs", 0, 0, 1, NULL },
+//    { "OutDestUnreachs", 0, 0, -1, NULL },
+//    { "InTimeExcds", 0, 0, 1, NULL },
+//    { "OutTimeExcds", 0, 0, -1, NULL },
+//    { "InParmProbs", 0, 0, 1, NULL },
+//    { "OutParmProbs", 0, 0, -1, NULL },
+//    { "InSrcQuenchs", 0, 0, 1, NULL },
+//    { "OutSrcQuenchs", 0, 0, -1, NULL },
+//    { "InRedirects", 0, 0, 1, NULL },
+//    { "OutRedirects", 0, 0, -1, NULL },
+//    { "InEchos", 0, 0, 1, NULL },
+//    { "OutEchos", 0, 0, -1, NULL },
+//    { "InEchoReps", 0, 0, 1, NULL },
+//    { "OutEchoReps", 0, 0, -1, NULL },
+//    { "InTimestamps", 0, 0, 1, NULL },
+//    { "OutTimestamps", 0, 0, -1, NULL },
+//    { "InTimestampReps", 0, 0, 1, NULL },
+//    { "OutTimestampReps", 0, 0, -1, NULL },
+//    { "InAddrMasks", 0, 0, 1, NULL },
+//    { "OutAddrMasks", 0, 0, -1, NULL },
+//    { "InAddrMaskReps", 0, 0, 1, NULL },
+//    { "OutAddrMaskReps", 0, 0, -1, NULL },
+
+    { NULL, 0, 0, 0, NULL }
+};
+
+static struct netstat_columns icmpmsg_data[] = {
+    { "InType0", 0, 0, 1, "InEchoReps" },
+    { "OutType0", 0, 0, -1, "OutEchoReps" },
+//    { "InType1", 0, 0, 1, NULL },                   // unassigned
+//    { "OutType1", 0, 0, -1, NULL },                 // unassigned
+//    { "InType2", 0, 0, 1, NULL },                   // unassigned
+//    { "OutType2", 0, 0, -1, NULL },                 // unassigned
+    { "InType3", 0, 0, 1, "InDestUnreachs" },
+    { "OutType3", 0, 0, -1, "OutDestUnreachs" },
+//    { "InType4", 0, 0, 1, "InSrcQuenchs" },         // deprecated
+//    { "OutType4", 0, 0, -1, "OutSrcQuenchs" },      // deprecated
+    { "InType5", 0, 0, 1, "InRedirects" },
+    { "OutType5", 0, 0, -1, "OutRedirects" },
+//    { "InType6", 0, 0, 1, "InAlterHostAddr" },      // deprecated
+//    { "OutType6", 0, 0, -1, "OutAlterHostAddr" },   // deprecated
+//    { "InType7", 0, 0, 1, NULL },                   // unassigned
+//    { "OutType7", 0, 0, -1, NULL },                 // unassigned
+    { "InType8", 0, 0, 1, "InEchos" },
+    { "OutType8", 0, 0, -1, "OutEchos" },
+    { "InType9", 0, 0, 1, "InRouterAdvert" },
+    { "OutType9", 0, 0, -1, "OutRouterAdvert" },
+    { "InType10", 0, 0, 1, "InRouterSelect" },
+    { "OutType10", 0, 0, -1, "OutRouterSelect" },
+    { "InType11", 0, 0, 1, "InTimeExcds" },
+    { "OutType11", 0, 0, -1, "OutTimeExcds" },
+    { "InType12", 0, 0, 1, "InParmProbs" },
+    { "OutType12", 0, 0, -1, "OutParmProbs" },
+    { "InType13", 0, 0, 1, "InTimestamps" },
+    { "OutType13", 0, 0, -1, "OutTimestamps" },
+    { "InType14", 0, 0, 1, "InTimestampReps" },
+    { "OutType14", 0, 0, -1, "OutTimestampReps" },
+//    { "InType15", 0, 0, 1, "InInfos" },             // deprecated
+//    { "OutType15", 0, 0, -1, "OutInfos" },          // deprecated
+//    { "InType16", 0, 0, 1, "InInfoReps" },          // deprecated
+//    { "OutType16", 0, 0, -1, "OutInfoReps" },       // deprecated
+//    { "InType17", 0, 0, 1, "InAddrMasks" },         // deprecated
+//    { "OutType17", 0, 0, -1, "OutAddrMasks" },      // deprecated
+//    { "InType18", 0, 0, 1, "InAddrMaskReps" },      // deprecated
+//    { "OutType18", 0, 0, -1, "OutAddrMaskReps" },   // deprecated
+//    { "InType30", 0, 0, 1, "InTraceroute" },        // deprecated
+//    { "OutType30", 0, 0, -1, "OutTraceroute" },     // deprecated
+    { NULL, 0, 0, 0, NULL }
+};
+
+static struct netstat_columns tcp_data[] = {
+//    { "RtoAlgorithm", 0, 0, 1, NULL },
+//    { "RtoMin", 0, 0, 1, NULL },
+//    { "RtoMax", 0, 0, 1, NULL },
+//    { "MaxConn", 0, 0, 1, NULL },
+    { "ActiveOpens", 0, 0, 1, NULL },
+    { "PassiveOpens", 0, 0, 1, NULL },
+    { "AttemptFails", 0, 0, 1, NULL },
+    { "EstabResets", 0, 0, 1, NULL },
+    { "CurrEstab", 0, 0, 1, NULL },
+    { "InSegs", 0, 0, 1, NULL },
+    { "OutSegs", 0, 0, 1, NULL },
+    { "RetransSegs", 0, 0, 1, NULL },
+    { "InErrs", 0, 0, 1, NULL },
+    { "OutRsts", 0, 0, 1, NULL },
+    { "InCsumErrors", 0, 0, 1, NULL },
+    { NULL, 0, 0, 0, NULL }
+};
+
+static struct netstat_columns udp_data[] = {
+    { "InDatagrams", 0, 0, 1, NULL },
+    { "NoPorts", 0, 0, 1, NULL },
+    { "InErrors", 0, 0, 1, NULL },
+    { "OutDatagrams", 0, 0, 1, NULL },
+    { "RcvbufErrors", 0, 0, 1, NULL },
+    { "SndbufErrors", 0, 0, 1, NULL },
+    { "InCsumErrors", 0, 0, 1, NULL },
+    { "IgnoredMulti", 0, 0, 1, NULL },
+    { NULL, 0, 0, 0, NULL }
+};
+
+static struct netstat_columns udplite_data[] = {
+    { "InDatagrams", 0, 0, 1, NULL },
+    { "NoPorts", 0, 0, 1, NULL },
+    { "InErrors", 0, 0, 1, NULL },
+    { "OutDatagrams", 0, 0, 1, NULL },
+    { "RcvbufErrors", 0, 0, 1, NULL },
+    { "SndbufErrors", 0, 0, 1, NULL },
+    { "InCsumErrors", 0, 0, 1, NULL },
+    { "IgnoredMulti", 0, 0, 1, NULL },
+    { NULL, 0, 0, 0, NULL }
+};
+
+static void hash_array(struct netstat_columns *nc) {
+    int i;
+
+    for(i = 0; nc[i].name ;i++)
+        nc[i].hash = simple_hash(nc[i].name);
+}
+
+static unsigned long long *netstat_columns_find(struct netstat_columns *nc, const char *name) {
+    uint32_t i, hash = simple_hash(name);
+
+    for(i = 0; nc[i].name ;i++)
+        if(unlikely(nc[i].hash == hash && !strcmp(nc[i].name, name)))
+            return &nc[i].value;
+
+    fatal("Cannot find key '%s' in /proc/net/snmp internal array.", name);
+}
+
+static void parse_line_pair(procfile *ff, struct netstat_columns *nc, uint32_t header_line, uint32_t values_line) {
+    uint32_t hwords = procfile_linewords(ff, header_line);
+    uint32_t vwords = procfile_linewords(ff, values_line);
+    uint32_t w, i;
+
+    if(unlikely(vwords > hwords)) {
+        error("File /proc/net/snmp on header line %u has %u words, but on value line %u has %u words.", header_line, hwords, values_line, vwords);
+        vwords = hwords;
+    }
+
+    for(w = 1; w < vwords ;w++) {
+        char *key = procfile_lineword(ff, header_line, w);
+        uint32_t hash = simple_hash(key);
+
+        for(i = 0 ; nc[i].name ;i++) {
+            if(unlikely(hash == nc[i].hash && !strcmp(key, nc[i].name))) {
+                nc[i].value = strtoull(procfile_lineword(ff, values_line, w), NULL, 10);
+                break;
+            }
+        }
+    }
+}
+
 int do_proc_net_snmp(int update_every, unsigned long long dt) {
+    (void)dt;
+
     static procfile *ff = NULL;
     static int do_ip_packets = -1, do_ip_fragsout = -1, do_ip_fragsin = -1, do_ip_errors = -1,
         do_tcp_sockets = -1, do_tcp_packets = -1, do_tcp_errors = -1, do_tcp_handshake = -1,
-        do_udp_packets = -1, do_udp_errors = -1;
-
-    if(do_ip_packets == -1)     do_ip_packets       = config_get_boolean("plugin:proc:/proc/net/snmp", "ipv4 packets", 1);
-    if(do_ip_fragsout == -1)    do_ip_fragsout      = config_get_boolean("plugin:proc:/proc/net/snmp", "ipv4 fragments sent", 1);
-    if(do_ip_fragsin == -1)     do_ip_fragsin       = config_get_boolean("plugin:proc:/proc/net/snmp", "ipv4 fragments assembly", 1);
-    if(do_ip_errors == -1)      do_ip_errors        = config_get_boolean("plugin:proc:/proc/net/snmp", "ipv4 errors", 1);
-    if(do_tcp_sockets == -1)    do_tcp_sockets      = config_get_boolean("plugin:proc:/proc/net/snmp", "ipv4 TCP connections", 1);
-    if(do_tcp_packets == -1)    do_tcp_packets      = config_get_boolean("plugin:proc:/proc/net/snmp", "ipv4 TCP packets", 1);
-    if(do_tcp_errors == -1)     do_tcp_errors       = config_get_boolean("plugin:proc:/proc/net/snmp", "ipv4 TCP errors", 1);
-    if(do_tcp_handshake == -1)  do_tcp_handshake    = config_get_boolean("plugin:proc:/proc/net/snmp", "ipv4 TCP handshake issues", 1);
-    if(do_udp_packets == -1)    do_udp_packets      = config_get_boolean("plugin:proc:/proc/net/snmp", "ipv4 UDP packets", 1);
-    if(do_udp_errors == -1)     do_udp_errors       = config_get_boolean("plugin:proc:/proc/net/snmp", "ipv4 UDP errors", 1);
-
-    if(dt) {};
-
-    if(!ff) {
+        do_udp_packets = -1, do_udp_errors = -1, do_icmp_packets = -1, do_icmpmsg = -1, do_udplite_packets = -1;
+    static uint32_t hash_ip = 0, hash_icmp = 0, hash_tcp = 0, hash_udp = 0, hash_icmpmsg = 0, hash_udplite = 0;
+
+    //static unsigned long long *ip_Forwarding = NULL;
+    //static unsigned long long *ip_DefaultTTL = NULL;
+    static unsigned long long *ip_InReceives = NULL;
+    static unsigned long long *ip_InHdrErrors = NULL;
+    static unsigned long long *ip_InAddrErrors = NULL;
+    static unsigned long long *ip_ForwDatagrams = NULL;
+    static unsigned long long *ip_InUnknownProtos = NULL;
+    static unsigned long long *ip_InDiscards = NULL;
+    static unsigned long long *ip_InDelivers = NULL;
+    static unsigned long long *ip_OutRequests = NULL;
+    static unsigned long long *ip_OutDiscards = NULL;
+    static unsigned long long *ip_OutNoRoutes = NULL;
+    //static unsigned long long *ip_ReasmTimeout = NULL;
+    static unsigned long long *ip_ReasmReqds = NULL;
+    static unsigned long long *ip_ReasmOKs = NULL;
+    static unsigned long long *ip_ReasmFails = NULL;
+    static unsigned long long *ip_FragOKs = NULL;
+    static unsigned long long *ip_FragFails = NULL;
+    static unsigned long long *ip_FragCreates = NULL;
+
+    static unsigned long long *icmp_InMsgs = NULL;
+    static unsigned long long *icmp_OutMsgs = NULL;
+    static unsigned long long *icmp_InErrors = NULL;
+    static unsigned long long *icmp_OutErrors = NULL;
+    static unsigned long long *icmp_InCsumErrors = NULL;
+
+    //static unsigned long long *tcp_RtoAlgorithm = NULL;
+    //static unsigned long long *tcp_RtoMin = NULL;
+    //static unsigned long long *tcp_RtoMax = NULL;
+    //static unsigned long long *tcp_MaxConn = NULL;
+    static unsigned long long *tcp_ActiveOpens = NULL;
+    static unsigned long long *tcp_PassiveOpens = NULL;
+    static unsigned long long *tcp_AttemptFails = NULL;
+    static unsigned long long *tcp_EstabResets = NULL;
+    static unsigned long long *tcp_CurrEstab = NULL;
+    static unsigned long long *tcp_InSegs = NULL;
+    static unsigned long long *tcp_OutSegs = NULL;
+    static unsigned long long *tcp_RetransSegs = NULL;
+    static unsigned long long *tcp_InErrs = NULL;
+    static unsigned long long *tcp_OutRsts = NULL;
+    static unsigned long long *tcp_InCsumErrors = NULL;
+
+    static unsigned long long *udp_InDatagrams = NULL;
+    static unsigned long long *udp_NoPorts = NULL;
+    static unsigned long long *udp_InErrors = NULL;
+    static unsigned long long *udp_OutDatagrams = NULL;
+    static unsigned long long *udp_RcvbufErrors = NULL;
+    static unsigned long long *udp_SndbufErrors = NULL;
+    static unsigned long long *udp_InCsumErrors = NULL;
+    static unsigned long long *udp_IgnoredMulti = NULL;
+
+    static unsigned long long *udplite_InDatagrams = NULL;
+    static unsigned long long *udplite_NoPorts = NULL;
+    static unsigned long long *udplite_InErrors = NULL;
+    static unsigned long long *udplite_OutDatagrams = NULL;
+    static unsigned long long *udplite_RcvbufErrors = NULL;
+    static unsigned long long *udplite_SndbufErrors = NULL;
+    static unsigned long long *udplite_InCsumErrors = NULL;
+    static unsigned long long *udplite_IgnoredMulti = NULL;
+
+    if(unlikely(do_ip_packets == -1)) {
+        do_ip_packets       = config_get_boolean("plugin:proc:/proc/net/snmp", "ipv4 packets", 1);
+        do_ip_fragsout      = config_get_boolean("plugin:proc:/proc/net/snmp", "ipv4 fragments sent", 1);
+        do_ip_fragsin       = config_get_boolean("plugin:proc:/proc/net/snmp", "ipv4 fragments assembly", 1);
+        do_ip_errors        = config_get_boolean("plugin:proc:/proc/net/snmp", "ipv4 errors", 1);
+        do_tcp_sockets      = config_get_boolean("plugin:proc:/proc/net/snmp", "ipv4 TCP connections", 1);
+        do_tcp_packets      = config_get_boolean("plugin:proc:/proc/net/snmp", "ipv4 TCP packets", 1);
+        do_tcp_errors       = config_get_boolean("plugin:proc:/proc/net/snmp", "ipv4 TCP errors", 1);
+        do_tcp_handshake    = config_get_boolean("plugin:proc:/proc/net/snmp", "ipv4 TCP handshake issues", 1);
+        do_udp_packets      = config_get_boolean("plugin:proc:/proc/net/snmp", "ipv4 UDP packets", 1);
+        do_udp_errors       = config_get_boolean("plugin:proc:/proc/net/snmp", "ipv4 UDP errors", 1);
+        do_icmp_packets     = config_get_boolean("plugin:proc:/proc/net/snmp", "ipv4 ICMP packets", 1);
+        do_icmpmsg          = config_get_boolean("plugin:proc:/proc/net/snmp", "ipv4 ICMP messages", 1);
+        do_udplite_packets  = config_get_boolean("plugin:proc:/proc/net/snmp", "ipv4 UDPLite packets", 1);
+
+        hash_ip = simple_hash("Ip");
+        hash_tcp = simple_hash("Tcp");
+        hash_udp = simple_hash("Udp");
+        hash_icmp = simple_hash("Icmp");
+        hash_icmpmsg = simple_hash("IcmpMsg");
+        hash_udplite = simple_hash("UdpLite");
+
+        hash_array(ip_data);
+        hash_array(tcp_data);
+        hash_array(udp_data);
+        hash_array(icmp_data);
+        hash_array(icmpmsg_data);
+        hash_array(udplite_data);
+
+        //ip_Forwarding = netstat_columns_find(ip_data, "Forwarding");
+        //ip_DefaultTTL = netstat_columns_find(ip_data, "DefaultTTL");
+        ip_InReceives = netstat_columns_find(ip_data, "InReceives");
+        ip_InHdrErrors = netstat_columns_find(ip_data, "InHdrErrors");
+        ip_InAddrErrors = netstat_columns_find(ip_data, "InAddrErrors");
+        ip_ForwDatagrams = netstat_columns_find(ip_data, "ForwDatagrams");
+        ip_InUnknownProtos = netstat_columns_find(ip_data, "InUnknownProtos");
+        ip_InDiscards = netstat_columns_find(ip_data, "InDiscards");
+        ip_InDelivers = netstat_columns_find(ip_data, "InDelivers");
+        ip_OutRequests = netstat_columns_find(ip_data, "OutRequests");
+        ip_OutDiscards = netstat_columns_find(ip_data, "OutDiscards");
+        ip_OutNoRoutes = netstat_columns_find(ip_data, "OutNoRoutes");
+        //ip_ReasmTimeout = netstat_columns_find(ip_data, "ReasmTimeout");
+        ip_ReasmReqds = netstat_columns_find(ip_data, "ReasmReqds");
+        ip_ReasmOKs = netstat_columns_find(ip_data, "ReasmOKs");
+        ip_ReasmFails = netstat_columns_find(ip_data, "ReasmFails");
+        ip_FragOKs = netstat_columns_find(ip_data, "FragOKs");
+        ip_FragFails = netstat_columns_find(ip_data, "FragFails");
+        ip_FragCreates = netstat_columns_find(ip_data, "FragCreates");
+
+        icmp_InMsgs = netstat_columns_find(icmp_data, "InMsgs");
+        icmp_OutMsgs = netstat_columns_find(icmp_data, "OutMsgs");
+        icmp_InErrors = netstat_columns_find(icmp_data, "InErrors");
+        icmp_OutErrors = netstat_columns_find(icmp_data, "OutErrors");
+        icmp_InCsumErrors = netstat_columns_find(icmp_data, "InCsumErrors");
+
+        //tcp_RtoAlgorithm = netstat_columns_find(tcp_data, "RtoAlgorithm");
+        //tcp_RtoMin = netstat_columns_find(tcp_data, "RtoMin");
+        //tcp_RtoMax = netstat_columns_find(tcp_data, "RtoMax");
+        //tcp_MaxConn = netstat_columns_find(tcp_data, "MaxConn");
+        tcp_ActiveOpens = netstat_columns_find(tcp_data, "ActiveOpens");
+        tcp_PassiveOpens = netstat_columns_find(tcp_data, "PassiveOpens");
+        tcp_AttemptFails = netstat_columns_find(tcp_data, "AttemptFails");
+        tcp_EstabResets = netstat_columns_find(tcp_data, "EstabResets");
+        tcp_CurrEstab = netstat_columns_find(tcp_data, "CurrEstab");
+        tcp_InSegs = netstat_columns_find(tcp_data, "InSegs");
+        tcp_OutSegs = netstat_columns_find(tcp_data, "OutSegs");
+        tcp_RetransSegs = netstat_columns_find(tcp_data, "RetransSegs");
+        tcp_InErrs = netstat_columns_find(tcp_data, "InErrs");
+        tcp_OutRsts = netstat_columns_find(tcp_data, "OutRsts");
+        tcp_InCsumErrors = netstat_columns_find(tcp_data, "InCsumErrors");
+
+        udp_InDatagrams = netstat_columns_find(udp_data, "InDatagrams");
+        udp_NoPorts = netstat_columns_find(udp_data, "NoPorts");
+        udp_InErrors = netstat_columns_find(udp_data, "InErrors");
+        udp_OutDatagrams = netstat_columns_find(udp_data, "OutDatagrams");
+        udp_RcvbufErrors = netstat_columns_find(udp_data, "RcvbufErrors");
+        udp_SndbufErrors = netstat_columns_find(udp_data, "SndbufErrors");
+        udp_InCsumErrors = netstat_columns_find(udp_data, "InCsumErrors");
+        udp_IgnoredMulti = netstat_columns_find(udp_data, "IgnoredMulti");
+
+        udplite_InDatagrams = netstat_columns_find(udplite_data, "InDatagrams");
+        udplite_NoPorts = netstat_columns_find(udplite_data, "NoPorts");
+        udplite_InErrors = netstat_columns_find(udplite_data, "InErrors");
+        udplite_OutDatagrams = netstat_columns_find(udplite_data, "OutDatagrams");
+        udplite_RcvbufErrors = netstat_columns_find(udplite_data, "RcvbufErrors");
+        udplite_SndbufErrors = netstat_columns_find(udplite_data, "SndbufErrors");
+        udplite_InCsumErrors = netstat_columns_find(udplite_data, "InCsumErrors");
+        udplite_IgnoredMulti = netstat_columns_find(udplite_data, "IgnoredMulti");
+    }
+
+    if(unlikely(!ff)) {
         char filename[FILENAME_MAX + 1];
         snprintfz(filename, FILENAME_MAX, "%s%s", global_host_prefix, "/proc/net/snmp");
         ff = procfile_open(config_get("plugin:proc:/proc/net/snmp", "filename to monitor", filename), " \t:", PROCFILE_FLAG_DEFAULT);
     }
-    if(!ff) return 1;
+    if(unlikely(!ff)) return 1;
 
     ff = procfile_readall(ff);
-    if(!ff) return 0; // we return 0, so that we will retry to open it next time
+    if(unlikely(!ff)) return 0; // we return 0, so that we will retry to open it next time
 
     uint32_t lines = procfile_lines(ff), l;
     uint32_t words;
@@ -38,8 +372,11 @@ int do_proc_net_snmp(int update_every, unsigned long long dt) {
     RRDSET *st;
 
     for(l = 0; l < lines ;l++) {
-        if(strcmp(procfile_lineword(ff, l, 0), "Ip") == 0) {
-            l++;
+        char *key = procfile_lineword(ff, l, 0);
+        uint32_t hash = simple_hash(key);
+
+        if(unlikely(hash == hash_ip && strcmp(key, "Ip") == 0)) {
+            uint32_t h = l++;
 
             if(strcmp(procfile_lineword(ff, l, 0), "Ip") != 0) {
                 error("Cannot read Ip line from /proc/net/snmp.");
@@ -47,42 +384,13 @@ int do_proc_net_snmp(int update_every, unsigned long long dt) {
             }
 
             words = procfile_linewords(ff, l);
-            if(words < 20) {
-                error("Cannot read /proc/net/snmp Ip line. Expected 20 params, read %u.", words);
+            if(words < 3) {
+                error("Cannot read /proc/net/snmp Ip line. Expected 3+ params, read %u.", words);
                 continue;
             }
 
             // see also http://net-snmp.sourceforge.net/docs/mibs/ip.html
-            unsigned long long Forwarding, DefaultTTL, InReceives, InHdrErrors, InAddrErrors, ForwDatagrams, InUnknownProtos, InDiscards, InDelivers,
-                OutRequests, OutDiscards, OutNoRoutes, ReasmTimeout, ReasmReqds, ReasmOKs, ReasmFails, FragOKs, FragFails, FragCreates;
-
-            Forwarding      = strtoull(procfile_lineword(ff, l, 1), NULL, 10);
-            DefaultTTL      = strtoull(procfile_lineword(ff, l, 2), NULL, 10);
-            InReceives      = strtoull(procfile_lineword(ff, l, 3), NULL, 10);
-            InHdrErrors     = strtoull(procfile_lineword(ff, l, 4), NULL, 10);
-            InAddrErrors    = strtoull(procfile_lineword(ff, l, 5), NULL, 10);
-            ForwDatagrams   = strtoull(procfile_lineword(ff, l, 6), NULL, 10);
-            InUnknownProtos = strtoull(procfile_lineword(ff, l, 7), NULL, 10);
-            InDiscards      = strtoull(procfile_lineword(ff, l, 8), NULL, 10);
-            InDelivers      = strtoull(procfile_lineword(ff, l, 9), NULL, 10);
-            OutRequests     = strtoull(procfile_lineword(ff, l, 10), NULL, 10);
-            OutDiscards     = strtoull(procfile_lineword(ff, l, 11), NULL, 10);
-            OutNoRoutes     = strtoull(procfile_lineword(ff, l, 12), NULL, 10);
-            ReasmTimeout    = strtoull(procfile_lineword(ff, l, 13), NULL, 10);
-            ReasmReqds      = strtoull(procfile_lineword(ff, l, 14), NULL, 10);
-            ReasmOKs        = strtoull(procfile_lineword(ff, l, 15), NULL, 10);
-            ReasmFails      = strtoull(procfile_lineword(ff, l, 16), NULL, 10);
-            FragOKs         = strtoull(procfile_lineword(ff, l, 17), NULL, 10);
-            FragFails       = strtoull(procfile_lineword(ff, l, 18), NULL, 10);
-            FragCreates     = strtoull(procfile_lineword(ff, l, 19), NULL, 10);
-
-            // these are not counters
-            if(Forwarding) {};      // is forwarding enabled?
-            if(DefaultTTL) {};      // the default ttl on packets
-            if(ReasmTimeout) {};    // Reassembly timeout
-
-            // this counter is not used
-            if(InDelivers) {};      // total number of packets delivered to IP user-protocols
+            parse_line_pair(ff, ip_data, h, l);
 
             // --------------------------------------------------------------------
 
@@ -91,15 +399,17 @@ int do_proc_net_snmp(int update_every, unsigned long long dt) {
                 if(!st) {
                     st = rrdset_create(RRD_TYPE_NET_SNMP, "packets", NULL, "packets", NULL, "IPv4 Packets", "packets/s", 3000, update_every, RRDSET_TYPE_LINE);
 
-                    rrddim_add(st, "received", NULL, 1, 1, RRDDIM_INCREMENTAL);
-                    rrddim_add(st, "sent", NULL, -1, 1, RRDDIM_INCREMENTAL);
-                    rrddim_add(st, "forwarded", NULL, 1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "InReceives",    "received",  1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "OutRequests",   "sent",     -1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "ForwDatagrams", "forwarded", 1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "InDelivers",    "delivered", 1, 1, RRDDIM_INCREMENTAL);
                 }
                 else rrdset_next(st);
 
-                rrddim_set(st, "sent", OutRequests);
-                rrddim_set(st, "received", InReceives);
-                rrddim_set(st, "forwarded", ForwDatagrams);
+                rrddim_set(st, "OutRequests",   *ip_OutRequests);
+                rrddim_set(st, "InReceives",    *ip_InReceives);
+                rrddim_set(st, "ForwDatagrams", *ip_ForwDatagrams);
+                rrddim_set(st, "InDelivers",    *ip_InDelivers);
                 rrdset_done(st);
             }
 
@@ -111,15 +421,15 @@ int do_proc_net_snmp(int update_every, unsigned long long dt) {
                     st = rrdset_create(RRD_TYPE_NET_SNMP, "fragsout", NULL, "fragments", NULL, "IPv4 Fragments Sent", "packets/s", 3010, update_every, RRDSET_TYPE_LINE);
                     st->isdetail = 1;
 
-                    rrddim_add(st, "ok", NULL, 1, 1, RRDDIM_INCREMENTAL);
-                    rrddim_add(st, "failed", NULL, -1, 1, RRDDIM_INCREMENTAL);
-                    rrddim_add(st, "all", NULL, 1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "FragOKs",     "ok",      1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "FragFails",   "failed", -1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "FragCreates", "created", 1, 1, RRDDIM_INCREMENTAL);
                 }
                 else rrdset_next(st);
 
-                rrddim_set(st, "ok", FragOKs);
-                rrddim_set(st, "failed", FragFails);
-                rrddim_set(st, "all", FragCreates);
+                rrddim_set(st, "FragOKs",     *ip_FragOKs);
+                rrddim_set(st, "FragFails",   *ip_FragFails);
+                rrddim_set(st, "FragCreates", *ip_FragCreates);
                 rrdset_done(st);
             }
 
@@ -131,15 +441,15 @@ int do_proc_net_snmp(int update_every, unsigned long long dt) {
                     st = rrdset_create(RRD_TYPE_NET_SNMP, "fragsin", NULL, "fragments", NULL, "IPv4 Fragments Reassembly", "packets/s", 3011, update_every, RRDSET_TYPE_LINE);
                     st->isdetail = 1;
 
-                    rrddim_add(st, "ok", NULL, 1, 1, RRDDIM_INCREMENTAL);
-                    rrddim_add(st, "failed", NULL, -1, 1, RRDDIM_INCREMENTAL);
-                    rrddim_add(st, "all", NULL, 1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "ReasmOKs",   "ok",      1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "ReasmFails", "failed", -1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "ReasmReqds", "all",     1, 1, RRDDIM_INCREMENTAL);
                 }
                 else rrdset_next(st);
 
-                rrddim_set(st, "ok", ReasmOKs);
-                rrddim_set(st, "failed", ReasmFails);
-                rrddim_set(st, "all", ReasmReqds);
+                rrddim_set(st, "ReasmOKs",   *ip_ReasmOKs);
+                rrddim_set(st, "ReasmFails", *ip_ReasmFails);
+                rrddim_set(st, "ReasmReqds", *ip_ReasmReqds);
                 rrdset_done(st);
             }
 
@@ -151,28 +461,108 @@ int do_proc_net_snmp(int update_every, unsigned long long dt) {
                     st = rrdset_create(RRD_TYPE_NET_SNMP, "errors", NULL, "errors", NULL, "IPv4 Errors", "packets/s", 3002, update_every, RRDSET_TYPE_LINE);
                     st->isdetail = 1;
 
-                    rrddim_add(st, "InDiscards", NULL, 1, 1, RRDDIM_INCREMENTAL);
-                    rrddim_add(st, "OutDiscards", NULL, -1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "InDiscards",      NULL,  1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "OutDiscards",     NULL, -1, 1, RRDDIM_INCREMENTAL);
 
-                    rrddim_add(st, "InHdrErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
-                    rrddim_add(st, "InAddrErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
-                    rrddim_add(st, "InUnknownProtos", NULL, 1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "InHdrErrors",     NULL,  1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "OutNoRoutes",     NULL, -1, 1, RRDDIM_INCREMENTAL);
 
-                    rrddim_add(st, "OutNoRoutes", NULL, -1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "InAddrErrors",    NULL,  1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "InUnknownProtos", NULL,  1, 1, RRDDIM_INCREMENTAL);
                 }
                 else rrdset_next(st);
 
-                rrddim_set(st, "InDiscards", InDiscards);
-                rrddim_set(st, "OutDiscards", OutDiscards);
-                rrddim_set(st, "InHdrErrors", InHdrErrors);
-                rrddim_set(st, "InAddrErrors", InAddrErrors);
-                rrddim_set(st, "InUnknownProtos", InUnknownProtos);
-                rrddim_set(st, "OutNoRoutes", OutNoRoutes);
+                rrddim_set(st, "InDiscards",      *ip_InDiscards);
+                rrddim_set(st, "OutDiscards",     *ip_OutDiscards);
+                rrddim_set(st, "InHdrErrors",     *ip_InHdrErrors);
+                rrddim_set(st, "InAddrErrors",    *ip_InAddrErrors);
+                rrddim_set(st, "InUnknownProtos", *ip_InUnknownProtos);
+                rrddim_set(st, "OutNoRoutes",     *ip_OutNoRoutes);
                 rrdset_done(st);
             }
         }
-        else if(strcmp(procfile_lineword(ff, l, 0), "Tcp") == 0) {
-            l++;
+        else if(unlikely(hash == hash_icmp && strcmp(key, "Icmp") == 0)) {
+            uint32_t h = l++;
+
+            if(strcmp(procfile_lineword(ff, l, 0), "Icmp") != 0) {
+                error("Cannot read Icmp line from /proc/net/snmp.");
+                break;
+            }
+
+            words = procfile_linewords(ff, l);
+            if(words < 3) {
+                error("Cannot read /proc/net/snmp Icmp line. Expected 3+ params, read %u.", words);
+                continue;
+            }
+
+            parse_line_pair(ff, icmp_data, h, l);
+
+            // --------------------------------------------------------------------
+
+            if(do_icmp_packets) {
+                st = rrdset_find(RRD_TYPE_NET_SNMP ".icmp");
+                if(!st) {
+                    st = rrdset_create(RRD_TYPE_NET_SNMP, "icmp", NULL, "icmp", NULL, "IPv4 ICMP Packets", "packets/s", 2602, update_every, RRDSET_TYPE_LINE);
+
+                    rrddim_add(st, "InMsgs",  "received",  1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "OutMsgs", "sent",     -1, 1, RRDDIM_INCREMENTAL);
+                }
+                else rrdset_next(st);
+
+                rrddim_set(st, "InMsgs",  *icmp_InMsgs);
+                rrddim_set(st, "OutMsgs", *icmp_OutMsgs);
+
+                rrdset_done(st);
+
+                st = rrdset_find(RRD_TYPE_NET_SNMP ".icmp_errors");
+                if(!st) {
+                    st = rrdset_create(RRD_TYPE_NET_SNMP, "icmp_errors", NULL, "icmp", NULL, "IPv4 ICMP Errors", "packets/s", 2603, update_every, RRDSET_TYPE_LINE);
+
+                    rrddim_add(st, "InErrors",     NULL,  1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "OutErrors",    NULL, -1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "InCsumErrors", NULL,  1, 1, RRDDIM_INCREMENTAL);
+                }
+                else rrdset_next(st);
+
+                rrddim_set(st, "InErrors",     *icmp_InErrors);
+                rrddim_set(st, "OutErrors",    *icmp_OutErrors);
+                rrddim_set(st, "InCsumErrors", *icmp_InCsumErrors);
+
+                rrdset_done(st);
+            }
+        }
+        else if(unlikely(hash == hash_icmpmsg && strcmp(key, "IcmpMsg") == 0)) {
+            uint32_t h = l++;
+
+            if(strcmp(procfile_lineword(ff, l, 0), "IcmpMsg") != 0) {
+                error("Cannot read IcmpMsg line from /proc/net/snmp.");
+                break;
+            }
+
+            parse_line_pair(ff, icmpmsg_data, h, l);
+
+            // --------------------------------------------------------------------
+
+            if(do_icmpmsg) {
+                int i;
+
+                st = rrdset_find(RRD_TYPE_NET_SNMP ".icmpmsg");
+                if(!st) {
+                    st = rrdset_create(RRD_TYPE_NET_SNMP, "icmpmsg", NULL, "icmp", NULL, "IPv4 ICMP Messsages", "packets/s", 2604, update_every, RRDSET_TYPE_LINE);
+
+                    for(i = 0; icmpmsg_data[i].name ;i++)
+                        rrddim_add(st, icmpmsg_data[i].name, icmpmsg_data[i].label,  icmpmsg_data[i].multiplier, 1, RRDDIM_INCREMENTAL);
+                }
+                else rrdset_next(st);
+
+                for(i = 0; icmpmsg_data[i].name ;i++)
+                    rrddim_set(st, icmpmsg_data[i].name, icmpmsg_data[i].value);
+
+                rrdset_done(st);
+            }
+        }
+        else if(unlikely(hash == hash_tcp && strcmp(key, "Tcp") == 0)) {
+            uint32_t h = l++;
 
             if(strcmp(procfile_lineword(ff, l, 0), "Tcp") != 0) {
                 error("Cannot read Tcp line from /proc/net/snmp.");
@@ -180,34 +570,12 @@ int do_proc_net_snmp(int update_every, unsigned long long dt) {
             }
 
             words = procfile_linewords(ff, l);
-            if(words < 15) {
-                error("Cannot read /proc/net/snmp Tcp line. Expected 15 params, read %u.", words);
+            if(words < 3) {
+                error("Cannot read /proc/net/snmp Tcp line. Expected 3+ params, read %u.", words);
                 continue;
             }
 
-            unsigned long long RtoAlgorithm, RtoMin, RtoMax, MaxConn, ActiveOpens, PassiveOpens, AttemptFails, EstabResets,
-                CurrEstab, InSegs, OutSegs, RetransSegs, InErrs, OutRsts;
-
-            RtoAlgorithm    = strtoull(procfile_lineword(ff, l, 1), NULL, 10);
-            RtoMin          = strtoull(procfile_lineword(ff, l, 2), NULL, 10);
-            RtoMax          = strtoull(procfile_lineword(ff, l, 3), NULL, 10);
-            MaxConn         = strtoull(procfile_lineword(ff, l, 4), NULL, 10);
-            ActiveOpens     = strtoull(procfile_lineword(ff, l, 5), NULL, 10);
-            PassiveOpens    = strtoull(procfile_lineword(ff, l, 6), NULL, 10);
-            AttemptFails    = strtoull(procfile_lineword(ff, l, 7), NULL, 10);
-            EstabResets     = strtoull(procfile_lineword(ff, l, 8), NULL, 10);
-            CurrEstab       = strtoull(procfile_lineword(ff, l, 9), NULL, 10);
-            InSegs          = strtoull(procfile_lineword(ff, l, 10), NULL, 10);
-            OutSegs         = strtoull(procfile_lineword(ff, l, 11), NULL, 10);
-            RetransSegs     = strtoull(procfile_lineword(ff, l, 12), NULL, 10);
-            InErrs          = strtoull(procfile_lineword(ff, l, 13), NULL, 10);
-            OutRsts         = strtoull(procfile_lineword(ff, l, 14), NULL, 10);
-
-            // these are not counters
-            if(RtoAlgorithm) {};
-            if(RtoMin) {};
-            if(RtoMax) {};
-            if(MaxConn) {};
+            parse_line_pair(ff, tcp_data, h, l);
 
             // --------------------------------------------------------------------
 
@@ -217,11 +585,11 @@ int do_proc_net_snmp(int update_every, unsigned long long dt) {
                 if(!st) {
                     st = rrdset_create(RRD_TYPE_NET_SNMP, "tcpsock", NULL, "tcp", NULL, "IPv4 TCP Connections", "active connections", 2500, update_every, RRDSET_TYPE_LINE);
 
-                    rrddim_add(st, "connections", NULL, 1, 1, RRDDIM_ABSOLUTE);
+                    rrddim_add(st, "CurrEstab", "connections", 1, 1, RRDDIM_ABSOLUTE);
                 }
                 else rrdset_next(st);
 
-                rrddim_set(st, "connections", CurrEstab);
+                rrddim_set(st, "CurrEstab", *tcp_CurrEstab);
                 rrdset_done(st);
             }
 
@@ -232,13 +600,13 @@ int do_proc_net_snmp(int update_every, unsigned long long dt) {
                 if(!st) {
                     st = rrdset_create(RRD_TYPE_NET_SNMP, "tcppackets", NULL, "tcp", NULL, "IPv4 TCP Packets", "packets/s", 2600, update_every, RRDSET_TYPE_LINE);
 
-                    rrddim_add(st, "received", NULL, 1, 1, RRDDIM_INCREMENTAL);
-                    rrddim_add(st, "sent", NULL, -1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "InSegs",  "received", 1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "OutSegs", "sent",    -1, 1, RRDDIM_INCREMENTAL);
                 }
                 else rrdset_next(st);
 
-                rrddim_set(st, "received", InSegs);
-                rrddim_set(st, "sent", OutSegs);
+                rrddim_set(st, "InSegs",  *tcp_InSegs);
+                rrddim_set(st, "OutSegs", *tcp_OutSegs);
                 rrdset_done(st);
             }
 
@@ -250,13 +618,15 @@ int do_proc_net_snmp(int update_every, unsigned long long dt) {
                     st = rrdset_create(RRD_TYPE_NET_SNMP, "tcperrors", NULL, "tcp", NULL, "IPv4 TCP Errors", "packets/s", 2700, update_every, RRDSET_TYPE_LINE);
                     st->isdetail = 1;
 
-                    rrddim_add(st, "InErrs", NULL, 1, 1, RRDDIM_INCREMENTAL);
-                    rrddim_add(st, "RetransSegs", NULL, -1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "InErrs",       NULL,  1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "InCsumErrors", NULL,  1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "RetransSegs",  NULL, -1, 1, RRDDIM_INCREMENTAL);
                 }
                 else rrdset_next(st);
 
-                rrddim_set(st, "InErrs", InErrs);
-                rrddim_set(st, "RetransSegs", RetransSegs);
+                rrddim_set(st, "InErrs",       *tcp_InErrs);
+                rrddim_set(st, "InCsumErrors", *tcp_InCsumErrors);
+                rrddim_set(st, "RetransSegs",  *tcp_RetransSegs);
                 rrdset_done(st);
             }
 
@@ -268,24 +638,24 @@ int do_proc_net_snmp(int update_every, unsigned long long dt) {
                     st = rrdset_create(RRD_TYPE_NET_SNMP, "tcphandshake", NULL, "tcp", NULL, "IPv4 TCP Handshake Issues", "events/s", 2900, update_every, RRDSET_TYPE_LINE);
                     st->isdetail = 1;
 
-                    rrddim_add(st, "EstabResets", NULL, 1, 1, RRDDIM_INCREMENTAL);
-                    rrddim_add(st, "OutRsts", NULL, -1, 1, RRDDIM_INCREMENTAL);
-                    rrddim_add(st, "ActiveOpens", NULL, 1, 1, RRDDIM_INCREMENTAL);
-                    rrddim_add(st, "PassiveOpens", NULL, 1, 1, RRDDIM_INCREMENTAL);
-                    rrddim_add(st, "AttemptFails", NULL, 1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "EstabResets",  NULL,  1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "OutRsts",      NULL, -1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "ActiveOpens",  NULL,  1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "PassiveOpens", NULL,  1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "AttemptFails", NULL,  1, 1, RRDDIM_INCREMENTAL);
                 }
                 else rrdset_next(st);
 
-                rrddim_set(st, "EstabResets", EstabResets);
-                rrddim_set(st, "OutRsts", OutRsts);
-                rrddim_set(st, "ActiveOpens", ActiveOpens);
-                rrddim_set(st, "PassiveOpens", PassiveOpens);
-                rrddim_set(st, "AttemptFails", AttemptFails);
+                rrddim_set(st, "EstabResets",  *tcp_EstabResets);
+                rrddim_set(st, "OutRsts",      *tcp_OutRsts);
+                rrddim_set(st, "ActiveOpens",  *tcp_ActiveOpens);
+                rrddim_set(st, "PassiveOpens", *tcp_PassiveOpens);
+                rrddim_set(st, "AttemptFails", *tcp_AttemptFails);
                 rrdset_done(st);
             }
         }
-        else if(strcmp(procfile_lineword(ff, l, 0), "Udp") == 0) {
-            l++;
+        else if(unlikely(hash == hash_udp && strcmp(key, "Udp") == 0)) {
+            uint32_t h = l++;
 
             if(strcmp(procfile_lineword(ff, l, 0), "Udp") != 0) {
                 error("Cannot read Udp line from /proc/net/snmp.");
@@ -293,19 +663,12 @@ int do_proc_net_snmp(int update_every, unsigned long long dt) {
             }
 
             words = procfile_linewords(ff, l);
-            if(words < 7) {
-                error("Cannot read /proc/net/snmp Udp line. Expected 7 params, read %u.", words);
+            if(words < 3) {
+                error("Cannot read /proc/net/snmp Udp line. Expected 3+ params, read %u.", words);
                 continue;
             }
 
-            unsigned long long InDatagrams, NoPorts, InErrors, OutDatagrams, RcvbufErrors, SndbufErrors;
-
-            InDatagrams     = strtoull(procfile_lineword(ff, l, 1), NULL, 10);
-            NoPorts         = strtoull(procfile_lineword(ff, l, 2), NULL, 10);
-            InErrors        = strtoull(procfile_lineword(ff, l, 3), NULL, 10);
-            OutDatagrams    = strtoull(procfile_lineword(ff, l, 4), NULL, 10);
-            RcvbufErrors    = strtoull(procfile_lineword(ff, l, 5), NULL, 10);
-            SndbufErrors    = strtoull(procfile_lineword(ff, l, 6), NULL, 10);
+            parse_line_pair(ff, udp_data, h, l);
 
             // --------------------------------------------------------------------
 
@@ -315,13 +678,13 @@ int do_proc_net_snmp(int update_every, unsigned long long dt) {
                 if(!st) {
                     st = rrdset_create(RRD_TYPE_NET_SNMP, "udppackets", NULL, "udp", NULL, "IPv4 UDP Packets", "packets/s", 2601, update_every, RRDSET_TYPE_LINE);
 
-                    rrddim_add(st, "received", NULL, 1, 1, RRDDIM_INCREMENTAL);
-                    rrddim_add(st, "sent", NULL, -1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "InDatagrams",  "received", 1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "OutDatagrams", "sent",    -1, 1, RRDDIM_INCREMENTAL);
                 }
                 else rrdset_next(st);
 
-                rrddim_set(st, "received", InDatagrams);
-                rrddim_set(st, "sent", OutDatagrams);
+                rrddim_set(st, "InDatagrams",  *udp_InDatagrams);
+                rrddim_set(st, "OutDatagrams", *udp_OutDatagrams);
                 rrdset_done(st);
             }
 
@@ -333,17 +696,75 @@ int do_proc_net_snmp(int update_every, unsigned long long dt) {
                     st = rrdset_create(RRD_TYPE_NET_SNMP, "udperrors", NULL, "udp", NULL, "IPv4 UDP Errors", "events/s", 2701, update_every, RRDSET_TYPE_LINE);
                     st->isdetail = 1;
 
-                    rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "RcvbufErrors", NULL,  1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "SndbufErrors", NULL, -1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "InErrors",     NULL,  1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "NoPorts",      NULL,  1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "InCsumErrors", NULL,  1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "IgnoredMulti", NULL,  1, 1, RRDDIM_INCREMENTAL);
+                }
+                else rrdset_next(st);
+
+                rrddim_set(st, "InErrors",     *udp_InErrors);
+                rrddim_set(st, "NoPorts",      *udp_NoPorts);
+                rrddim_set(st, "RcvbufErrors", *udp_RcvbufErrors);
+                rrddim_set(st, "SndbufErrors", *udp_SndbufErrors);
+                rrddim_set(st, "InCsumErrors", *udp_InCsumErrors);
+                rrddim_set(st, "IgnoredMulti", *udp_IgnoredMulti);
+                rrdset_done(st);
+            }
+        }
+        else if(unlikely(hash == hash_udplite && strcmp(key, "UdpLite") == 0)) {
+            uint32_t h = l++;
+
+            if(strcmp(procfile_lineword(ff, l, 0), "UdpLite") != 0) {
+                error("Cannot read UdpLite line from /proc/net/snmp.");
+                break;
+            }
+
+            words = procfile_linewords(ff, l);
+            if(words < 3) {
+                error("Cannot read /proc/net/snmp UdpLite line. Expected 3+ params, read %u.", words);
+                continue;
+            }
+
+            parse_line_pair(ff, udplite_data, h, l);
+
+            // --------------------------------------------------------------------
+
+            if(do_udplite_packets) {
+                st = rrdset_find(RRD_TYPE_NET_SNMP ".udplite");
+                if(!st) {
+                    st = rrdset_create(RRD_TYPE_NET_SNMP, "udplite", NULL, "udplite", NULL, "IPv4 UDPLite Packets", "packets/s", 2603, update_every, RRDSET_TYPE_LINE);
+
+                    rrddim_add(st, "InDatagrams",  "received", 1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "OutDatagrams", "sent",    -1, 1, RRDDIM_INCREMENTAL);
+                }
+                else rrdset_next(st);
+
+                rrddim_set(st, "InDatagrams",  *udplite_InDatagrams);
+                rrddim_set(st, "OutDatagrams", *udplite_OutDatagrams);
+                rrdset_done(st);
+
+                st = rrdset_find(RRD_TYPE_NET_SNMP ".udplite_errors");
+                if(!st) {
+                    st = rrdset_create(RRD_TYPE_NET_SNMP, "udplite_errors", NULL, "udplite", NULL, "IPv4 UDPLite Errors", "packets/s", 2604, update_every, RRDSET_TYPE_LINE);
+
+                    rrddim_add(st, "RcvbufErrors", NULL,  1, 1, RRDDIM_INCREMENTAL);
                     rrddim_add(st, "SndbufErrors", NULL, -1, 1, RRDDIM_INCREMENTAL);
-                    rrddim_add(st, "InErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
-                    rrddim_add(st, "NoPorts", NULL, 1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "NoPorts",      NULL,  1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "IgnoredMulti", NULL,  1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "InErrors",     NULL,  1, 1, RRDDIM_INCREMENTAL);
+                    rrddim_add(st, "InCsumErrors", NULL,  1, 1, RRDDIM_INCREMENTAL);
                 }
                 else rrdset_next(st);
 
-                rrddim_set(st, "InErrors", InErrors);
-                rrddim_set(st, "NoPorts", NoPorts);
-                rrddim_set(st, "RcvbufErrors", RcvbufErrors);
-                rrddim_set(st, "SndbufErrors", SndbufErrors);
+                rrddim_set(st, "NoPorts",      *udplite_NoPorts);
+                rrddim_set(st, "InErrors",     *udplite_InErrors);
+                rrddim_set(st, "InCsumErrors", *udplite_InCsumErrors);
+                rrddim_set(st, "RcvbufErrors", *udplite_RcvbufErrors);
+                rrddim_set(st, "SndbufErrors", *udplite_SndbufErrors);
+                rrddim_set(st, "IgnoredMulti", *udplite_IgnoredMulti);
                 rrdset_done(st);
             }
         }