Development May 2021

development@lists.ipfire.org

18 participants
107 discussions

[PATCH] knot: Update to 3.0.6
by Matthias Fischer 25 May '21

25 May '21

For details see: https://www.knot-dns.cz/2021-05-12-version-306.html "Features: mod-probe: new module for simple traffic logging (Python API not yet included) Improvements: keymgr: new mode for listing zones with at least one key stored keymgr: the pregenerate command accepts optional timestamp-from parameter kzonecheck: accept '-' as substitution for standard input #727 knotd: print an error when unable to change owner of a logging file knotd: new warning log if no interface is configured knotd: new signing policy check for NSEC3 iterations higher than 20 knotd: don't allow backup to/restore from the DB storage directory Various code (mostly zone backup/restore), tests, and documentation improvements Bugfixes: knotd: secondary fails to load zone file if HTTPS or SVCB record is present #725 knotd: (KSK roll-over) new KSK is not signing DNSKEY long enough before DS submission knotd: (KSK roll-over) old KSK uselessly published after roll-over finished knotd: malformed address in TCP-related logs when listening on a UNIX socket knotd: server responds FORMERR instead of BADTIME if TSIG signed time is zero #730 modules: incorrect local and remote addresses in the XDP mode modules: failed to read configuration from a section without identifiers mod-synthrecord: queries on synthesized empty-non-terminals not answered with NODATA keymgr: confusing error if del-all-old command fails" For 3.0.5 (skipped): https://www.knot-dns.cz/2021-03-25-version-305.html Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/knot | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/knot b/lfs/knot index 39940a358..ec6ec4deb 100644 --- a/lfs/knot +++ b/lfs/knot @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 3.0.4 +VER = 3.0.6 THISAPP = knot-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = c0a546927ff50db153893de43758cb37 +$(DL_FILE)_MD5 = 0d8aaa8e5214623c12123c67b5f2c460 install : $(TARGET) -- 2.18.0

1 0

[PATCH] knot: Update to 3.0.6
by Matthias Fischer 25 May '21

25 May '21

For details see: https://www.knot-dns.cz/2021-05-12-version-306.html " Features: mod-probe: new module for simple traffic logging (Python API not yet included) Improvements: keymgr: new mode for listing zones with at least one key stored keymgr: the pregenerate command accepts optional timestamp-from parameter kzonecheck: accept '-' as substitution for standard input #727 knotd: print an error when unable to change owner of a logging file knotd: new warning log if no interface is configured knotd: new signing policy check for NSEC3 iterations higher than 20 knotd: don't allow backup to/restore from the DB storage directory Various code (mostly zone backup/restore), tests, and documentation improvements Bugfixes: knotd: secondary fails to load zone file if HTTPS or SVCB record is present #725 knotd: (KSK roll-over) new KSK is not signing DNSKEY long enough before DS submission knotd: (KSK roll-over) old KSK uselessly published after roll-over finished knotd: malformed address in TCP-related logs when listening on a UNIX socket knotd: server responds FORMERR instead of BADTIME if TSIG signed time is zero #730 modules: incorrect local and remote addresses in the XDP mode modules: failed to read configuration from a section without identifiers mod-synthrecord: queries on synthesized empty-non-terminals not answered with NODATA keymgr: confusing error if del-all-old command fails" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/knot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/knot b/lfs/knot index bdf34b966..ec6ec4deb 100644 --- a/lfs/knot +++ b/lfs/knot @@ -24,7 +24,7 @@ include Config -VER = 3.0.5 +VER = 3.0.6 THISAPP = knot-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 687d00586202bc0bbf0c76fa90921652 +$(DL_FILE)_MD5 = 0d8aaa8e5214623c12123c67b5f2c460 install : $(TARGET) -- 2.18.0

3 3

[PATCH 1/2] pakfire: Prevent from get launched multiple times.
by Stefan Schantl 25 May '21

25 May '21

When pakfire gets launched a check if a so called lockfile exists and the process will be aborted, otherwise the file will be created which prevents any other pakfire instance to perform any operations until the first process gets finished and the lock will be released again. Because the release of the lock is located in an END block, the lock also will be released in case the pakfire process gets interuped or gains an error. This prevents from an lock loop and an unuseable pakfire. Reference: #12621. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- src/pakfire/lib/functions.pl | 3 +++ src/pakfire/pakfire | 26 +++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index 4d5c6219a..f9a19b60d 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -73,6 +73,9 @@ my %pakfiresettings = (); # Make version $Conf::version = &make_version(); +# Pakfire lock file. +our $lockfile = "/tmp/pakfire_lock"; + sub message { my $message = shift; diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire index c69a8d3ad..4139d106b 100644 --- a/src/pakfire/pakfire +++ b/src/pakfire/pakfire @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -31,6 +31,7 @@ my $interactive = 1; my $force = "noforce"; + my $locked; &Pakfire::logger("PAKFIRE INFO: IPFire Pakfire $Conf::version started!"); @@ -47,6 +48,21 @@ &Pakfire::message("PAKFIRE ERROR: You need to be online to run pakfire!"); exit 2; } + + # Check if a lockfile already exists. + if (-e "$Pakfire::lockfile") { + &Pakfire::message("PAKFIRE ERROR: Another instance of pakfire is already running!"); + exit 1; + } + + # Write lockfile. + open(LOCK, ">$Pakfire::lockfile"); + + # Pakfire has locked in this session set locket to "1". + $locked = "1"; + + # Close filehandle. + close(LOCK); ### Check if we are started by another name # @@ -330,4 +346,12 @@ &Pakfire::logger("PAKFIRE INFO: Pakfire has finished. Closing."); + END { + # Check if pakfire has been locked in this session. + if ($locked) { + # Remove lockfile. + unlink($Pakfire::lockfile); + } + } + exit 0; -- 2.20.1

2 2

[PATCH] Network based RRD graphs Bytes to Bits
by nateos2g＠fastmail.com 24 May '21

24 May '21

