debian/0000755000000000000000000000000011717152330007166 5ustar debian/manpages0000644000000000000000000000005511303315236010701 0ustar debian/iptotal.8 iptotald.8 iptotal_config.5 debian/rules0000755000000000000000000000115211354601742010250 0ustar #!/usr/bin/make -f %: dh --with autotools_dev $@ override_dh_auto_configure: dh_auto_configure -- --datadir=/var/lib/iptotal --sysconfdir=/etc/iptotal override_dh_auto_install: dh_auto_install mv $(CURDIR)/debian/iptotal/var/lib/iptotal/*.cgi $(CURDIR)/debian/iptotal/usr/lib/cgi-bin/iptotal for i in $(CURDIR)/debian/iptotal/usr/lib/cgi-bin/iptotal/*.cgi; do chmod +x $$i; done rm -f $(CURDIR)/debian/iptotal/var/lib/iptotal/*.gif rm -f $(CURDIR)/debian/iptotal/var/lib/iptotal/*.png rm -f $(CURDIR)/debian/iptotal/var/lib/iptotal/archive/*.png rm -f $(CURDIR)/debian/iptotal/var/lib/iptotal/images/*.png debian/source/0000755000000000000000000000000011303315236010463 5ustar debian/source/format0000644000000000000000000000001411354711740011677 0ustar 3.0 (quilt) debian/dirs0000644000000000000000000000007411354430626010057 0ustar var/lib/iptotal/archive usr/lib/cgi-bin/iptotal etc/iptotal debian/postinst0000644000000000000000000000377411354237271011014 0ustar #!/bin/sh # # Author: Dario Minnucci # Date: Tue, 25 Aug 2009 02:52:05 +0200 # Updated by: Ignace Mouzannar # set -e case "$1" in configure) # Copy old user files (if they are present) # Check archive and images directories for folder in archive images do if [ -d "/usr/lib/iptotal/${folder}" ]; then # case of update from 0.3.3-10 in which the working # directory is /usr/lib/iptotal/ for file in `find /usr/lib/iptotal/${folder}/ -maxdepth 1 -type f` do cp ${file} /var/lib/iptotal/${folder} done # delete files from old directories rm -f /usr/lib/iptotal/${folder}/* rm -f /var/www/iptotal/${folder}/* elif [ -d "/var/www/iptotal/${folder}" ]; then # case of update from 0.3.3-8 or older in which the working # directory is /var/www/iptotal/ for file in `find /var/www/iptotal/${folder}/ -maxdepth 1 -type f` do cp ${file} /var/lib/iptotal/${folder} done # delete files from old directory rm -f /var/www/iptotal/${folder}/* fi done for file in iptotal.rrd result.txt do if [ -f "/usr/lib/iptotal/${file}" ]; then cp -f /usr/lib/iptotal/${file} /var/lib/iptotal/ rm -f /usr/lib/iptotal/${file} rm -f /var/www/iptotal/${file} elif [ -f "/var/www/iptotal/${file}" ]; then cp -f /var/www/iptotal/${file} /var/lib/iptotal/ rm -f /var/www/iptotal/${file} fi done # change ownership to www-data chown -R www-data:www-data /var/lib/iptotal/* ;; abort-upgrade|abort-remove|abort-deconfigure) ;; *) echo "postinst called with unknown argument \`$1'" >&2 exit 1 ;; esac #DEBHELPER# exit 0 debian/init0000644000000000000000000000333311717104262010057 0ustar #!/bin/sh ### BEGIN INIT INFO # Provides: iptotal # Required-Start: $remote_fs $syslog # Required-Stop: $remote_fs $syslog # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: monitor for IP traffic, not requiring SNMP # Description: This scripts start, restart and stop iptotal traffic # monitoring tool. ### END INIT INFO PATH=/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/sbin/iptotald NAME=iptotal DESC="IP traffic monitor" PIDFILE=/var/run/$NAME.pid test -x $DAEMON || exit 0 . /lib/lsb/init-functions # Include iptotal defaults if available if [ -f /etc/default/iptotal ] ; then . /etc/default/iptotal fi set -e case "$1" in start) if [ "$ENABLE_DAEMON" != "yes" ] && [ "$ENABLE_DAEMON" != "YES" ]; then echo "Not starting iptotald. Disabled via /etc/default/iptotal" exit 0 fi echo -n "Starting $DESC: " start-stop-daemon -b --start --quiet --pidfile $PIDFILE \ --exec $DAEMON -- $DAEMON_OPTS echo "$NAME." ;; stop) echo -n "Stopping $DESC: " start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE rm -f $PIDFILE echo "$NAME." ;; restart|force-reload) echo -n "Restarting $DESC: " start-stop-daemon --stop --quiet --pidfile $PIDFILE rm -f $PIDFILE sleep 1 start-stop-daemon -b --start --quiet --pidfile \ $PIDFILE --exec $DAEMON -- $DAEMON_OPTS echo "$NAME." ;; force-start) echo -n "Starting $DESC: " start-stop-daemon -b --start --quiet --pidfile $PIDFILE \ --exec $DAEMON -- $DAEMON_OPTS echo "$NAME." ;; status) status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $? ;; *) N=/etc/init.d/$NAME echo "Usage: $N {start|stop|restart|force-reload|force-start}" >&2 exit 1 ;; esac debian/copyright0000644000000000000000000000257011303315236011122 0ustar This package was debianized by Millis Miller on Tue, 11 Nov 2003 00:26:53 +0000. It was downloaded from http://sourceforge.net/projects/iptotal Upstream Author: Antoine Megens Files: * Copyright: 2003, Antoine Megens Licence: GPL Files: debian/* Copyright: 2003-2004, Millis Miller 2007, Lucas Nussbaum 2008, Peter Eisentraut 2009, Dario Minnucci (midget) 2009, Ignace Mouzannar Licence: GPL License: GPL This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this package; if not, see . On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-2'. debian/install0000644000000000000000000000024511354430541010560 0ustar debian/apache.conf /etc/iptotal/ debian/iptotal/var/lib/iptotal/template.html /usr/share/iptotal/www/ debian/iptotal/var/lib/iptotal/images/ /usr/share/iptotal/www/ debian/control0000644000000000000000000000173411717105402010574 0ustar Source: iptotal Section: admin Priority: extra Maintainer: Ignace Mouzannar DM-Upload-Allowed: yes Build-Depends: debhelper (>= 7.0.50~), libpcap-dev, rrdtool, autotools-dev (>=20100122.1) Standards-Version: 3.9.2 Homepage: http://sourceforge.net/projects/iptotal Package: iptotal Architecture: any Depends: rrdtool, tcpdump, apache2 | httpd, ${shlibs:Depends}, ${misc:Depends} Description: monitor for IP traffic, not requiring SNMP iptotal is yet another IP traffic monitor. It listens to a network interface in non-promiscuous mode, and measures IP bandwidth usage. After the specified number of seconds, the average throughput is printed at total, input and output usage. . The utility can be used to measure bandwidth usage without the need for an SNMP daemon. In combination with a simple script and rrdtool it can be used to present the measured data in graphical format e.g. through a web interface. The package contains www + CGI sample files. debian/changelog0000644000000000000000000002261711717105344011053 0ustar iptotal (0.3.3-13) unstable; urgency=low * debian/control: - Bumped Standards-Version to 3.9.2. - Added the "DM-Upload-Allowed" field. * debian/patches: - 08_datalink_offset.diff: fixes iptotal not reporting traffic on PPP insterfaces. (Closes: #230649) * debian/init: - Added the Description LSB section. - Added the status option. -- Ignace Mouzannar Thu, 16 Feb 2012 08:49:19 +0400 iptotal (0.3.3-12) unstable; urgency=low * debian/control: - Bumped Standards-Version to 3.8.4. - Added dependency on ${misc:Depends}. - Set dependency on debhelper to (>= 7.0.50~) in order to use dh7 features. - Set dependency on autotools-dev to (>=20100122.1) to enable the use of the dh7 addons. - Removed dependency on quilt (as source format is now "3.0 (quilt)") * debian/rules: - Updated the rules file to use the dh7 features. * debian/postinst: - Removed the reload of apache2, as iptotal depends on httpd and not apache2. (Closes: #572246) * debian/postrm: - Removed the reload of apache2. * debian/links: - Removed the linking of /etc/apache2/conf.d/iptotal. * debian/patches: - 07_cgi_filename.diff: fixes incorrect filenames for graph images. (Closes: #574121) * debian/README.debian: - Explains the different directory changes that occurred over the last releases of iptotal. - Shows how to configure iptotal with apache2. -- Ignace Mouzannar Wed, 31 Mar 2010 00:57:48 +0200 iptotal (0.3.3-11) unstable; urgency=low * debian/rules: - Updated --data-dir from /usr/lib to /var/lib (Closes: #557972) * debian/dirs, debian/install, debian/links, debian/apache.conf: - Replaced usr/lib by var/lib. * debian/postinst: - Replaced /usr/lib by /var/lib. - As installation path has changed in this release, added a temporary copying of old files to the new working directory, and deletion of files from old directories, to prevent data history loss. * Removed debian/lintian-overrides file as it isn't needed anymore. -- Ignace Mouzannar Wed, 25 Nov 2009 18:03:58 +0100 iptotal (0.3.3-10) unstable; urgency=low * Converted to "3.0 (quilt)" format. * debian/rules: - Removed the include of dpatch.make. - Removed dh_testroot from the clean section. * debian/patches: - Converted all patches from dpatch(1) to quilt(1) format. - 06_FTBFS_kFreeBSD.diff: Fixes the FTBFS on GNU/kFreeBSD. Thanks to Cyril Brulebois for providing the patch. (Closes: #557165) * debian/control: - Removed dependecy on dpatch. - Added a dependency on quilt. * debian/source/format: - New file set to "3.0 (quilt)". -- Ignace Mouzannar Fri, 20 Nov 2009 15:09:43 +0100 iptotal (0.3.3-9) unstable; urgency=low * New maintainer. (Closes: #473843) * debian/rules: - Moved the copying of /usr/share/misc/config.{sub,guess} from the clean section to the configure section. And added functions to backup/restore the config{sud,guess} files provided by upstream. - Changed the data directory from /var/www/iptotal to /usr/lib/iptotal/ (user content) and /usr/share/iptotal/www (static). (Closes: #553536) - Moved configuration file from /etc/ to /etc/iptotal/ directory. - Added dh_lintian in the binary-arch section to install the override file. * debian/control: - Added build dependency on autotools-dev. * debian/patches: - Added 05_fix_old_fixes.dpatch: Includes all changes made by original maintainer outside the debian/ directory. - Updated the 00list placing 05_fix_old_fixes.dpatch before 04_fix_kbytes_sufixes.dpatch. * debian/init: - Renamed debian/init.d to debian/init. - Added a short description. - Forced deletion of the pid file as daemon does not take care of this. - Added support for /etc/default/iptotal - Added force-start option, to start the daemon, ignoring the content of the /etc/default/iptotal file. * debian/postinst: - Reloads apache2 configuration. - As installation path has changed in this release, added a temporary copying of old files to the new working directory, to prevent data history loss. * debian/copyright: - Updated copyright file format. * Added apache configuration file (i.e. debian/apache.conf). * Added debian/dirs to create both cgi and working directories. * Added debian/links to link the static content to the working directory (i.e. /usr/lib/iptotal). * Added debian/install file in order to clean up the debian/rules file. * Added debian/postrm file to reload apache2 configuration after purging or removing the iptotal package. * Added debian/default file, in order to easily disable iptotald. (Closes: #317260) * Moved iptotal.8 man page to the debian/ directory as it isn't provided by upstream. * Added a lintian override of package-contains-empty-directory, as the /usr/lib/iptotal/archive/ directory is intentionally created empty during the initial installation. -- Ignace Mouzannar Sun, 15 Nov 2009 21:11:05 +0100 iptotal (0.3.3-8) unstable; urgency=medium * QA upload. * Added patch system (dpatch) * debian/patches: 01_fix_ownership.dpatch * debian/patches: 02_fix_for_arm_systems.dpatch (Closes: #459128) * debian/patches: 03_manpage_fixes.dpatch (Closes: #379785) * debian/patches: 03_fix_kbytes_sufixes.dpatch (Closes: #362480) * debian/postinst: Fix ownership (Closes: #515951) * debian/control: Compat version updated to >=7 * Standards-Version: Updated to 3.8.3 - debian/README.source file * debian/control: Homepage field added * debian/watch: Added -- Dario Minnucci (midget) Tue, 25 Aug 2009 03:33:37 +0200 iptotal (0.3.3-7) unstable; urgency=low * QA upload. * Changed maintainer to Debian QA Group * Cleaned up debian/rules * Removed empty maintainer scripts * Updated standards version * Changed dependency apache to apache2 -- Peter Eisentraut Mon, 16 Jun 2008 23:59:31 +0200 iptotal (0.3.3-6.2) unstable; urgency=low * Non-maintainer upload. * Added LSB formatted dependency info in init.d script (closes: #468185) -- Peter Eisentraut Wed, 02 Apr 2008 00:23:08 +0200 iptotal (0.3.3-6.1) unstable; urgency=low * Non-maintainer upload. * Switched to using invoke-rc.d in maintainer scripts (Closes: #367731). -- Lucas Nussbaum Sun, 30 Sep 2007 12:42:31 +0200 iptotal (0.3.3-6) unstable; urgency=low * Correct image paths in template.html (Closes: #259047) -- Millis Miller Wed, 18 Aug 2004 21:54:26 +0100 iptotal (0.3.3-5) unstable; urgency=medium * Remove dh_installinit helper files and make scripts manually (Closes: #248988) -- Millis Miller Sat, 26 Jun 2004 01:07:42 +0100 iptotal (0.3.3-4) unstable; urgency=medium * Added content to NEWS file (to remove lintian warning) * Moved iptotal manpage to section 8 (lintian warning) plus other * minor manpage corrections -- Millis Miller Wed, 16 Jun 2004 00:08:03 +0100 iptotal (0.3.3-3) unstable; urgency=medium * Don't fail stop if daemon not running (Closes: #248988) -- Millis Miller Fri, 11 Jun 2004 09:22:12 +0100 iptotal (0.3.3-2) unstable; urgency=low * Remove surplus .gif files in /var/www/iptotal (Closes: #236158) * Also alter template.html use of paths for cgis (as suggested in #236158) * Remove use of prerm file (Closes: #234742) -- Millis Miller Sun, 2 May 2004 01:21:11 +0100 iptotal (0.3.3-1) unstable; urgency=low * New upstream release * Made priority extra to correct debcheck error * Added non-virtual depend of 'apache' to remove lintian error * Removed conffiles (not needed) * Added 'iptotal' to cgi.in files for images directory (Closes: #231055) * Remove images/*.png as derived files (Closes: #231295) * Start/stop deamon on install/remove (Closes: #231398) -- Millis Miller Sat, 14 Feb 2004 00:16:07 +0000 iptotal (0.3.2-5) unstable; urgency=low * Fixed the daemon to go into background -- Millis Miller Wed, 28 Jan 2004 00:20:50 +0000 iptotal (0.3.2-4) unstable; urgency=low * First correct version uploaded to Debian (Closes: #217563) * Place files in /usr/lib/cgi-bin directory (not /var/www) * Change depend to be on virtual package 'httpd' * Add /etc/iptotal.cfg to conffiles * Correct path specifiers in *.cgi and iptotal.cfg files * Correctly create subdirectories archive/ and images/ * Correct homepage link * Separate cgi and html files -- Millis Miller Tue, 27 Jan 2004 13:52:07 +0000 iptotal (0.3.2-3) unstable; urgency=low * Fixed a missing depend for shared libs (${shlibs:Depends}) * Uploaded for Millis by Jaldhar H. Vyas -- Jaldhar H. Vyas Sat, 24 Jan 2004 22:34:52 -0500 iptotal (0.3.2-1) unstable; urgency=low * New upstream version. * Some fixes to the Makefiles to install files into /var/www/iptotal * Uploaded for Millis by Jaldhar H. Vyas -- Jaldhar H. Vyas Mon, 12 Jan 2004 18:15:30 -0500 iptotal (0.3.1-1) unstable; urgency=low * Initial Release. -- Millis Miller Tue, 11 Nov 2003 00:26:53 +0000 debian/README.debian0000644000000000000000000000265411354241072011275 0ustar Using iptotal with Apache2: --------------------------- An apache configuration file template is shipped with this package. In order to use it, it should be symlinked inside apache2's configuration folder: $ sudo ln -s /etc/iptotal/apache.conf /etc/apache2/conf.d/ Then reload apache2 configuration: $ sudo /etc/init.d/apache2 reload Note concerning iptotal's data directory: ----------------------------------------- Some important changes have been applied to iptotal's data directory over the last releases: * Upgrading from a version lower than 0.3.3-8: In this version, the data directory is set to /var/www/iptotal. As the /var/www direcotry is not stated in the FHS to be a standard directory, the iptotal data was moved to /var/lib/iptotal and /usr/share/iptotal/www. As a result, when upgrading from 0.3.3-8 (or an older release) to the current release of iptotal: - generated files from your older installation are moved from /var/www/iptotal to /var/lib/iptotal. - static files that are shipped within this package are moved to /usr/share/iptotal/www. * Upgrading from 0.3.3-10: When upgrading from this version to the current release: - generated files from your older installation are moved from /usr/lib/iptotal to /var/lib/iptotal. For more information about these directory changes, please refer to the following bug reports: - http://bugs.debian.org/553536 - http://bugs.debian.org/557972 debian/watch0000644000000000000000000000006711303315236010217 0ustar version=3 http://sf.net/iptotal/iptotal-(.+)\.tar\.gz debian/patches/0000755000000000000000000000000011717103532010615 5ustar debian/patches/series0000644000000000000000000000027511401033640012026 0ustar 01_fix_ownership.diff 02_fix_for_arm_systems.diff 03_manpage_fixes.diff 05_fix_old_fixes.diff 04_fix_kbytes_sufixes.diff 06_FTBFS_kFreeBSD.diff 07_cgi_filename.diff 08_datalink_offset.diff debian/patches/03_manpage_fixes.diff0000755000000000000000000000372511303315236014566 0ustar Description: - Manpage fixes (see BTS #379785) - Updated, removing changes on iptotal.8 (as this file was moved to the debian/ directory). Authors: - Dario Minnucci (midget) Updated by: - Ignace Mouzannar Last-Update: 2009-11-15 diff -urNad iptotal-0.3.3~/iptotal.1 iptotal-0.3.3/iptotal.1 --- iptotal-0.3.3~/iptotal.1 2009-08-29 05:41:12.000000000 +0200 +++ iptotal-0.3.3/iptotal.1 2009-08-29 05:49:12.147997435 +0200 @@ -15,7 +15,7 @@ .SH OPTIONS .TP \fB\-c\fR -Read configuration file. Default is /etc/iptotal.conf. +Read configuration file. Default is /etc/iptotal.cfg. .TP \fB\-C\fR Ignore configuration file. @@ -47,7 +47,7 @@ .SH CONFIGURATION FILE .TP -/etc/iptotal.conf +/etc/iptotal.cfg File that defines the default configuration used. See iptotald_config(5) for more details. diff -urNad iptotal-0.3.3~/iptotal_config.5 iptotal-0.3.3/iptotal_config.5 --- iptotal-0.3.3~/iptotal_config.5 2009-08-29 05:41:12.000000000 +0200 +++ iptotal-0.3.3/iptotal_config.5 2009-08-29 05:49:30.767997684 +0200 @@ -3,11 +3,11 @@ iptotal_config \- iptotal configuration file .SH SYNOPSIS -.B \fI/etc/iptotal.conf\fR +.B \fI/etc/iptotal.cfg\fR .br .SH DESCRIPTION .B iptotal -reads configuration data from /etc/iptotal.conf (or the file specified with -c on the command line). The file contains keyword-argument pairs, one per line. Lines starting with '#' and empty lines are interpreted as comments. +reads configuration data from /etc/iptotal.cfg (or the file specified with \-c on the command line). The file contains keyword-argument pairs, one per line. Lines starting with '#' and empty lines are interpreted as comments. The possible keywords and their meanings are as follows (note that keywords are case-insensitive and arguments are case-sensitive): @@ -34,7 +34,7 @@ .SH FILES .TP -/etc/iptotal.conf +/etc/iptotal.cfg File that defines the configuration used to invoke iptotal(1). .SH AUTHOR debian/patches/07_cgi_filename.diff0000755000000000000000000000442411351167413014370 0ustar Description: Fixes incorrect filenames for graph images - This patch closes bug#574121 Author: Ignace Mouzannar Last-Update: 2010-03-20 --- a/www/iptotal.cgi.in +++ b/www/iptotal.cgi.in @@ -57,7 +57,7 @@ --lazy --end 'now-60s' --start 'end-2h' - --imginfo 'kbyte(s)' + --imginfo 'kbyte(s)' DEF:in=@datadir@/iptotal.rrd:input:AVERAGE DEF:out=@datadir@/iptotal.rrd:output:AVERAGE AREA:in#009828:"In kbyte(s)" @@ -73,7 +73,7 @@ --height 150 --end 'now-60s' --start 'end-24h' - --imginfo 'kbyte(s)' + --imginfo 'kbyte(s)' DEF:in=@datadir@/iptotal.rrd:input:AVERAGE DEF:out=@datadir@/iptotal.rrd:output:AVERAGE DEF:maxin=@datadir@/iptotal.rrd:input:MAX --- a/www/iptotal_m.cgi.in +++ b/www/iptotal_m.cgi.in @@ -57,7 +57,7 @@ --lazy --end 'now-60s' --start 'end-744h' - --imginfo 'kbyte(s)' + --imginfo 'kbyte(s)' DEF:in=@datadir@/iptotal.rrd:input:AVERAGE DEF:inmax=@datadir@/iptotal.rrd:input:MAX DEF:out=@datadir@/iptotal.rrd:output:AVERAGE --- a/www/iptotal_w.cgi.in +++ b/www/iptotal_w.cgi.in @@ -57,7 +57,7 @@ --height 150 --end 'now-60s' --start 'end-168h' - --imginfo 'kbyte(s)' + --imginfo 'kbyte(s)' DEF:inmax=@datadir@/iptotal.rrd:input:MAX DEF:outmax=@datadir@/iptotal.rrd:output:MAX DEF:inavg=@datadir@/iptotal.rrd:input:AVERAGE --- a/www/iptotal_y.cgi.in +++ b/www/iptotal_y.cgi.in @@ -57,7 +57,7 @@ --lazy --end 'now-60s' --start 'end-365d' - --imginfo 'kbyte(s)' + --imginfo 'kbyte(s)' DEF:in=@datadir@/iptotal.rrd:input:AVERAGE DEF:out=@datadir@/iptotal.rrd:output:AVERAGE AREA:in#009828:"In kbyte(s)" debian/patches/02_fix_for_arm_systems.diff0000755000000000000000000000111411303315236016027 0ustar Description: - Fix for ARM systems (see BTS #459128) Author: Dario Minnucci (midget) Last-Update: 2009-08-25 diff -urNad iptotal-0.3.3~/iptotal.c iptotal-0.3.3/iptotal.c --- iptotal-0.3.3~/iptotal.c 2003-12-12 12:54:10.000000000 +0100 +++ iptotal-0.3.3/iptotal.c 2009-08-25 02:56:30.873591709 +0200 @@ -464,7 +464,7 @@ /* Read options from command line */ void read_options (int argc, char *argv[]) { - char optchar; + signed char optchar; while(-1 != (optchar=getopt(argc,argv,"a:Ab:c:Cd:Ff:hl:L:m:M:o:Pr:t:v"))) { switch (optchar) { debian/patches/01_fix_ownership.diff0000755000000000000000000000146511303315236014641 0ustar Description: - Change ownership to www-data:www-data ( see RC Bug #515951). Author: Dario Minnucci (midget) Last-Update: 2009-08-25 diff -urNad iptotal-0.3.3~/src/iptotald.in iptotal-0.3.3/src/iptotald.in --- iptotal-0.3.3~/src/iptotald.in 2009-08-29 05:41:12.759997162 +0200 +++ iptotal-0.3.3/src/iptotald.in 2009-08-29 05:41:16.236015691 +0200 @@ -87,7 +87,7 @@ RRA:MAX:0.5:1440:365 # make it readable for user nobody (HTTP user) - chown nobody $ETH_DBASE + chown www-data:www-data $ETH_DBASE fi # @@ -137,6 +137,10 @@ # # show result in text file for web page to include # + if [ ! -f @datadir@/result.txt ]; then + touch @datadir@/result.txt + chown www-data:www-data @datadir@/result.txt + fi echo $RESULT > @datadir@/result.txt #--------------------------- debian/patches/04_fix_kbytes_sufixes.diff0000755000000000000000000001265411303315236015677 0ustar Description: - Normalization of kbyte(s) sufixes. (see #362480) Author: Dario Minnucci (midget) Last-Update: 2009-08-25 diff -urNad iptotal-0.3.3~/iptotal.c iptotal-0.3.3/iptotal.c --- iptotal-0.3.3~/iptotal.c 2009-08-25 03:12:52.813581701 +0200 +++ iptotal-0.3.3/iptotal.c 2009-08-25 03:16:03.845591718 +0200 @@ -417,7 +417,7 @@ double din = (double) intotal / div; double dout = (double) outtotal / div; t0 = t1; - printf("Total: %5.2f kBytes/s In: %5.2f Kbytes/s Out: %5.2f Kbytes/s\n", + printf("Total: %5.2f kbyte(s) In: %5.2f kbyte(s) Out: %5.2f kbyte(s)\n", dtotal, din, dout); total =0; intotal=0; outtotal=0; break; diff -urNad iptotal-0.3.3~/src/iptotald.in iptotal-0.3.3/src/iptotald.in --- iptotal-0.3.3~/src/iptotald.in 2009-08-25 03:12:52.821573691 +0200 +++ iptotal-0.3.3/src/iptotald.in 2009-08-25 03:17:03.129582449 +0200 @@ -51,8 +51,8 @@ DEF:out=@datadir@/iptotal.rrd:output:AVERAGE \ DEF:maxin=@datadir@/iptotal.rrd:input:MAX \ DEF:maxout=@datadir@/iptotal.rrd:output:MAX \ - AREA:in#009828:"In kByte/s" \ - LINE2:out#ff0000:"Out kByte/s" \ + AREA:in#009828:"In kbyte(s)" \ + LINE2:out#ff0000:"Out kbyte(s)" \ LINE2:maxin#0030ff:"Max In" \ LINE2:maxout#ff8040:"Max Out" @@ -120,7 +120,7 @@ set $RESULT # # $1 $2 $3 $4 $5 $6 $7 $8 - #Total: 0 kBytes/s In: 0 Kbytes/s Out: 0 Kbytes/s + #Total: 0 kbyte(s) In: 0 kbyte(s) Out: 0 kbyte(s) #-------------------------------------------------- # we need 2nd, 5th and 8th element of the output #-------------------------------------------------- diff -urNad iptotal-0.3.3~/www/iptotal.cgi.in iptotal-0.3.3/www/iptotal.cgi.in --- iptotal-0.3.3~/www/iptotal.cgi.in 2009-08-25 01:24:19.000000000 +0200 +++ iptotal-0.3.3/www/iptotal.cgi.in 2009-08-25 03:19:42.013568202 +0200 @@ -57,11 +57,11 @@ --lazy --end 'now-60s' --start 'end-2h' - --imginfo 'kB/s' + --imginfo 'kbyte(s)' DEF:in=@datadir@/iptotal.rrd:input:AVERAGE DEF:out=@datadir@/iptotal.rrd:output:AVERAGE - AREA:in#009828:"In kByte/s" - LINE2:out#ff0000:"Out kByte/s" + AREA:in#009828:"In kbyte(s)" + LINE2:out#ff0000:"Out kbyte(s)" >

