bugfix: Fixed the calculation of hourly statistics for several gateways

added: A collector has been written for netflow (v5|v9). Now there is no need for an external collector.

scripts/eye-statd.pl

@@ -0,0 +1,587 @@
+#!/usr/bin/perl -w
+
+use utf8;
+use open ":encoding(utf8)";
+use English;
+use base;
+use FindBin '$Bin';
+use lib "/opt/Eye/scripts";
+use strict;
+use DBI;
+use Time::Local;
+use Net::Patricia;
+use Data::Dumper;
+use Date::Parse;
+use DateTime;
+use eyelib::config;
+use eyelib::main;
+use eyelib::net_utils;
+use eyelib::mysql;
+use Socket qw(AF_INET6 inet_ntop);
+use IO::Socket;
+use Data::Dumper;
+
+$debug = 1;
+
+my @router_ref = ();
+my @interfaces = ();
+
+my %router_svi;
+my %routers;
+my %wan_dev;
+my %lan_dev;
+
+my @traffic = ();
+
+#user statistics for cached data
+my %user_stats;
+
+my $MAXREAD = 9216;
+
+my $childrunning = 0;
+
+my $fork_count = $cpu_count*10;
+
+my $timeshift = get_option($dbh,55)*60;
+
+#save traffic to DB
+my $traf_lastflush = time();
+
+# NetFlow
+my $server_port = 2055;
+my $netflow5_header_len = 24;
+my $netflow5_flowrec_len = 48;
+my $netflow9_header_len = 20;
+my $netflow9_templates = {};
+
+# reap dead children
+$SIG{CHLD} = \&REAPER;
+$SIG{TERM} = \&TERM;
+$SIG{INT} = \&TERM;
+$SIG{HUP} = \&INIT;
+
+sub REAPER {
+	wait;
+	$childrunning = 0;
+	$SIG{CHLD} = \&REAPER;
+}
+
+sub TERM {
+	print "SIGTERM received\n";
+	flush_traffic(1);
+	while (wait() != -1) {}
+	exit 0;
+}
+
+sub INIT {
+
+# Create new database handle. If we can't connect, die()
+my $hdb = DBI->connect("dbi:mysql:database=$DBNAME;host=$DBHOST","$DBUSER","$DBPASS");
+if ( !defined $hdb ) { die "Cannot connect to mySQL server: $DBI::errstr\n"; }
+
+InitSubnets();
+
+init_option($hdb);
+
+$timeshift = get_option($dbh,55)*60;
+
+@router_ref = get_records_sql($hdb,"SELECT * FROM devices WHERE deleted=0 AND device_type=2 AND snmp_version>0 ORDER by ip" );
+@interfaces = get_records_sql($hdb,"SELECT * FROM `device_l3_interfaces` ORDER by device_id" );
+
+#router device_id by known device ip
+foreach my $row (@router_ref) {
+    $routers{$row->{id}}=$row;
+    my @auth_list = get_records_sql($hdb,"SELECT ip FROM User_auth WHERE deleted=0 AND user_id=".$row->{user_id});
+    foreach my $auth (@auth_list) {
+	$router_svi{$auth->{ip}}=$row->{id};
+	}
+    }
+
+#snmp index for WAN/LAN interface by device id
+foreach my $row (@interfaces) {
+    if ($row->{interface_type}) { $wan_dev{$row->{device_id}}{$row->{snmpin}}=1; } else { $lan_dev{$row->{device_id}}{$row->{snmpin}}=1; }
+    }
+
+#get userid list
+my @auth_list_ref = get_records_sql($dbh,"SELECT id,ip,save_traf FROM User_auth where deleted=0 ORDER by id");
+
+foreach my $row (@auth_list_ref) {
+    $user_stats{$row->{ip}}{auth_id}=$row->{id};
+    $user_stats{$row->{ip}}{save_traf}=$row->{save_traf};
+    }
+$hdb->disconnect();
+}
+
+############### MAIN ##########################
+
+#close default database
+$dbh->disconnect();
+
+INIT();
+
+my $lsn_nflow;
+my $sel = IO::Select->new();
+
+# prepare to listen for NetFlow UDP packets
+if ($server_port > 0) {
+	$lsn_nflow = IO::Socket::INET->new(LocalPort => $server_port, Proto => "udp")
+		or die "Couldn't be a NetFlow UDP server on port $server_port : $@\n";
+	$sel->add($lsn_nflow);
+}
+
+my ($him,$datagram,$flags);
+
+# main datagram receive loop
+while (1) {
+	while (my @ready = $sel->can_read) {
+		foreach my $server (@ready) {
+			$him = $server->recv($datagram, $MAXREAD);
+			next if (!$him);
+			
+			my ($port, $ipaddr) = sockaddr_in($server->peername);
+			
+			if (defined($lsn_nflow) && $server == $lsn_nflow) {
+				my ($version) = unpack("n", $datagram);
+                                if ($version == 5) {
+                                        parse_netflow_v5($datagram, $ipaddr);
+                                } elsif ($version == 9) {
+                                        parse_netflow_v9($datagram, $ipaddr);
+                                } else {
+                                        print "unknown NetFlow version: $version\n";
+                                }
+			}
+		}
+	}
+}
+
+sub parse_netflow_v5 {
+        my $datagram = shift;
+        my $ipaddr = shift;
+
+        my ($version, $count, $sysuptime, $unix_secs, $unix_nsecs,
+          $flow_sequence, $engine_type, $engine_id, $aggregation,
+          $agg_version) = unpack("nnNNNNCCCC", $datagram);
+
+        my $flowrecs = substr($datagram, $netflow5_header_len);
+
+#0 - N 0-3	srcaddr	Source IP address
+#1 - N 4-7	dstaddr	Destination IP address
+#2 - N 8-11	nexthop	IP address of next hop router
+#3 - n 12-13	input	SNMP index of input interface
+#4 - n 14-15	output	SNMP index of output interface
+#5 - N 16-19	dPkts	Packets in the flow
+#6 - N 20-23	dOctets	Total number of Layer 3 bytes in the packets of the flow
+#7 - N 24-27	First	SysUptime at start of flow
+#8 - N 28-31	Last	SysUptime at the time the last packet of the flow was received
+#9 - n 32-33	src_port	TCP/UDP source port number or equivalent
+#10- n 34-35	dst_port	TCP/UDP destination port number or equivalent
+#11- C 36	pad1	Unused (zero) byte
+#12- C 37	tcp_flags	Cumulative OR of TCP flags
+#13- C 38	prot	IP protocol type (for example, TCP = 6; UDP = 17)
+#14- C 39	tos	IP type of service (ToS)
+#15- n 40-41	src_as	Autonomous system number of the source, either origin or peer
+#16- n 42-43	dst_as	Autonomous system number of the destination, either origin or peer
+#17- C 44	src_mask	Source address prefix mask bits
+#18- C 45	dst_mask	Destination address prefix mask bits
+#19- n 46-47	pad2	Unused (zero) bytes
+
+        for (my $i = 0; $i < $count; $i++) {
+                my $flowrec = substr($datagram, $netflow5_header_len + ($i*$netflow5_flowrec_len), $netflow5_flowrec_len);
+                my @flowdata = unpack("NNNnnNNNNnnCCCCnnCCn", $flowrec);
+		my %flow;
+                $flow{src_ip} = join '.', unpack 'C4', pack 'N', $flowdata[0];
+                $flow{dst_ip} = join '.', unpack 'C4', pack 'N', $flowdata[1];
+		$flow{snmp_in} = $flowdata[3] || 0;
+		$flow{snmp_out} = $flowdata[4] || 0;
+		$flow{pkts} = $flowdata[5] || 0;
+		$flow{octets} = $flowdata[6] || 0;
+		$flow{src_port} = $flowdata[9] || 0;
+		$flow{dst_port} = $flowdata[10] || 0;
+		$flow{proto} = $flowdata[13] || 0;
+		$flow{xsrc_ip} = $flow{src_ip};
+		$flow{xdst_ip} = $flow{dst_ip};
+		$flow{starttime} = time();
+		$flow{netflow_v} = '5';
+		$flow{ipv} = '4';
+		save_flow($ipaddr, \%flow);
+        }
+}
+
+sub parse_netflow_v9 {
+	my $datagram = shift;
+	my $ipaddr = shift;
+	
+	# Parse packet
+	my ($version, $count, $sysuptime, $unix_secs, $seqno, $source_id, @flowsets) = unpack("nnNNNN(nnX4/a)*", $datagram);
+	
+	# Loop through FlowSets and take appropriate action
+	for (my $i = 0; $i < scalar @flowsets; $i += 2) {
+		my $flowsetid = $flowsets[$i];
+		my $flowsetdata = substr($flowsets[$i+1], 4);	# chop off id/length
+		if ($flowsetid == 0) {
+			# 0 = Template FlowSet
+			parse_netflow_v9_template_flowset($flowsetdata, $ipaddr, $source_id);
+		} elsif ($flowsetid == 1) {
+			# 1 - Options Template FlowSet
+		} elsif ($flowsetid > 255) {
+			# > 255: Data FlowSet
+			parse_netflow_v9_data_flowset($flowsetid, $flowsetdata, $ipaddr, $source_id);
+		} else {
+			# reserved FlowSet
+			print "Unknown FlowSet ID $flowsetid found\n";
+		}
+	}
+}
+
+sub parse_netflow_v9_template_flowset {
+	my $templatedata = shift;
+	my $ipaddr = shift;
+	my $source_id = shift;
+	
+	# Note: there may be multiple templates in a Template FlowSet
+	
+	my @template_ints = unpack("n*", $templatedata);
+
+	my $i = 0;
+	while ($i < scalar @template_ints) {
+		my $template_id = $template_ints[$i];
+		my $fldcount = $template_ints[$i+1];
+
+		last if (!defined($template_id) || !defined($fldcount));
+
+		print "Updated template ID $template_id (source ID $source_id, from " . inet_ntoa($ipaddr) . ")\n" if ($debug);
+		my $template = [@template_ints[($i+2) .. ($i+2+$fldcount*2-1)]];
+		$netflow9_templates->{$ipaddr}->{$source_id}->{$template_id}->{'template'} = $template;
+		
+		# Calculate total length of template data
+		my $totallen = 0;
+		for (my $j = 1; $j < scalar @$template; $j += 2) {
+			$totallen += $template->[$j];
+		}
+
+		$netflow9_templates->{$ipaddr}->{$source_id}->{$template_id}->{'len'} = $totallen;
+
+		$i += (2 + $fldcount*2);
+	}
+}
+
+sub parse_netflow_v9_data_flowset {
+	my $flowsetid = shift;
+	my $flowsetdata = shift;
+	my $ipaddr = shift;
+	my $source_id = shift;
+	
+	my $template = $netflow9_templates->{$ipaddr}->{$source_id}->{$flowsetid}->{'template'};
+	if (!defined($template)) {
+		print "Template ID $flowsetid from $source_id/" . inet_ntoa($ipaddr) . " does not (yet) exist\n" if ($debug);
+		return;
+		}
+
+# Flowset record types
+#define NF9_IN_BYTES            1
+#define NF9_IN_PACKETS          2
+#define NF9_IN_PROTOCOL         4
+#define NF9_L4_SRC_PORT         7
+#define NF9_IPV4_SRC_ADDR       8
+#define NF9_INPUT_SNMP          10
+#define NF9_L4_DST_PORT         11
+#define NF9_IPV4_DST_ADDR       12
+#define NF9_OUTPUT_SNMP         14
+#define NF9_OUT_BYTES           23
+#define NF9_OUT_PKTS            24
+#define NF9_DIRECTION           61
+#define NF_F_XLATE_SRC_ADDR_IPV4          225
+#define NF_F_XLATE_DST_ADDR_IPV4          226
+#define NF_F_XLATE_SRC_PORT               227
+#define NF_F_XLATE_DST_PORT               228
+#define NF9_IPV6_SRC_ADDR       27
+#define NF9_IPV6_DST_ADDR       28
+#define NF_F_XLATE_SRC_ADDR_IPV6          281
+#define NF_F_XLATE_DST_ADDR_IPV6          282
+
+	my $len = $netflow9_templates->{$ipaddr}->{$source_id}->{$flowsetid}->{'len'};
+	my $offset = 0;
+	my $datalen = length($flowsetdata);
+
+	while (($offset + $len) <= $datalen) {
+		my %flow;
+		$flow{netflow_v} = '9';
+		$flow{ipv} = '4';
+		$flow{starttime} = time();
+		for (my $i = 0; $i < scalar @$template; $i += 2) {
+		    my $field_type = $template->[$i];
+		    my $field_length = $template->[$i+1];
+		    my $value = substr($flowsetdata, $offset, $field_length);
+		    $offset += $field_length;
+			# IN_BYTES
+		    if ($field_type == 1) {
+				if ($field_length == 4) {
+				    $flow{octets} = unpack("N", $value);
+				    } elsif ($field_length == 8) {
+					$flow{octets} = unpack("Q>", $value);
+				    }
+				}
+			# IN_PACKETS
+			elsif ($field_type == 2) {
+				if ($field_length == 4) {
+				    $flow{pkts} = unpack("N", $value);
+				    } elsif ($field_length == 8) {
+					$flow{pkts} = unpack("Q>", $value);
+				    }
+				}
+			# IN_PROTOCOL
+			elsif ($field_type == 4) { $flow{proto} = unpack("C", $value); }
+			# L4_SRC_PORT
+			elsif ($field_type == 7) { $flow{src_port} = unpack("n", $value); }
+			# IPV4_SRC_ADDR
+			elsif ($field_type == 8) { $flow{src_ip} = inet_ntop(AF_INET, $value); }
+			# INPUT_SNMP
+			elsif ($field_type == 10) {
+				if ($field_length == 2) {
+				    $flow{snmp_in} = unpack("n", $value);
+				    } elsif ($field_length == 4) {
+					$flow{snmp_in} = unpack("N", $value);
+				    }
+				}
+			# L4_DST_PORT
+			elsif ($field_type == 11) { $flow{dst_port} = unpack("n", $value); }
+			# IPV4_DST_ADDR
+			elsif ($field_type == 12) { $flow{dst_ip} = inet_ntop(AF_INET, $value); }
+			# OUTPUT_SNMP
+			elsif ($field_type == 14) {
+				if ($field_length == 2) {
+				    $flow{snmp_out} = unpack("n", $value);
+				    } elsif ($field_length == 4) {
+					$flow{snmp_out} = unpack("N", $value);
+				    }
+				}
+			# IP_PROTOCOL_VERSION
+			elsif ($field_type == 60) { my $ipversion = unpack("C", $value);
+				#skip ipv6
+				if ($ipversion == 6) { %flow=(); last; }
+				}
+			# XLATE_SRC_ADDR_IPV4
+			elsif ($field_type == 225) { $flow{xsrc_ip} = inet_ntop(AF_INET, $value); }
+			# XLATE_DST_ADDR_IPV4
+			elsif ($field_type == 226) { $flow{xdst_ip} = inet_ntop(AF_INET, $value); }
+		}
+		$flow{snmp_in} = 0 if (!$flow{snmp_in});
+		$flow{snmp_out} = 0 if (!$flow{snmp_out});
+		$flow{octets} = 0 if (!$flow{octets});
+		$flow{pkts} = 0 if (!$flow{pkts});
+		if (%flow and $flow{snmp_in} and $flow{snmp_out}) { save_flow($ipaddr, \%flow); }
+	}
+}
+
+sub save_flow {
+	my $router_ip = shift;
+	my $flow = shift;
+	$router_ip = inet_ntoa($router_ip);
+	#direction for user, 0 - in, 1 - out
+	$flow->{direction} = '0';
+	my $router_id;
+	#skip unknown router
+	if (exists $router_svi{$router_ip}) { 
+		$router_id = $router_svi{$router_ip};
+		$flow->{router_ip} = $router_ip;
+		$flow->{device_id} = $router_id;
+		} else { return; }
+	#skip input traffic for router
+	if (exists $wan_dev{$router_id}->{$flow->{snmp_out}} and exists $wan_dev{$router_id}->{$flow->{snmp_in}}) { return; }
+	#skip local traffic for router
+	if (!exists $wan_dev{$router_id}->{$flow->{snmp_out}} and ! exists $wan_dev{$router_id}->{$flow->{snmp_in}}) { return; }
+
+	if (exists $wan_dev{$router_id}->{$flow->{snmp_out}}) { $flow->{direction} = 1; }
+
+#	print Dumper($flow) if ($debug);
+	push(@traffic,$flow);
+	flush_traffic(0);
+}
+
+sub flush_traffic {
+
+my $force = shift || 0;
+
+if (!$force && ($childrunning || ((time - $traf_lastflush) < $timeshift))) { return; }
+
+$childrunning = 1;
+my $pid = fork();
+
+if (!defined $pid) {
+    $childrunning = 0;
+    print "cannot fork! Save traffic and exit...\n";
+    } elsif ($pid != 0) {
+        # in parent
+	$traf_lastflush = time();
+	#clean main cache
+	@traffic = ();
+        return;
+    }
+
+#create oper-cache
+my @flush_table = @traffic;
+
+my $hdb=init_db();
+
+#saved packet by users
+my @detail_traffic = ();
+
+my %routers_found;
+
+#last packet timestamp
+my $last_time = time();
+
+foreach my $traf_record (@flush_table) {
+
+my ($auth_id,$l_src_ip,$l_dst_ip,$user_ip,$router_id);
+
+$router_id = $traf_record->{device_id};
+
+$routers_found{$router_id} = 1;
+
+#outbound traffic
+if ($traf_record->{direction}) {
+    if (exists $user_stats{$traf_record->{src_ip}}) {
+	$user_ip  = $traf_record->{src_ip};
+	$l_src_ip = $traf_record->{src_ip};
+	$l_dst_ip = $traf_record->{dst_ip};
+	if (exists $user_stats{$user_ip}{$router_id}{out}) {
+		$user_stats{$user_ip}{$router_id}{out}+=$traf_record->{octets};
+		} else {
+		$user_stats{$user_ip}{$router_id}{out}=$traf_record->{octets};
+		}
+	if (exists $user_stats{$user_ip}{$router_id}{pkt_out}) {
+		$user_stats{$user_ip}{$router_id}{pkt_out}+=$traf_record->{pkts};
+		} else {
+		$user_stats{$user_ip}{$router_id}{pkt_out}=$traf_record->{pkts};
+		}
+	}
+    if (!$user_ip and $config_ref{add_unknown_user}) {
+        $user_ip = $traf_record->{src_ip};
+	$auth_id = new_auth($hdb,$user_ip);
+	$user_stats{$user_ip}{auth_id}=$auth_id;
+	$user_stats{$user_ip}{$router_id}{in}=0;
+	$user_stats{$user_ip}{$router_id}{out}=$traf_record->{octets};
+	$user_stats{$user_ip}{$router_id}{pkt_in}=0;
+	$user_stats{$user_ip}{$router_id}{pkt_out}=$traf_record->{pkts};
+	$user_stats{$user_ip}{save_traf}=$config_ref{save_detail};
+	}
+    #inbound traffic
+    } else {
+    if (exists $user_stats{$traf_record->{xdst_ip}}) {
+	$user_ip  = $traf_record->{xdst_ip};
+	$l_src_ip = $traf_record->{src_ip};
+	$l_dst_ip = $traf_record->{xdst_ip};
+	if (exists $user_stats{$user_ip}{$router_id}{in}) {
+		$user_stats{$user_ip}{$router_id}{in}+=$traf_record->{octets};
+		} else {
+		$user_stats{$user_ip}{$router_id}{in}=$traf_record->{octets};
+		}
+	if (exists $user_stats{$user_ip}{$router_id}{pkt_in}) {
+		$user_stats{$user_ip}{$router_id}{pkt_in}+=$traf_record->{pkts};
+		} else {
+		$user_stats{$user_ip}{$router_id}{pkt_in}=$traf_record->{pkts};
+		}
+	}
+    }
+
+next if (!$user_ip);
+
+$last_time = $traf_record->{starttime};
+
+$user_stats{$user_ip}{last_found} = $last_time;
+
+next if (!$config_ref{save_detail} and !$user_stats{$user_ip}{save_traf});
+
+my $l_src_ip_aton=StrToIp($l_src_ip);
+my $l_dst_ip_aton=StrToIp($l_dst_ip);
+
+my ($sec,$min,$hour,$day,$month,$year,$zone) = (localtime($last_time))[0,1,2,3,4,5];
+$month++;
+$year += 1900;
+my $full_time = sprintf "%04d-%02d-%02d %02d:%02d:%02d",$year,$month,$day,$hour,$min,$sec;
+
+my @detail_array = ($user_stats{$user_ip}->{auth_id},$router_id,$full_time,$traf_record->{proto},$l_src_ip_aton,$l_dst_ip_aton,$traf_record->{src_port},$traf_record->{dst_port},$traf_record->{octets},$traf_record->{pkts});
+push(@detail_traffic,\@detail_array);
+}
+
+if (scalar(@detail_traffic)) {
+    db_log_debug($hdb,"Start write traffic detail to DB. ".scalar @detail_traffic." lines count") if ($debug);
+    batch_db_sql_cached("INSERT INTO Traffic_detail (auth_id,router_id,timestamp,proto,src_ip,dst_ip,src_port,dst_port,bytes,pkt) VALUES(?,?,?,?,?,?,?,?,?,?)",\@detail_traffic);
+    db_log_debug($hdb,"Write traffic detail to DB stopped") if ($debug);
+    }
+
+#save statistics
+
+#start hour
+my ($min,$hour,$day,$month,$year) = (localtime($last_time))[1,2,3,4,5];
+
+#start stat time
+my $hour_date1 = $hdb->quote(sprintf "%04d-%02d-%02d %02d:00:00",$year+1900,$month+1,$day,$hour);
+#end hour
+($hour,$day,$month,$year) = (localtime($last_time+3600))[2,3,4,5];
+my $hour_date2 = $hdb->quote(sprintf "%04d-%02d-%02d %02d:00:00",$year+1900,$month+1,$day,$hour);
+
+my @batch_sql_traf=();
+
+#print Dumper(\%user_stats) if ($debug);
+
+# update database
+foreach my $user_ip (keys %user_stats) {
+    next if (!exists $user_stats{$user_ip}{last_found});
+    my $user_ip_aton=StrToIp($user_ip);
+    my $auth_id = $user_stats{$user_ip}{auth_id};
+
+    #last flow for user
+    my ($sec,$min,$hour,$day,$month,$year) = (localtime($user_stats{$user_ip}{last_found}))[0,1,2,3,4,5];
+    #flow time string
+    my $flow_date = $hdb->quote(sprintf "%04d-%02d-%02d %02d:%02d:%02d",$year+1900,$month+1,$day,$hour,$min,$sec);
+
+    #last found timestamp
+    my $tSQL="UPDATE User_auth SET `last_found`=$flow_date WHERE id='$auth_id'";
+    push (@batch_sql_traf,$tSQL);
+
+    #per router stats
+    foreach my $router_id (keys %routers_found) {
+	next if (!exists $user_stats{$user_ip}{$router_id});
+	if (!exists $user_stats{$user_ip}{$router_id}{in})  { $user_stats{$user_ip}{$router_id}{in} = 0; }
+	if (!exists $user_stats{$user_ip}{$router_id}{out}) { $user_stats{$user_ip}{$router_id}{out} = 0; }
+	#skip empty stats
+	if ($user_stats{$user_ip}{$router_id}{in} + $user_stats{$user_ip}{$router_id}{out} ==0) { next; }
+	#packet count per router
+	if (!exists $user_stats{$user_ip}{$router_id}{pkt_in})  { $user_stats{$user_ip}{$router_id}{pkt_in} = 0; }
+	if (!exists $user_stats{$user_ip}{$router_id}{pkt_out}) { $user_stats{$user_ip}{$router_id}{pkt_out} = 0; }
+	#current stats
+	my $tSQL="INSERT INTO User_stats_full (timestamp,auth_id,router_id,byte_in,byte_out,pkt_in,pkt_out,step) VALUES($flow_date,'$auth_id','$router_id','$user_stats{$user_ip}{$router_id}{in}','$user_stats{$user_ip}{$router_id}{out}','$user_stats{$user_ip}{$router_id}{pkt_in}','$user_stats{$user_ip}{$router_id}{pkt_out}','$timeshift')";
+	push (@batch_sql_traf,$tSQL);
+	#hour stats
+	# get current stats
+	my $sql = "SELECT id, byte_in, byte_out FROM User_stats WHERE `timestamp`>=$hour_date1 AND `timestamp`<$hour_date2 AND router_id=$router_id AND auth_id=$auth_id";
+	my $hour_stat = get_record_sql($hdb,$sql);
+	if (!$hour_stat) {
+	    my $dSQL="INSERT INTO User_stats (timestamp,auth_id,router_id,byte_in,byte_out) VALUES($flow_date,'$auth_id','$router_id','$user_stats{$user_ip}{$router_id}{in}','$user_stats{$user_ip}{$router_id}{out}')";
+	    push (@batch_sql_traf,$dSQL);
+	    next;
+	    }
+	if (!$hour_stat->{byte_in}) { $hour_stat->{byte_in}=0; }
+	if (!$hour_stat->{byte_out}) { $hour_stat->{byte_out}=0; }
+	$hour_stat->{byte_in} += $user_stats{$user_ip}{$router_id}{in};
+	$hour_stat->{byte_out} += $user_stats{$user_ip}{$router_id}{out};
+	$tSQL="UPDATE User_stats SET byte_in='".$hour_stat->{byte_in}."', byte_out='".$hour_stat->{byte_out}."' WHERE id='".$auth_id."' AND router_id='".$router_id."'";
+	push (@batch_sql_traf,$tSQL);
+	}
+    }
+
+#print Dumper(\@batch_sql_traf) if ($debug);
+
+#update statistics in DB
+batch_db_sql($hdb,\@batch_sql_traf);
+db_log_debug($hdb,"Recalc quotes started");
+foreach my $router_id (keys %routers_found) { recalc_quotes($hdb,$router_id); }
+db_log_debug($hdb,"Recalc quotes stopped");
+
+$hdb->disconnect();
+
+exit;
+
+}