From: Nate Oaks <nateos2g(a)fastmail.com> For proper display of network measurements, Bps (bytes) should be converted to bps (bits). Bytes are for data/storage (RAM, HDD, SSD, etc.), bits are for network bandwidth or throughput (NICs, switches, routers, WiFi adapters, etc.). Networks transfer data as single bits at a time. It’s both more accurate and more intuitive to measure network speed in bits per second that a network connection is transmitting, not the amount of data units, or bytes, it transmits. Notice all network devices are marketed, measure and diplay in bits per second. I simply used RRD CDEF to multiply by 8. NOTE: Found: "ERROR: rpn expressions without DEF or CDEF variables are not supported". Specifically in updateqosgraph, CDEF does not like a number as a variable name. ie. "204" from $classline[1]. Requires update of the language cache files: perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" or: update-lang-cache Found one other asking for this: https://community.ipfire.org/t/ipfire-bandwidth-usage/1203 Signed-off-by: Nate Oaks <nateos2g(a)fastmail.com> --- config/cfgroot/graphs.pl | 202 +++++++++++++++++++++------------------ langs/en/cgi-bin/en.pl | 13 +-- 2 files changed, 117 insertions(+), 98 deletions(-) diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index 441d4c483a46..c83ae67bbfc1 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -545,28 +545,30 @@ sub updateifgraph { "-1".$period, "-r", "-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, - "-v ".$Lang::tr{'bytes per second'}, + "-v ".$Lang::tr{'bits per second'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, "--color=BACK".$color{"color21"}, "DEF:incoming=".$mainsettings{'RRDLOG'}."/collectd/localhost/interface/if_octets-".$interface.".rrd:rx:AVERAGE", "DEF:outgoing=".$mainsettings{'RRDLOG'}."/collectd/localhost/interface/if_octets-".$interface.".rrd:tx:AVERAGE", - "CDEF:outgoingn=outgoing,-1,*", + "CDEF:outgoingb=outgoing,8,*", + "CDEF:outgoingn=outgoingb,-1,*", + "CDEF:incomingb=incoming,8,*", "COMMENT:".sprintf("%-20s",$Lang::tr{'caption'}), "COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}), "COMMENT:".sprintf("%15s",$Lang::tr{'average'}), "COMMENT:".sprintf("%15s",$Lang::tr{'minimal'}), "COMMENT:".sprintf("%15s",$Lang::tr{'current'})."\\j", - "AREA:incoming".$color{"color12"}."A0:".sprintf("%-20s",$Lang::tr{'incoming traffic in bytes per second'}), - "GPRINT:incoming:MAX:%8.1lf %sBps", - "GPRINT:incoming:AVERAGE:%8.1lf %sBps", - "GPRINT:incoming:MIN:%8.1lf %sBps", - "GPRINT:incoming:LAST:%8.1lf %sBps\\j", - "AREA:outgoingn".$color{"color13"}."A0:".sprintf("%-20s",$Lang::tr{'outgoing traffic in bytes per second'}), - "GPRINT:outgoing:MAX:%8.1lf %sBps", - "GPRINT:outgoing:AVERAGE:%8.1lf %sBps", - "GPRINT:outgoing:MIN:%8.1lf %sBps", - "GPRINT:outgoing:LAST:%8.1lf %sBps\\j", + "AREA:incomingb".$color{"color12"}."A0:".sprintf("%-20s",$Lang::tr{'incoming traffic in bits per second'}), + "GPRINT:incomingb:MAX:%8.1lf %sbps", + "GPRINT:incomingb:AVERAGE:%8.1lf %sbps", + "GPRINT:incomingb:MIN:%8.1lf %sbps", + "GPRINT:incomingb:LAST:%8.1lf %sbps\\j", + "AREA:outgoingn".$color{"color13"}."A0:".sprintf("%-20s",$Lang::tr{'outgoing traffic in bits per second'}), + "GPRINT:outgoingb:MAX:%8.1lf %sbps", + "GPRINT:outgoingb:AVERAGE:%8.1lf %sbps", + "GPRINT:outgoingb:MIN:%8.1lf %sbps", + "GPRINT:outgoingb:LAST:%8.1lf %sbps\\j", ); $ERROR = RRDs::error; return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR; @@ -582,28 +584,30 @@ sub updatevpngraph { "-1".$period, "-r", "-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, - "-v ".$Lang::tr{'bytes per second'}, + "-v ".$Lang::tr{'bits per second'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, "--color=BACK".$color{"color21"}, "DEF:incoming=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets_derive.rrd:rx:AVERAGE", "DEF:outgoing=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets_derive.rrd:tx:AVERAGE", - "CDEF:outgoingn=outgoing,-1,*", + "CDEF:outgoingb=outgoing,8,*", + "CDEF:outgoingn=outgoingb,-1,*", + "CDEF:incomingb=incoming,8,*", "COMMENT:".sprintf("%-20s",$Lang::tr{'caption'}), "COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}), "COMMENT:".sprintf("%15s",$Lang::tr{'average'}), "COMMENT:".sprintf("%15s",$Lang::tr{'minimal'}), "COMMENT:".sprintf("%15s",$Lang::tr{'current'})."\\j", - "AREA:incoming#00dd00:".sprintf("%-20s",$Lang::tr{'incoming traffic in bytes per second'}), - "GPRINT:incoming:MAX:%8.1lf %sBps", - "GPRINT:incoming:AVERAGE:%8.1lf %sBps", - "GPRINT:incoming:MIN:%8.1lf %sBps", - "GPRINT:incoming:LAST:%8.1lf %sBps\\j", - "AREA:outgoingn#dd0000:".sprintf("%-20s",$Lang::tr{'outgoing traffic in bytes per second'}), - "GPRINT:outgoing:MAX:%8.1lf %sBps", - "GPRINT:outgoing:AVERAGE:%8.1lf %sBps", - "GPRINT:outgoing:MIN:%8.1lf %sBps", - "GPRINT:outgoing:LAST:%8.1lf %sBps\\j", + "AREA:incomingb#00dd00:".sprintf("%-20s",$Lang::tr{'incoming traffic in bits per second'}), + "GPRINT:incomingb:MAX:%8.1lf %sbps", + "GPRINT:incomingb:AVERAGE:%8.1lf %sbps", + "GPRINT:incomingb:MIN:%8.1lf %sbps", + "GPRINT:incomingb:LAST:%8.1lf %sbps\\j", + "AREA:outgoingn#dd0000:".sprintf("%-20s",$Lang::tr{'outgoing traffic in bits per second'}), + "GPRINT:outgoingb:MAX:%8.1lf %sbps", + "GPRINT:outgoingb:AVERAGE:%8.1lf %sbps", + "GPRINT:outgoingb:MIN:%8.1lf %sbps", + "GPRINT:outgoingb:LAST:%8.1lf %sbps\\j", ); $ERROR = RRDs::error; return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR; @@ -619,7 +623,7 @@ sub updatevpnn2ngraph { "-1".$period, "-r", "-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, - "-v ".$Lang::tr{'bytes per second'}, + "-v ".$Lang::tr{'bits per second'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, "--color=BACK".$color{"color21"}, @@ -629,44 +633,50 @@ sub updatevpnn2ngraph { "DEF:overhead_out=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets_derive-overhead.rrd:tx:AVERAGE", "DEF:compression_in=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/compression_derive-data_in.rrd:uncompressed:AVERAGE", "DEF:compression_out=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/compression_derive-data_out.rrd:uncompressed:AVERAGE", - "CDEF:outgoingn=outgoing,-1,*", - "CDEF:overhead_outn=overhead_out,-1,*", - "CDEF:compression_outn=compression_out,-1,*", + "CDEF:outgoingb=outgoing,8,*", + "CDEF:outgoingn=outgoingb,-1,*", + "CDEF:incomingb=incoming,8,*", + "CDEF:overhead_outb=overhead_out,8,*", + "CDEF:overhead_outn=overhead_outb,-1,*", + "CDEF:overhead_inb=overhead_in,8,*", + "CDEF:compression_outb=compression_out,8,*", + "CDEF:compression_outn=compression_outb,-1,*", + "CDEF:compression_inb=compression_in,8,*", "COMMENT:".sprintf("%-20s",$Lang::tr{'caption'}), "COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}), "COMMENT:".sprintf("%15s",$Lang::tr{'average'}), "COMMENT:".sprintf("%15s",$Lang::tr{'minimal'}), "COMMENT:".sprintf("%15s",$Lang::tr{'current'})."\\j", - "AREA:incoming#00dd00:".sprintf("%-23s",$Lang::tr{'incoming traffic in bytes per second'}), - "GPRINT:incoming:MAX:%8.1lf %sBps", - "GPRINT:incoming:AVERAGE:%8.1lf %sBps", - "GPRINT:incoming:MIN:%8.1lf %sBps", - "GPRINT:incoming:LAST:%8.1lf %sBps\\j", - "STACK:overhead_in#116B11:".sprintf("%-23s",$Lang::tr{'incoming overhead in bytes per second'}), - "GPRINT:overhead_in:MAX:%8.1lf %sBps", - "GPRINT:overhead_in:AVERAGE:%8.1lf %sBps", - "GPRINT:overhead_in:MIN:%8.1lf %sBps", - "GPRINT:overhead_in:LAST:%8.1lf %sBps\\j", - "LINE1:compression_in#ff00ff:".sprintf("%-23s",$Lang::tr{'incoming compression in bytes per second'}), - "GPRINT:compression_in:MAX:%8.1lf %sBps", - "GPRINT:compression_in:AVERAGE:%8.1lf %sBps", - "GPRINT:compression_in:MIN:%8.1lf %sBps", - "GPRINT:compression_in:LAST:%8.1lf %sBps\\j", - "AREA:outgoingn#dd0000:".sprintf("%-23s",$Lang::tr{'outgoing traffic in bytes per second'}), - "GPRINT:outgoing:MAX:%8.1lf %sBps", - "GPRINT:outgoing:AVERAGE:%8.1lf %sBps", - "GPRINT:outgoing:MIN:%8.1lf %sBps", - "GPRINT:outgoing:LAST:%8.1lf %sBps\\j", - "STACK:overhead_outn#870C0C:".sprintf("%-23s",$Lang::tr{'outgoing overhead in bytes per second'}), - "GPRINT:overhead_out:MAX:%8.1lf %sBps", - "GPRINT:overhead_out:AVERAGE:%8.1lf %sBps", - "GPRINT:overhead_out:MIN:%8.1lf %sBps", - "GPRINT:overhead_out:LAST:%8.1lf %sBps\\j", - "LINE1:compression_outn#000000:".sprintf("%-23s",$Lang::tr{'outgoing compression in bytes per second'}), - "GPRINT:compression_out:MAX:%8.1lf %sBps", - "GPRINT:compression_out:AVERAGE:%8.1lf %sBps", - "GPRINT:compression_out:MIN:%8.1lf %sBps", - "GPRINT:compression_out:LAST:%8.1lf %sBps\\j", + "AREA:incomingb#00dd00:".sprintf("%-23s",$Lang::tr{'incoming traffic in bits per second'}), + "GPRINT:incomingb:MAX:%8.1lf %sbps", + "GPRINT:incomingb:AVERAGE:%8.1lf %sbps", + "GPRINT:incomingb:MIN:%8.1lf %sbps", + "GPRINT:incomingb:LAST:%8.1lf %sbps\\j", + "STACK:overhead_inb#116B11:".sprintf("%-23s",$Lang::tr{'incoming overhead in bits per second'}), + "GPRINT:overhead_inb:MAX:%8.1lf %sbps", + "GPRINT:overhead_inb:AVERAGE:%8.1lf %sbps", + "GPRINT:overhead_inb:MIN:%8.1lf %sbps", + "GPRINT:overhead_inb:bLAST:%8.1lf %sbps\\j", + "LINE1:compression_inb#ff00ff:".sprintf("%-23s",$Lang::tr{'incoming compression in bits per second'}), + "GPRINT:compression_inb:MAX:%8.1lf %sbps", + "GPRINT:compression_inb:AVERAGE:%8.1lf %sbps", + "GPRINT:compression_inb:MIN:%8.1lf %sbps", + "GPRINT:compression_inb:LAST:%8.1lf %sbps\\j", + "AREA:outgoingn#dd0000:".sprintf("%-23s",$Lang::tr{'outgoing traffic in bits per second'}), + "GPRINT:outgoingb:MAX:%8.1lf %sbps", + "GPRINT:outgoingb:AVERAGE:%8.1lf %sbps", + "GPRINT:outgoingb:MIN:%8.1lf %sbps", + "GPRINT:outgoingb:LAST:%8.1lf %sbps\\j", + "STACK:overhead_outn#870C0C:".sprintf("%-23s",$Lang::tr{'outgoing overhead in bits per second'}), + "GPRINT:overhead_outb:MAX:%8.1lf %sbps", + "GPRINT:overhead_outb:AVERAGE:%8.1lf %sbps", + "GPRINT:overhead_outb:MIN:%8.1lf %sbps", + "GPRINT:overhead_outb:LAST:%8.1lf %sbps\\j", + "LINE1:compression_outn#000000:".sprintf("%-23s",$Lang::tr{'outgoing compression in bits per second'}), + "GPRINT:compression_outb:MAX:%8.1lf %sbps", + "GPRINT:compression_outb:AVERAGE:%8.1lf %sbps", + "GPRINT:compression_outb:MIN:%8.1lf %sbps", + "GPRINT:compression_outb:LAST:%8.1lf %sbps\\j", ); $ERROR = RRDs::error; return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR; @@ -683,7 +693,7 @@ sub updatefwhitsgraph { "-1".$period, "-r", "-t ".$Lang::tr{'firewall hits per'}." ".$Lang::tr{$period."-graph"}, - "-v ".$Lang::tr{'bytes per second'}, + "-v ".$Lang::tr{'bits per second'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, "--color=BACK".$color{"color21"}, @@ -692,36 +702,41 @@ sub updatefwhitsgraph { "DEF:forward=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-POLICYFWD/ipt_bytes-DROP_FORWARD.rrd:value:AVERAGE", "DEF:newnotsyn=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-NEWNOTSYN/ipt_bytes-DROP_NEWNOTSYN.rrd:value:AVERAGE", "DEF:portscan=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-PSCAN/ipt_bytes-DROP_PScan.rrd:value:AVERAGE", + "CDEF:outputb=output,8,*", + "CDEF:inputb=input,8,*", + "CDEF:forwardb=forward,8,*", + "CDEF:newnotsynb=newnotsyn,8,*", + "CDEF:portscanb=portscan,8,*", "COMMENT:".sprintf("%-26s",$Lang::tr{'caption'}), "COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}), "COMMENT:".sprintf("%15s",$Lang::tr{'average'}), "COMMENT:".sprintf("%14s",$Lang::tr{'minimal'}), "COMMENT:".sprintf("%15s",$Lang::tr{'current'})."\\j", - "AREA:output".$color{"color25"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (OUTPUT)"), - "GPRINT:output:MAX:%8.1lf %sBps", - "GPRINT:output:AVERAGE:%8.1lf %sBps", - "GPRINT:output:MIN:%8.1lf %sBps", - "GPRINT:output:LAST:%8.1lf %sBps\\j", - "STACK:forward".$color{"color23"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (FORWARD)"), - "GPRINT:forward:MAX:%8.1lf %sBps", - "GPRINT:forward:AVERAGE:%8.1lf %sBps", - "GPRINT:forward:MIN:%8.1lf %sBps", - "GPRINT:forward:LAST:%8.1lf %sBps\\j", - "STACK:input".$color{"color24"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (INPUT)"), - "GPRINT:input:MAX:%8.1lf %sBps", - "GPRINT:input:AVERAGE:%8.1lf %sBps", - "GPRINT:input:MIN:%8.1lf %sBps", - "GPRINT:input:LAST:%8.1lf %sBps\\j", - "STACK:newnotsyn".$color{"color14"}."A0:".sprintf("%-25s","NewNotSYN"), - "GPRINT:newnotsyn:MAX:%8.1lf %sBps", - "GPRINT:newnotsyn:AVERAGE:%8.1lf %sBps", - "GPRINT:newnotsyn:MIN:%8.1lf %sBps", - "GPRINT:newnotsyn:LAST:%8.1lf %sBps\\j", - "STACK:portscan".$color{"color16"}."A0:".sprintf("%-25s",$Lang::tr{'portscans'}), - "GPRINT:portscan:MAX:%8.1lf %sBps", - "GPRINT:portscan:AVERAGE:%8.1lf %sBps", - "GPRINT:portscan:MIN:%8.1lf %sBps", - "GPRINT:portscan:LAST:%8.1lf %sBps\\j", + "AREA:outputb".$color{"color25"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (OUTPUT)"), + "GPRINT:outputb:MAX:%8.1lf %sbps", + "GPRINT:outputb:AVERAGE:%8.1lf %sbps", + "GPRINT:outputb:MIN:%8.1lf %sbps", + "GPRINT:outputb:LAST:%8.1lf %sbps\\j", + "STACK:forwardb".$color{"color23"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (FORWARD)"), + "GPRINT:forwardb:MAX:%8.1lf %sbps", + "GPRINT:forwardb:AVERAGE:%8.1lf %sbps", + "GPRINT:forwardb:MIN:%8.1lf %sbps", + "GPRINT:forwardb:LAST:%8.1lf %sbps\\j", + "STACK:inputb".$color{"color24"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (INPUT)"), + "GPRINT:inputb:MAX:%8.1lf %sbps", + "GPRINT:inputb:AVERAGE:%8.1lf %sbps", + "GPRINT:inputb:MIN:%8.1lf %sbps", + "GPRINT:inputb:LAST:%8.1lf %sbps\\j", + "STACK:newnotsynb".$color{"color14"}."A0:".sprintf("%-25s","NewNotSYN"), + "GPRINT:newnotsynb:MAX:%8.1lf %sbps", + "GPRINT:newnotsynb:AVERAGE:%8.1lf %sbps", + "GPRINT:newnotsynb:MIN:%8.1lf %sbps", + "GPRINT:newnotsynb:LAST:%8.1lf %sbps\\j", + "STACK:portscanb".$color{"color16"}."A0:".sprintf("%-25s",$Lang::tr{'portscans'}), + "GPRINT:portscanb:MAX:%8.1lf %sbps", + "GPRINT:portscanb:AVERAGE:%8.1lf %sbps", + "GPRINT:portscanb:MIN:%8.1lf %sbps", + "GPRINT:portscanb:LAST:%8.1lf %sbps\\j", ); $ERROR = RRDs::error; return "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR; @@ -1012,7 +1027,7 @@ sub updateqosgraph { "-1".$period, "-r", "-t ".$Lang::tr{'Utilization on'}." (".$qossettings{'DEV'}.") ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, - "-v ".$Lang::tr{'bytes per second'}, + "-v ".$Lang::tr{'bits per second'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, "--color=BACK".$color{"color21"}, @@ -1039,21 +1054,24 @@ sub updateqosgraph { } if ( $classline[0] eq $qossettings{'DEV'} ){ - push(@command, "DEF:$classline[1]=$mainsettings{'RRDLOG'}/class_$qossettings{'CLASSPRFX'}-$classline[1]_$qossettings{'DEV'}.rrd:bytes:AVERAGE"); + # Found: ERROR: rpn expressions without DEF or CDEF variables are not supported + # CDEF does not like a number as a variable name. ie. "204" from $classline[1] + push(@command, "DEF:$classline[1]bit=$mainsettings{'RRDLOG'}/class_$qossettings{'CLASSPRFX'}-$classline[1]_$qossettings{'DEV'}.rrd:bytes:AVERAGE"); + push(@command, "CDEF:$classline[8]=$classline[1]bit,8,*"); # get color to be used for this graph my $graphColor = $colorMap{$colorKey}; if ($count eq "1") { - push(@command, "AREA:$classline[1]$graphColor:$Lang::tr{'Class'} $classline[1] -".sprintf("%15s",$classline[8])); + push(@command, "AREA:$classline[8]$graphColor:$Lang::tr{'Class'} $classline[1] -".sprintf("%15s",$classline[8])); } else { - push(@command, "STACK:$classline[1]$graphColor:$Lang::tr{'Class'} $classline[1] -".sprintf("%15s",$classline[8])); + push(@command, "STACK:$classline[8]$graphColor:$Lang::tr{'Class'} $classline[1] -".sprintf("%15s",$classline[8])); } - push(@command, "GPRINT:$classline[1]:MAX:%8.1lf %sBps" - , "GPRINT:$classline[1]:AVERAGE:%8.1lf %sBps" - , "GPRINT:$classline[1]:MIN:%8.1lf %sBps" - , "GPRINT:$classline[1]:LAST:%8.1lf %sBps\\j"); + push(@command, "GPRINT:$classline[8]:MAX:%8.1lf %sbps" + , "GPRINT:$classline[8]:AVERAGE:%8.1lf %sbps" + , "GPRINT:$classline[8]:MIN:%8.1lf %sbps" + , "GPRINT:$classline[8]:LAST:%8.1lf %sbps\\j"); $count++; } } diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index dc1fd8d67b30..b0097074beb0 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -515,6 +515,7 @@ 'broken pipe' => 'Broken pipe', 'buffered memory' => 'Buffered Memory', 'buffers' => 'buffers', +'bits per second' => 'Bits per Second', 'bytes per second' => 'Bytes per Second', 'bytes received' => 'Bytes Received', 'bytes sent' => 'Bytes Sent', @@ -1431,10 +1432,10 @@ 'inactive' => 'inactive', 'include logfiles' => 'Include logfiles', 'incoming' => 'incoming', -'incoming compression in bytes per second' => 'Incoming Compression', +'incoming compression in bits per second' => 'Incoming Compression', 'incoming firewall access' => 'Incoming Firewall Access', -'incoming overhead in bytes per second' => 'Incoming Overhead', -'incoming traffic in bytes per second' => 'Incoming Traffic', +'incoming overhead in bits per second' => 'Incoming Overhead', +'incoming traffic in bits per second' => 'Incoming Traffic', 'incorrect password' => 'Incorrect password', 'info' => 'Info', 'init string' => 'Init:', @@ -1907,7 +1908,7 @@ 'our donors' => 'Our donors', 'out' => 'Out', 'outgoing' => 'outgoing', -'outgoing compression in bytes per second' => 'Outgoing compression', +'outgoing compression in bits per second' => 'Outgoing compression', 'outgoing firewall' => 'Outgoing Firewall', 'outgoing firewall access' => 'Outgoing Firewall Access', 'outgoing firewall add ip group' => 'Add IP Address Group', @@ -1930,8 +1931,8 @@ 'outgoing firewall reset' => 'Reset all', 'outgoing firewall view group' => 'View group', 'outgoing firewall warning' => 'Not selecting source ip or mac ignores them', -'outgoing overhead in bytes per second' => 'Outgoing Overhead', -'outgoing traffic in bytes per second' => 'Outgoing Traffic', +'outgoing overhead in bits per second' => 'Outgoing Overhead', +'outgoing traffic in bits per second' => 'Outgoing Traffic', 'override mtu' => 'Override default MTU', 'ovpn' => 'OpenVPN', 'ovpn add conf' => 'Additional configuration', -- 2.20.1

4 3

[PATCH 0/2] Added new Package node_exporter
by Holger Sunke 24 May '21

24 May '21

These patches add the new package node_exporter as discussed in the form thread: https://community.ipfire.org/t/please-add-prometheus-exporter/3555 GO language is required to compile node_exporter. In order to compile node_exporter for i586 arch, "go" package supported architecture must be extended for this. You'll likely want to download packages and adjust DL_FROM variables in "go" and "node_exporter" LFS scripts. Holger Sunke (2): Added i586/386 support for GO language required for node_exporter. Added new node_exporter package. config/rootfiles/packages/node_exporter | 3 + lfs/Config | 4 + lfs/go | 6 +- lfs/node_exporter | 88 +++++++++++++++++++ make.sh | 1 + src/paks/node_exporter/install.sh | 31 +++++++ src/paks/node_exporter/uninstall.sh | 30 +++++++ src/paks/node_exporter/update.sh | 27 ++++++ ..._exporter-configurable-initd-options.patch | 48 ++++++++++ 9 files changed, 235 insertions(+), 3 deletions(-) create mode 100644 config/rootfiles/packages/node_exporter create mode 100644 lfs/node_exporter create mode 100644 src/paks/node_exporter/install.sh create mode 100644 src/paks/node_exporter/uninstall.sh create mode 100644 src/paks/node_exporter/update.sh create mode 100644 src/patches/node_exporter-configurable-initd-options.patch -- 2.30.2

4 12

[PATCH] Network based RRD graphs Bytes to Bits
by nateos2g 24 May '21

24 May '21

For proper display of network measurements, Bps (bytes) should be converted to bps (bits). Bytes are for data/storage (RAM, HDD, SSD, etc.), bits are for network bandwidth or throughput (NICs, switches, routers, WiFi adapters, etc.). Networks transfer data as single bits at a time. It’s both more accurate and more intuitive to measure network speed in bits per second that a network connection is transmitting, not the amount of data units, or bytes, it transmits. Notice all network devices are marketed, measure and diplay in bits per second. I simply used RRD CDEF to multiply by 8. NOTE: Found: "ERROR: rpn expressions without DEF or CDEF variables are not supported". Specifically in updateqosgraph, CDEF does not like a number as a variable name. ie. "204" from $classline[1]. Requires update of the language cache files: perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" or: update-lang-cache Found one other asking for this: https://community.ipfire.org/t/ipfire-bandwidth-usage/1203 Signed-off-by: Nate Oaks <nateos2g(a)fastmail.com> --- config/cfgroot/graphs.pl | 202 +++++++++++++++++++++------------------ langs/en/cgi-bin/en.pl | 13 +-- 2 files changed, 117 insertions(+), 98 deletions(-) diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index 441d4c483a46..c83ae67bbfc1 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -545,28 +545,30 @@ sub updateifgraph { "-1".$period, "-r", "-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, - "-v ".$Lang::tr{'bytes per second'}, + "-v ".$Lang::tr{'bits per second'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, "--color=BACK".$color{"color21"}, "DEF:incoming=".$mainsettings{'RRDLOG'}."/collectd/localhost/interface/if_octets-".$interface.".rrd:rx:AVERAGE", "DEF:outgoing=".$mainsettings{'RRDLOG'}."/collectd/localhost/interface/if_octets-".$interface.".rrd:tx:AVERAGE", - "CDEF:outgoingn=outgoing,-1,*", + "CDEF:outgoingb=outgoing,8,*", + "CDEF:outgoingn=outgoingb,-1,*", + "CDEF:incomingb=incoming,8,*", "COMMENT:".sprintf("%-20s",$Lang::tr{'caption'}), "COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}), "COMMENT:".sprintf("%15s",$Lang::tr{'average'}), "COMMENT:".sprintf("%15s",$Lang::tr{'minimal'}), "COMMENT:".sprintf("%15s",$Lang::tr{'current'})."\\j", - "AREA:incoming".$color{"color12"}."A0:".sprintf("%-20s",$Lang::tr{'incoming traffic in bytes per second'}), - "GPRINT:incoming:MAX:%8.1lf %sBps", - "GPRINT:incoming:AVERAGE:%8.1lf %sBps", - "GPRINT:incoming:MIN:%8.1lf %sBps", - "GPRINT:incoming:LAST:%8.1lf %sBps\\j", - "AREA:outgoingn".$color{"color13"}."A0:".sprintf("%-20s",$Lang::tr{'outgoing traffic in bytes per second'}), - "GPRINT:outgoing:MAX:%8.1lf %sBps", - "GPRINT:outgoing:AVERAGE:%8.1lf %sBps", - "GPRINT:outgoing:MIN:%8.1lf %sBps", - "GPRINT:outgoing:LAST:%8.1lf %sBps\\j", + "AREA:incomingb".$color{"color12"}."A0:".sprintf("%-20s",$Lang::tr{'incoming traffic in bits per second'}), + "GPRINT:incomingb:MAX:%8.1lf %sbps", + "GPRINT:incomingb:AVERAGE:%8.1lf %sbps", + "GPRINT:incomingb:MIN:%8.1lf %sbps", + "GPRINT:incomingb:LAST:%8.1lf %sbps\\j", + "AREA:outgoingn".$color{"color13"}."A0:".sprintf("%-20s",$Lang::tr{'outgoing traffic in bits per second'}), + "GPRINT:outgoingb:MAX:%8.1lf %sbps", + "GPRINT:outgoingb:AVERAGE:%8.1lf %sbps", + "GPRINT:outgoingb:MIN:%8.1lf %sbps", + "GPRINT:outgoingb:LAST:%8.1lf %sbps\\j", ); $ERROR = RRDs::error; return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR; @@ -582,28 +584,30 @@ sub updatevpngraph { "-1".$period, "-r", "-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, - "-v ".$Lang::tr{'bytes per second'}, + "-v ".$Lang::tr{'bits per second'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, "--color=BACK".$color{"color21"}, "DEF:incoming=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets_derive.rrd:rx:AVERAGE", "DEF:outgoing=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets_derive.rrd:tx:AVERAGE", - "CDEF:outgoingn=outgoing,-1,*", + "CDEF:outgoingb=outgoing,8,*", + "CDEF:outgoingn=outgoingb,-1,*", + "CDEF:incomingb=incoming,8,*", "COMMENT:".sprintf("%-20s",$Lang::tr{'caption'}), "COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}), "COMMENT:".sprintf("%15s",$Lang::tr{'average'}), "COMMENT:".sprintf("%15s",$Lang::tr{'minimal'}), "COMMENT:".sprintf("%15s",$Lang::tr{'current'})."\\j", - "AREA:incoming#00dd00:".sprintf("%-20s",$Lang::tr{'incoming traffic in bytes per second'}), - "GPRINT:incoming:MAX:%8.1lf %sBps", - "GPRINT:incoming:AVERAGE:%8.1lf %sBps", - "GPRINT:incoming:MIN:%8.1lf %sBps", - "GPRINT:incoming:LAST:%8.1lf %sBps\\j", - "AREA:outgoingn#dd0000:".sprintf("%-20s",$Lang::tr{'outgoing traffic in bytes per second'}), - "GPRINT:outgoing:MAX:%8.1lf %sBps", - "GPRINT:outgoing:AVERAGE:%8.1lf %sBps", - "GPRINT:outgoing:MIN:%8.1lf %sBps", - "GPRINT:outgoing:LAST:%8.1lf %sBps\\j", + "AREA:incomingb#00dd00:".sprintf("%-20s",$Lang::tr{'incoming traffic in bits per second'}), + "GPRINT:incomingb:MAX:%8.1lf %sbps", + "GPRINT:incomingb:AVERAGE:%8.1lf %sbps", + "GPRINT:incomingb:MIN:%8.1lf %sbps", + "GPRINT:incomingb:LAST:%8.1lf %sbps\\j", + "AREA:outgoingn#dd0000:".sprintf("%-20s",$Lang::tr{'outgoing traffic in bits per second'}), + "GPRINT:outgoingb:MAX:%8.1lf %sbps", + "GPRINT:outgoingb:AVERAGE:%8.1lf %sbps", + "GPRINT:outgoingb:MIN:%8.1lf %sbps", + "GPRINT:outgoingb:LAST:%8.1lf %sbps\\j", ); $ERROR = RRDs::error; return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR; @@ -619,7 +623,7 @@ sub updatevpnn2ngraph { "-1".$period, "-r", "-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, - "-v ".$Lang::tr{'bytes per second'}, + "-v ".$Lang::tr{'bits per second'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, "--color=BACK".$color{"color21"}, @@ -629,44 +633,50 @@ sub updatevpnn2ngraph { "DEF:overhead_out=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets_derive-overhead.rrd:tx:AVERAGE", "DEF:compression_in=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/compression_derive-data_in.rrd:uncompressed:AVERAGE", "DEF:compression_out=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/compression_derive-data_out.rrd:uncompressed:AVERAGE", - "CDEF:outgoingn=outgoing,-1,*", - "CDEF:overhead_outn=overhead_out,-1,*", - "CDEF:compression_outn=compression_out,-1,*", + "CDEF:outgoingb=outgoing,8,*", + "CDEF:outgoingn=outgoingb,-1,*", + "CDEF:incomingb=incoming,8,*", + "CDEF:overhead_outb=overhead_out,8,*", + "CDEF:overhead_outn=overhead_outb,-1,*", + "CDEF:overhead_inb=overhead_in,8,*", + "CDEF:compression_outb=compression_out,8,*", + "CDEF:compression_outn=compression_outb,-1,*", + "CDEF:compression_inb=compression_in,8,*", "COMMENT:".sprintf("%-20s",$Lang::tr{'caption'}), "COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}), "COMMENT:".sprintf("%15s",$Lang::tr{'average'}), "COMMENT:".sprintf("%15s",$Lang::tr{'minimal'}), "COMMENT:".sprintf("%15s",$Lang::tr{'current'})."\\j", - "AREA:incoming#00dd00:".sprintf("%-23s",$Lang::tr{'incoming traffic in bytes per second'}), - "GPRINT:incoming:MAX:%8.1lf %sBps", - "GPRINT:incoming:AVERAGE:%8.1lf %sBps", - "GPRINT:incoming:MIN:%8.1lf %sBps", - "GPRINT:incoming:LAST:%8.1lf %sBps\\j", - "STACK:overhead_in#116B11:".sprintf("%-23s",$Lang::tr{'incoming overhead in bytes per second'}), - "GPRINT:overhead_in:MAX:%8.1lf %sBps", - "GPRINT:overhead_in:AVERAGE:%8.1lf %sBps", - "GPRINT:overhead_in:MIN:%8.1lf %sBps", - "GPRINT:overhead_in:LAST:%8.1lf %sBps\\j", - "LINE1:compression_in#ff00ff:".sprintf("%-23s",$Lang::tr{'incoming compression in bytes per second'}), - "GPRINT:compression_in:MAX:%8.1lf %sBps", - "GPRINT:compression_in:AVERAGE:%8.1lf %sBps", - "GPRINT:compression_in:MIN:%8.1lf %sBps", - "GPRINT:compression_in:LAST:%8.1lf %sBps\\j", - "AREA:outgoingn#dd0000:".sprintf("%-23s",$Lang::tr{'outgoing traffic in bytes per second'}), - "GPRINT:outgoing:MAX:%8.1lf %sBps", - "GPRINT:outgoing:AVERAGE:%8.1lf %sBps", - "GPRINT:outgoing:MIN:%8.1lf %sBps", - "GPRINT:outgoing:LAST:%8.1lf %sBps\\j", - "STACK:overhead_outn#870C0C:".sprintf("%-23s",$Lang::tr{'outgoing overhead in bytes per second'}), - "GPRINT:overhead_out:MAX:%8.1lf %sBps", - "GPRINT:overhead_out:AVERAGE:%8.1lf %sBps", - "GPRINT:overhead_out:MIN:%8.1lf %sBps", - "GPRINT:overhead_out:LAST:%8.1lf %sBps\\j", - "LINE1:compression_outn#000000:".sprintf("%-23s",$Lang::tr{'outgoing compression in bytes per second'}), - "GPRINT:compression_out:MAX:%8.1lf %sBps", - "GPRINT:compression_out:AVERAGE:%8.1lf %sBps", - "GPRINT:compression_out:MIN:%8.1lf %sBps", - "GPRINT:compression_out:LAST:%8.1lf %sBps\\j", + "AREA:incomingb#00dd00:".sprintf("%-23s",$Lang::tr{'incoming traffic in bits per second'}), + "GPRINT:incomingb:MAX:%8.1lf %sbps", + "GPRINT:incomingb:AVERAGE:%8.1lf %sbps", + "GPRINT:incomingb:MIN:%8.1lf %sbps", + "GPRINT:incomingb:LAST:%8.1lf %sbps\\j", + "STACK:overhead_inb#116B11:".sprintf("%-23s",$Lang::tr{'incoming overhead in bits per second'}), + "GPRINT:overhead_inb:MAX:%8.1lf %sbps", + "GPRINT:overhead_inb:AVERAGE:%8.1lf %sbps", + "GPRINT:overhead_inb:MIN:%8.1lf %sbps", + "GPRINT:overhead_inb:bLAST:%8.1lf %sbps\\j", + "LINE1:compression_inb#ff00ff:".sprintf("%-23s",$Lang::tr{'incoming compression in bits per second'}), + "GPRINT:compression_inb:MAX:%8.1lf %sbps", + "GPRINT:compression_inb:AVERAGE:%8.1lf %sbps", + "GPRINT:compression_inb:MIN:%8.1lf %sbps", + "GPRINT:compression_inb:LAST:%8.1lf %sbps\\j", + "AREA:outgoingn#dd0000:".sprintf("%-23s",$Lang::tr{'outgoing traffic in bits per second'}), + "GPRINT:outgoingb:MAX:%8.1lf %sbps", + "GPRINT:outgoingb:AVERAGE:%8.1lf %sbps", + "GPRINT:outgoingb:MIN:%8.1lf %sbps", + "GPRINT:outgoingb:LAST:%8.1lf %sbps\\j", + "STACK:overhead_outn#870C0C:".sprintf("%-23s",$Lang::tr{'outgoing overhead in bits per second'}), + "GPRINT:overhead_outb:MAX:%8.1lf %sbps", + "GPRINT:overhead_outb:AVERAGE:%8.1lf %sbps", + "GPRINT:overhead_outb:MIN:%8.1lf %sbps", + "GPRINT:overhead_outb:LAST:%8.1lf %sbps\\j", + "LINE1:compression_outn#000000:".sprintf("%-23s",$Lang::tr{'outgoing compression in bits per second'}), + "GPRINT:compression_outb:MAX:%8.1lf %sbps", + "GPRINT:compression_outb:AVERAGE:%8.1lf %sbps", + "GPRINT:compression_outb:MIN:%8.1lf %sbps", + "GPRINT:compression_outb:LAST:%8.1lf %sbps\\j", ); $ERROR = RRDs::error; return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR; @@ -683,7 +693,7 @@ sub updatefwhitsgraph { "-1".$period, "-r", "-t ".$Lang::tr{'firewall hits per'}." ".$Lang::tr{$period."-graph"}, - "-v ".$Lang::tr{'bytes per second'}, + "-v ".$Lang::tr{'bits per second'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, "--color=BACK".$color{"color21"}, @@ -692,36 +702,41 @@ sub updatefwhitsgraph { "DEF:forward=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-POLICYFWD/ipt_bytes-DROP_FORWARD.rrd:value:AVERAGE", "DEF:newnotsyn=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-NEWNOTSYN/ipt_bytes-DROP_NEWNOTSYN.rrd:value:AVERAGE", "DEF:portscan=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-PSCAN/ipt_bytes-DROP_PScan.rrd:value:AVERAGE", + "CDEF:outputb=output,8,*", + "CDEF:inputb=input,8,*", + "CDEF:forwardb=forward,8,*", + "CDEF:newnotsynb=newnotsyn,8,*", + "CDEF:portscanb=portscan,8,*", "COMMENT:".sprintf("%-26s",$Lang::tr{'caption'}), "COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}), "COMMENT:".sprintf("%15s",$Lang::tr{'average'}), "COMMENT:".sprintf("%14s",$Lang::tr{'minimal'}), "COMMENT:".sprintf("%15s",$Lang::tr{'current'})."\\j", - "AREA:output".$color{"color25"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (OUTPUT)"), - "GPRINT:output:MAX:%8.1lf %sBps", - "GPRINT:output:AVERAGE:%8.1lf %sBps", - "GPRINT:output:MIN:%8.1lf %sBps", - "GPRINT:output:LAST:%8.1lf %sBps\\j", - "STACK:forward".$color{"color23"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (FORWARD)"), - "GPRINT:forward:MAX:%8.1lf %sBps", - "GPRINT:forward:AVERAGE:%8.1lf %sBps", - "GPRINT:forward:MIN:%8.1lf %sBps", - "GPRINT:forward:LAST:%8.1lf %sBps\\j", - "STACK:input".$color{"color24"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (INPUT)"), - "GPRINT:input:MAX:%8.1lf %sBps", - "GPRINT:input:AVERAGE:%8.1lf %sBps", - "GPRINT:input:MIN:%8.1lf %sBps", - "GPRINT:input:LAST:%8.1lf %sBps\\j", - "STACK:newnotsyn".$color{"color14"}."A0:".sprintf("%-25s","NewNotSYN"), - "GPRINT:newnotsyn:MAX:%8.1lf %sBps", - "GPRINT:newnotsyn:AVERAGE:%8.1lf %sBps", - "GPRINT:newnotsyn:MIN:%8.1lf %sBps", - "GPRINT:newnotsyn:LAST:%8.1lf %sBps\\j", - "STACK:portscan".$color{"color16"}."A0:".sprintf("%-25s",$Lang::tr{'portscans'}), - "GPRINT:portscan:MAX:%8.1lf %sBps", - "GPRINT:portscan:AVERAGE:%8.1lf %sBps", - "GPRINT:portscan:MIN:%8.1lf %sBps", - "GPRINT:portscan:LAST:%8.1lf %sBps\\j", + "AREA:outputb".$color{"color25"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (OUTPUT)"), + "GPRINT:outputb:MAX:%8.1lf %sbps", + "GPRINT:outputb:AVERAGE:%8.1lf %sbps", + "GPRINT:outputb:MIN:%8.1lf %sbps", + "GPRINT:outputb:LAST:%8.1lf %sbps\\j", + "STACK:forwardb".$color{"color23"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (FORWARD)"), + "GPRINT:forwardb:MAX:%8.1lf %sbps", + "GPRINT:forwardb:AVERAGE:%8.1lf %sbps", + "GPRINT:forwardb:MIN:%8.1lf %sbps", + "GPRINT:forwardb:LAST:%8.1lf %sbps\\j", + "STACK:inputb".$color{"color24"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (INPUT)"), + "GPRINT:inputb:MAX:%8.1lf %sbps", + "GPRINT:inputb:AVERAGE:%8.1lf %sbps", + "GPRINT:inputb:MIN:%8.1lf %sbps", + "GPRINT:inputb:LAST:%8.1lf %sbps\\j", + "STACK:newnotsynb".$color{"color14"}."A0:".sprintf("%-25s","NewNotSYN"), + "GPRINT:newnotsynb:MAX:%8.1lf %sbps", + "GPRINT:newnotsynb:AVERAGE:%8.1lf %sbps", + "GPRINT:newnotsynb:MIN:%8.1lf %sbps", + "GPRINT:newnotsynb:LAST:%8.1lf %sbps\\j", + "STACK:portscanb".$color{"color16"}."A0:".sprintf("%-25s",$Lang::tr{'portscans'}), + "GPRINT:portscanb:MAX:%8.1lf %sbps", + "GPRINT:portscanb:AVERAGE:%8.1lf %sbps", + "GPRINT:portscanb:MIN:%8.1lf %sbps", + "GPRINT:portscanb:LAST:%8.1lf %sbps\\j", ); $ERROR = RRDs::error; return "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR; @@ -1012,7 +1027,7 @@ sub updateqosgraph { "-1".$period, "-r", "-t ".$Lang::tr{'Utilization on'}." (".$qossettings{'DEV'}.") ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, - "-v ".$Lang::tr{'bytes per second'}, + "-v ".$Lang::tr{'bits per second'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, "--color=BACK".$color{"color21"}, @@ -1039,21 +1054,24 @@ sub updateqosgraph { } if ( $classline[0] eq $qossettings{'DEV'} ){ - push(@command, "DEF:$classline[1]=$mainsettings{'RRDLOG'}/class_$qossettings{'CLASSPRFX'}-$classline[1]_$qossettings{'DEV'}.rrd:bytes:AVERAGE"); + # Found: ERROR: rpn expressions without DEF or CDEF variables are not supported + # CDEF does not like a number as a variable name. ie. "204" from $classline[1] + push(@command, "DEF:$classline[1]bit=$mainsettings{'RRDLOG'}/class_$qossettings{'CLASSPRFX'}-$classline[1]_$qossettings{'DEV'}.rrd:bytes:AVERAGE"); + push(@command, "CDEF:$classline[8]=$classline[1]bit,8,*"); # get color to be used for this graph my $graphColor = $colorMap{$colorKey}; if ($count eq "1") { - push(@command, "AREA:$classline[1]$graphColor:$Lang::tr{'Class'} $classline[1] -".sprintf("%15s",$classline[8])); + push(@command, "AREA:$classline[8]$graphColor:$Lang::tr{'Class'} $classline[1] -".sprintf("%15s",$classline[8])); } else { - push(@command, "STACK:$classline[1]$graphColor:$Lang::tr{'Class'} $classline[1] -".sprintf("%15s",$classline[8])); + push(@command, "STACK:$classline[8]$graphColor:$Lang::tr{'Class'} $classline[1] -".sprintf("%15s",$classline[8])); } - push(@command, "GPRINT:$classline[1]:MAX:%8.1lf %sBps" - , "GPRINT:$classline[1]:AVERAGE:%8.1lf %sBps" - , "GPRINT:$classline[1]:MIN:%8.1lf %sBps" - , "GPRINT:$classline[1]:LAST:%8.1lf %sBps\\j"); + push(@command, "GPRINT:$classline[8]:MAX:%8.1lf %sbps" + , "GPRINT:$classline[8]:AVERAGE:%8.1lf %sbps" + , "GPRINT:$classline[8]:MIN:%8.1lf %sbps" + , "GPRINT:$classline[8]:LAST:%8.1lf %sbps\\j"); $count++; } } diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index dc1fd8d67b30..b0097074beb0 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -515,6 +515,7 @@ 'broken pipe' => 'Broken pipe', 'buffered memory' => 'Buffered Memory', 'buffers' => 'buffers', +'bits per second' => 'Bits per Second', 'bytes per second' => 'Bytes per Second', 'bytes received' => 'Bytes Received', 'bytes sent' => 'Bytes Sent', @@ -1431,10 +1432,10 @@ 'inactive' => 'inactive', 'include logfiles' => 'Include logfiles', 'incoming' => 'incoming', -'incoming compression in bytes per second' => 'Incoming Compression', +'incoming compression in bits per second' => 'Incoming Compression', 'incoming firewall access' => 'Incoming Firewall Access', -'incoming overhead in bytes per second' => 'Incoming Overhead', -'incoming traffic in bytes per second' => 'Incoming Traffic', +'incoming overhead in bits per second' => 'Incoming Overhead', +'incoming traffic in bits per second' => 'Incoming Traffic', 'incorrect password' => 'Incorrect password', 'info' => 'Info', 'init string' => 'Init:', @@ -1907,7 +1908,7 @@ 'our donors' => 'Our donors', 'out' => 'Out', 'outgoing' => 'outgoing', -'outgoing compression in bytes per second' => 'Outgoing compression', +'outgoing compression in bits per second' => 'Outgoing compression', 'outgoing firewall' => 'Outgoing Firewall', 'outgoing firewall access' => 'Outgoing Firewall Access', 'outgoing firewall add ip group' => 'Add IP Address Group', @@ -1930,8 +1931,8 @@ 'outgoing firewall reset' => 'Reset all', 'outgoing firewall view group' => 'View group', 'outgoing firewall warning' => 'Not selecting source ip or mac ignores them', -'outgoing overhead in bytes per second' => 'Outgoing Overhead', -'outgoing traffic in bytes per second' => 'Outgoing Traffic', +'outgoing overhead in bits per second' => 'Outgoing Overhead', +'outgoing traffic in bits per second' => 'Outgoing Traffic', 'override mtu' => 'Override default MTU', 'ovpn' => 'OpenVPN', 'ovpn add conf' => 'Additional configuration', -- 2.20.1

2 1

[PATCH] libusb: update to 1.0.24
by Peter Müller 23 May '21

23 May '21

Full changelog as per CHANGELOG file: 2020-12-09: v1.0.24 * Add new platform abstraction (#252) * Add Null POSIX backend * Add support for eventfd * Add support for thread IDs on Haiku, NetBSD and Solaris * New API libusb_hotplug_get_user_data() * Darwin (macOS): Fix race condition that results in segmentation fault (#701) * Darwin (macOS): Fix stale descriptor information post reset (#733) * Darwin (macOS): use IOUSBDevice as darwin_device_class explicitly (#693) * Linux: Drop support for kernel older than 2.6.32 * Linux: Provide an event thread name (#689) * Linux: Wait until all USBs have been reaped before freeing them (#607) * NetBSD: Recognize device timeouts (#710) * OpenBSD: Allow opening ugen devices multiple times (#763) * OpenBSD: Support libusb_get_port_number() (#764) * SunOS: Fix a memory leak (#756) * SunOS: Various fixes (#627, #628, #629) * Windows: Add Visual Studio 2019 support * Windows: Drop support for WinCE and Visual Studio older than 2013 * Windows: Drop support for Windows XP * Windows: Support building all examples using Visual Studio (#151) * Documentation fixes and improvements * Various other bug fixes and improvements Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- config/rootfiles/common/libusb | 2 +- lfs/libusb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/common/libusb b/config/rootfiles/common/libusb index 232574159..db0215195 100644 --- a/config/rootfiles/common/libusb +++ b/config/rootfiles/common/libusb @@ -5,5 +5,5 @@ etc/udev/rules.d/23-usb.rules #usr/lib/libusb-1.0.la #usr/lib/libusb-1.0.so usr/lib/libusb-1.0.so.0 -usr/lib/libusb-1.0.so.0.2.0 +usr/lib/libusb-1.0.so.0.3.0 #usr/lib/pkgconfig/libusb-1.0.pc diff --git a/lfs/libusb b/lfs/libusb index 4b99a6d18..9c8a9ac9a 100644 --- a/lfs/libusb +++ b/lfs/libusb @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 1.0.23 +VER = 1.0.24 THISAPP = libusb-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1e29700f6a134766d32b36b8d1d61a95 +$(DL_FILE)_MD5 = 5bc27df16155302f308d409e73589872 install : $(TARGET) -- 2.26.2

2 1

[PATCH] vnstat 2.7: Adjusted 'traffic.cgi' to display 5-minute graphs
by Matthias Fischer 22 May '21

22 May '21

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- html/cgi-bin/traffic.cgi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/html/cgi-bin/traffic.cgi b/html/cgi-bin/traffic.cgi index cafccf73f..4846cfdf9 100644 --- a/html/cgi-bin/traffic.cgi +++ b/html/cgi-bin/traffic.cgi @@ -86,7 +86,10 @@ sub display_vnstat if ( $testdata =~ 'enough') { print"No data for $device !<br>"; } else { + # Summary system("/usr/bin/vnstati -c 1 -s -i $device -o /srv/web/ipfire/html/graphs/vnstat-s-$device.png"); + # 5-minute graphs + system("/usr/bin/vnstati -c 1 -5 -i $device -o /srv/web/ipfire/html/graphs/vnstat-5-$device.png"); # Hour graph system("/usr/bin/vnstati -c 1 -h -i $device -o /srv/web/ipfire/html/graphs/vnstat-h-$device.png"); # Day graph @@ -100,6 +103,7 @@ sub display_vnstat print <<END <table> <tr><td><img src="/graphs/vnstat-s-$device.png"></td></tr> +<tr><td><img src="/graphs/vnstat-5-$device.png"></td></tr> <tr><td><img src="/graphs/vnstat-h-$device.png"></td></tr> <tr><td><img src="/graphs/vnstat-d-$device.png"></td></tr> <tr><td><img src="/graphs/vnstat-m-$device.png"></td></tr> -- 2.18.0

2 1

[PATCH] bind: Update to 9.11.32
by Matthias Fischer 22 May '21

22 May '21

For details see: https://downloads.isc.org/isc/bind9/9.11.31/RELEASE-NOTES-bind-9.11.32.html "Notes for BIND 9.11.32 Feature Changes DNSSEC responses containing NSEC3 records with iteration counts greater than 150 are now treated as insecure. [GL #2445] The maximum supported number of NSEC3 iterations that can be configured for a zone has been reduced to 150. [GL #2642] The implementation of the ZONEMD RR type has been updated to match RFC 8976. [GL #2658] Notes for BIND 9.11.31 Security Fixes A malformed incoming IXFR transfer could trigger an assertion failure in named, causing it to quit abnormally. (CVE-2021-25214) ISC would like to thank Greg Kuechle of SaskTel for bringing this vulnerability to our attention. [GL #2467] named crashed when a DNAME record placed in the ANSWER section during DNAME chasing turned out to be the final answer to a client query. (CVE-2021-25215) ISC would like to thank Siva Kakarla for bringing this vulnerability to our attention. [GL #2540] When a server's configuration set the tkey-gssapi-keytab or tkey-gssapi-credential option, a specially crafted GSS-TSIG query could cause a buffer overflow in the ISC implementation of SPNEGO (a protocol enabling negotiation of the security mechanism used for GSSAPI authentication). This flaw could be exploited to crash named binaries compiled for 64-bit platforms, and could enable remote code execution when named was compiled for 32-bit platforms. (CVE-2021-25216) This vulnerability was reported to us as ZDI-CAN-13347 by Trend Micro Zero Day Initiative. [GL #2604] Feature Changes The ISC implementation of SPNEGO was removed from BIND 9 source code. Instead, BIND 9 now always uses the SPNEGO implementation provided by the system GSSAPI library when it is built with GSSAPI support. All major contemporary Kerberos/GSSAPI libraries contain an implementation of the SPNEGO mechanism. [GL #2607] Notes for BIND 9.11.30 The BIND 9.11.30 release was withdrawn after a backporting bug was discovered during pre-release testing. ISC would like to acknowledge the assistance of Natan Segal of Bluecat Networks.2" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/bind | 4 ++-- lfs/bind | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind index 7e1ecd48f..6fb228a5a 100644 --- a/config/rootfiles/common/bind +++ b/config/rootfiles/common/bind @@ -272,8 +272,8 @@ usr/lib/libbind9.so.161 usr/lib/libbind9.so.161.0.4 #usr/lib/libdns.la #usr/lib/libdns.so -usr/lib/libdns.so.1113 -usr/lib/libdns.so.1113.0.2 +usr/lib/libdns.so.1115 +usr/lib/libdns.so.1115.0.0 #usr/lib/libisc.la #usr/lib/libisc.so usr/lib/libisc.so.1107 diff --git a/lfs/bind b/lfs/bind index c0c7c5ebf..0545066b7 100644 --- a/lfs/bind +++ b/lfs/bind @@ -25,7 +25,7 @@ include Config -VER = 9.11.29 +VER = 9.11.32 THISAPP = bind-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 439d5491dfea08be032a1f9ca5a54faa +$(DL_FILE)_MD5 = 0d029dd06ca60c6739c3189c999ef757 install : $(TARGET) -- 2.18.0

2 1

[PATCH] vnstat: Update to 2.7
by Matthias Fischer 22 May '21

22 May '21

For details see: https://humdi[dot]net/vnstat/CHANGES "2.7 / 16-May-2021 - Fixed - Possibility of segmentation fault with image list output when database existed but no data was available - ./configure output could show invalid install paths with some parameter combinations (pull request by Severin Glöckner) - Columns in text hours graph output could get misaligned if the selected system locale used a UTF-8 sequence for the thousands separator instead of a single character - New - Add -5g / --fivegraph options to image output with sizing related parameters for the output of a 5 minute resolution bar graph - Add configuration option SummaryGraph and optional parameter for --hsummary and --vsummary for selecting which graph is shown next to the summary data in the horizontal and vertical summary image outputs - Add --large / --small options and configuration option LargeFonts for controlling the image output font size - Add --scale and configuration option ImageScale for scaling the image output to a given percent - Add configuration option LineSpacingAdjustment for adjusting the line spacing of list format image outputs - Add bar visualizations for traffic estimations in image output - Allow writing image output to a filename starting with - - Add --initdb to daemon for creating a new empty database without having the daemon process staying running, doesn't discard data if a database already exists - Add configuration option BarColumnShowsRate for having the bar column in image list outputs be scaled according to the average rate column values when those values are visible, disabled by default - Add --dbiflist for getting a list of interfaces in the database, both --iflist and --dbiflist also get alternative more parseable outputs - Add configuration option for large font output and make 5 minute resolution graph visible in vnstat.cgi" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/vnstat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/vnstat b/lfs/vnstat index a5762bf5d..d66a4b2e4 100644 --- a/lfs/vnstat +++ b/lfs/vnstat @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 2.6 +VER = 2.7 THISAPP = vnstat-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = fe2928a81243cc8a532a357f97221736 +$(DL_FILE)_MD5 = fcf28cf5fdfbaab522f37b6431f327e1 install : $(TARGET) -- 2.18.0

2 1

← Newer
1
2
3
4
5
6
7
...
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development May 2021