@@ -73,13 +73,13 @@ --height 150 --end 'now-60s' --start 'end-24h' - --imginfo 'kB/s' + --imginfo 'kbyte(s)' DEF:in=@datadir@/iptotal.rrd:input:AVERAGE DEF:out=@datadir@/iptotal.rrd:output:AVERAGE DEF:maxin=@datadir@/iptotal.rrd:input:MAX DEF:maxout=@datadir@/iptotal.rrd:output:MAX - AREA:in#009828:"In kByte/s" - LINE2:out#ff0000:"Out kByte/s" + AREA:in#009828:"In kbyte(s)" + LINE2:out#ff0000:"Out kbyte(s)" LINE2:maxin#0030ff:"Max In" LINE2:maxout#ff8040:"Max Out" > diff -urNad iptotal-0.3.3~/www/iptotal_m.cgi.in iptotal-0.3.3/www/iptotal_m.cgi.in --- iptotal-0.3.3~/www/iptotal_m.cgi.in 2009-08-25 01:24:19.000000000 +0200 +++ iptotal-0.3.3/www/iptotal_m.cgi.in 2009-08-25 03:18:39.105591585 +0200 @@ -57,12 +57,12 @@ --lazy --end 'now-60s' --start 'end-744h' - --imginfo 'kB/s' + --imginfo 'kbyte(s)' DEF:in=@datadir@/iptotal.rrd:input:AVERAGE DEF:inmax=@datadir@/iptotal.rrd:input:MAX DEF:out=@datadir@/iptotal.rrd:output:AVERAGE - AREA:inmax#009828:"In kByte/s" - LINE2:out#ff0000:"Out kByte/s" + AREA:inmax#009828:"In kbyte(s)" + LINE2:out#ff0000:"Out kbyte(s)" LINE2:in#0000ff:"In Avg." >