scripts/eyelib/mysql.pm

@@ -225,6 +225,7 @@ if (!$db) { $db_log = 0; }
 if ($level eq $L_ERROR and $log_level >= $L_ERROR) { log_error($msg); $db_log = 1; }
 if ($level eq $L_WARNING and $log_level >= $L_WARNING) { log_warning($msg); $db_log = 1; }
 if ($level eq $L_INFO and $log_level >= $L_INFO) { log_info($msg); $db_log = 1; }
+if ($level eq $L_VERBOSE and $log_level >= $L_VERBOSE) { log_verbose($msg); $db_log = 1; }
 if ($level eq $L_DEBUG and $log_level >= $L_DEBUG) { log_debug($msg); $db_log = 1; }
 
 if ($db_log) {

scripts/eyelib/nagios.pm

@@ -1,5 +1,6 @@
 package eyelib::nagios;
 
+#use v5.28;
 use utf8;
 use open ":encoding(utf8)";
 use strict;
@@ -82,18 +83,18 @@ my @custom_cfg=();
 if (-e $template_file) { @custom_cfg = read_file($template_file); } else { return; }
 if (@custom_cfg and scalar(@custom_cfg)) {
     foreach my $row (@custom_cfg) {
-        next if (!$row);
+	next if (!$row);
         $row=~s/\%HOSTNAME\%/$device->{name}/;
         $row=~s/\%HOST\%/$device->{name}/;
-        $row=~s/\%HOSTIP\%/$device->{ip}/;
-        $row=~s/\%HOST_IP\%/$device->{ip}/;
-        $row=~s/\%COMMUNITY\%/$device->{community}/ if ($device->{community});
-        $row=~s/\%RW_COMMUNITY\%/$device->{rw_community}/ if ($device->{rw_community});
-        $row=~s/\%SNMP_VERSION\%/$device->{snmp_version}/ if ($device->{snmp_version});
-        $row=~s/\%MODEL\%/$device->{device_model}->{model_name}/ if ($device->{device_model}->{model_name});
+	$row=~s/\%HOSTIP\%/$device->{ip}/;
+	$row=~s/\%HOST_IP\%/$device->{ip}/;
+	$row=~s/\%COMMUNITY\%/$device->{community}/ if ($device->{community});
+	$row=~s/\%RW_COMMUNITY\%/$device->{rw_community}/ if ($device->{rw_community});
+	$row=~s/\%SNMP_VERSION\%/$device->{snmp_version}/ if ($device->{snmp_version});
+	$row=~s/\%MODEL\%/$device->{device_model}->{model_name}/ if ($device->{device_model}->{model_name});
         push(@{$result->{template}},$row);
-        if ($row=~/\s+service_description\s+(.*)$/i) { $result->{services}->{$1}=1; }
-        }
+	if ($row=~/\s+service_description\s+(.*)$/i) { $result->{services}->{$1}=1; }
+	}
     }
 return $result;
 }