diff -urNad iptotal-0.3.3~/www/iptotal_w.cgi.in iptotal-0.3.3/www/iptotal_w.cgi.in --- iptotal-0.3.3~/www/iptotal_w.cgi.in 2009-08-25 01:24:19.000000000 +0200 +++ iptotal-0.3.3/www/iptotal_w.cgi.in 2009-08-25 03:18:00.253567912 +0200 @@ -57,12 +57,12 @@ --height 150 --end 'now-60s' --start 'end-168h' - --imginfo 'kB/s' + --imginfo 'kbyte(s)' DEF:inmax=@datadir@/iptotal.rrd:input:MAX DEF:outmax=@datadir@/iptotal.rrd:output:MAX DEF:inavg=@datadir@/iptotal.rrd:input:AVERAGE - AREA:inmax#009828:"In kByte/s" - LINE2:outmax#ff0000:"Out kByte/s" + AREA:inmax#009828:"In kbyte(s)" + LINE2:outmax#ff0000:"Out kbyte(s)" LINE2:inavg#0000ff:"In Avg." >

diff -urNad iptotal-0.3.3~/www/iptotal_y.cgi.in iptotal-0.3.3/www/iptotal_y.cgi.in --- iptotal-0.3.3~/www/iptotal_y.cgi.in 2009-08-25 01:24:19.000000000 +0200 +++ iptotal-0.3.3/www/iptotal_y.cgi.in 2009-08-25 03:19:02.217567884 +0200 @@ -57,11 +57,11 @@ --lazy --end 'now-60s' --start 'end-365d' - --imginfo 'kB/s' + --imginfo 'kbyte(s)' DEF:in=@datadir@/iptotal.rrd:input:AVERAGE DEF:out=@datadir@/iptotal.rrd:output:AVERAGE - AREA:in#009828:"In kByte/s" - LINE2:out#ff0000:"Out kByte/s" + AREA:in#009828:"In kbyte(s)" + LINE2:out#ff0000:"Out kbyte(s)" >

debian/patches/05_fix_old_fixes.diff0000755000000000000000000003322311303315236014600 0ustar Description: - Includes all changes made by original maintainer outside the debian/ disrectory Author: Ignace Mouzannar Last-Update: 2009-11-15 diff -urNad iptotal-0.3.3~/Makefile.am iptotal-0.3.3/Makefile.am --- iptotal-0.3.3~/Makefile.am 2004-01-28 00:37:44.000000000 +0100 +++ iptotal-0.3.3/Makefile.am 2009-11-13 15:14:23.000000000 +0100 @@ -1,7 +1,7 @@ PERL=@PERL@ sbin_PROGRAMS = iptotal sbin_SCRIPTS = src/iptotald -data_DATA = www/archive.cgi www/iptotal.cgi www/iptotal_w.cgi www/iptotal_m.cgi www/iptotal_y.cgi www/images/*.gif www/images/*.png www/archive/*.png +data_DATA = www/archive.cgi www/iptotal.cgi www/iptotal_w.cgi www/iptotal_m.cgi www/iptotal_y.cgi www/images/*.gif sysconf_DATA = etc/iptotal.cfg iptotal_SOURCES = iptotal.c iptotal_LDADD = -lpcap diff -urNad iptotal-0.3.3~/Makefile.in iptotal-0.3.3/Makefile.in --- iptotal-0.3.3~/Makefile.in 2004-02-02 14:13:04.000000000 +0100 +++ iptotal-0.3.3/Makefile.in 2009-11-13 15:14:23.000000000 +0100 @@ -114,11 +114,11 @@ target_alias = @target_alias@ sbin_PROGRAMS = iptotal sbin_SCRIPTS = src/iptotald -data_DATA = www/archive.cgi www/iptotal.cgi www/iptotal_w.cgi www/iptotal_m.cgi www/iptotal_y.cgi www/images/*.gif www/images/*.png www/archive/*.png +data_DATA = www/archive.cgi www/iptotal.cgi www/iptotal_w.cgi www/iptotal_m.cgi www/iptotal_y.cgi www/images/*.gif sysconf_DATA = etc/iptotal.cfg iptotal_SOURCES = iptotal.c iptotal_LDADD = -lpcap -EXTRA_DIST = src/iptotald.in www/*.in www/images/*.png www/images/*.gif www/archive/*.png iptotal.1 iptotald.8 iptotal_config.5 etc/iptotal.cfg etc/iptotal.cfg.in +EXTRA_DIST = src/iptotald.in www/*.in www/images/*.gif iptotal.1 iptotald.8 iptotal_config.5 etc/iptotal.cfg etc/iptotal.cfg.in SUBDIRS = etc www subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -435,7 +435,7 @@ distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkinstalldirs) $(distdir)/etc $(distdir)/src $(distdir)/www $(distdir)/www/archive $(distdir)/www/images + $(mkinstalldirs) $(distdir)/etc $(distdir)/src $(distdir)/www $(distdir)/www/images @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ diff -urNad iptotal-0.3.3~/iptotald.8 iptotal-0.3.3/iptotald.8 --- iptotal-0.3.3~/iptotald.8 2003-12-12 13:06:38.000000000 +0100 +++ iptotal-0.3.3/iptotald.8 2009-11-13 15:17:15.000000000 +0100 @@ -1,4 +1,4 @@ -.TH IPTOTALD 8 "Dec 2003" "iptotal 0.3.2" "System Manager's Manual" +.TH IPTOTALD 8 "Jun 2004" "iptotal 0.3.3" "System Manager's Manual" .SH NAME iptotald \- iptotal daemon @@ -9,7 +9,7 @@ .B iptotald is the daemon program for iptotal. -iptotal is the daemon that regularly invokes iptotal(1) to monitor traffic. +iptotal is the daemon that regularly invokes iptotal(8) to monitor traffic. It is normally started at boot from /etc/rc. .SH OPTIONS @@ -19,8 +19,8 @@ .SH CONFIGURATION FILE .TP /etc/iptotal.conf -File that defines the configuration used to invoke iptotal(1). See -iptotald_config(5) for more details. +File that defines the configuration used to invoke iptotal(8). See +iptotal_config(5) for more details. .SH AUTHOR Written by Antoine Megens @@ -30,7 +30,7 @@ .SH "REPORTING BUGS" Report bugs to .SH COPYRIGHT -Copyright \(co 2003 Free Software Foundation, Inc. +Copyright \(co 2003, 2004 Free Software Foundation, Inc. .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff -urNad iptotal-0.3.3~/www/Makefile.am iptotal-0.3.3/www/Makefile.am --- iptotal-0.3.3~/www/Makefile.am 2004-01-27 23:25:34.000000000 +0100 +++ iptotal-0.3.3/www/Makefile.am 2009-11-13 15:14:23.000000000 +0100 @@ -1 +1 @@ -nobase_data_DATA = template.html images/*gif images/*png archive/*png archive.cgi iptotal.cgi iptotal_w.cgi iptotal_m.cgi iptotal_y.cgi +nobase_data_DATA = template.html images/*gif archive.cgi iptotal.cgi iptotal_w.cgi iptotal_m.cgi iptotal_y.cgi diff -urNad iptotal-0.3.3~/www/Makefile.in iptotal-0.3.3/www/Makefile.in --- iptotal-0.3.3~/www/Makefile.in 2004-02-02 14:13:05.000000000 +0100 +++ iptotal-0.3.3/www/Makefile.in 2009-11-13 15:14:23.000000000 +0100 @@ -112,7 +112,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -nobase_data_DATA = template.html images/*gif images/*png archive/*png archive.cgi iptotal.cgi iptotal_w.cgi iptotal_m.cgi iptotal_y.cgi +nobase_data_DATA = template.html images/*gif archive.cgi iptotal.cgi iptotal_w.cgi iptotal_m.cgi iptotal_y.cgi subdir = www ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff -urNad iptotal-0.3.3~/www/iptotal.cgi.in iptotal-0.3.3/www/iptotal.cgi.in --- iptotal-0.3.3~/www/iptotal.cgi.in 2004-01-28 00:12:17.000000000 +0100 +++ iptotal-0.3.3/www/iptotal.cgi.in 2009-11-13 15:14:23.000000000 +0100 @@ -31,7 +31,7 @@ +vLink=#008000 background="/iptotal/images/zertxtr.gif" bgproperties="fixed">

Network usage

@@ -57,7 +57,7 @@ --lazy --end 'now-60s' --start 'end-2h' - --imginfo 'kB/s' + --imginfo 'kB/s' DEF:in=@datadir@/iptotal.rrd:input:AVERAGE DEF:out=@datadir@/iptotal.rrd:output:AVERAGE AREA:in#009828:"In kByte/s" @@ -73,7 +73,7 @@ --height 150 --end 'now-60s' --start 'end-24h' - --imginfo 'kB/s' + --imginfo 'kB/s' DEF:in=@datadir@/iptotal.rrd:input:AVERAGE DEF:out=@datadir@/iptotal.rrd:output:AVERAGE DEF:maxin=@datadir@/iptotal.rrd:input:MAX @@ -86,15 +86,15 @@

- + -Last Week +Last Week -Last Month +Last Month -Last Year +Last Year -Last 30 Days +Last 30 Days diff -urNad iptotal-0.3.3~/www/iptotal_m.cgi.in iptotal-0.3.3/www/iptotal_m.cgi.in --- iptotal-0.3.3~/www/iptotal_m.cgi.in 2004-01-28 00:08:25.000000000 +0100 +++ iptotal-0.3.3/www/iptotal_m.cgi.in 2009-11-13 15:14:23.000000000 +0100 @@ -31,7 +31,7 @@ +vLink=#008000 background="/iptotal/images/zertxtr.gif" bgproperties="fixed">

Network usage

@@ -57,7 +57,7 @@ --lazy --end 'now-60s' --start 'end-744h' - --imginfo 'kB/s' + --imginfo 'kB/s' DEF:in=@datadir@/iptotal.rrd:input:AVERAGE DEF:inmax=@datadir@/iptotal.rrd:input:MAX DEF:out=@datadir@/iptotal.rrd:output:AVERAGE @@ -68,14 +68,14 @@

- + -Last 24 hr +Last 24 hr -Last Week +Last Week -Last Year +Last Year -Last 30 Days +Last 30 Days diff -urNad iptotal-0.3.3~/www/iptotal_w.cgi.in iptotal-0.3.3/www/iptotal_w.cgi.in --- iptotal-0.3.3~/www/iptotal_w.cgi.in 2004-01-28 00:12:52.000000000 +0100 +++ iptotal-0.3.3/www/iptotal_w.cgi.in 2009-11-13 15:14:23.000000000 +0100 @@ -31,7 +31,7 @@ +vLink=#008000 background="/iptotal/images/zertxtr.gif" bgproperties="fixed">

Network usage

@@ -57,7 +57,7 @@ --height 150 --end 'now-60s' --start 'end-168h' - --imginfo 'kB/s' + --imginfo 'kB/s' DEF:inmax=@datadir@/iptotal.rrd:input:MAX DEF:outmax=@datadir@/iptotal.rrd:output:MAX DEF:inavg=@datadir@/iptotal.rrd:input:AVERAGE @@ -68,14 +68,14 @@

- + -Last 24 hr +Last 24 hr -Last Month +Last Month -Last Year +Last Year -Last 30 Days +Last 30 Days diff -urNad iptotal-0.3.3~/www/iptotal_y.cgi.in iptotal-0.3.3/www/iptotal_y.cgi.in --- iptotal-0.3.3~/www/iptotal_y.cgi.in 2004-01-28 00:09:44.000000000 +0100 +++ iptotal-0.3.3/www/iptotal_y.cgi.in 2009-11-13 15:14:23.000000000 +0100 @@ -31,7 +31,7 @@ +vLink=#008000 background="/iptotal/images/zertxtr.gif" bgproperties="fixed">

Network usage

@@ -57,7 +57,7 @@ --lazy --end 'now-60s' --start 'end-365d' - --imginfo 'kB/s' + --imginfo 'kB/s' DEF:in=@datadir@/iptotal.rrd:input:AVERAGE DEF:out=@datadir@/iptotal.rrd:output:AVERAGE AREA:in#009828:"In kByte/s" @@ -66,14 +66,14 @@

- + -Last 24 hr +Last 24 hr -Last Week +Last Week -Last Month +Last Month -Last 30 Days +Last 30 Days diff -urNad iptotal-0.3.3~/www/template.html iptotal-0.3.3/www/template.html --- iptotal-0.3.3~/www/template.html 1970-01-01 01:00:00.000000000 +0100 +++ iptotal-0.3.3/www/template.html 2009-11-13 15:14:23.000000000 +0100 @@ -0,0 +1,35 @@ + + + + + + + + +<--TITLE--> + + + + + +

iptotal daily graph images archive

+ +

<--IMAGES-->

+ +
+
+ + + +Last 24 hr + +Last Week + +Last Month + +Last Year +
+ + + debian/patches/08_datalink_offset.diff0000755000000000000000000000126711717103532015124 0ustar Description: Fixes iptotal not reporting traffic on PPP insterface. - This patch closes bug#230649 Author: Antoine Megens Forwarded: http://sourceforge.net/tracker/?func=detail&aid=889062&group_id=94291&atid=607374 Last-Update: 2010-06-01 --- a/iptotal.c +++ b/iptotal.c @@ -75,6 +75,7 @@ #define PLEN 68 /* Length of packet headers */ +#define POFF_SLL 16 #define POFF_ETH 14 #define POFF_PPP 4 #define POFF_RAW 0 @@ -579,6 +580,9 @@ case DLT_RAW: PacketOffset = POFF_RAW; break; + case DLT_LINUX_SLL: + PacketOffset = POFF_SLL; + break; /* For others we guess */ default: PacketOffset = 0; debian/patches/06_FTBFS_kFreeBSD.diff0000755000000000000000000000125011303315236014263 0ustar Description: - Fixes FTBFS on GNU/kFreeBSD. Author: Cyril Brulebois Last-Update: 2009-11-20 diff -urNad iptotal-0.3.3~/iptotal.c iptotal-0.3.3/iptotal.c --- iptotal-0.3.3~/iptotal.c 2009-11-20 15:14:20.000000000 +0100 +++ iptotal-0.3.3/iptotal.c 2009-11-20 15:16:36.000000000 +0100 @@ -44,10 +44,16 @@ #include #include #include -#include +#include +#ifdef __linux__ #include +#else +#include +#endif #include +#ifdef __linux #include /* for EINVAL */ +#endif /* ------------------------------------------------------------------------ debian/docs0000644000000000000000000000000711354241673010044 0ustar README debian/compat0000644000000000000000000000000211303315236010361 0ustar 7 debian/apache.conf0000644000000000000000000000031011303315236011245 0ustar Alias /iptotal /var/lib/iptotal/ Options +FollowSymLinks AllowOverride None order allow,deny allow from all DirectoryIndex template.html debian/iptotal.80000644000000000000000000000320711303315236010732 0ustar .TH IPTOTAL 8 "Jun 2004" "iptotal 0.3.3" "System Manager's Manual" .SH NAME iptotal \- IP Traffic-based monitor, not requiring SNMP .SH SYNOPSIS .B iptotal [\fIOPTS\fR] \fI\fR .br .SH DESCRIPTION .B iptotal listens to a network interface in non-promiscuous mode, and measures IP bandwidth usage. After the specified number of seconds, the average throughput is printed as total, input and output usage. .SH OPTIONS .TP \fB\-c\fR Read configuration file. Default is /etc/iptotal.cfg. .TP \fB\-C\fR Ignore configuration file. .TP \fB\-d\fR Debug level: 0 - no debuging; 1 - summary; 3 - all packets captured. .TP \fB\-f\fR Use pcap filters (see tcpdump). .TP \fB\-F\fR Fork and run in background. .TP \fB\-h\fR Print help. .TP \fB\-m\fR Set number of network mask bits (1-32) for subnet traffic aggregation. Default is 24 (255.255.255.0). .TP \fB\-P\fR Use promiscuous mode on network interface. .TP \fB\-r\fR Reporting period - number of seconds, default 300. .TP \fB\-v\fR Print version. .SH CONFIGURATION FILE .TP /etc/iptotal.cfg File that defines the default configuration used. See iptotal_config(5) for more details. .SH AUTHOR Written by Antoine Megens Manpage written by Millis Miller .SH "REPORTING BUGS" Report bugs to .SH COPYRIGHT Copyright \(co 2003, 2004 Free Software Foundation, Inc. .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. .SH "SEE ALSO" iptotal_config(5), iptotald(8), tcpdump(1) debian/links0000644000000000000000000000145411343252562010240 0ustar usr/share/iptotal/www/images/Archive_Button.gif var/lib/iptotal/images/Archive_Button.gif usr/share/iptotal/www/images/Daily_Button.gif var/lib/iptotal/images/Daily_Button.gif usr/share/iptotal/www/images/email_@anim.gif var/lib/iptotal/images/email_@anim.gif usr/share/iptotal/www/images/home.gif var/lib/iptotal/images/home.gif usr/share/iptotal/www/images/Howto_Button.gif var/lib/iptotal/images/Howto_Button.gif usr/share/iptotal/www/images/Month_Button.gif var/lib/iptotal/images/Month_Button.gif usr/share/iptotal/www/images/Week_Button.gif var/lib/iptotal/images/Week_Button.gif usr/share/iptotal/www/images/Year_Button.gif var/lib/iptotal/images/Year_Button.gif usr/share/iptotal/www/images/zertxtr.gif var/lib/iptotal/images/zertxtr.gif usr/share/iptotal/www/template.html var/lib/iptotal/template.html debian/default0000644000000000000000000000036711303315236010540 0ustar # Defaults for iptotal initscript # sourced by /etc/init.d/iptotal # installed at /etc/default/iptotal by the maintainer scripts # In order to override this file, use /etc/init.d/iptotal force-start # run iptotal daemon at boot ENABLE_DAEMON=yes