@@ -114,11 +115,11 @@ print(FH "       use                     $host_template\n");
 print(FH "       host_name               $device->{name}\n");
 print(FH "       alias                   $device->{name}\n");
 print(FH "       address                 $device->{ip}\n");
-print(FH "       _ID                     $device->{auth_id}\n");
-print(FH "       _TYPE                   user\n");
+print(FH "       _ID			 $device->{auth_id}\n"); 
+print(FH "       _TYPE			 user\n");
 if ($device->{device_model}) {
-        print(FH "       notes          $device->{device_model}->{model_name}\n");
-        }
+	print(FH "       notes		$device->{device_model}->{model_name}\n"); 
+	}
 if ($device->{parent_name}) {
         print(FH "       parents                    $device->{parent_name}\n");
         }
@@ -126,16 +127,16 @@ print(FH "       notes_url       ".$config_ref{stat_url}."/admin/users/editauth.
 print(FH "       }\n\n");
 
 if ($ping_enable) {
-        print(FH "define service{\n");
-        print(FH "       use                    ping-service\n");
-        print(FH "       host_name              $device->{name}\n");
-        print(FH "       service_description    ping $device->{name}\n");
-        print(FH "       check_command          check_ping!100.0,20%!500.0,60%\n");
-        print(FH "       }\n");
-        print(FH "\n");
+	print(FH "define service{\n");
+	print(FH "       use                    ping-service\n");
+	print(FH "       host_name              $device->{name}\n");
+	print(FH "       service_description    ping $device->{name}\n");
+	print(FH "       check_command          check_ping_icmp!100.0,20%!500.0,60%\n");
+	print(FH "       }\n");
+	print(FH "\n");
     }
 if ($device->{parent_name} and $device->{link_check} and $device->{parent_snmp_version}) {
-        #port status
+	#port status
         print(FH "define service{\n");
         print(FH "       use                        $default_service\n");
         print(FH "       host_name                  $device->{parent_name}\n");
@@ -176,17 +177,17 @@ if ($custom_cfg->{template}) {
     open(FH, "> $cfg_file");
     my @custom_cfg = @{$custom_cfg->{template}};
     if (@custom_cfg and scalar(@custom_cfg)) {
-        foreach my $row (@custom_cfg) {
-            next if (!$row);
+	foreach my $row (@custom_cfg) {
+	    next if (!$row);
             print(FH $row."\n");
-            }
-        }
+	    }
+	}
     close(FH);
     return;
     }
 
-#router | switch | gateway
-if (in_array([1,2],$device->{type})) {
+#switch | router
+if (in_array([0,1,2],$device->{type})) {
     open(FH, "> $cfg_file");
     my $device_template = 'switches';
     if ($device->{type} eq 2) {  $device_template='routers'; }
@@ -198,8 +199,8 @@ if (in_array([1,2],$device->{type})) {
     print(FH "       _ID                     $device->{device_id}\n");
     print(FH "       _TYPE                   device\n");
     if ($device->{device_model}) {
-        print(FH "       notes          $device->{device_model}->{model_name}\n");
-        }
+	print(FH "       notes		$device->{device_model}->{model_name}\n");
+	}
     if ($device->{parent_name}) {
         print(FH "       parents                    $device->{parent_name}\n");
         }
@@ -210,32 +211,32 @@ if (in_array([1,2],$device->{type})) {
     print(FH "        use                             ping-service         ; Name of service template to use\n");
     print(FH "        host_name                       $device->{name}\n");
     print(FH "        service_description             ping $device->{name}\n");
-    print(FH "        check_command                   check_ping!100.0,20%!500.0,60%\n");
+    print(FH "        check_command                   check_ping_icmp!100.0,20%!500.0,60%\n");
     print(FH "        }\n");
     #uptime
     if ($device->{snmp_version}) {
         print(FH "define service{\n");
-        print(FH "        use                             $default_service\n");
+	print(FH "        use                             $default_service\n");
         print(FH "        host_name                       $device->{name}\n");
-        print(FH "        service_description             Uptime\n");
+	print(FH "        service_description             Uptime\n");
         print(FH "        check_command                   check_snmp_uptime!$device->{community}!161!$device->{snmp_version}\n");
-        print(FH "        }\n");
+	print(FH "        }\n");
         print(FH "\n");
         #uplink
         if (exists $device->{uplink}) {
-            print(FH "define service{\n");
-            print(FH "       use                        service-snmp-crc\n");
+	    print(FH "define service{\n");
+    	    print(FH "       use                        service-snmp-crc\n");
             print(FH "       host_name                  $device->{name}\n");
             my $port_description = $device->{parent_name};
             my $conn = $device->{uplink};
             print(FH "       service_description port $conn->{port} - $port_description CRC Errors\n");
             print(FH "       check_command              check_snmp_switch_crc!$device->{community}!$conn->{snmp_index}\n");
             print(FH "       }\n\n");
-            }
-        foreach my $conn (@{$device->{downlinks}}) {
-            #id,port,snmp_index,comment
-            print(FH "define service{\n");
-            print(FH "       use                        $default_service\n");
+    	    }
+	foreach my $conn (@{$device->{downlinks}}) {
+	    #id,port,snmp_index,comment
+	    print(FH "define service{\n");
+    	    print(FH "       use                        $default_service\n");
             print(FH "       host_name                  $device->{name}\n");
             my $port_description=translit($conn->{comment});
             if ($conn->{target_port_id}) { $port_description = $conn->{downlink_name}; }
@@ -243,8 +244,8 @@ if (in_array([1,2],$device->{type})) {
             print(FH "       check_command              check_ifoperstatus!$conn->{snmp_index}!$device->{community}\n");
             print(FH "       }\n\n");
             #src
-            print(FH "define service{\n");
-            print(FH "       use                        service-snmp-crc\n");
+	    print(FH "define service{\n");
+    	    print(FH "       use                        service-snmp-crc\n");
             print(FH "       host_name                  $device->{name}\n");
             my $port_description=translit($conn->{comment});
             if ($conn->{target_port_id}) { $port_description = $conn->{downlink_name}; }
@@ -252,16 +253,16 @@ if (in_array([1,2],$device->{type})) {
             print(FH "       check_command              check_snmp_switch_crc!$device->{community}!$conn->{snmp_index}\n");
             print(FH "       }\n\n");
             #band
-            print(FH "define service{\n");
-            print(FH "       use                        service-snmp-bandwidth\n");
+	    print(FH "define service{\n");
+    	    print(FH "       use                        service-snmp-bandwidth\n");
             print(FH "       host_name                  $device->{name}\n");
             my $port_description=translit($conn->{comment});
             if ($conn->{target_port_id}) { $port_description = $conn->{downlink_name}; }
             print(FH "       service_description port $conn->{port} - $port_description bandwidth usage\n");
             print(FH "       check_command              check_snmp_bandwidth!$device->{community}!$conn->{snmp_index}\n");
             print(FH "       }\n\n");
-            }
-        }
+	    }
+	}
     close FH;
     }
 
@@ -272,13 +273,13 @@ if ($device->{type} eq 3) {
     my $dev_cfg;
     if ($device->{device_model} and $device->{device_model}->{nagios_template}) { $dev_cfg = read_host_template($device,$config_ref{nagios_dir}.'/gen_template/'.$device->{device_model}->{nagios_template}); }
     if ($dev_cfg and $dev_cfg->{template}) {
-            my @dev_cfg = @{$dev_cfg->{template}};
-            if (@dev_cfg and scalar(@dev_cfg)) {
-                foreach my $row (@dev_cfg) {
-                    next if (!$row);
-                    print(FH $row."\n");
-                    }
-                }
+	    my @dev_cfg = @{$dev_cfg->{template}};
+	    if (@dev_cfg and scalar(@dev_cfg)) {
+		foreach my $row (@dev_cfg) {
+		    next if (!$row);
+    		    print(FH $row."\n");
+		    }
+		}
         }
     close FH;
     }