webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-21 08:22:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

Browse Source
This commit is contained in:
Michael Tremer
2008-09-30 10:24:18 +00:00
parent 1a3c82538c 2d0adb746e
commit 824a0f689e
71 changed files with 8442 additions and 2513 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/backup/backup.pl
View File

@@ -32,7 +32,7 @@ $Monatstag = sprintf("%02d", $Monatstag);
$Stunden = sprintf("%02d", $Stunden);
$Minuten = sprintf("%02d", $Minuten);
if ($ARGV[0] eq 'include') {
if (($ARGV[0] eq 'include') || ($ARGV[0] eq 'iso')) {
&createinclude;
my @files = `find / -name *.log* 2>/dev/null`;
foreach (@files){
@@ -48,6 +48,9 @@ if ($ARGV[0] eq 'include') {
close(DATEI);
system("tar -cvzf /var/ipfire/backup/$Jahr$Monat$Monatstag-$Stunden$Minuten.ipf --files-from='/tmp/include' --exclude-from='/var/ipfire/backup/exclude'");
system("rm /tmp/include");
if ($ARGV[0] eq 'iso') {
system("/usr/local/bin/backupiso $Jahr$Monat$Monatstag-$Stunden$Minuten &");
}
}
elsif ($ARGV[0] eq 'exclude') {
&createinclude;

1606
config/cfgroot/graphs.pl
View File

File diff suppressed because it is too large Load Diff

1
config/cfgroot/useragents
View File

@@ -17,6 +17,7 @@ NETSCAPE,Netscape,(^Mozilla\/4.[7|8])|(Netscape)
OPERA,Opera,(Opera)
SAFARI,Safari,(Safari)
SYMLU,Symantec LiveUpdate,(Symantec\sLiveUpdate)
THUNDERBIRD,Thunderbird,(Thunderbird)
WGA,WGA,(LegitCheck)
WGET,Wget,(Wget)
WINUPD,Windows Update,(Industry\sUpdate\sControl)|(Windows\sUpdate)|(Service\sPack\sSetup)|(Progressive\sDownload)|(Windows\-Update\-Agent)|(Microsoft\sBITS)

3
config/collectd/collectd.conf
View File

@@ -19,7 +19,6 @@ LoadPlugin interface
LoadPlugin iptables
LoadPlugin load
#LoadPlugin logfile
#LoadPlugin mbmon
LoadPlugin memory
LoadPlugin ping
LoadPlugin processes
@@ -76,8 +75,6 @@ LoadPlugin syslog
<Plugin rrdtool>
DataDir "/var/log/rrd/collectd"
CacheTimeout 300
CacheFlush 900
</Plugin>
<Plugin syslog>

1
config/cron/crontab
View File

@@ -22,6 +22,7 @@ HOME=/
# Make some nice graphs
*/5 * * * * /usr/local/bin/makegraphs >/dev/null
01 * * * * /etc/init.d/collectd backup >/dev/null
# Force update the dynamic dns registration once a week
# Force update even if IP has not changed once a month if 'minimize update' selected in GUI

5
config/etc/fstab
View File

@@ -8,4 +8,7 @@ DEVICE4 /var FSTYPE defaults 1 1
proc /proc proc defaults 0 0
sysfs /sys sysfs defaults 0 0
devpts /dev/pts devpts gid=4,mode=620 0 0
shm /dev/shm tmpfs defaults 0 0
shm /dev/shm tmpfs defaults,size=25% 0 0
none /tmp tmpfs defaults,size=128M 0 0
none /var/log/rrd tmpfs defaults,size=64M 0 0
none /var/lock tmpfs defaults,size=32M 0 0

5
config/grub/grub.conf
View File

@@ -34,3 +34,8 @@ title IPFire (all storage drivers)
kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 MOUNT
initrd /ipfirerd-KVER-emergency.img
savedefault 5
title IPFire - experimental kernel-2.6.25.17 - no ipsec (vesafb 640x480)
root (hd0,0)
kernel /vmlinuz-2.6.25.17-ipfire root=ROOT rootdelay=10 panic=10 vga=785 MOUNT
initrd /ipfirerd-2.6.25.17.img
savedefault 6

3277
config/kernel/kernel25.config.i586 Normal file
View File

File diff suppressed because it is too large Load Diff

9
config/menu/20-status.menu
View File

@@ -24,22 +24,19 @@
};
$substatus->{'50.networkred'} = {
'caption' => "$Lang::tr{'network red'}",
'uri' => '/cgi-bin/network.cgi',
'vars' => 'network=red',
'uri' => '/cgi-bin/netexternal.cgi',
'title' => "$Lang::tr{'network red'}",
'enabled' => 1,
};
$substatus->{'51.networkinternal'} = {
'caption' => "$Lang::tr{'network internal'}",
'uri' => '/cgi-bin/network.cgi',
'vars' => 'network=internal',
'uri' => '/cgi-bin/netinternal.cgi',
'title' => "$Lang::tr{'network internal'}",
'enabled' => 1,
};
$substatus->{'52.networkother'} = {
'caption' => "$Lang::tr{'network other'}",
'uri' => '/cgi-bin/network.cgi',
'vars' => 'network=other',
'uri' => '/cgi-bin/netother.cgi',
'title' => "$Lang::tr{'network other'}",
'enabled' => 1,
};

4
config/menu/EX-wlanap.menu
View File

@@ -1,5 +1,5 @@
$subipfire->{'54.wlanap'} = {'caption' => wlanap,
$subipfire->{'54.wlanap'} = {'caption' => WLanAP,
'uri' => '/cgi-bin/wlanap.cgi',
'title' => wlanap,
'title' => WLanAP,
'enabled' => 1,
};

11
config/rootfiles/common/apache2
View File

@@ -1268,8 +1268,7 @@ srv/web/ipfire/cgi-bin/dhcp.cgi
#srv/web/ipfire/cgi-bin/dial/index.cgi
srv/web/ipfire/cgi-bin/dmzholes.cgi
srv/web/ipfire/cgi-bin/extrahd.cgi
srv/web/ipfire/cgi-bin/fwhits.cgi
srv/web/ipfire/cgi-bin/graphs.cgi
#srv/web/ipfire/cgi-bin/graphs.cgi
srv/web/ipfire/cgi-bin/gui.cgi
srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
srv/web/ipfire/cgi-bin/hosts.cgi
@@ -1293,7 +1292,9 @@ srv/web/ipfire/cgi-bin/logs.cgi
srv/web/ipfire/cgi-bin/media.cgi
srv/web/ipfire/cgi-bin/memory.cgi
srv/web/ipfire/cgi-bin/modem.cgi
srv/web/ipfire/cgi-bin/network.cgi
srv/web/ipfire/cgi-bin/netexternal.cgi
srv/web/ipfire/cgi-bin/netinternal.cgi
srv/web/ipfire/cgi-bin/netother.cgi
srv/web/ipfire/cgi-bin/networks.cgi
srv/web/ipfire/cgi-bin/outgoingfw.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
@@ -1301,16 +1302,14 @@ srv/web/ipfire/cgi-bin/pakfire.cgi
srv/web/ipfire/cgi-bin/portfw.cgi
srv/web/ipfire/cgi-bin/pppsetup.cgi
srv/web/ipfire/cgi-bin/proxy.cgi
srv/web/ipfire/cgi-bin/proxygraphs.cgi
srv/web/ipfire/cgi-bin/qos.cgi
srv/web/ipfire/cgi-bin/qosgraph.cgi
#srv/web/ipfire/cgi-bin/qosgraph.cgi
srv/web/ipfire/cgi-bin/remote.cgi
srv/web/ipfire/cgi-bin/services.cgi
srv/web/ipfire/cgi-bin/speed.cgi
srv/web/ipfire/cgi-bin/system.cgi
srv/web/ipfire/cgi-bin/time.cgi
srv/web/ipfire/cgi-bin/traffic.cgi
srv/web/ipfire/cgi-bin/traffics.cgi
srv/web/ipfire/cgi-bin/updatexlrator.cgi
srv/web/ipfire/cgi-bin/upnp.cgi
srv/web/ipfire/cgi-bin/urlfilter.cgi

1
config/rootfiles/common/atl2-2.0.4 Normal file
View File

@@ -0,0 +1 @@
#lib/modules/2.6.23.17-ipfire/kernel/drivers/net/atl2.ko

2
config/rootfiles/common/backup
View File

@@ -1,4 +1,6 @@
#var/ipfire/backup/addons
var/ipfire/backup/addons/backup
var/ipfire/backup/addons/includes
#var/ipfire/backup/bin
var/ipfire/backup/bin/backup.pl
var/ipfire/backup/exclude

4
config/rootfiles/common/cdrtools
View File

@@ -1,12 +1,12 @@
#usr/bin/cdda2wav
#usr/bin/cdrecord
usr/bin/cdrecord
#usr/bin/devdump
#usr/bin/isodebug
#usr/bin/isodump
#usr/bin/isoinfo
#usr/bin/isovfy
#usr/bin/mkhybrid
#usr/bin/mkisofs
usr/bin/mkisofs
#usr/bin/readcd
#usr/bin/scgcheck
#usr/bin/skel

24
config/rootfiles/common/initscripts
View File

@@ -5,31 +5,42 @@ etc/rc.d/helper/getdnsfromdhcpc.pl
etc/rc.d/helper/writeipac.pl
#etc/rc.d/init.d
#etc/rc.d/init.d/alsa
#etc/rc.d/init.d/amavisd
etc/rc.d/init.d/apache
#etc/rc.d/init.d/applejuice
#etc/rc.d/init.d/asterisk
etc/rc.d/init.d/beep
#etc/rc.d/init.d/bluetooth
etc/rc.d/init.d/checkfs
etc/rc.d/init.d/checkfstab
#etc/rc.d/init.d/clamav
etc/rc.d/init.d/cleanfs
etc/rc.d/init.d/collectd
etc/rc.d/init.d/connectd
etc/rc.d/init.d/console
#etc/rc.d/init.d/cpufreq
#etc/rc.d/init.d/cups
#etc/rc.d/init.d/cyrus-imapd
#etc/rc.d/init.d/cyrus-sasl
etc/rc.d/init.d/dhcp
etc/rc.d/init.d/dnsmasq
etc/rc.d/init.d/fcron
#etc/rc.d/init.d/fetchmail
etc/rc.d/init.d/firewall
etc/rc.d/init.d/functions
#etc/rc.d/init.d/gnump3d
etc/rc.d/init.d/halt
#etc/rc.d/init.d/hostapd
#etc/rc.d/init.d/ipfireseeder
etc/rc.d/init.d/ipsec
etc/rc.d/init.d/localnet
#etc/rc.d/init.d/messagebus
#etc/rc.d/init.d/mldonkey
etc/rc.d/init.d/mISDN
etc/rc.d/init.d/modules
etc/rc.d/init.d/mountfs
etc/rc.d/init.d/mountkernfs
#etc/rc.d/init.d/mpd
#etc/rc.d/init.d/mysql
etc/rc.d/init.d/network
#etc/rc.d/init.d/networking
@@ -69,9 +80,12 @@ etc/rc.d/init.d/random
etc/rc.d/init.d/rc
etc/rc.d/init.d/reboot
#etc/rc.d/init.d/samba
#etc/rc.d/init.d/sane
etc/rc.d/init.d/sendsignals
etc/rc.d/init.d/setclock
etc/rc.d/init.d/smartenabler
etc/rc.d/init.d/snort
#etc/rc.d/init.d/spamassassin
etc/rc.d/init.d/squid
etc/rc.d/init.d/sshd
etc/rc.d/init.d/swap
@@ -79,9 +93,11 @@ etc/rc.d/init.d/sysctl
etc/rc.d/init.d/sysklogd
etc/rc.d/init.d/teamspeak
etc/rc.d/init.d/template
#etc/rc.d/init.d/tftpd
etc/rc.d/init.d/udev
etc/rc.d/init.d/udev_retry
etc/rc.d/init.d/upnpd
#etc/rc.d/init.d/vdr
#etc/rc.d/init.d/vsftpd
#etc/rc.d/init.d/winbind
#etc/rc.d/init.d/xinetd
@@ -91,6 +107,8 @@ etc/rc.d/rc0.d/K28apache
etc/rc.d/rc0.d/K30sshd
etc/rc.d/rc0.d/K45random
etc/rc.d/rc0.d/K80network
#etc/rc.d/rc0.d/K84bluetooth
#etc/rc.d/rc0.d/K85messagebus
etc/rc.d/rc0.d/K90sysklogd
etc/rc.d/rc0.d/K99beep
etc/rc.d/rc0.d/S60sendsignals
@@ -100,6 +118,10 @@ etc/rc.d/rc0.d/S90swap
etc/rc.d/rc0.d/S99halt
#etc/rc.d/rc3.d
etc/rc.d/rc3.d/S10sysklogd
#etc/rc.d/rc3.d/S15messagebus
#etc/rc.d/rc3.d/S16bluetooth
#etc/rc.d/rc3.d/S18cpufreq
etc/rc.d/rc3.d/S19smartenabler
etc/rc.d/rc3.d/S20network
etc/rc.d/rc3.d/S25random
etc/rc.d/rc3.d/S30sshd
@@ -113,6 +135,8 @@ etc/rc.d/rc6.d/K28apache
etc/rc.d/rc6.d/K30sshd
etc/rc.d/rc6.d/K45random
etc/rc.d/rc6.d/K80network
#etc/rc.d/rc6.d/K84bluetooth
#etc/rc.d/rc6.d/K85messagebus
etc/rc.d/rc6.d/K90sysklogd
etc/rc.d/rc6.d/K99beep
etc/rc.d/rc6.d/S60sendsignals

1302
config/rootfiles/common/linux25 Normal file
View File

File diff suppressed because it is too large Load Diff

365
config/rootfiles/common/nagios-3.0 Normal file
View File

@@ -0,0 +1,365 @@
usr/bin/nagios
usr/bin/nagiostats
usr/bin/p1.pl
usr/share/nagios
#usr/share/nagios/cgi-bin
#usr/share/nagios/cgi-bin/avail.cgi
#usr/share/nagios/cgi-bin/cmd.cgi
#usr/share/nagios/cgi-bin/config.cgi
#usr/share/nagios/cgi-bin/extinfo.cgi
#usr/share/nagios/cgi-bin/histogram.cgi
#usr/share/nagios/cgi-bin/history.cgi
#usr/share/nagios/cgi-bin/notifications.cgi
#usr/share/nagios/cgi-bin/outages.cgi
#usr/share/nagios/cgi-bin/showlog.cgi
#usr/share/nagios/cgi-bin/status.cgi
#usr/share/nagios/cgi-bin/statusmap.cgi
#usr/share/nagios/cgi-bin/statuswml.cgi
#usr/share/nagios/cgi-bin/statuswrl.cgi
#usr/share/nagios/cgi-bin/summary.cgi
#usr/share/nagios/cgi-bin/tac.cgi#
#usr/share/nagios/cgi-bin/trends.cgi
usr/share/nagios/contexthelp
#usr/share/nagios/contexthelp/A1.html
#usr/share/nagios/contexthelp/A2.html
#usr/share/nagios/contexthelp/A3.html
#usr/share/nagios/contexthelp/A4.html
#usr/share/nagios/contexthelp/A5.html
#usr/share/nagios/contexthelp/A6.html
#usr/share/nagios/contexthelp/A7.html
#usr/share/nagios/contexthelp/B1.html
#usr/share/nagios/contexthelp/C1.html
#usr/share/nagios/contexthelp/D1.html
#usr/share/nagios/contexthelp/E1.html
#usr/share/nagios/contexthelp/F1.html
#usr/share/nagios/contexthelp/G1.html
#usr/share/nagios/contexthelp/G2.html
#usr/share/nagios/contexthelp/G3.html
#usr/share/nagios/contexthelp/G4.html
#usr/share/nagios/contexthelp/G5.html
#usr/share/nagios/contexthelp/G6.html
#usr/share/nagios/contexthelp/H1.html
#usr/share/nagios/contexthelp/H2.html
#usr/share/nagios/contexthelp/H3.html
#usr/share/nagios/contexthelp/H4.html
#usr/share/nagios/contexthelp/H5.html
#usr/share/nagios/contexthelp/H6.html
#usr/share/nagios/contexthelp/H7.html
#usr/share/nagios/contexthelp/H8.html
#usr/share/nagios/contexthelp/I1.html
#usr/share/nagios/contexthelp/I2.html
#usr/share/nagios/contexthelp/I3.html
#usr/share/nagios/contexthelp/I4.html
#usr/share/nagios/contexthelp/I5.html
#usr/share/nagios/contexthelp/I6.html
#usr/share/nagios/contexthelp/I7.html
#usr/share/nagios/contexthelp/I8.html
#usr/share/nagios/contexthelp/I9.html
#usr/share/nagios/contexthelp/J1.html
#usr/share/nagios/contexthelp/K1.html
#usr/share/nagios/contexthelp/L1.html
#usr/share/nagios/contexthelp/L10.html
#usr/share/nagios/contexthelp/L11.html
#usr/share/nagios/contexthelp/L12.html
#usr/share/nagios/contexthelp/L13.html
#usr/share/nagios/contexthelp/L2.html
#usr/share/nagios/contexthelp/L3.html
#usr/share/nagios/contexthelp/L4.html
#usr/share/nagios/contexthelp/L5.html
#usr/share/nagios/contexthelp/L6.html
#usr/share/nagios/contexthelp/L7.html
#usr/share/nagios/contexthelp/L8.html
#usr/share/nagios/contexthelp/L9.html
#usr/share/nagios/contexthelp/M1.html
#usr/share/nagios/contexthelp/M2.html
#usr/share/nagios/contexthelp/M3.html
#usr/share/nagios/contexthelp/M4.html
#usr/share/nagios/contexthelp/M5.html
#usr/share/nagios/contexthelp/M6.html
#usr/share/nagios/contexthelp/N1.html
#usr/share/nagios/contexthelp/N2.html
#usr/share/nagios/contexthelp/N3.html
#usr/share/nagios/contexthelp/N4.html
#usr/share/nagios/contexthelp/N5.html
#usr/share/nagios/contexthelp/N6.html
#usr/share/nagios/contexthelp/N7.html
usr/share/nagios/docs
#usr/share/nagios/docs/about.html
#usr/share/nagios/docs/activechecks.html
#usr/share/nagios/docs/adaptive.html
#usr/share/nagios/docs/addons.html
#usr/share/nagios/docs/beginners.html
#usr/share/nagios/docs/cachedchecks.html
#usr/share/nagios/docs/cgiauth.html
#usr/share/nagios/docs/cgiincludes.html
#usr/share/nagios/docs/cgis.html
#usr/share/nagios/docs/checkscheduling.html
#usr/share/nagios/docs/clusters.html
#usr/share/nagios/docs/config.html
#usr/share/nagios/docs/configcgi.html
#usr/share/nagios/docs/configmain.html
#usr/share/nagios/docs/configobject.html
#usr/share/nagios/docs/customobjectvars.html
#usr/share/nagios/docs/dependencies.html
#usr/share/nagios/docs/dependencychecks.html
#usr/share/nagios/docs/distributed.html
#usr/share/nagios/docs/downtime.html
#usr/share/nagios/docs/embeddedperl.html
#usr/share/nagios/docs/epnplugins.html
#usr/share/nagios/docs/escalations.html
#usr/share/nagios/docs/eventhandlers.html
#usr/share/nagios/docs/extcommands.html
#usr/share/nagios/docs/faststartup.html
#usr/share/nagios/docs/flapping.html
#usr/share/nagios/docs/freshness.html
#usr/share/nagios/docs/funstuff.html
#usr/share/nagios/docs/hostchecks.html
#usr/share/nagios/docs/images
#usr/share/nagios/docs/images/activechecks.png
#usr/share/nagios/docs/images/cachedcheckgraphs.png
#usr/share/nagios/docs/images/cachedchecks.png
#usr/share/nagios/docs/images/cachedchecks1.png
#usr/share/nagios/docs/images/cgi-avail-a.png
#usr/share/nagios/docs/images/cgi-avail-b.png
#usr/share/nagios/docs/images/cgi-cmd.png
#usr/share/nagios/docs/images/cgi-config.png
#usr/share/nagios/docs/images/cgi-extinfo-a.png
#usr/share/nagios/docs/images/cgi-extinfo-b.png
#usr/share/nagios/docs/images/cgi-extinfo-c.png
#usr/share/nagios/docs/images/cgi-extinfo-d.png
#usr/share/nagios/docs/images/cgi-histogram.png
#usr/share/nagios/docs/images/cgi-history.png
#usr/share/nagios/docs/images/cgi-notifications.png
#usr/share/nagios/docs/images/cgi-outages.png
#usr/share/nagios/docs/images/cgi-showlog.png
#usr/share/nagios/docs/images/cgi-status-a.png
#usr/share/nagios/docs/images/cgi-status-b.png
#usr/share/nagios/docs/images/cgi-status-c.png
#usr/share/nagios/docs/images/cgi-status-d.png
#usr/share/nagios/docs/images/cgi-statusmap.png
#usr/share/nagios/docs/images/cgi-statuswml.png
#usr/share/nagios/docs/images/cgi-statuswrl.png
#usr/share/nagios/docs/images/cgi-summary.png
#usr/share/nagios/docs/images/cgi-tac.png
#usr/share/nagios/docs/images/cgi-trends.png
#usr/share/nagios/docs/images/checkmark.png
#usr/share/nagios/docs/images/checktiming.png
#usr/share/nagios/docs/images/configoverview.png
#usr/share/nagios/docs/images/distributed.png
#usr/share/nagios/docs/images/downtime.png
#usr/share/nagios/docs/images/epn.png
#usr/share/nagios/docs/images/eventhandlers.png
#usr/share/nagios/docs/images/externalcommands.png
#usr/share/nagios/docs/images/fast-startup.png
#usr/share/nagios/docs/images/fast-startup1.png
#usr/share/nagios/docs/images/fast-startup2.png
#usr/share/nagios/docs/images/freshness.png
#usr/share/nagios/docs/images/host-dependencies.png
#usr/share/nagios/docs/images/important.gif
#usr/share/nagios/docs/images/integrationoverview.png
#usr/share/nagios/docs/images/interleaved1.png
#usr/share/nagios/docs/images/interleaved2.png
#usr/share/nagios/docs/images/interleaved3.png
#usr/share/nagios/docs/images/logofullsize.png
#usr/share/nagios/docs/images/monitoring-printers.png
#usr/share/nagios/docs/images/monitoring-routers.png
#usr/share/nagios/docs/images/monitoring-windows.png
#usr/share/nagios/docs/images/mrtg-activehostchecks.png
#usr/share/nagios/docs/images/mrtg-activelychecked.png
#usr/share/nagios/docs/images/mrtg-activeservicechecks.png
#usr/share/nagios/docs/images/mrtg-cachedchecks.png
#usr/share/nagios/docs/images/mrtg-commandbuffers.png
#usr/share/nagios/docs/images/mrtg-externalcommands.png
#usr/share/nagios/docs/images/mrtg-hostperfstats.png
#usr/share/nagios/docs/images/mrtg-hoststatechange.png
#usr/share/nagios/docs/images/mrtg-passivechecks.png
#usr/share/nagios/docs/images/mrtg-passivelychecked.png
#usr/share/nagios/docs/images/mrtg-serviceperfstats.png
#usr/share/nagios/docs/images/mrtg-servicestatechange.png
#usr/share/nagios/docs/images/multiple-templates1.png
#usr/share/nagios/docs/images/multiple-templates2.png
#usr/share/nagios/docs/images/nagios.jpg
#usr/share/nagios/docs/images/ndoutils.png
#usr/share/nagios/docs/images/network-outage1.png
#usr/share/nagios/docs/images/network-outage2.png
#usr/share/nagios/docs/images/noninterleaved1.png
#usr/share/nagios/docs/images/noninterleaved2.png
#usr/share/nagios/docs/images/note.gif
#usr/share/nagios/docs/images/nrpe.png
#usr/share/nagios/docs/images/nsca.png
#usr/share/nagios/docs/images/nscpp.png
#usr/share/nagios/docs/images/objects-commands.png
#usr/share/nagios/docs/images/objects-contacts.png
#usr/share/nagios/docs/images/objects-hosts.png
#usr/share/nagios/docs/images/objects-services.png
#usr/share/nagios/docs/images/objects-timeperiods.png
#usr/share/nagios/docs/images/passivechecks.png
#usr/share/nagios/docs/images/passivehosttranslation.png
#usr/share/nagios/docs/images/plugins.png
#usr/share/nagios/docs/images/predictive-dependency-checks.png
#usr/share/nagios/docs/images/printer.png
#usr/share/nagios/docs/images/reachability1.png
#usr/share/nagios/docs/images/reachability2.png
#usr/share/nagios/docs/images/reachability3.png
#usr/share/nagios/docs/images/reachability4.png
#usr/share/nagios/docs/images/redudancy.png
#usr/share/nagios/docs/images/redundancy.png
#usr/share/nagios/docs/images/security.png
#usr/share/nagios/docs/images/security1.png
#usr/share/nagios/docs/images/security2.png
#usr/share/nagios/docs/images/security3.png
#usr/share/nagios/docs/images/seealso.gif
#usr/share/nagios/docs/images/service-dependencies.png
#usr/share/nagios/docs/images/statetransitions.png
#usr/share/nagios/docs/images/statetransitions2.png
#usr/share/nagios/docs/images/stoprestart.png
#usr/share/nagios/docs/images/switch.png
#usr/share/nagios/docs/images/tcpwrappers.png
#usr/share/nagios/docs/images/tip.gif
#usr/share/nagios/docs/images/tuning.png
#usr/share/nagios/docs/images/upto.gif
#usr/share/nagios/docs/index.html
#usr/share/nagios/docs/int-snmptrap.html
#usr/share/nagios/docs/int-tcpwrappers.html
#usr/share/nagios/docs/integration.html
#usr/share/nagios/docs/largeinstalltweaks.html
#usr/share/nagios/docs/macrolist.html
#usr/share/nagios/docs/macros.html
#usr/share/nagios/docs/monitoring-linux.html
#usr/share/nagios/docs/monitoring-netware.html
#usr/share/nagios/docs/monitoring-printers.html
#usr/share/nagios/docs/monitoring-publicservices.html
#usr/share/nagios/docs/monitoring-routers.html
#usr/share/nagios/docs/monitoring-windows.html
#usr/share/nagios/docs/mrtggraphs.html
#usr/share/nagios/docs/nagiostats.html
#usr/share/nagios/docs/networkreachability.html
#usr/share/nagios/docs/notifications.html
#usr/share/nagios/docs/objectdefinitions.html
#usr/share/nagios/docs/objectinheritance.html
#usr/share/nagios/docs/objecttricks.html
#usr/share/nagios/docs/oncallrotation.html
#usr/share/nagios/docs/passivechecks.html
#usr/share/nagios/docs/passivestatetranslation.html
#usr/share/nagios/docs/perfdata.html
#usr/share/nagios/docs/pluginapi.html
#usr/share/nagios/docs/plugins.html
#usr/share/nagios/docs/quickstart-fedora.html
#usr/share/nagios/docs/quickstart-opensuse.html
#usr/share/nagios/docs/quickstart-ubuntu.html
#usr/share/nagios/docs/quickstart.html
#usr/share/nagios/docs/redundancy.html
#usr/share/nagios/docs/robots.txt
#usr/share/nagios/docs/security.html
#usr/share/nagios/docs/servicechecks.html
#usr/share/nagios/docs/stalking.html
#usr/share/nagios/docs/startstop.html
#usr/share/nagios/docs/statetypes.html
#usr/share/nagios/docs/timeperiods.html
#usr/share/nagios/docs/toc.html
#usr/share/nagios/docs/tuning.html
#usr/share/nagios/docs/upgrading.html
#usr/share/nagios/docs/verifyconfig.html
#usr/share/nagios/docs/volatileservices.html
#usr/share/nagios/docs/whatsnew.html
usr/share/nagios/images
#usr/share/nagios/images/NagiosEnterprises-whitebg-112x46.png
#usr/share/nagios/images/ack.gif
#usr/share/nagios/images/action.gif
#usr/share/nagios/images/command.png
#usr/share/nagios/images/comment.gif
#usr/share/nagios/images/contexthelp1.gif
#usr/share/nagios/images/contexthelp2.gif
#usr/share/nagios/images/critical.png
#usr/share/nagios/images/delay.gif
#usr/share/nagios/images/delete.gif
#usr/share/nagios/images/detail.gif
#usr/share/nagios/images/disabled.gif
#usr/share/nagios/images/down.gif
#usr/share/nagios/images/downtime.gif
#usr/share/nagios/images/empty.gif
#usr/share/nagios/images/enabled.gif
#usr/share/nagios/images/extinfo.gif
#usr/share/nagios/images/favicon.ico
#usr/share/nagios/images/flapping.gif
#usr/share/nagios/images/globe-support-150x150.png
#usr/share/nagios/images/greendot.gif
#usr/share/nagios/images/histogram.png
#usr/share/nagios/images/history.gif
#usr/share/nagios/images/hostevent.gif
#usr/share/nagios/images/info.png
#usr/share/nagios/images/left.gif
#usr/share/nagios/images/logofullsize.png
#usr/share/nagios/images/logos
#usr/share/nagios/images/logos/nagios.gd2
#usr/share/nagios/images/logos/nagios.gif
#usr/share/nagios/images/logos/nagiosvrml.png
#usr/share/nagios/images/logos/unknown.gd2
#usr/share/nagios/images/logos/unknown.gif
#usr/share/nagios/images/logrotate.png
#usr/share/nagios/images/ndisabled.gif
#usr/share/nagios/images/noack.gif
#usr/share/nagios/images/notes.gif
#usr/share/nagios/images/notify.gif
#usr/share/nagios/images/orangedot.gif
#usr/share/nagios/images/passiveonly.gif
#usr/share/nagios/images/recovery.png
#usr/share/nagios/images/redudancy.png
#usr/share/nagios/images/redundancy.png
#usr/share/nagios/images/restart.gif
#usr/share/nagios/images/right.gif
#usr/share/nagios/images/sblogo.jpg
#usr/share/nagios/images/serviceevent.gif
#usr/share/nagios/images/splunk1.gif
#usr/share/nagios/images/splunk2.gif
#usr/share/nagios/images/start.gif
#usr/share/nagios/images/status.gif
#usr/share/nagios/images/status2.gif
#usr/share/nagios/images/status3.gif
#usr/share/nagios/images/status4.gif
#usr/share/nagios/images/stop.gif
#usr/share/nagios/images/tacdisabled.jpg
#usr/share/nagios/images/tacdisabled.png
#usr/share/nagios/images/tacenabled.jpg
#usr/share/nagios/images/tacenabled.png
#usr/share/nagios/images/thermcrit.png
#usr/share/nagios/images/thermok.png
#usr/share/nagios/images/thermwarn.png
#usr/share/nagios/images/trends.gif
#usr/share/nagios/images/trendshost.png
#usr/share/nagios/images/trendssvc.png
#usr/share/nagios/images/unknown.png
#usr/share/nagios/images/up.gif
#usr/share/nagios/images/warning.png
#usr/share/nagios/images/weblogo1.png
#usr/share/nagios/images/zoom1.gif
#usr/share/nagios/images/zoom2.gif
usr/share/nagios/index.html
usr/share/nagios/main.html
usr/share/nagios/media
#usr/share/nagios/media/critical.wav
#usr/share/nagios/media/hostdown.wav
#usr/share/nagios/media/warning.wav
#usr/share/nagios/robots.txt
#usr/share/nagios/side.html
usr/share/nagios/ssi
usr/share/nagios/stylesheets
#usr/share/nagios/stylesheets/avail.css
#usr/share/nagios/stylesheets/checksanity.css
#usr/share/nagios/stylesheets/cmd.css
#usr/share/nagios/stylesheets/common.css
#usr/share/nagios/stylesheets/config.css
#usr/share/nagios/stylesheets/extinfo.css
#usr/share/nagios/stylesheets/histogram.css
#usr/share/nagios/stylesheets/history.css
#usr/share/nagios/stylesheets/ministatus.css
#usr/share/nagios/stylesheets/notifications.css
#usr/share/nagios/stylesheets/outages.css
#usr/share/nagios/stylesheets/showlog.css
#usr/share/nagios/stylesheets/status.css
#usr/share/nagios/stylesheets/statusmap.css
#usr/share/nagios/stylesheets/summary.css
#usr/share/nagios/stylesheets/tac.css
#usr/share/nagios/stylesheets/trends.css
var/archives
var/spool/checkresults

2
config/rootfiles/common/oldcore10
View File

@@ -3,6 +3,6 @@ srv/web/ipfire/cgi-bin/optionsfw.cgi
srv/web/ipfire/cgi-bin/gui.cgi
srv/web/ipfire/cgi-bin/qos.cgi
srv/web/ipfire/cgi-bin/services.cgi
srv/web/ipfire/cgi-bin/graphs.cgi
#srv/web/ipfire/cgi-bin/graphs.cgi
var/ipfire/langs
var/ipfire/graphs.pl

4
config/rootfiles/common/oldcore7
View File

@@ -1,9 +1,9 @@
etc/rc.d/rc3.d/S19smartenabler
etc/rc.d/init.d/smartenabler
etc/rc.d/init.d/networking/red
srv/web/ipfire/cgi-bin/graphs.cgi
#srv/web/ipfire/cgi-bin/graphs.cgi
srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
srv/web/ipfire/cgi-bin/network.cgi
#srv/web/ipfire/cgi-bin/network.cgi
srv/web/ipfire/cgi-bin/optionsfw.cgi
srv/web/ipfire/cgi-bin/proxy.cgi
usr/local/bin/makegraphs

1
config/rootfiles/common/r8168-8.005.00 Normal file
View File

@@ -0,0 +1 @@
#lib/modules/2.6.23.17-ipfire/kernel/drivers/net/r8168.ko

1
config/rootfiles/common/stage2
View File

@@ -56,6 +56,7 @@ tmp
#usr/lib
usr/lib/libgcc_s.so
usr/lib/libgcc_s.so.1
usr/local/bin/backupiso
usr/local/bin/connscheduler
usr/local/bin/dialctrl.pl
usr/local/bin/hddshutdown

291
config/rootfiles/common/v4l-dvb-e9a442d3b53a Normal file
View File

@@ -0,0 +1,291 @@
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/common
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/common/ir-common.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/common/saa7146.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/common/saa7146_vv.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/common/tuners
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/common/tuners/mt2060.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/common/tuners/mt20xx.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/common/tuners/mt2131.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/common/tuners/mt2266.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/common/tuners/mxl5005s.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/common/tuners/mxl5007t.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/common/tuners/qt1010.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/common/tuners/tda18271.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/common/tuners/tda827x.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/common/tuners/tda8290.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/common/tuners/tda9887.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/common/tuners/tea5761.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/common/tuners/tea5767.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/common/tuners/tuner-simple.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/common/tuners/tuner-types.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/common/tuners/tuner-xc2028.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/common/tuners/xc5000.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/b2c2
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/b2c2/b2c2-flexcop-pci.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/b2c2/b2c2-flexcop-usb.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/b2c2/b2c2-flexcop.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/bt8xx
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/bt8xx/bt878.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/bt8xx/dst.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/bt8xx/dst_ca.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/bt8xx/dvb-bt8xx.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/cinergyT2
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/cinergyT2/cinergyT2.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/dvb-usb
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-a800.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-af9005-remote.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-af9005.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-af9015.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-anysee.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-au6610.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-cxusb.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-dib0700.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-dibusb-common.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-dibusb-mb.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-dibusb-mc.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-digitv.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-dtt200u.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-dw2102.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-gl861.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-gp8psk.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-m920x.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-nova-t-usb2.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-opera.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-ttusb2.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-umt-010.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-vp702x.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-vp7045.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/af9013.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/au8522.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/bcm3510.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/cx22700.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/cx22702.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/cx24110.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/cx24123.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/dib0070.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/dib3000mb.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/dib3000mc.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/dib7000m.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/dib7000p.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/dibx000_common.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/drx397xD.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/dvb-pll.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/isl6405.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/isl6421.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/itd1000.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/l64781.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/lgdt330x.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/lnbp21.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/mt312.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/mt352.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/nxt200x.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/nxt6000.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/or51132.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/or51211.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/s5h1409.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/s5h1411.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/s5h1420.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/sp8870.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/sp887x.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/stv0297.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/stv0299.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/tda10021.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/tda10023.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/tda10048.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/tda1004x.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/tda10086.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/tda8083.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/tda826x.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/tua6100.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/ves1820.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/ves1x93.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/frontends/zl10353.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/pluto2
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/pluto2/pluto2.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/siano
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/siano/sms1xxx.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/ttpci
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/ttpci/budget-av.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/ttpci/budget-ci.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/ttpci/budget-core.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/ttpci/budget-patch.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/ttpci/budget.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/ttpci/dvb-ttpci.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/ttpci/ttpci-eeprom.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/ttusb-budget
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/ttusb-dec
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/ttusb-dec/ttusb_dec.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/dvb/ttusb-dec/ttusbdecfe.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/radio
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/radio/dsbr100.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/radio/radio-aimslab.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/radio/radio-aztech.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/radio/radio-cadet.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/radio/radio-gemtek-pci.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/radio/radio-gemtek.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/radio/radio-maestro.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/radio/radio-maxiradio.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/radio/radio-rtrack2.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/radio/radio-sf16fmi.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/radio/radio-sf16fmr2.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/radio/radio-si470x.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/radio/radio-terratec.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/radio/radio-trust.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/radio/radio-typhoon.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/radio/radio-zoltrix.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/adv7170.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/adv7175.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/au0828
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/au0828/au0828.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/bt819.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/bt856.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/bt866.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/bt8xx
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/bt8xx/bttv.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/btcx-risc.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/bw-qcam.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/c-qcam.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/cafe_ccic.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/cpia.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/cpia2
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/cpia2/cpia2.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/cpia_pp.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/cpia_usb.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/cs5345.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/cs53l32a.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/cx18
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/cx18/cx18.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/cx2341x.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/cx23885
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/cx23885/cx23885.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/cx25840
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/cx25840/cx25840.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/cx88
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/cx88/cx88-alsa.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/cx88/cx88-blackbird.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/cx88/cx88-dvb.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/cx88/cx88-vp3054-i2c.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/cx88/cx8800.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/cx88/cx8802.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/cx88/cx88xx.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/dpc7146.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/em28xx
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/em28xx/em28xx-alsa.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/em28xx/em28xx-dvb.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/em28xx/em28xx.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/et61x251
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/et61x251/et61x251.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/gspca
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/gspca/gspca_conex.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/gspca/gspca_etoms.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/gspca/gspca_main.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/gspca/gspca_mars.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/gspca/gspca_ov519.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/gspca/gspca_pac207.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/gspca/gspca_pac7311.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/gspca/gspca_sonixb.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/gspca/gspca_sonixj.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/gspca/gspca_spca500.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/gspca/gspca_spca501.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/gspca/gspca_spca505.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/gspca/gspca_spca506.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/gspca/gspca_spca508.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/gspca/gspca_spca561.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/gspca/gspca_stk014.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/gspca/gspca_sunplus.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/gspca/gspca_t613.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/gspca/gspca_tv8532.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/gspca/gspca_vc032x.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/gspca/gspca_zc3xx.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/hexium_gemini.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/hexium_orion.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/ir-kbd-i2c.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/ivtv
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/ivtv/ivtv.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/ivtv/ivtvfb.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/ks0127.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/m52790.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/msp3400.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/mxb.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/ov511.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/ov7670.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/ovcamchip
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/ovcamchip/ovcamchip.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/pms.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/pvrusb2
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/pvrusb2/pvrusb2.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/pwc
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/pwc/pwc.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/s2255drv.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/saa5246a.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/saa5249.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/saa6588.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/saa7110.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/saa7111.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/saa7114.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/saa7115.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/saa7127.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/saa7134
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/saa7134/saa6752hs.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/saa7134/saa7134-alsa.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/saa7134/saa7134-dvb.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/saa7134/saa7134-empress.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/saa7134/saa7134.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/saa717x.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/saa7185.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/saa7191.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/se401.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/sn9c102
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/sn9c102/sn9c102.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/stkwebcam.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/stradis.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/stv680.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/tcm825x.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/tda7432.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/tda9840.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/tda9875.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/tea6415c.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/tea6420.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/tlv320aic23b.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/tuner-3036.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/tuner.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/tvaudio.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/tveeprom.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/tvp5150.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/upd64031a.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/upd64083.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/usbvideo
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/usbvideo/ibmcam.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/usbvideo/konicawc.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/usbvideo/quickcam_messenger.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/usbvideo/ultracam.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/usbvideo/usbvideo.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/usbvideo/vicam.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/usbvision
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/usbvision/usbvision.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/uvc
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/uvc/uvcvideo.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/v4l2-int-device.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/videobuf-core.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/videobuf-dma-contig.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/videobuf-dma-sg.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/videobuf-dvb.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/videobuf-vmalloc.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/videocodec.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/vivi.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/vp27smpx.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/vpx3220.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/w9966.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/w9968cf.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/wm8739.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/wm8775.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/zc0301
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/zc0301/zc0301.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/zr36016.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/zr36050.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/zr36060.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/zr36067.ko
#lib/modules/2.6.23.17-ipfire/kernel/drivers/media/video/zr364xx.ko

5
config/rootfiles/core/17/files
View File

@@ -8,14 +8,9 @@ bin/ntfs-3g
lib/libntfs-3g.so
lib/libntfs-3g.so.38
lib/libntfs-3g.so.38.0.0
srv/web/ipfire/html/images/updbooster/
srv/web/ipfire/cgi-bin/updatexlrator.cgi
var/ipfire/updatexlrator/bin/
usr/sbin/updxlrator
srv/web/ipfire/cgi-bin/qos.cgi
usr/local/bin/qosd
var/ipfire/qos/bin
var/ipfire/langs
usr/lib/collectd/
var/lib/collectd/
usr/sbin/collectd

38
config/rootfiles/packages/mpfire
View File

@@ -1,25 +1,29 @@
srv/web/ipfire/cgi-bin/mpfire.cgi
srv/web/ipfire/html/images/mpfire
usr/lib/perl5/5.8.8/Class/Accessor
usr/lib/perl5/5.8.8/Class/Accessor.pm
usr/lib/perl5/5.8.8/Class/Accessor/Fast.pm
usr/lib/perl5/5.8.8/Class/Accessor/Faster.pm
usr/lib/perl5/5.8.8/Readonly.pm
usr/lib/perl5/site_perl/5.8.8/Audio
#usr/lib/perl5/site_perl/5.8.8/Audio/MPD
#usr/lib/perl5/site_perl/5.8.8/Audio/MPD.pm
#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Collection.pm
#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common
#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common.pm
#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Item
#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Item.pm
#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Item/Directory.pm
#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Item/Playlist.pm
#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Item/Song.pm
#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Stats.pm
#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Status.pm
#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Time.pm
#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Playlist.pm
#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Test.pm
usr/lib/perl5/site_perl/5.8.8/Audio/MPD
usr/lib/perl5/site_perl/5.8.8/Audio/MPD.pm
usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Collection.pm
usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common
usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common.pm
usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Item
usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Item.pm
usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Item/Directory.pm
usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Item/Playlist.pm
usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Item/Song.pm
usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Stats.pm
usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Status.pm
usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Time.pm
usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Playlist.pm
usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Test.pm
usr/local/bin/mpfirectrl
var/ipfire/backup/addons/includes/mpfire
var/ipfire/menu.d/EX-mpfire.menu
var/ipfire/mpfire
var/ipfire/mpfire/bin
var/ipfire/mpfire/bin/mpfire.pl
@@ -29,3 +33,7 @@ var/ipfire/mpfire/mpd.conf
var/ipfire/mpfire/playlist.m3u
var/ipfire/mpfire/settings
var/ipfire/mpfire/webradio
usr/local/bin/mpfirectrl
srv/web/ipfire/cgi-bin/mpfire.cgi
srv/web/ipfire/html/images/mpfire
var/ipfire/menu.d/EX-mpfire.menu

1
config/rootfiles/packages/tcptrack
View File

@@ -1 +1,2 @@
usr/bin/tcptrack
#usr/share/man/man1/tcptrack.1

20
config/rootfiles/updater/filelists/files
View File

@@ -3,6 +3,7 @@ etc/init.d/mISDN
etc/modprobe.d/blacklist
usr/bin/bc
usr/bin/dc
etc/fstab
etc/ppp/dialer
etc/rc.d/init.d/checkfstab
etc/rc.d/rcsysinit.d/S19checkfstab
@@ -19,16 +20,31 @@ etc/linuxigd/gatedesc.xml
usr/local/bin/getiptstate
usr/local/bin/makegraphs
usr/local/bin/squidctrl
usr/local/bin/setddns.pl
srv/web/ipfire/cgi-bin/credits.cgi
srv/web/ipfire/cgi-bin/speed.cgi
srv/web/ipfire/cgi-bin/traffic.cgi
srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
srv/web/ipfire/cgi-bin/connections.cgi
srv/web/ipfire/cgi-bin/graphs.cgi
srv/web/ipfire/cgi-bin/pppsetup.cgi
srv/web/ipfire/cgi-bin/network.cgi
srv/web/ipfire/cgi-bin/netexternal.cgi
srv/web/ipfire/cgi-bin/netinternal.cgi
srv/web/ipfire/cgi-bin/netother.cgi
srv/web/ipfire/cgi-bin/system.cgi
srv/web/ipfire/cgi-bin/services.cgi
srv/web/ipfire/cgi-bin/media.cgi
srv/web/ipfire/cgi-bin/memory.cgi
srv/web/ipfire/cgi-bin/ids.cgi
srv/web/ipfire/cgi-bin/ddns.cgi
var/ipfire/sensors/
var/ipfire/graphs.pl
var/ipfire/firebuild
var/ipfire/proxy/advanced/useragents
srv/web/ipfire/html/images/updbooster/
srv/web/ipfire/cgi-bin/updatexlrator.cgi
var/ipfire/updatexlrator/bin/
usr/sbin/updxlrator
var/ipfire/langs
usr/local/bin/qosd
usr/bin/mkisofs
usr/bin/cdrecord

1
config/rootfiles/updater/filelists/linux25 Symbolic link
View File

@@ -0,0 +1 @@
../../common/linux25

25
config/rootfiles/updater/update.sh
View File

@@ -56,6 +56,11 @@ echo var/updatexlerator >> /opt/pakfire/tmp/ROOTFILES
echo lib/iptables >> /opt/pakfire/tmp/ROOTFILES
echo lib/modules >> /opt/pakfire/tmp/ROOTFILES
echo boot >> /opt/pakfire/tmp/ROOTFILES
echo srv/web/ipfire/cgi-bin/fwhits.cgi >> /opt/pakfire/tmp/ROOTFILES
echo srv/web/ipfire/cgi-bin/network.cgi >> /opt/pakfire/tmp/ROOTFILES
echo srv/web/ipfire/cgi-bin/traffics.cgi >> /opt/pakfire/tmp/ROOTFILES
echo srv/web/ipfire/cgi-bin/graphs.cgi >> /opt/pakfire/tmp/ROOTFILES
echo srv/web/ipfire/cgi-bin/qosgraph.cgi >> /opt/pakfire/tmp/ROOTFILES
#
tar cjvf /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.bz2 \
-T /opt/pakfire/tmp/ROOTFILES --exclude='#*' -C / > /dev/null 2>&1
@@ -70,6 +75,14 @@ rm -rf /etc/rc.d/rc3.d/S20collectd
#
rm -rf /etc/rc.d/rc3.d/S99squid
#
# Delete old cgi files ...
#
rm -rf /srv/web/ipfire/cgi-bin/fwhits.cgi
rm -rf /srv/web/ipfire/cgi-bin/network.cgi
rm -rf /srv/web/ipfire/cgi-bin/traffics.cgi
rm -rf /srv/web/ipfire/cgi-bin/graphs.cgi
rm -rf /srv/web/ipfire/cgi-bin/qosgraph.cgi
#
# Delete old iptables libs...
#
rm -rf /lib/iptables
@@ -131,11 +144,21 @@ fi
fi
mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER.img
#mkinitcpio -k $KVER-ipfire-smp -g /boot/ipfirerd-$KVER-smp.img
mkinitcpio -k 2.6.25.17-ipfire -g /boot/ipfirerd-2.6.25.17.img
#
# ReInstall grub
#
grub-install --no-floppy ${ROOT::`expr length $ROOT`-1}
#
# Update fstab
#
grep -v "tmpfs" /etc/fstab > /tmp/fstab.tmp
echo shm /dev/shm tmpfs defaults,size=25% 0 0 >> /tmp/fstab.tmp
echo none /tmp tmpfs defaults,size=128M 0 0 >> /tmp/fstab.tmp
echo none /var/log/rrd tmpfs defaults,size=64M 0 0 >> /tmp/fstab.tmp
echo none /var/lock tmpfs defaults,size=32M 0 0 >> /tmp/fstab.tmp
mv /tmp/fstab.tmp /etc/fstab
#
# Change version of Pakfire.conf
#
sed -i "s|$OLDVERSION|$NEWVERSION|g" /opt/pakfire/etc/pakfire.conf
@@ -149,6 +172,8 @@ echo \\n running on \\s \\r \\m >> /etc/issue
# Update crontab
#
grep -v "ipacsum" /var/spool/cron/root.orig > /tmp/root.orig.tmp
echo "# Backup collectd files" >> /tmp/root.orig.tmp
echo "01 * * * * /etc/init.d/collectd backup >/dev/null" >> /tmp/root.orig.tmp
mv /tmp/root.orig.tmp /var/spool/cron/root.orig
chmod 600 /var/spool/cron/root.orig
chown root:cron /var/spool/cron/root.orig

1
config/syslinux/unattended.conf
View File

@@ -10,3 +10,4 @@ GREEN_NETADDRESS=192.168.180.0
GREEN_BROADCAST=192.168.180.255
ROOT_PASSWORD=ipfire
ADMIN_PASSWORD=ipfire
RESTORE_FILE=

17
doc/packages-list.txt
View File

@@ -34,14 +34,16 @@
* Unix-Syslog-0.100
* XML-Parser-2.34
* alsa-lib-1.0.17
* alsa-lib-1.0.17-kmod
* alsa-lib-1.0.17-kmod-2.6.23.17
* alsa-lib-1.0.17-kmod-2.6.25.17
* amavisd-new-2.5.2
* apcupsd-3.14.4
* applejuice-0.30
* arping-2.05
* as86-0.16.17
* asterisk-1.4.18
* atl2-2.0.4
* atl2-2.0.4-kmod-2.6.23.17
* atl2-2.0.4-kmod-2.6.25.17
* autoconf-2.59
* automake-1.9.6
* backup-ipfire
@@ -143,7 +145,8 @@
* jpegsrc.v6b
* kbd-1.12
* klibc-1.5.14
* kqemu-1.3.0pre11
* kqemu-1.3.0pre11-kmod-2.6.23.17
* kqemu-1.3.0pre11-kmod-2.6.25.17
* kudzu-1.2.64
* l7-protocols-2008-04-23
* lame-3.97
@@ -173,8 +176,8 @@
* libxml2-2.6.26
* libxslt-1.1.17
* linux-2.6.23.17
* linux-2.6.25.17
* linux-atm-2.4.1
* linux-fusion-7.0.1
* linux-libc-headers-2.6.12.0
* linuxigd-0.95
* lm_sensors-3.0.2
@@ -184,7 +187,8 @@
* lzo-2.02
* m4-1.4.4
* mISDNuser-1_1_8
* madwifi-hal-2008-08-15-r3862-20080903
* madwifi-hal-2008-08-15-r3862-20080903-kmod-2.6.23.17
* madwifi-hal-2008-08-15-r3862-20080903-kmod-2.6.25.17
* make-3.81
* man-db-2.4.3
* man-pages-2.34
@@ -294,7 +298,8 @@
* urlgrabber-3.1.0
* usbutils-0.72
* util-linux-2.12r
* v4l-dvb-e9a442d3b53a
* v4l-dvb-e9a442d3b53a-kmod-2.6.23.17
* v4l-dvb-e9a442d3b53a-kmod-2.6.25.17
* vdr-1.6.0
* vim-7.0
* vlan.1.9

21
html/cgi-bin/backup.cgi
View File

@@ -113,8 +113,13 @@ sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' cont
if ( $cgiparams{'ACTION'} eq "backup" )
{
if ( $cgiparams{'BACKUPLOGS'} eq "include" ){system("/usr/local/bin/backupctrl include >/dev/null 2>&1");}
else {system("/usr/local/bin/backupctrl exclude >/dev/null 2>&1");}
if ( $cgiparams{'BACKUPLOGS'} eq "include" ) {
system("/usr/local/bin/backupctrl include >/dev/null 2>&1");
} elsif ( $cgiparams{'BACKUPLOGS'} eq "exclude" ) {
system("/usr/local/bin/backupctrl exclude >/dev/null 2>&1");
} elsif ( $cgiparams{'BACKUPLOGS'} eq "iso" ) {
system("/usr/local/bin/backupctrl iso >/dev/null 2>&1");
}
}
if ( $cgiparams{'ACTION'} eq "addonbackup" )
{
@@ -141,10 +146,14 @@ my @backups = `cd /var/ipfire/backup/ && ls *.ipf 2>/dev/null`;
print <<END
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<table width='95%' cellspacing='0'>
<tr><td align='left' width='40%'>$Lang::tr{'logs'}</td><td align='left'>$Lang::tr{'include logfiles'}
<input type='radio' name='BACKUPLOGS' value='include'/>/
<input type='radio' name='BACKUPLOGS' value='exclude' checked='checked'/>$Lang::tr{'exclude logfiles'}
</td></tr>
<tr>
<td align='left' width='40%'>$Lang::tr{'logs'}</td>
<td align='left'>
<input type='radio' name='BACKUPLOGS' value='include'/> $Lang::tr{'include logfiles'}<br/>
<input type='radio' name='BACKUPLOGS' value='exclude' checked='checked'/> $Lang::tr{'exclude logfiles'}<br/>
<input type='radio' name='BACKUPLOGS' value='iso' /> $Lang::tr{'generate iso'}
</td>
</tr>
<tr><td align='center' colspan='2'>
<input type='hidden' name='ACTION' value='backup' />
<input type='image' alt='$Lang::tr{'backup'}' title='$Lang::tr{'backup'}' src='/images/document-save.png' />

3
html/cgi-bin/credits.cgi
View File

@@ -37,6 +37,7 @@ require "${General::swroot}/header.pl";
&Header::openbox('100%', 'left', 'Version');
print "This is IPFire ".`cat /opt/pakfire/etc/pakfire.conf | grep "version =" | cut -d\\" -f2`;
print "<br>".`uname -a`;
&Header::closebox();
&Header::openbox('100%', 'left', $Lang::tr{'credits'});
@@ -63,6 +64,8 @@ Developer - Sven Nierlein
(<a href='mailto:affect\@ipfire.org'>affect\@versatel.de</a>)<br />
Developer - Rene Zingel
(<a href='mailto:linuxadmin\@ipfire.org'>linuxadmin\@ipfire.org</a>)<br />
Developer - Daniel Glanzmann
(<a href='mailto:dg\@ipfire.org'>dg\@ipfire.org</a>)<br />
Sponsor - Karsten Rechenbach
(<a href='mailto:space\@ipfire.org'>space\@ipfire.org</a>)<br />
Tester - Ronald Wiesinger

2
html/cgi-bin/ddns.cgi
View File

@@ -243,6 +243,7 @@ $checked{'SERVICE'}{'easydns.com'} = '';
$checked{'SERVICE'}{'enom.com'} = '';
$checked{'SERVICE'}{'freedns.afraid.org'} = '';
$checked{'SERVICE'}{'hn.org'} = '';
$checked{'SERVICE'}{'mydyn.de'} = '';
$checked{'SERVICE'}{'no-ip.com'} = '';
$checked{'SERVICE'}{'nsupdate'} = '';
$checked{'SERVICE'}{'ovh.com'} = '';
@@ -335,6 +336,7 @@ print <<END
<option $checked{'SERVICE'}{'enom.com'}>enom.com</option>
<option $checked{'SERVICE'}{'freedns.afraid.org'}>freedns.afraid.org</option>
<option $checked{'SERVICE'}{'hn.org'}>hn.org</option>
<option $checked{'SERVICE'}{'mydyn.de'}>mydyn.de</option>
<option $checked{'SERVICE'}{'no-ip.com'}>no-ip.com</option>
<option $checked{'SERVICE'}{'nsupdate'}>nsupdate</option>
<option $checked{'SERVICE'}{'ovh.com'}>ovh.com</option>

105
html/cgi-bin/fwhits.cgi
View File

@@ -1,105 +0,0 @@
#!/usr/bin/perl
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# #
# 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 #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program 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 program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
use strict;
# enable only the following on debugging purpose
#use warnings;
#use CGI::Carp 'fatalsToBrowser';
require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
require "${General::swroot}/graphs.pl";
my %cgiparams=();
my @cgigraphs=();
my @graphs=();
&Graphs::updatefwhitsgraph ("day");
&Graphs::updatefwhitsgraph ("week");
&Graphs::updatefwhitsgraph ("month");
&Graphs::updatefwhitsgraph ("year");
$ENV{'QUERY_STRING'} =~ s/&//g;
@cgigraphs = split(/graph=/,$ENV{'QUERY_STRING'});
$cgigraphs[1] = '' unless defined $cgigraphs[1];
&Header::showhttpheaders();
my $graphdir = "/home/httpd/html/graphs";
my @LOCALCHECK=();
my $errormessage="";
&Header::openpage($Lang::tr{'firewall graphs'}, 1, '');
&Header::openbigbox('100%', 'left', '', $errormessage);
&Header::openbox('100%', 'center', $Lang::tr{"daily firewallhits"});
if (-e "$Header::graphdir/firewallhits-day-area.png") {
my $ftime = localtime((stat("$Header::graphdir/firewallhits-day-area.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<img alt='' src='/graphs/firewallhits-day-area.png' border='0' />";
print "<br />\n";
} else {
print $Lang::tr{'no information available'};
}
print "<br />\n";
&Header::closebox();
&Header::openbox('100%', 'center', $Lang::tr{"weekly firewallhits"});
if (-e "$Header::graphdir/firewallhits-week-area.png") {
my $ftime = localtime((stat("$Header::graphdir/firewallhits-week-area.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<img alt='' src='/graphs/firewallhits-week-area.png' border='0' />";
print "<br />\n";
} else {
print $Lang::tr{'no information available'};
}
print "<br />\n";
&Header::closebox();
&Header::openbox('100%', 'center', $Lang::tr{"monthly firewallhits"});
if (-e "$Header::graphdir/firewallhits-month-area.png") {
my $ftime = localtime((stat("$Header::graphdir/firewallhits-month-area.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<img alt='' src='/graphs/firewallhits-month-area.png' border='0' />";
print "<br />\n";
} else {
print $Lang::tr{'no information available'};
}
print "<br />\n";
&Header::closebox();
&Header::openbox('100%', 'center', $Lang::tr{"yearly firewallhits"});
if (-e "$Header::graphdir/firewallhits-year-area.png") {
my $ftime = localtime((stat("$Header::graphdir/firewallhits-year-area.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<img alt='' src='/graphs/firewallhits-year-area.png' border='0' />";
print "<br />\n";
} else {
print $Lang::tr{'no information available'};
}
print "<br />\n";
&Header::closebox();
&Header::closebigbox();
&Header::closepage();

149
html/cgi-bin/graphs.cgi
View File

@@ -1,149 +0,0 @@
#!/usr/bin/perl
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# #
# 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 #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program 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 program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
use strict;
# enable only the following on debugging purpose
#use warnings;
#use CGI::Carp 'fatalsToBrowser';
require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
require "${General::swroot}/graphs.pl";
my %cgiparams=();
my %pppsettings=();
my %netsettings=();
my @cgigraphs=();
my @graphs=();
my $iface='';
&Header::showhttpheaders();
my $graphdir = "/srv/web/ipfire/html/graphs";
&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
$ENV{'QUERY_STRING'} =~ s/&//g;
@cgigraphs = split(/graph=/,$ENV{'QUERY_STRING'});
$cgigraphs[1] = '' unless defined $cgigraphs[1];
$cgigraphs[2] = '' unless defined $cgigraphs[2];
if ($cgigraphs[1] =~ /(load)/) {&Graphs::updateloadgraph ("hour");&Graphs::updateloadgraph ("week");&Graphs::updateloadgraph ("month");&Graphs::updateloadgraph ("year");}
elsif ($cgigraphs[1] =~ /(cpufreq)/) {&Graphs::updatecpufreqgraph ("hour");&Graphs::updatecpufreqgraph ("week");&Graphs::updatecpufreqgraph ("month");&Graphs::updatecpufreqgraph ("year");}
elsif ($cgigraphs[1] =~ /(cpu)/) {&Graphs::updatecpugraph ("hour");&Graphs::updatecpugraph ("week");&Graphs::updatecpugraph ("month");&Graphs::updatecpugraph ("year");}
elsif ($cgigraphs[1] =~ /(processes)/) {&Graphs::updateprocessesgraph ("hour");&Graphs::updateprocessesgraph ("week");&Graphs::updateprocessesgraph ("month");&Graphs::updateprocessesgraph ("year");}
elsif ($cgigraphs[1] =~ /(memory|swap)/) {&Graphs::updatememgraph ("hour");&Graphs::updatememgraph ("week");&Graphs::updatememgraph ("month");&Graphs::updatememgraph ("year");}
elsif ($cgigraphs[1] =~ /wireless/){ &Graphs::wireless("hour",$cgigraphs[2]); &Graphs::wireless("week",$cgigraphs[2]); &Graphs::wireless("month",$cgigraphs[2]); &Graphs::wireless("year",$cgigraphs[2]); }
elsif ($cgigraphs[1] =~ /disk/){
my @devices = `kudzu -qps -c HD | grep device: | cut -d" " -f2 | sort | uniq`;
foreach (@devices) {
my $device = $_;
chomp($device);
&Graphs::updatediskgraph ("hour",$device);
&Graphs::updatediskgraph ("week",$device);
&Graphs::updatediskgraph ("month",$device);
&Graphs::updatediskgraph ("year",$device);}}
elsif ($cgigraphs[2] ne "" ) {&Graphs::updatepinggraph("hour",$cgigraphs[1]);&Graphs::updatepinggraph("week",$cgigraphs[1]);&Graphs::updatepinggraph("month",$cgigraphs[1]);&Graphs::updatepinggraph("year",$cgigraphs[1]);}
elsif ($cgigraphs[1] =~ /fwhits/) {&Graphs::updatefwhitsgraph("hour");&Graphs::updatefwhitsgraph("week");&Graphs::updatefwhitsgraph("month");&Graphs::updatefwhitsgraph("year");}
elsif ($cgigraphs[1] =~ /green/ || $cgigraphs[1] =~ /blue/ || $cgigraphs[1] =~ /ipsec/ || $cgigraphs[1] =~ /tun/ || $cgigraphs[1] =~ /orange/ || $cgigraphs[1] =~ /ppp/ || $cgigraphs[1] =~ /red/ ) {&Graphs::updateifgraph($cgigraphs[1], "hour");&Graphs::updateifgraph($cgigraphs[1], "week");&Graphs::updateifgraph($cgigraphs[1], "month");&Graphs::updateifgraph($cgigraphs[1], "year");}
if ($cgigraphs[1] =~ /(network|green|blue|orange|red|ppp|ipsec|tun)/ || $cgigraphs[2] ne "") {
&Header::openpage($Lang::tr{'network traffic graphs'}, 1, '');
} else {
&Header::openpage($Lang::tr{'system graphs'}, 1, '');
}
&Header::openbigbox('100%', 'left');
if ($cgigraphs[1] =~ /wireless/){
my $graphname = $cgigraphs[2];
&Header::openbox('100%', 'center', "wireless $graphname $Lang::tr{'graph'}");
if (-e "$graphdir/wireless-${graphname}-day.png") {
my $ftime = localtime((stat("$graphdir/wireless-${graphname}-day.png"))[9]);
print "<center>";
print "<b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br /><hr />\n";
print "<img alt='' src='/graphs/wireless-${graphname}-hour.png' border='0' /><hr />";
print "<img alt='' src='/graphs/wireless-${graphname}-day.png' border='0' /><hr />";
print "<img alt='' src='/graphs/wireless-${graphname}-week.png' border='0' /><hr />";
print "<img alt='' src='/graphs/wireless-${graphname}-month.png' border='0' /><hr />";
print "<img alt='' src='/graphs/wireless-${graphname}-year.png' border='0' />";
} else {
print $Lang::tr{'no information available'};
}
&Header::closebox();
}
elsif ($cgigraphs[1] =~ /(green|blue|orange|red|ppp|ipsec|tun|cpu|memory|swap|disk|load|fwhits|processes)/ || $cgigraphs[2] ne "") {
my $graph = $cgigraphs[1];
my $graphname = ucfirst(lc($cgigraphs[1]));
&Header::openbox('100%', 'center', "$graphname $Lang::tr{'graph'}");
if (-e "$graphdir/${graph}-day.png") {
my $ftime = localtime((stat("$graphdir/${graph}-day.png"))[9]);
print "<center>";
print "<b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br /><hr />\n";
print "<img alt='' src='/graphs/${graph}-hour.png' border='0' /><hr />";
print "<img alt='' src='/graphs/${graph}-day.png' border='0' /><hr />";
print "<img alt='' src='/graphs/${graph}-week.png' border='0' /><hr />";
print "<img alt='' src='/graphs/${graph}-month.png' border='0' /><hr />";
print "<img alt='' src='/graphs/${graph}-year.png' border='0' />";
} else {
print $Lang::tr{'no information available'};
}
&Header::closebox();
} elsif ($cgigraphs[1] =~ /network/) {
push (@graphs, ('GREEN'));
if ($netsettings{'BLUE_DEV'}) {
push (@graphs, ('BLUE')); }
if ($netsettings{'ORANGE_DEV'}) {
push (@graphs, ('ORANGE')); }
push (@graphs, ("RED"));
push (@graphs, ('gateway'));
foreach my $graphname (@graphs) {
&Header::openbox('100%', 'center', "$graphname $Lang::tr{'graph'}");
if (-e "$graphdir/${graphname}-day.png") {
my $ftime = localtime((stat("$graphdir/${graphname}-day.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<a href='/cgi-bin/graphs.cgi?graph=$graphname'>";
print "<img alt='' src='/graphs/${graphname}-day.png' border='0' />";
print "</a>";
} else {
print $Lang::tr{'no information available'};
}
print "<br />\n";
&Header::closebox();
}
}
print "<div align='center'><table width='80%'><tr><td align='center'>";
if ( $cgigraphs[1] eq "cpu" || $cgigraphs[1] eq "cpufreq" || $cgigraphs[1] eq "load" ) { print "<a href='/cgi-bin/system.cgi'>"; }
elsif ( $cgigraphs[1] eq "memory" || $cgigraphs[1] eq "swap" ) { print "<a href='/cgi-bin/memory.cgi'>"; }
elsif ( $cgigraphs[1] eq "processes" ) { print "<a href='/cgi-bin/services.cgi'>"; }
elsif ( $cgigraphs[1] =~ /disk/ ) { print "<a href='/cgi-bin/media.cgi'>"; }
elsif ( $cgigraphs[1] =~ /red/ || $cgigraphs[1] =~ /ppp/ || $cgigraphs[1] =~ /ipsec/ || $cgigraphs[1] =~ /tun/) { print "<a href='/cgi-bin/network.cgi?network=red'>"; }
elsif ( $cgigraphs[1] =~ /green/ || $cgigraphs[1] =~ /blue/ || $cgigraphs[1] =~ /orange/ || $cgigraphs[1] =~ /wireless/ ) { print "<a href='/cgi-bin/network.cgi?network=internal'>"; }
elsif ( $cgigraphs[1] eq "fwhits" || $cgigraphs[2] ne "" ) { print "<a href='/cgi-bin/network.cgi?network=other'>"; }
print "$Lang::tr{'back'}</a></td></tr></table></div>\n";
&Header::closebigbox();
&Header::closepage();

276
html/cgi-bin/hardwaregraphs.cgi
View File

@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2008 Michael Tremer & Christian Schmidt #
# #
# 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 #
@@ -30,23 +30,16 @@ require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
require "${General::swroot}/graphs.pl";
my %color = ();
my %mainsettings = ();
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
my %sensorsettings = ();
my %cgiparams=();
my @cgigraphs=();
my $rrdlog = "/var/log/rrd";
&Header::showhttpheaders();
my $graphdir = "/srv/web/ipfire/html/graphs";
$ENV{'QUERY_STRING'} =~ s/&//g;
@cgigraphs = split(/graph=/,$ENV{'QUERY_STRING'});
$cgigraphs[1] = '' unless defined $cgigraphs[1];
my @sensorsgraphs = ();
my @sensorsdir = `ls -dA $rrdlog/collectd/localhost/sensors-*/`;
foreach (@sensorsdir)
{
my @sensorsdir = `ls -dA $mainsettings{'RRDLOG'}/collectd/localhost/sensors-*/`;
foreach (@sensorsdir){
chomp($_);chop($_);
foreach (`ls $_/*`){
chomp($_);
@@ -54,167 +47,106 @@ foreach (@sensorsdir)
}
}
&Header::getcgihash(\%sensorsettings);
my @querry = split(/\?/,$ENV{'QUERY_STRING'});
$querry[0] = '' unless defined $querry[0];
$querry[1] = 'hour' unless defined $querry[1];
if ( $sensorsettings{'ACTION'} eq $Lang::tr{'save'} ) {
foreach(@sensorsgraphs){
chomp($_);
if ( $querry[0] =~ "hwtemp"){
print "Content-type: image/png\n\n";
binmode(STDOUT);
&Graphs::updatehwtempgraph($querry[1]);
}elsif ( $querry[0] =~ "hwfan"){
print "Content-type: image/png\n\n";
binmode(STDOUT);
&Graphs::updatehwfangraph($querry[1]);
}elsif ( $querry[0] =~ "hwvolt"){
print "Content-type: image/png\n\n";
binmode(STDOUT);
&Graphs::updatehwvoltgraph($querry[1]);
}elsif ( $querry[0] =~ "sd?" || $querry[0] =~ "hd?" ){
print "Content-type: image/png\n\n";
binmode(STDOUT);
&Graphs::updatehddgraph($querry[0],$querry[1]);
}else{
&Header::showhttpheaders();
&Header::openpage($Lang::tr{'harddisk temperature graphs'}, 1, '');
&Header::openbigbox('100%', 'left');
&Header::getcgihash(\%sensorsettings);
if ( $sensorsettings{'ACTION'} eq $Lang::tr{'save'} ) {
foreach(@sensorsgraphs){
chomp($_);
$_ =~ /\/(.*)sensors-(.*)\/(.*)\.rrd/;
my $label = $2.$3;$label=~ s/-//g;
if ( $sensorsettings{'LINE-'.$label} ne "on" ){$sensorsettings{'LINE-'.$label} = 'off';}
elsif ( $sensorsettings{'LINE-'.$label} eq "on" ){$sensorsettings{'LINE-'.$label} = 'checked';}
}
&General::writehash("${General::swroot}/sensors/settings", \%sensorsettings);
}
my @disks = `kudzu -qps -c HD | grep device: | cut -d" " -f2 | sort | uniq`;
foreach (@disks){
my $disk = $_;
chomp $disk;
my @array = split(/\//,$disk);
&Header::openbox('100%', 'center', "$array[$#array] $Lang::tr{'graph'}");
&Graphs::makegraphbox("hardwaregraphs.cgi",$array[$#array],"day");
&Header::closebox();
}
&Header::openbox('100%', 'center', "hwtemp $Lang::tr{'graph'}");
&Graphs::makegraphbox("hardwaregraphs.cgi","hwtemp","day");
&Header::closebox();
&Header::openbox('100%', 'center', "hwfan $Lang::tr{'graph'}");
&Graphs::makegraphbox("hardwaregraphs.cgi","hwfan","day");
&Header::closebox();
&Header::openbox('100%', 'center', "hwvolt $Lang::tr{'graph'}");
&Graphs::makegraphbox("hardwaregraphs.cgi","hwvolt","day","375");
&Header::closebox();
sensorsbox();
&Header::closebigbox();
&Header::closepage();
}
sub sensorsbox {
&Header::openbox('100%', 'center', "$Lang::tr{'mbmon settings'}");
print <<END
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<table width='100%' border='0' cellspacing='5' cellpadding='0' align='center'>
<tr>
<td align='right' width='40%'><b>$Lang::tr{'mbmon display'}</b></td>
<td align='left'><b>$Lang::tr{'mbmon label'}</b></td>
</tr>
END
;
foreach (@sensorsgraphs){
$_ =~ /\/(.*)sensors-(.*)\/(.*)\.rrd/;
my $label = $2.$3;$label=~ s/-//g;
if ( $sensorsettings{'LINE-'.$label} ne "on" ){$sensorsettings{'LINE-'.$label} = 'off';}
elsif ( $sensorsettings{'LINE-'.$label} eq "on" ){$sensorsettings{'LINE-'.$label} = 'checked';}
$sensorsettings{'LABEL-'.$label}="$label";
$sensorsettings{'LINE-'.$label}="checked";
&General::readhash("${General::swroot}/sensors/settings", \%sensorsettings);
print("<tr><td align='right'><input type='checkbox' name='LINE-$label' $sensorsettings{'LINE-'.$label} /></td>");
print("<td><input type='text' name='LABEL-$label' value='$sensorsettings{'LABEL-'.$label}' size='25' /></td></tr>\n");
}
&General::writehash("${General::swroot}/sensors/settings", \%sensorsettings);
}
my @disks = `kudzu -qps -c HD | grep device: | cut -d" " -f2 | sort | uniq`;
&Header::openpage($Lang::tr{'harddisk temperature graphs'}, 1, '');
&Header::openbigbox('100%', 'left');
if ($cgigraphs[1] =~ /hwtemp/) {&Graphs::updatehwtempgraph ("hour");&Graphs::updatehwtempgraph ("week");&Graphs::updatehwtempgraph ("month");&Graphs::updatehwtempgraph ("year");graphbox("hwtemp");}
elsif ($cgigraphs[1] =~ /hwfan/) {&Graphs::updatehwfangraph ("hour");&Graphs::updatehwfangraph ("week");&Graphs::updatehwfangraph ("month");&Graphs::updatehwfangraph ("year");graphbox("hwfan");}
elsif ($cgigraphs[1] =~ /hwvolt/) {&Graphs::updatehwvoltgraph ("hour");&Graphs::updatehwvoltgraph ("week");&Graphs::updatehwvoltgraph ("month");&Graphs::updatehwvoltgraph ("year");graphbox("hwvolt");}
elsif ($cgigraphs[1] =~ /hddtemp/) {
foreach (@disks){
my $disk = $_;
chomp $disk;
my @array = split(/\//,$disk);
&Graphs::updatehddgraph ($array[$#array],"week");&Graphs::updatehddgraph ($array[$#array],"month");&Graphs::updatehddgraph ($array[$#array],"year");
hddtempbox($array[$#array]);
}
}
else
{
&Graphs::updatehwtempgraph ("day");&Graphs::updatehwfangraph ("day");&Graphs::updatehwvoltgraph ("day");
foreach (@disks){
my $disk = $_;
chomp $disk;
my @array = split(/\//,$disk);
&Graphs::updatehddgraph ($array[$#array],"day");
if (-e "$graphdir/hddtemp-$disk-day.png") {
&Header::openbox('100%', 'center', "Disk $disk $Lang::tr{'graph'}");
my $ftime = localtime((stat("$graphdir/hddtemp-$disk-day.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<a href='/cgi-bin/hardwaregraphs.cgi?graph=hddtemp'>";
print "<img src='/graphs/hddtemp-$disk-day.png' border='0' />";
print "</a>";
print "<br />\n";
&Header::closebox();
}
}
my @graphs = ("hwtemp","hwfan","hwvolt");
foreach (@graphs){
&Header::openbox('100%', 'center', "$_ $Lang::tr{'graph'}");
if (-e "$graphdir/sensors-$_-day.png"){
my $ftime = localtime((stat("$graphdir/sensors-$_-day.png"))[9]);
print "<center>";
print "<b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<a href='/cgi-bin/hardwaregraphs.cgi?graph=$_'>";
print "<img src='/graphs/sensors-$_-day.png' border='0' />";
print "</a><hr />";
}
else{print $Lang::tr{'no information available'};}
print <<END
<tr>
<td align='center' colspan='2' ><input type='submit' name='ACTION' value=$Lang::tr{'save'} /></td>
</tr>
</table>
</form>
END
;
&Header::closebox();
}
sensorsbox();
}
&Header::closebigbox();
&Header::closepage();
sub hddtempbox {
my $disk = $_[0];
if (-e "$graphdir/hddtemp-$disk-week.png") {
&Header::openbox('100%', 'center', "Disk $disk $Lang::tr{'graph'}");
my $ftime = localtime((stat("$graphdir/hddtemp-$disk-week.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<img src='/graphs/hddtemp-$disk-week.png' border='0' />";
print "<br />\n";
&Header::closebox();
}
if (-e "$graphdir/hddtemp-$disk-month.png") {
&Header::openbox('100%', 'center', "Disk $disk $Lang::tr{'graph'}");
my $ftime = localtime((stat("$graphdir/hddtemp-$disk-month.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<img src='/graphs/hddtemp-$disk-month.png' border='0' />";
print "<br />\n";
&Header::closebox();
}
if (-e "$graphdir/hddtemp-$disk-year.png") {
&Header::openbox('100%', 'center', "Disk $disk $Lang::tr{'graph'}");
my $ftime = localtime((stat("$graphdir/hddtemp-$disk-year.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<img src='/graphs/hddtemp-$disk-year.png' border='0' />";
print "<br />\n";
&Header::closebox();
}
}
sub graphbox {
my $graph = $_[0];
&Header::openbox('100%', 'center', "$graph $Lang::tr{'graph'}");
if (-e "$graphdir/sensors-$graph-week.png"){
my $ftime = localtime((stat("$graphdir/sensors-$graph-week.png"))[9]);
print "<center>";
print "<b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<img src='/graphs/sensors-$graph-week.png' border='0' /><hr />";
}
else{print $Lang::tr{'no information available'};}
&Header::closebox();
&Header::openbox('100%', 'center', "$graph $Lang::tr{'graph'}");
if (-e "$graphdir/sensors-$graph-month.png"){
my $ftime = localtime((stat("$graphdir/sensors-$graph-month.png"))[9]);
print "<center>";
print "<b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<img src='/graphs/sensors-$graph-month.png' border='0' /><hr />";
}
else{print $Lang::tr{'no information available'};}
&Header::closebox();
&Header::openbox('100%', 'center', "$graph $Lang::tr{'graph'}");
if (-e "$graphdir/sensors-$graph-year.png"){
my $ftime = localtime((stat("$graphdir/sensors-$graph-year.png"))[9]);
print "<center>";
print "<b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<img src='/graphs/sensors-$graph-year.png' border='0' /><hr />";
}
else{print $Lang::tr{'no information available'};}
&Header::closebox();
}
sub sensorsbox{
&Header::openbox('100%', 'center', "$Lang::tr{'mbmon settings'}");
if ( $cgiparams{'ACTION'} eq $Lang::tr{'save'} ){print "Test";}
print <<END
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<table width='100%' border='0' cellspacing='5' cellpadding='0' align='center'>
<tr><td align='right' width='40%'><b>$Lang::tr{'mbmon display'}</b></td>
<td align='left'><b>$Lang::tr{'mbmon label'}</b></td>
</tr>
END
;
foreach (@sensorsgraphs){
$_ =~ /\/(.*)sensors-(.*)\/(.*)\.rrd/;
my $label = $2.$3;$label=~ s/-//g;
$sensorsettings{'LABEL-'.$label}="$label";
$sensorsettings{'LINE-'.$label}="checked";
&General::readhash("${General::swroot}/sensors/settings", \%sensorsettings);
print("<tr><td align='right'><input type='checkbox' name='LINE-$label' $sensorsettings{'LINE-'.$label} /></td>");
print("<td><input type='text' name='LABEL-$label' value='$sensorsettings{'LABEL-'.$label}' size='25' /></td></tr>\n");
}
print <<END
<tr><td align='center' colspan='2' ><input type='submit' name='ACTION' value=$Lang::tr{'save'} /></td></tr>
</table>
</form>
END
;
&Header::closebox();
}

4
html/cgi-bin/ids.cgi
View File

@@ -114,7 +114,7 @@ if (-e "/etc/snort/snort.conf") {
if ($snortsettings{'ACTION'} eq $Lang::tr{'save'}) {
# Check for preprocessor settings
if ($line =~ /preprocessor http_inspect:/) {
if ($line =~ /preprocessor http_inspect/) {
# Strip out leading # from rule line
$line =~ s/\# ?//i;
if (($snortsettings{'ENABLE_PREPROCESSOR_HTTP_INSPECT'} eq 'off')) {
@@ -459,7 +459,7 @@ print <<END
<td><b>$Lang::tr{'ids preprocessor'}</b></td>
</tr>
<tr>
<td><input type='checkbox' name='ENABLE_PREPROCESSOR_HTTP_INSPECT' $checked{'ENABLE_PREPROCESSOR_HTTP_INSPECT'}{'on'} /> http_inspect
<td><input type='checkbox' name='ENABLE_PREPROCESSOR_HTTP_INSPECT' $checked{'ENABLE_PREPROCESSOR_HTTP_INSPECT'}{'on'} /> http_inspect $Lang::tr{'active'}
<tr>
<td><hr /></td>
</tr>

199
html/cgi-bin/media.cgi
View File

@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2008 Michael Tremer & Christian Schmidt #
# #
# 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 #
@@ -30,38 +30,50 @@ require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
require "${General::swroot}/graphs.pl";
my %color = ();
my %mainsettings = ();
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
#workaround to suppress a warning when a variable is used only once
my @dummy = ( ${Header::colourred} );
undef (@dummy);
my %cgiparams=();
&Header::showhttpheaders();
&Header::getcgihash(\%cgiparams);
&Header::openpage($Lang::tr{'media information'}, 1, '');
&Header::openbigbox('100%', 'left');
my @querry = split(/\?/,$ENV{'QUERY_STRING'});
$querry[0] = '' unless defined $querry[0];
$querry[1] = 'hour' unless defined $querry[1];
my @devices = `kudzu -qps -c HD | grep device: | cut -d" " -f2 | sort | uniq`;
foreach (@devices) {
my $device = $_;
chomp($device);
my @array = split(/\//,$device);
&Graphs::updatediskgraph ("day",$array[$#array]);
diskbox($array[$#array]);
}
if ( $querry[0] =~ "sd?" || $querry[0] =~ "hd?" ){
print "Content-type: image/png\n\n";
binmode(STDOUT);
&Graphs::updatediskgraph($querry[0],$querry[1]);
}else{
&Header::showhttpheaders();
&Header::openpage($Lang::tr{'media information'}, 1, '');
&Header::openbigbox('100%', 'left');
&Header::openbox('100%', 'center', $Lang::tr{'disk usage'});
print "<table width='95%' cellspacing='5'>\n";
open(DF,'/bin/df -B M -x rootfs|');
while(<DF>)
{
if ($_ =~ m/^Filesystem/ )
{
print <<END
foreach (@devices) {
my $device = $_;
chomp($device);
my @array = split(/\//,$device);
&Header::openbox('100%', 'center', "$array[$#array] $Lang::tr{'graph'}");
diskbox($array[$#array]);
&Graphs::makegraphbox("media.cgi",$array[$#array],"day");
&Header::closebox();
}
&Header::openbox('100%', 'center', $Lang::tr{'disk usage'});
print "<table width='95%' cellspacing='5'>\n";
open(DF,'/bin/df -B M -x rootfs|');
while(<DF>){
if ($_ =~ m/^Filesystem/ ){
print <<END
<tr>
<td align='center' class='boldbase'><b>$Lang::tr{'device'}</b></td>
<td align='center' class='boldbase'><b>$Lang::tr{'mounted on'}</b></td>
@@ -72,11 +84,9 @@ while(<DF>)
</tr>
END
;
}
else
{
my ($device,$size,$used,$free,$percent,$mount) = split;
print <<END
}else{
my ($device,$size,$used,$free,$percent,$mount) = split;
print <<END
<tr>
<td align='center'>$device</td>
<td align='center'>$mount</td>
@@ -86,24 +96,22 @@ END
<td align='left'>
END
;
&percentbar($percent);
print <<END
&percentbar($percent);
print <<END
</td>
<td align='left'>$percent</td>
</tr>
END
;
}
}
close DF;
print "<tr><td colspan='7'>&nbsp;\n<tr><td colspan='7'><h3>Inodes</h3>\n";
}
}
close DF;
print "<tr><td colspan='7'>&nbsp;\n<tr><td colspan='7'><h3>Inodes</h3>\n";
open(DF,'/bin/df -i -x rootfs|');
while(<DF>)
{
if ($_ =~ m/^Filesystem/ )
{
print <<END
open(DF,'/bin/df -i -x rootfs|');
while(<DF>){
if ($_ =~ m/^Filesystem/ ){
print <<END
<tr>
<td align='center' class='boldbase'><b>$Lang::tr{'device'}</b></td>
<td align='center' class='boldbase'><b>$Lang::tr{'mounted on'}</b></td>
@@ -114,11 +122,9 @@ while(<DF>)
</tr>
END
;
}
else
{
my ($device,$size,$used,$free,$percent,$mount) = split;
print <<END
}else{
my ($device,$size,$used,$free,$percent,$mount) = split;
print <<END
<tr>
<td align='center'>$device</td>
<td align='center'>$mount</td>
@@ -128,33 +134,35 @@ END
<td>
END
;
&percentbar($percent);
print <<END
&percentbar($percent);
print <<END
</td>
<td align='left'>$percent</td>
</tr>
END
;
}
}
}
close DF;
my @iostat1 = qx(/usr/bin/iostat -dm -p | grep -v "Linux" | awk '{print \$1}');
my @iostat2 = qx(/usr/bin/iostat -dm -p | grep -v "Linux" | awk '{print \$5}');
my @iostat3 = qx(/usr/bin/iostat -dm -p | grep -v "Linux" | awk '{print \$6}');
print "<tr><td colspan='3'>&nbsp;\n<tr><td colspan='3'><h3>transfers</h3></td></tr>";
my $i=0;
for(my $i = 1; $i <= $#iostat1; $i++){
if ( $i eq '1' ){
print "<tr><td align='center' class='boldbase'><b>Device</b></td><td align='center' class='boldbase'><b>MB read</b></td><td align='center' class='boldbase'><b>MB writen</b></td></tr>";
}else{
print "<tr><td align='center'>$iostat1[$i]</td><td align='center'>$iostat2[$i]</td><td align='center'>$iostat3[$i]</td></tr>";
}
}
print "</table>\n";
&Header::closebox();
&Header::closebigbox();
&Header::closepage();
}
close DF;
my @iostat1 = qx(/usr/bin/iostat -dm -p | grep -v "Linux" | awk '{print \$1}');
my @iostat2 = qx(/usr/bin/iostat -dm -p | grep -v "Linux" | awk '{print \$5}');
my @iostat3 = qx(/usr/bin/iostat -dm -p | grep -v "Linux" | awk '{print \$6}');
print "<tr><td colspan='3'>&nbsp;\n<tr><td colspan='3'><h3>transfers</h3></td></tr>";
my $i=0;
for(my $i = 1; $i <= $#iostat1; $i++)
{
if ( $i eq '1' ){print "<tr><td align='center' class='boldbase'><b>Device</b></td><td align='center' class='boldbase'><b>MB read</b></td><td align='center' class='boldbase'><b>MB writen</b></td></tr>";}
else {print "<tr><td align='center'>$iostat1[$i]</td><td align='center'>$iostat2[$i]</td><td align='center'>$iostat3[$i]</td></tr>";}
}
print "</table>\n";
&Header::closebox();
&Header::closebigbox();
&Header::closepage();
sub percentbar
{
@@ -184,44 +192,33 @@ END
}
sub diskbox {
my $disk = $_[0];
chomp $disk;
my @status;
if (-e "$Header::graphdir/disk-$disk-day.png") {
&Header::openbox('100%', 'center', "Disk $disk $Lang::tr{'graph'}");
my $ftime = localtime((stat("$Header::graphdir/disk-$disk-day.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<a href='/cgi-bin/graphs.cgi?graph=disk-$disk'>";
print "<img alt='' src='/graphs/disk-$disk-day.png' border='0' />";
print "</a>";
print "<br />\n";
my $disk = $_[0];
chomp $disk;
my @status;
if (-e "/tmp/hddstatus"){
open(DATEI, "</tmp/hddstatus") || die "Datei nicht gefunden";
my @diskstate = <DATEI>;
close(DATEI);
if (-e "/tmp/hddstatus") {
open(DATEI, "</tmp/hddstatus") || die "Datei nicht gefunden";
my @diskstate = <DATEI>;
close(DATEI);
foreach (@diskstate){
if ( $_ =~/$disk/ ){@status = split(/-/,$_);}
}
foreach (@diskstate){
if ( $_ =~/$disk/ ){@status = split(/-/,$_);}
}
if ( $status[1]=~/standby/){
my $ftime = localtime((stat("/tmp/hddshutdown-$disk"))[9]);
print"<B>Disk $disk status:<font color=#FF0000>".$status[1]."</font></B> (since $ftime)";
}else{
print"<B>Disk $disk status:<font color=#00FF00>".$status[1]."</font></B>";
}
}
if ( $status[1]=~/standby/){
my $ftime = localtime((stat("/tmp/hddshutdown-$disk"))[9]);
print"<B>Disk $disk status:<font color=#FF0000>".$status[1]."</font></B> (since $ftime)";
}
else{
print"<B>Disk $disk status:<font color=#00FF00>".$status[1]."</font></B>";
}
}
my $smart = `/usr/local/bin/smartctrl $disk`;
$smart = &Header::cleanhtml($smart);
print <<END
<br /><input type="button" onClick="swapVisibility('smart_$disk')" value="$Lang::tr{'smart information'}" />
<div id='smart_$disk' style='display: none'>
<hr /><table border=0><tr><td align=left><pre>$smart</pre></table>
</div>
my $smart = `/usr/local/bin/smartctrl $disk`;
$smart = &Header::cleanhtml($smart);
print <<END
<br /><input type="button" onClick="swapVisibility('smart_$disk')" value="$Lang::tr{'smart information'}" />
<div id='smart_$disk' style='display: none'>
<hr /><table border=0><tr><td align=left><pre>$smart</pre></table>
</div>
END
;
&Header::closebox();
}
}

179
html/cgi-bin/memory.cgi
View File

@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2008 Michael Tremer & Christian Schmidt #
# #
# 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 #
@@ -30,57 +30,51 @@ require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
require "${General::swroot}/graphs.pl";
my %cgiparams=();
my %color = ();
my %mainsettings = ();
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
&Graphs::updatememgraph ("day");
my @querry = split(/\?/,$ENV{'QUERY_STRING'});
$querry[0] = '' unless defined $querry[0];
$querry[1] = 'hour' unless defined $querry[1];
&Header::showhttpheaders();
&Header::getcgihash(\%cgiparams);
&Header::openpage($Lang::tr{'memory information'}, 1, '');
&Header::openbigbox('100%', 'left');
if ( $querry[0] =~ "memory"){
print "Content-type: image/png\n\n";
binmode(STDOUT);
&Graphs::updatememorygraph($querry[1]);
}elsif ( $querry[0] =~ "swap"){
print "Content-type: image/png\n\n";
binmode(STDOUT);
&Graphs::updateswapgraph($querry[1]);
}else{
&Header::showhttpheaders();
&Header::openpage($Lang::tr{'memory information'}, 1, '');
&Header::openbigbox('100%', 'left');
&Header::openbox('100%', 'center', "Memory $Lang::tr{'graph'}");
if (-e "$Header::graphdir/memory-day.png") {
my $ftime = localtime((stat("$Header::graphdir/memory-day.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<a href='/cgi-bin/graphs.cgi?graph=memory'>";
print "<img alt='' src='/graphs/memory-day.png' border='0' />";
print "</a>";
} else {
print $Lang::tr{'no information available'};
}
print "<br />\n";
&Header::closebox();
&Header::openbox('100%', 'center', "Memory $Lang::tr{'graph'}");
&Graphs::makegraphbox("memory.cgi","memory","day");
&Header::closebox();
&Header::openbox('100%', 'center', "Swap $Lang::tr{'graph'}");
if (-e "$Header::graphdir/swap-day.png") {
my $ftime = localtime((stat("$Header::graphdir/swap-day.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<a href='/cgi-bin/graphs.cgi?graph=swap'>";
print "<img alt='' src='/graphs/swap-day.png' border='0' />";
print "</a>";
} else {
print $Lang::tr{'no information available'};
}
print "<br />\n";
&Header::closebox();
&Header::openbox('100%', 'center', "Swap $Lang::tr{'graph'}");
&Graphs::makegraphbox("memory.cgi","swap","day");
&Header::closebox();
&Header::openbox('100%', 'center', $Lang::tr{'memory'});
print "<table width='95%' cellspacing='5'>";
my $ram=0;
my $size=0;
my $used=0;
my $free=0;
my $percent=0;
my $shared=0;
my $buffers=0;
my $cached=0;
&Header::openbox('100%', 'center', $Lang::tr{'memory'});
print "<table width='95%' cellspacing='5'>";
my $ram=0;
my $size=0;
my $used=0;
my $free=0;
my $percent=0;
my $shared=0;
my $buffers=0;
my $cached=0;
open(FREE,'/usr/bin/free |');
while(<FREE>)
{
if ($_ =~ m/^\s+total\s+used\s+free\s+shared\s+buffers\s+cached$/ )
{
print <<END
open(FREE,'/usr/bin/free |');
while(<FREE>){
if ($_ =~ m/^\s+total\s+used\s+free\s+shared\s+buffers\s+cached$/ ){
print <<END
<tr>
<td align='center'>&nbsp;</td>
<td align='center' class='boldbase'><b>$Lang::tr{'size'}</b></td>
@@ -90,52 +84,51 @@ while(<FREE>)
</tr>
END
;
} else {
if ($_ =~ m/^Mem:\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)$/) {
($ram,$size,$used,$free,$shared,$buffers,$cached) = ($1,$1,$2,$3,$4,$5,$6);
($percent = ($used/$size)*100) =~ s/^(\d+)(\.\d+)?$/$1%/;
print <<END
}else{
if ($_ =~ m/^Mem:\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)$/){
($ram,$size,$used,$free,$shared,$buffers,$cached) = ($1,$1,$2,$3,$4,$5,$6);
($percent = ($used/$size)*100) =~ s/^(\d+)(\.\d+)?$/$1%/;
print <<END
<tr>
<td class='boldbase'><b>$Lang::tr{'ram'}</b></td>
<td align='center'>$size KB</td>
END
;
} elsif ($_ =~ m/^Swap:\s+(\d+)\s+(\d+)\s+(\d+)$/) {
($size,$used,$free) = ($1,$2,$3);
if ($size != 0)
{
($percent = ($used/$size)*100) =~ s/^(\d+)(\.\d+)?$/$1%/;
} else {
($percent = '');
}
print <<END
}elsif($_ =~ m/^Swap:\s+(\d+)\s+(\d+)\s+(\d+)$/){
($size,$used,$free) = ($1,$2,$3);
if ($size != 0){
($percent = ($used/$size)*100) =~ s/^(\d+)(\.\d+)?$/$1%/;
}else{
($percent = '');
}
print <<END
<tr>
<td class='boldbase'><b>$Lang::tr{'swap'}</b></td>
<td align='center'>$size KB</td>
END
;
} elsif ($ram and $_ =~ m/^-\/\+ buffers\/cache:\s+(\d+)\s+(\d+)$/ ) {
($used,$free) = ($1,$2);
($percent = ($used/$ram)*100) =~ s/^(\d+)(\.\d+)?$/$1%/;
print "<tr><td colspan='2' class='boldbase'><b>$Lang::tr{'excluding buffers and cache'}</b></td>"
}
print <<END
}elsif($ram and $_ =~ m/^-\/\+ buffers\/cache:\s+(\d+)\s+(\d+)$/ ){
($used,$free) = ($1,$2);
($percent = ($used/$ram)*100) =~ s/^(\d+)(\.\d+)?$/$1%/;
print "<tr><td colspan='2' class='boldbase'><b>$Lang::tr{'excluding buffers and cache'}</b></td>";
}
print <<END
<td align='center'>$used KB</td>
<td align='center'>$free KB</td>
<td>
END
;
&percentbar($percent);
print <<END
&percentbar($percent);
print <<END
</td>
<td align='left'>$percent</td>
</tr>
END
;
}
}
close FREE;
print <<END
}
}
close FREE;
print <<END
<tr><td class='boldbase' colspan='2'><br /></td></tr>
<tr><td class='boldbase'><b>$Lang::tr{'shared'}</b></td><td align='center'>$shared KB</td></tr>
<tr><td class='boldbase'><b>$Lang::tr{'buffers'}</b></td><td align='center'>$buffers KB</td></tr>
@@ -143,35 +136,33 @@ print <<END
</table>
END
;
&Header::closebox();
&Header::closebox();
&Header::closebigbox();
&Header::closebigbox();
&Header::closepage();
}
&Header::closepage();
sub percentbar{
my $percent = $_[0];
my $fg = '#a0a0a0';
my $bg = '#e2e2e2';
sub percentbar
{
my $percent = $_[0];
my $fg = '#a0a0a0';
my $bg = '#e2e2e2';
if ($percent =~ m/^(\d+)%$/ )
{
print <<END
if ($percent =~ m/^(\d+)%$/ ){
print <<END
<table width='100' border='1' cellspacing='0' cellpadding='0' style='border-width:1px;border-style:solid;border-color:$fg;width:100px;height:10px;'>
<tr>
END
;
if ($percent eq "100%") {
print "<td width='100%' bgcolor='$fg' style='background-color:$fg;border-style:solid;border-width:1px;border-color:$bg'>"
} elsif ($percent eq "0%") {
print "<td width='100%' bgcolor='$bg' style='background-color:$bg;border-style:solid;border-width:1px;border-color:$bg'>"
} else {
print "<td width='$percent' bgcolor='$fg' style='background-color:$fg;border-style:solid;border-width:1px;border-color:$bg'></td><td width='" . (100-$1) . "%' bgcolor='$bg' style='background-color:$bg;border-style:solid;border-width:1px;border-color:$bg'>"
}
print <<END
if ($percent eq "100%"){
print "<td width='100%' bgcolor='$fg' style='background-color:$fg;border-style:solid;border-width:1px;border-color:$bg'>";
}elsif($percent eq "0%"){
print "<td width='100%' bgcolor='$bg' style='background-color:$bg;border-style:solid;border-width:1px;border-color:$bg'>";
}else{
print "<td width='$percent' bgcolor='$fg' style='background-color:$fg;border-style:solid;border-width:1px;border-color:$bg'></td><td width='" . (100-$1) . "%' bgcolor='$bg' style='background-color:$bg;border-style:solid;border-width:1px;border-color:$bg'>";
}
print <<END
<img src='/images/null.gif' width='1' height='1' alt='' /></td></tr></table>
END
;
}
}
}

169
html/cgi-bin/netexternal.cgi Executable file
View File

@@ -0,0 +1,169 @@
#!/usr/bin/perl
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2008 Michael Tremer & Christian Schmidt #
# #
# 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 #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program 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 program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
use strict;
# enable only the following on debugging purpose
#use warnings;
#use CGI::Carp 'fatalsToBrowser';
require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
require "${General::swroot}/graphs.pl";
my %color = ();
my %mainsettings = ();
my %netsettings=();
&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
my @graphs=();
my %dhcpinfo=();
my @querry = split(/\?/,$ENV{'QUERY_STRING'});
$querry[0] = '' unless defined $querry[0];
$querry[1] = 'hour' unless defined $querry[1];
if ( $querry[0] ne~ ""){
print "Content-type: image/png\n\n";
binmode(STDOUT);
&Graphs::updateifgraph($querry[0],$querry[1]);
}else{
&Header::showhttpheaders();
&Header::openpage($Lang::tr{'network traffic graphs external'}, 1, '');
&Header::openbigbox('100%', 'left');
if ($netsettings{'RED_TYPE'} ne 'PPPOE'){
if ($netsettings{'RED_DEV'} ne $netsettings{'GREEN_DEV'}){
push (@graphs, ($netsettings{'RED_DEV'}));
}
}else{
push (@graphs, "ppp0");
}
if (-e "/var/log/rrd/collectd/localhost/interface/if_octets-ipsec0.rrd"){
push (@graphs, ("ipsec0"));
}
if (-e "/var/log/rrd/collectd/localhost/interface/if_octets-tun0.rrd"){
push (@graphs, ("tun0"));
}
foreach (@graphs) {
&Header::openbox('100%', 'center', "$_ $Lang::tr{'graph'}");
&Graphs::makegraphbox("netexternal.cgi",$_,"day");
&Header::closebox();
}
if ( $netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ && $netsettings{'RED_TYPE'} eq "DHCP"){
&Header::openbox('100%', 'left', "RED $Lang::tr{'dhcp configuration'}");
if (-s "${General::swroot}/dhcpc/dhcpcd-$netsettings{'RED_DEV'}.info") {
&General::readhash("${General::swroot}/dhcpc/dhcpcd-$netsettings{'RED_DEV'}.info", \%dhcpinfo);
my $DNS1=`echo $dhcpinfo{'DNS'} | cut -f 1 -d ,`;
my $DNS2=`echo $dhcpinfo{'DNS'} | cut -f 2 -d ,`;
my $lsetme=0;
my $leasetime="";
if ($dhcpinfo{'LEASETIME'} ne "") {
$lsetme=$dhcpinfo{'LEASETIME'};
$lsetme=($lsetme/60);
if ($lsetme > 59) {
$lsetme=($lsetme/60); $leasetime=$lsetme." Hour";
}else{
$leasetime=$lsetme." Minute";
}
if ($lsetme > 1) {
$leasetime=$leasetime."s";
}
}
my $rentme=0;
my $rnwltime="";
if ($dhcpinfo{'RENEWALTIME'} ne "") {
$rentme=$dhcpinfo{'RENEWALTIME'};
$rentme=($rentme/60);
if ($rentme > 59){
$rentme=($rentme/60); $rnwltime=$rentme." Hour";
}else{
$rnwltime=$rentme." Minute";
}
if ($rentme > 1){
$rnwltime=$rnwltime."s";
}
}
my $maxtme=0;
my $maxtime="";
if ($dhcpinfo{'REBINDTIME'} ne "") {
$maxtme=$dhcpinfo{'REBINDTIME'};
$maxtme=($maxtme/60);
if ($maxtme > 59){
$maxtme=($maxtme/60); $maxtime=$maxtme." Hour";
} else {
$maxtime=$maxtme." Minute";
}
if ($maxtme > 1) {
$maxtime=$maxtime."s";
}
}
print "<table width='100%'>";
if ($dhcpinfo{'HOSTNAME'}) {
print "<tr><td width='30%'>$Lang::tr{'hostname'}</td><td>$dhcpinfo{'HOSTNAME'}.$dhcpinfo{'DOMAIN'}</td></tr>\n";
} else {
print "<tr><td width='30%'>$Lang::tr{'domain'}</td><td>$dhcpinfo{'DOMAIN'}</td></tr>\n";
}
print <<END
<tr><td>$Lang::tr{'gateway'}</td><td>$dhcpinfo{'GATEWAY'}</td></tr>
<tr><td>$Lang::tr{'primary dns'}</td><td>$DNS1</td></tr>
<tr><td>$Lang::tr{'secondary dns'}</td><td>$DNS2</td></tr>
<tr><td>$Lang::tr{'dhcp server'}</td><td>$dhcpinfo{'DHCPSIADDR'}</td></tr>
<tr><td>$Lang::tr{'def lease time'}</td><td>$leasetime</td></tr>
<tr><td>$Lang::tr{'default renewal time'}</td><td>$rnwltime</td></tr>
<tr><td>$Lang::tr{'max renewal time'}</td><td>$maxtime</td></tr>
</table>
END
;
}else{
print "$Lang::tr{'no dhcp lease'}";
}
&Header::closebox();
}
&Header::closebigbox();
&Header::closepage();
}

87
html/cgi-bin/netinternal.cgi Executable file
View File

@@ -0,0 +1,87 @@
#!/usr/bin/perl
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2008 Michael Tremer & Christian Schmidt #
# #
# 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 #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program 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 program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
use strict;
# enable only the following on debugging purpose
#use warnings;
#use CGI::Carp 'fatalsToBrowser';
require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
require "${General::swroot}/graphs.pl";
my %color = ();
my %mainsettings = ();
my %netsettings=();
&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
my @graphs=();
my @wireless=();
my @querry = split(/\?/,$ENV{'QUERY_STRING'});
$querry[0] = '' unless defined $querry[0];
$querry[1] = 'hour' unless defined $querry[1];
$querry[2] = '' unless defined $querry[2];
if ( $querry[0] =~ /wireless/ ){
print "Content-type: image/png\n\n";
binmode(STDOUT);
$querry[0] =~ s/wireless//g;
&Graphs::updatewirelessgraph($querry[0],$querry[1]);
}elsif ( $querry[0] ne "" ){
print "Content-type: image/png\n\n";
binmode(STDOUT);
&Graphs::updateifgraph($querry[0],$querry[1]);
}else{
&Header::showhttpheaders();
&Header::openpage($Lang::tr{'network traffic graphs internal'}, 1, '');
&Header::openbigbox('100%', 'left');
push (@graphs, ($netsettings{'GREEN_DEV'}));
if ($netsettings{'BLUE_DEV'}) {push (@graphs, ($netsettings{'BLUE_DEV'})); }
if ($netsettings{'ORANGE_DEV'}) {push (@graphs, ($netsettings{'ORANGE_DEV'})); }
my @wirelessgraphs = `ls -dA /var/log/rrd/collectd/localhost/wireless*`;
foreach (@wirelessgraphs){
$_ =~ /(.*)\/wireless-(.*)/;
push(@wireless,$2);
}
foreach (@graphs) {
&Header::openbox('100%', 'center', "$_ $Lang::tr{'graph'}");
&Graphs::makegraphbox("netinternal.cgi",$_,"day");
&Header::closebox();
}
foreach (@wireless) {
&Header::openbox('100%', 'center', "Wireless $_ $Lang::tr{'graph'}");
&Graphs::makegraphbox("netinternal.cgi","wireless".$_,"day");
&Header::closebox();
}
&Header::closebigbox();
&Header::closepage();
}

77
html/cgi-bin/proxygraphs.cgi → html/cgi-bin/netother.cgi Normal file → Executable file
View File

@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2008 Michael Tremer & Christian Schmidt #
# #
# 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 #
@@ -28,50 +28,49 @@ use strict;
require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
require "${General::swroot}/graphs.pl";
my %cgiparams=();
my %pppsettings=();
my %netsettings=();
my @graphs=();
my %color = ();
my %mainsettings = ();
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
&Header::showhttpheaders();
my @pings=();
my $dir = "/srv/web/ipfire/html/sgraph";
$cgiparams{'ACTION'} = '';
&Header::getcgihash(\%cgiparams);
my $sgraphdir = "/srv/web/ipfire/html/sgraph";
my @querry = split(/\?/,$ENV{'QUERY_STRING'});
$querry[0] = '' unless defined $querry[0];
$querry[1] = 'hour' unless defined $querry[1];
&Header::openpage($Lang::tr{'proxy access graphs'}, 1, '');
if ( $querry[0] =~ "fwhits"){
print "Content-type: image/png\n\n";
binmode(STDOUT);
&Graphs::updatefwhitsgraph($querry[0],$querry[1]);
}elsif ( $querry[0] ne ""){
print "Content-type: image/png\n\n";
binmode(STDOUT);
&Graphs::updatepinggraph($querry[0],$querry[1]);
}else{
&Header::openbigbox('100%', 'left');
&Header::openbox('100%', 'left', $Lang::tr{'proxy access graphs'} . ":" );
if (open(IPACHTML, "$sgraphdir/index.html"))
{
my $skip = 1;
while (<IPACHTML>)
{
$skip = 1 if /^<HR>$/;
if ($skip)
{
$skip = 0 if /<H1>/;
next;
}
s/<IMG SRC=([^"'>]+)>/<img src='\/sgraph\/$1' alt='Graph' \/>/;
s/<HR>/<hr \/>/g;
s/<BR>/<br \/>/g;
s/<([^>]*)>/\L<$1>\E/g;
s/(size|align|border|color)=([^'"> ]+)/$1='$2'/g;
print;
&Header::showhttpheaders();
&Header::openpage($Lang::tr{'network traffic graphs others'}, 1, '');
&Header::openbigbox('100%', 'left');
my @pinggraphs = `ls -dA /var/log/rrd/collectd/localhost/ping/*`;
foreach (@pinggraphs){
$_ =~ /(.*)\/ping\/ping-(.*)\.rrd/;
push(@pings,$2);
}
close(IPACHTML);
}
else {
print $Lang::tr{'no information available'}; }
&Header::closebox();
foreach (@pings) {
&Header::openbox('100%', 'center', "$_ $Lang::tr{'graph'}");
&Graphs::makegraphbox("netother.cgi",$_,"day");
&Header::closebox();
}
&Header::closebigbox();
&Header::openbox('100%', 'center', "Firewall Hits $Lang::tr{'graph'}");
&Graphs::makegraphbox("netother.cgi","fwhits","day");
&Header::closebox();
&Header::closepage();
&Header::closebigbox();
&Header::closepage();
}

251
html/cgi-bin/network.cgi
View File

@@ -1,251 +0,0 @@
#!/usr/bin/perl
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# #
# 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 #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program 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 program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
use strict;
# enable only the following on debugging purpose
#use warnings;
#use CGI::Carp 'fatalsToBrowser';
require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
require "${General::swroot}/graphs.pl";
my %cgiparams=();
my %pppsettings=();
my %netsettings=();
my @cgiparams=();
my @graphs=();
my @pings=();
my @wireless=();
my $iface='';
my %dhcpsettings=();
my %dhcpinfo=();
my $output='';
&Header::showhttpheaders();
&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
$ENV{'QUERY_STRING'} =~ s/&//g;
@cgiparams = split(/network=/,$ENV{'QUERY_STRING'});
$cgiparams[1] = '' unless defined $cgiparams[1];
if ($cgiparams[1] =~ /red/) {
&Header::openpage($Lang::tr{'network traffic graphs external'}, 1, '');
if ($netsettings{'RED_TYPE'} ne 'PPPOE') {
if ($netsettings{'RED_DEV'} ne $netsettings{'GREEN_DEV'}) {
push (@graphs, ($netsettings{'RED_DEV'}));
}
} else {
push (@graphs, "ppp0");
}
if (-e "/var/log/rrd/collectd/localhost/interface/if_octets-ipsec0.rrd") {push (@graphs, ("ipsec0"));}
if (-e "/var/log/rrd/collectd/localhost/interface/if_octets-tun0.rrd") {push (@graphs, ("tun0"));}
}elsif ($cgiparams[1] =~ /other/) {
&Header::openpage($Lang::tr{'network traffic graphs others'}, 1, '');
my @pinggraphs = `ls -dA /var/log/rrd/collectd/localhost/ping/*`;
foreach (@pinggraphs){
$_ =~ /(.*)\/ping\/ping-(.*)\.rrd/;
push(@pings,$2);
}
push (@graphs, ("fwhits"));
}else {
&Header::openpage($Lang::tr{'network traffic graphs internal'}, 1, '');
push (@graphs, ($netsettings{'GREEN_DEV'}));
if ($netsettings{'BLUE_DEV'}) {
push (@graphs, ($netsettings{'BLUE_DEV'})); }
if ($netsettings{'ORANGE_DEV'}) {
push (@graphs, ($netsettings{'ORANGE_DEV'})); }
my @wirelessgraphs = `ls -dA /var/log/rrd/collectd/localhost/wireless*`;
foreach (@wirelessgraphs){
$_ =~ /(.*)\/wireless-(.*)/;
push(@wireless,$2);
}
}
&Header::openbigbox('100%', 'left');
foreach my $graphname (@pings) {
if ($graphname eq "gateway" )
{ &Graphs::updatepinggraph("day","gateway"); }
else
{ &Graphs::updatepinggraph("day","$graphname"); }
&Header::openbox('100%', 'center', "$graphname $Lang::tr{'graph'}");
if (-e "$Header::graphdir/${graphname}-day.png") {
my $ftime = localtime((stat("$Header::graphdir/${graphname}-day.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<a href='/cgi-bin/graphs.cgi?graph=$graphname&graph=ping'>";
print "<img alt='' src='/graphs/${graphname}-day.png' border='0' />";
print "</a>";
} else {
print $Lang::tr{'no information available'};
}
print "<br />\n";
&Header::closebox();
}
foreach my $graphname (@graphs) {
if ($graphname eq "fwhits" )
{ &Graphs::updatefwhitsgraph("day"); }
else
{ &Graphs::updateifgraph($graphname, "day"); }
&Header::openbox('100%', 'center', "$graphname $Lang::tr{'graph'}");
if (-e "$Header::graphdir/${graphname}-day.png") {
my $ftime = localtime((stat("$Header::graphdir/${graphname}-day.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<a href='/cgi-bin/graphs.cgi?graph=$graphname'>";
print "<img alt='' src='/graphs/${graphname}-day.png' border='0' />";
print "</a>";
} else {
print $Lang::tr{'no information available'};
}
print "<br />\n";
&Header::closebox();
}
foreach my $graphname (@wireless) {
&Graphs::wireless("day",$graphname);
&Header::openbox('100%', 'center', "wireless $graphname $Lang::tr{'graph'}");
if (-e "$Header::graphdir/wireless-${graphname}-day.png") {
my $ftime = localtime((stat("$Header::graphdir/wireless-${graphname}-day.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<a href='/cgi-bin/graphs.cgi?graph=wireless&graph=$graphname'>";
print "<img alt='' src='/graphs/wireless-${graphname}-day.png' border='0' />";
print "</a>";
} else {
print $Lang::tr{'no information available'};
}
print "<br />\n";
&Header::closebox();
}
if ($cgiparams[1] =~ /red/) {
if ( $netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ && $netsettings{'RED_TYPE'} eq "DHCP") {
&Header::openbox('100%', 'left', "RED $Lang::tr{'dhcp configuration'}");
if (-s "${General::swroot}/dhcpc/dhcpcd-$netsettings{'RED_DEV'}.info") {
&General::readhash("${General::swroot}/dhcpc/dhcpcd-$netsettings{'RED_DEV'}.info", \%dhcpinfo);
my $DNS1=`echo $dhcpinfo{'DNS'} | cut -f 1 -d ,`;
my $DNS2=`echo $dhcpinfo{'DNS'} | cut -f 2 -d ,`;
my $lsetme=0;
my $leasetime="";
if ($dhcpinfo{'LEASETIME'} ne "") {
$lsetme=$dhcpinfo{'LEASETIME'};
$lsetme=($lsetme/60);
if ($lsetme > 59) {
$lsetme=($lsetme/60); $leasetime=$lsetme." Hour";
} else {
$leasetime=$lsetme." Minute";
}
if ($lsetme > 1) {
$leasetime=$leasetime."s";
}
}
my $rentme=0;
my $rnwltime="";
if ($dhcpinfo{'RENEWALTIME'} ne "") {
$rentme=$dhcpinfo{'RENEWALTIME'};
$rentme=($rentme/60);
if ($rentme > 59){
$rentme=($rentme/60); $rnwltime=$rentme." Hour";
} else {
$rnwltime=$rentme." Minute";
}
if ($rentme > 1){
$rnwltime=$rnwltime."s";
}
}
my $maxtme=0;
my $maxtime="";
if ($dhcpinfo{'REBINDTIME'} ne "") {
$maxtme=$dhcpinfo{'REBINDTIME'};
$maxtme=($maxtme/60);
if ($maxtme > 59){
$maxtme=($maxtme/60); $maxtime=$maxtme." Hour";
} else {
$maxtime=$maxtme." Minute";
}
if ($maxtme > 1) {
$maxtime=$maxtime."s";
}
}
print "<table width='100%'>";
if ($dhcpinfo{'HOSTNAME'}) {
print "<tr><td width='30%'>$Lang::tr{'hostname'}</td><td>$dhcpinfo{'HOSTNAME'}.$dhcpinfo{'DOMAIN'}</td></tr>\n";
} else {
print "<tr><td width='30%'>$Lang::tr{'domain'}</td><td>$dhcpinfo{'DOMAIN'}</td></tr>\n";
}
print <<END
<tr><td>$Lang::tr{'gateway'}</td><td>$dhcpinfo{'GATEWAY'}</td></tr>
<tr><td>$Lang::tr{'primary dns'}</td><td>$DNS1</td></tr>
<tr><td>$Lang::tr{'secondary dns'}</td><td>$DNS2</td></tr>
<tr><td>$Lang::tr{'dhcp server'}</td><td>$dhcpinfo{'DHCPSIADDR'}</td></tr>
<tr><td>$Lang::tr{'def lease time'}</td><td>$leasetime</td></tr>
<tr><td>$Lang::tr{'default renewal time'}</td><td>$rnwltime</td></tr>
<tr><td>$Lang::tr{'max renewal time'}</td><td>$maxtime</td></tr>
</table>
END
;
}
else
{
print "$Lang::tr{'no dhcp lease'}";
}
&Header::closebox();
}
if ($dhcpsettings{'ENABLE_GREEN'} eq 'on' || $dhcpsettings{'ENABLE_BLUE'} eq 'on') {
&Header::CheckSortOrder;
&Header::PrintActualLeases;
}
} else {
&Header::openbox('100%', 'left', $Lang::tr{'routing table entries'});
$output = `/sbin/ip route show`;
$output = &Header::cleanhtml($output,"y");
print "<pre>$output</pre>\n";
&Header::closebox();
&Header::openbox('100%', 'left', $Lang::tr{'arp table entries'});
$output = `/sbin/ip neigh show`;
$output = &Header::cleanhtml($output,"y");
print "<pre>$output</pre>\n";
&Header::closebox();
}
&Header::closebigbox();
&Header::closepage();

1
html/cgi-bin/ovpnmain.cgi
View File

@@ -1378,6 +1378,7 @@ END
}
print CLIENTCONF "verb 3\r\n";
print CLIENTCONF "ns-cert-type server\r\n";
print CLIENTCONF "tls-remote $vpnsettings{ROOTCERT_HOSTNAME}\r\n";
close(CLIENTCONF);
$zip->addFile( "$tempdir/$clientovpn", $clientovpn) or die "Can't add file $clientovpn\n";
my $status = $zip->writeToFileNamed($zippathname);

47
html/cgi-bin/qos.cgi
View File

@@ -64,8 +64,6 @@ my $portfile = "/var/ipfire/qos/portconfig";
my $tosfile = "/var/ipfire/qos/tosconfig";
&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
&Header::showhttpheaders();
$qossettings{'ENABLED'} = 'off';
$qossettings{'EDIT'} = 'no';
$qossettings{'OUT_SPD'} = '';
@@ -120,8 +118,19 @@ my %mainsettings = ();
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
&Header::openpage('QoS', 1, '');
&Header::openbigbox('100%', 'left', '', $errormessage);
my @querry = split(/\?/,$ENV{'QUERY_STRING'});
$querry[0] = '' unless defined $querry[0];
$querry[1] = 'hour' unless defined $querry[1];
if ( $querry[0] ne ""){
print "Content-type: image/png\n\n";
binmode(STDOUT);
&Graphs::updateqosgraph($querry[0],$querry[1]);
}else{
&Header::showhttpheaders();
&Header::openpage('QoS', 1, '');
&Header::openbigbox('100%', 'left', '', $errormessage);
############################################################################################################################
############################################################################################################################
@@ -759,28 +768,12 @@ if ( ($qossettings{'DEFCLASS_INC'} eq '') || ($qossettings{'DEFCLASS_OUT'} eq ''
exit
}
&Header::openbox('100%', 'center', $Lang::tr{'info'});
&Graphs::overviewgraph("3240",$qossettings{'RED_DEV'});
&Graphs::overviewgraph("3240",$qossettings{'IMQ_DEV'});
print <<END
<table>
<tr><td colspan='9' align='center' valign='middle'><img alt="" src='/images/addblue.gif' />&nbsp;$Lang::tr{'add subclass'} | <img alt="" src='/images/addgreen.gif' />&nbsp;$Lang::tr{'Add Rule'} | <img alt="" src='/images/edit.gif' />&nbsp;$Lang::tr{'edit'} | <img alt="" src='/images/delete.gif' />&nbsp;$Lang::tr{'delete'} &nbsp;
<tr><td colspan='9' align='right' valign='middle'><b>$Lang::tr{'TOS Bits'}:</b>&nbsp;&nbsp;<b>0</b> - $Lang::tr{'disabled'} | <b>8</b> - $Lang::tr{'min delay'} | <b>4</b> - $Lang::tr{'max throughput'} | <b>2</b> - $Lang::tr{'max reliability'} | <b>1</b> - $Lang::tr{'min costs'} &nbsp;
END
;
if (( -e "/srv/web/ipfire/html/graphs/qos-graph-$qossettings{'RED_DEV'}-3240.png") && ( -e "/srv/web/ipfire/html/graphs/qos-graph-$qossettings{'IMQ_DEV'}-3240.png")) {
print <<END
<tr><td colspan='9' align='center'><a href='/cgi-bin/qosgraph.cgi?graph=$qossettings{'RED_DEV'}'><img alt="" src="/graphs/qos-graph-$qossettings{'RED_DEV'}-3240.png" border='0' /></a></td></tr>
<tr><td colspan='9' align='center'><a href='/cgi-bin/qosgraph.cgi?graph=$qossettings{'IMQ_DEV'}'><img alt="" src="/graphs/qos-graph-$qossettings{'IMQ_DEV'}-3240.png" border='0' /></a></td></tr>
END
;}
else
{
print "\t</table><br />".$Lang::tr{'no information available'};
}
print "\t</table>";
&Header::closebox();
&Header::openbox('100%', 'center', "$qossettings{'RED_DEV'} $Lang::tr{'graph'}");
&Graphs::makegraphbox("qos.cgi",$qossettings{'RED_DEV'},"hour","325");
&Header::closebox();
&Header::openbox('100%', 'center', "$qossettings{'IMQ_DEV'} $Lang::tr{'graph'}");
&Graphs::makegraphbox("qos.cgi",$qossettings{'IMQ_DEV'},"hour","325");
&Header::closebox();
&showclasses($qossettings{'RED_DEV'});
&showclasses($qossettings{'IMQ_DEV'});
@@ -788,6 +781,8 @@ print "\t</table>";
&Header::closebigbox();
&Header::closepage();
}
############################################################################################################################
############################################################################################################################

91
html/cgi-bin/qosgraph.cgi
View File

@@ -1,91 +0,0 @@
#!/usr/bin/perl
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# #
# 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 #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program 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 program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
use strict;
# enable only the following on debugging purpose
#use warnings;
#use CGI::Carp 'fatalsToBrowser';
require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
require "${General::swroot}/graphs.pl";
my @cgigraph=();
my $errormessage = "";
&Header::showhttpheaders();
$ENV{'QUERY_STRING'} =~ s/&//g;
@cgigraph = split(/graph=/,$ENV{'QUERY_STRING'});
$cgigraph[1] = '' unless defined $cgigraph[1];
&Graphs::overviewgraph("day",$cgigraph[1]);
&Graphs::overviewgraph("week",$cgigraph[1]);
&Graphs::overviewgraph("month",$cgigraph[1]);
&Graphs::overviewgraph("year",$cgigraph[1]);
&Header::openpage('QoS', 1, '');
&Header::openbigbox('100%', 'left', '', $errormessage);
&Header::openbox('100%', 'left', $cgigraph[1]);
if (-e "/srv/web/ipfire/html/graphs/qos-graph-$cgigraph[1]-day.png") {
my $ftime = localtime((stat("/srv/web/ipfire/html/graphs/qos-graph-$cgigraph[1]-day.png"))[9]);
print "<center>";
print "<b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<img alt='' src='/graphs/qos-graph-$cgigraph[1]-day.png' border='0' /><hr />";
} else {
print $Lang::tr{'no information available'};
}
if (-e "/srv/web/ipfire/html/graphs/qos-graph-$cgigraph[1]-week.png") {
my $ftime = localtime((stat("/srv/web/ipfire/html/graphs/qos-graph-$cgigraph[1]-week.png"))[9]);
print "<center>";
print "<b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<img alt='' src='/graphs/qos-graph-$cgigraph[1]-week.png' border='0' /><hr />";
} else {
print $Lang::tr{'no information available'};
}
if (-e "/srv/web/ipfire/html/graphs/qos-graph-$cgigraph[1]-month.png") {
my $ftime = localtime((stat("/srv/web/ipfire/html/graphs/qos-graph-$cgigraph[1]-month.png.png"))[9]);
print "<center>";
print "<b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<img alt='' src='/graphs/qos-graph-$cgigraph[1]-month.png' border='0' /><hr />";
} else {
print $Lang::tr{'no information available'};
}
if (-e "/srv/web/ipfire/html/graphs/qos-graph-$cgigraph[1]-year.png") {
my $ftime = localtime((stat("/srv/web/ipfire/html/graphs/qos-graph-$cgigraph[1]-year.png"))[9]);
print "<center>";
print "<b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<img alt='' src='/graphs/qos-graph-$cgigraph[1]-year.png' border='0' /><hr />";
} else {
print $Lang::tr{'no information available'};
}
print"<div align='center'><br/><a href='/cgi-bin/qos.cgi'>$Lang::tr{'back'}</a></div>";
&Header::closebox();
&Header::closebigbox();
&Header::closepage();

278
html/cgi-bin/services.cgi
View File

@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2008 Michael Tremer & Christian Schmidt #
# #
# 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 #
@@ -30,25 +30,22 @@ require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
require "${General::swroot}/graphs.pl";
my %color = ();
my %mainsettings = ();
my %netsettings=();
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
#workaround to suppress a warning when a variable is used only once
my @dummy = ( ${Header::colourred} );
undef (@dummy);
my %color = ();
my %mainsettings = ();
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
my %netsettings=();
&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
&Graphs::updateprocessesgraph ("day");
my %cgiparams=();
# Maps a nice printable name to the changing part of the pid file, which
# is also the name of the program
my %servicenames =
(
my %servicenames =(
$Lang::tr{'dhcp server'} => 'dhcpd',
$Lang::tr{'web server'} => 'httpd',
$Lang::tr{'cron server'} => 'fcron',
@@ -65,65 +62,73 @@ my %servicenames =
my $lines=0; # Used to count the outputlines to make different bgcolor
my $iface = '';
if (open(FILE, "${General::swroot}/red/iface"))
{
if (open(FILE, "${General::swroot}/red/iface")){
$iface = <FILE>;
close FILE;
chomp $iface;
}
$servicenames{"$Lang::tr{'intrusion detection system'} (RED)"} = "snort_${iface}";
$servicenames{"$Lang::tr{'intrusion detection system'} (GREEN)"} = "snort_$netsettings{'GREEN_DEV'}";
if ($netsettings{'ORANGE_DEV'} ne '') {
if ($netsettings{'ORANGE_DEV'} ne ''){
$servicenames{"$Lang::tr{'intrusion detection system'} (ORANGE)"} = "snort_$netsettings{'ORANGE_DEV'}";
}
if ($netsettings{'BLUE_DEV'} ne '') {
if ($netsettings{'BLUE_DEV'} ne ''){
$servicenames{"$Lang::tr{'intrusion detection system'} (BLUE)"} = "snort_$netsettings{'BLUE_DEV'}";
}
&Header::showhttpheaders();
&Header::getcgihash(\%cgiparams);
&Header::openpage($Lang::tr{'status information'}, 1, '');
&Header::openbigbox('100%', 'left');
my @querry = split(/\?/,$ENV{'QUERY_STRING'});
$querry[0] = '' unless defined $querry[0];
$querry[1] = 'hour' unless defined $querry[1];
&Header::openbox('100%', 'left', $Lang::tr{'services'});
if ( $querry[0] =~ "processescpu"){
print "Content-type: image/png\n\n";
binmode(STDOUT);
&Graphs::updateprocessescpugraph($querry[1]);
}elsif ( $querry[0] =~ "processesmemory"){
print "Content-type: image/png\n\n";
binmode(STDOUT);
&Graphs::updateprocessesmemorygraph($querry[1]);
}else{
&Header::showhttpheaders();
&Header::openpage($Lang::tr{'status information'}, 1, '');
&Header::openbigbox('100%', 'left');
print <<END
&Header::openbox('100%', 'left', $Lang::tr{'services'});
print <<END
<div align='center'>
<table width='80%' cellspacing='1' border='0'>
<tr bgcolor='$color{'color20'}'><td align='left'><b>$Lang::tr{'services'}</b></td><td align='center' ><b>$Lang::tr{'status'}</b></td><td align='center'><b>PID</b></td><td align='center'><b>$Lang::tr{'memory'}</b></td></tr>
END
;
my $key = '';
foreach $key (sort keys %servicenames){
$lines++;
if ($lines % 2){
print "<tr bgcolor='$color{'color22'}'>\n<td align='left'>$key</td>\n";
}else{
print "<tr bgcolor='$color{'color20'}'>\n<td align='left'>$key</td>\n";
}
my $key = '';
foreach $key (sort keys %servicenames)
{
$lines++;
if ($lines % 2)
{ print "<tr bgcolor='$color{'color22'}'>\n<td align='left'>$key</td>\n";}
else
{ print "<tr bgcolor='$color{'color20'}'>\n<td align='left'>$key</td>\n";}
my $shortname = $servicenames{$key};
my $status = &isrunning($shortname);
my $shortname = $servicenames{$key};
my $status = &isrunning($shortname);
print "$status\n";
print "</tr>\n";
}
print "$status\n";
print "</tr>\n";
}
print "</table></div>\n";
&Header::closebox();
&Header::openbox('100%', 'left', "Addon - $Lang::tr{services}");
my $paramstr=$ENV{QUERY_STRING};
my @param=split(/!/, $paramstr);
if ($param[1] ne ''){
system("/usr/local/bin/addonctrl @param[0] @param[1] > /dev/null 2>&1");
}
print "</table></div>\n";
&Header::closebox();
&Header::openbox('100%', 'left', "Addon - $Lang::tr{services}");
my $paramstr=$ENV{QUERY_STRING};
my @param=split(/!/, $paramstr);
if ($param[1] ne '') {
system("/usr/local/bin/addonctrl @param[0] @param[1] > /dev/null 2>&1");
}
print <<END
print <<END
<div align='center'>
<table width='80%' cellspacing='1' border='0'>
<tr bgcolor='$color{'color20'}'>
@@ -137,101 +142,76 @@ print <<END
END
;
my $lines=0; # Used to count the outputlines to make different bgcolor
my $lines=0; # Used to count the outputlines to make different bgcolor
# Generate list of installed addon pak's
my @pak = `find /opt/pakfire/db/installed/meta-* 2>/dev/null | cut -d"-" -f2`;
foreach (@pak)
{
chomp($_);
# Generate list of installed addon pak's
my @pak = `find /opt/pakfire/db/installed/meta-* 2>/dev/null | cut -d"-" -f2`;
foreach (@pak){
chomp($_);
# Check which of the paks are services
my @svc = `find /etc/init.d/$_ 2>/dev/null | cut -d"/" -f4`;
foreach (@svc)
{
# blacklist some packages
#
# alsa has trouble with the volume saving and was not really stopped
#
chomp($_);
if ($_ ne "alsa")
{
$lines++;
if ($lines % 2)
{
print "<tr bgcolor='$color{'color22'}'>";
# Check which of the paks are services
my @svc = `find /etc/init.d/$_ 2>/dev/null | cut -d"/" -f4`;
foreach (@svc){
# blacklist some packages
#
# alsa has trouble with the volume saving and was not really stopped
#
chomp($_);
if ($_ ne "alsa"){
$lines++;
if ($lines % 2){
print "<tr bgcolor='$color{'color22'}'>";
}else{
print "<tr bgcolor='$color{'color20'}'>";
}
print "<td align='left'>$_</td> ";
my $status = isautorun($_);
print "$status ";
print "<td align='center'><A HREF=services.cgi?$_!start><img alt='$Lang::tr{'start'}' title='$Lang::tr{'start'}' src='/images/go-up.png' border='0' /></A></td>";
print "<td align='center'><A HREF=services.cgi?$_!stop><img alt='$Lang::tr{'stop'}' title='$Lang::tr{'stop'}' src='/images/go-down.png' border='0' /></A></td> ";
my $status = &isrunningaddon($_);
$status =~ s/\\[[0-1]\;[0-9]+m//g;
chomp($status);
print "$status";
print "</tr>";
}
}
else
{
print "<tr bgcolor='$color{'color20'}'>";
}
print "<td align='left'>$_</td> ";
my $status = isautorun($_);
print "$status ";
print "<td align='center'><A HREF=services.cgi?$_!start><img alt='$Lang::tr{'start'}' title='$Lang::tr{'start'}' src='/images/go-up.png' border='0' /></A></td>";
print "<td align='center'><A HREF=services.cgi?$_!stop><img alt='$Lang::tr{'stop'}' title='$Lang::tr{'stop'}' src='/images/go-down.png' border='0' /></A></td> ";
my $status = &isrunningaddon($_);
$status =~ s/\\[[0-1]\;[0-9]+m//g;
chomp($status);
print "$status";
print "</tr>";
}
}
print "</table></div>\n";
&Header::closebox();
&Header::openbox('100%', 'center', "$Lang::tr{'processes'} $Lang::tr{'graph'}");
&Graphs::makegraphbox("services.cgi","processescpu","day");
&Header::closebox();
&Header::openbox('100%', 'center', "$Lang::tr{'processes'} $Lang::tr{'memory'} $Lang::tr{'graph'}");
&Graphs::makegraphbox("services.cgi","processesmemory","day");
&Header::closebox();
&Header::closebigbox();
&Header::closepage();
}
print "</table></div>\n";
&Header::closebox();
&Header::openbox('100%', 'center', "$Lang::tr{'processes'} $Lang::tr{'graph'}");
if (-e "$Header::graphdir/processes-day.png") {
my $ftime = localtime((stat("$Header::graphdir/processes-day.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<a href='/cgi-bin/graphs.cgi?graph=processes'>";
print "<img alt='' src='/graphs/processes-day.png' border='0' />";
print "</a>";
} else {
print $Lang::tr{'no information available'};
}
print "<br />\n";
&Header::closebox();
&Header::openbox('100%', 'center', "$Lang::tr{'processes'} $Lang::tr{'memory'} $Lang::tr{'graph'}");
if (-e "$Header::graphdir/processesmem-day.png") {
my $ftime = localtime((stat("$Header::graphdir/processesmem-day.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<a href='/cgi-bin/graphs.cgi?graph=processesmem'>";
print "<img alt='' src='/graphs/processesmem-day.png' border='0' />";
print "</a>";
} else {
print $Lang::tr{'no information available'};
}
print "<br />\n";
&Header::closebox();
&Header::closebigbox();
&Header::closepage();
sub isautorun
{
sub isautorun{
my $cmd = $_[0];
my $status = "<td align='center'></td>";
my $init = `find /etc/rc.d/rc3.d/S??${cmd} 2>/dev/null`;
chomp ($init);
if ($init ne '') {
$status = "<td align='center'><A HREF=services.cgi?$_!disable><img alt='$Lang::tr{'deactivate'}' title='$Lang::tr{'deactivate'}' src='/images/on.gif' border='0' width='16' height='16' /></A></td>";
if ($init ne ''){
$status = "<td align='center'><A HREF=services.cgi?$_!disable><img alt='$Lang::tr{'deactivate'}' title='$Lang::tr{'deactivate'}' src='/images/on.gif' border='0' width='16' height='16' /></A></td>";
}
$init = `find /etc/rc.d/rc3.d/off/S??${cmd} 2>/dev/null`;
chomp ($init);
if ($init ne '') {
$status = "<td align='center'><A HREF=services.cgi?$_!enable><img alt='$Lang::tr{'activate'}' title='$Lang::tr{'activate'}' src='/images/off.gif' border='0' width='16' height='16' /></A></td>";
if ($init ne ''){
$status = "<td align='center'><A HREF=services.cgi?$_!enable><img alt='$Lang::tr{'activate'}' title='$Lang::tr{'activate'}' src='/images/off.gif' border='0' width='16' height='16' /></A></td>";
}
return $status;
return $status;
}
sub isrunning
{
sub isrunning{
my $cmd = $_[0];
my $status = "<td align='center' bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td><td colspan='2'></td>";
my $pid = '';
@@ -247,7 +227,9 @@ sub isrunning
close FILE;
if (open(FILE, "/proc/${pid}/status")){
while (<FILE>){
if (/^Name:\W+(.*)/) {$testcmd = $1; }
if (/^Name:\W+(.*)/) {
$testcmd = $1;
}
}
close FILE;
}
@@ -256,13 +238,14 @@ sub isrunning
@memory = split(/ /,$temp);
}
close FILE;
if ($testcmd =~ /$exename/){$status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td><td align='center'>$pid</td><td align='center'>$memory[0] KB</td>";}
if ($testcmd =~ /$exename/){
$status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td><td align='center'>$pid</td><td align='center'>$memory[0] KB</td>";
}
return $status;
}
return $status;
}
sub isrunningaddon
{
sub isrunningaddon{
my $cmd = $_[0];
my $status = "<td align='center' bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td><td colspan='2'></td>";
my $pid = '';
@@ -273,24 +256,29 @@ sub isrunningaddon
my $testcmd = `/usr/local/bin/addonctrl $_ status`;
if ( $testcmd =~ /is\ running/ && $testcmd !~ /is\ not\ running/){
$status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td>";
$testcmd =~ s/[a-z_]//gi; $testcmd =~ s/\[[0-1]\;[0-9]+//gi; $testcmd =~ s/[\(\)\.]//gi; $testcmd =~ s/ //gi; $testcmd =~ s///gi;
$status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td>";
$testcmd =~ s/[a-z_]//gi;
$testcmd =~ s/\[[0-1]\;[0-9]+//gi;
$testcmd =~ s/[\(\)\.]//gi;
$testcmd =~ s/ //gi;
$testcmd =~ s///gi;
my @pid = split(/\s/,$testcmd);
$status .="<td align='center'>$pid[0]</td>";
my @pid = split(/\s/,$testcmd);
$status .="<td align='center'>$pid[0]</td>";
my $memory = 0;
my $memory = 0;
foreach (@pid){
chomp($_);
if (open(FILE, "/proc/$_/statm")){
foreach (@pid){
chomp($_);
if (open(FILE, "/proc/$_/statm")){
my $temp = <FILE>;
@memory = split(/ /,$temp);
@memory = split(/ /,$temp);
}
$memory+=$memory[0];
}
$memory+=$memory[0];
$status .="<td align='center'>$memory KB</td>";
}else{
$status = "<td align='center' bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td><td colspan='2'></td>";
}
$status .="<td align='center'>$memory KB</td>";
}
else {$status = "<td align='center' bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td><td colspan='2'></td>";}
return $status;
return $status;
}

82
html/cgi-bin/system.cgi
View File

@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2008 Michael Tremer & Christian Schmidt #
# #
# 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 #
@@ -35,53 +35,41 @@ my %mainsettings = ();
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
my %cgiparams=();
my @querry = split(/\?/,$ENV{'QUERY_STRING'});
$querry[0] = '' unless defined $querry[0];
$querry[1] = 'hour' unless defined $querry[1];
# Generate Graphs from rrd Data
&Graphs::updatecpugraph ("day");
&Graphs::updatecpufreqgraph ("day");
&Graphs::updateloadgraph ("day");
if ( $querry[0] =~ "cpu"){
print "Content-type: image/png\n\n";
binmode(STDOUT);
&Graphs::updatecpugraph($querry[1]);
}elsif ( $querry[0] =~ "cpufreq"){
print "Content-type: image/png\n\n";
binmode(STDOUT);
&Graphs::updatecpufreqgraph($querry[1]);
}elsif ( $querry[0] =~ "load"){
print "Content-type: image/png\n\n";
binmode(STDOUT);
&Graphs::updateloadgraph($querry[1]);
}else{
&Header::showhttpheaders();
&Header::openpage($Lang::tr{'status information'}, 1, '');
&Header::openbigbox('100%', 'left');
&Header::showhttpheaders();
&Header::getcgihash(\%cgiparams);
&Header::openpage($Lang::tr{'status information'}, 1, '');
&Header::openbigbox('100%', 'left');
if ( -e "$mainsettings{'RRDLOG'}/collectd/localhost/cpufreq/cpufreq-0.rrd"){
&Header::openbox('100%', 'center', "CPU $Lang::tr{'graph'}");
&Graphs::makegraphbox("system.cgi","cpu","day","325");
&Header::closebox();
}
&Header::openbox('100%', 'center', "CPU $Lang::tr{'graph'}");
if (-e "$Header::graphdir/cpu-day.png") {
my $ftime = localtime((stat("$Header::graphdir/cpu-day.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<a href='/cgi-bin/graphs.cgi?graph=cpu'>";
print "<img alt='' src='/graphs/cpu-day.png' border='0' />";
print "</a>";
} else {
print $Lang::tr{'no information available'};
&Header::openbox('100%', 'center', "CPU $Lang::tr{'graph'}");
&Graphs::makegraphbox("system.cgi","cpu","day","325");
&Header::closebox();
&Header::openbox('100%', 'center', "Load $Lang::tr{'graph'}");
&Graphs::makegraphbox("system.cgi","load","day");
&Header::closebox();
&Header::closebigbox();
&Header::closepage();
}
print "<br />\n";
&Header::closebox();
if (-e "$Header::graphdir/cpufreq-day.png") {
&Header::openbox('100%', 'center', "CPU Frequency $Lang::tr{'graph'}");
my $ftime = localtime((stat("$Header::graphdir/cpufreq-day.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<a href='/cgi-bin/graphs.cgi?graph=cpufreq'>";
print "<img alt='' src='/graphs/cpufreq-day.png' border='0' />";
print "</a>";
print "<br />\n";
&Header::closebox();
}
&Header::openbox('100%', 'center', "Load $Lang::tr{'graph'}");
if (-e "$Header::graphdir/load-day.png") {
my $ftime = localtime((stat("$Header::graphdir/load-day.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<a href='/cgi-bin/graphs.cgi?graph=load'>";
print "<img alt='' src='/graphs/load-day.png' border='0' />";
print "</a>";
} else {
print $Lang::tr{'no information available'};
}
print "<br />\n";
&Header::closebox();
&Header::closebigbox();
&Header::closepage();

373
html/cgi-bin/traffics.cgi
View File

@@ -1,373 +0,0 @@
#!/usr/bin/perl
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# #
# 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 #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program 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 program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
use strict;
# enable only the following on debugging purpose
#use warnings;
#use CGI::Carp 'fatalsToBrowser';
require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
require "${General::swroot}/net-traffic/net-traffic-admin.pl";
require "${General::swroot}/net-traffic/net-traffic-lib.pl";
my %color = ();
my %mainsettings = ();
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
my %cgiparams;
my %netsettings;
&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
my @days = ( 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31 );
my @now = localtime(time);
$now[5] = $now[5]+1900;
$cgiparams{'STARTDAY'} = 10;
$cgiparams{'STOPDAY'} = 11;
$cgiparams{'STARTYEAR'} = $now[5];
$cgiparams{'STOPYEAR'} = $now[5];
if($NETTRAFF::settings{'MONTHLY_VOLUME_ON'} eq 'on')
{
$cgiparams{'STARTDAY'} = $NETTRAFF::settings{'STARTDAY'};
$cgiparams{'STOPDAY'} = $NETTRAFF::settings{'STARTDAY'};
}
# this periode started last month
if ($now[3] < $cgiparams{'STARTDAY'}) {
$cgiparams{'STARTMONTH'} = $now[4]-1;
$cgiparams{'STOPMONTH'} = $now[4];
# when current month is january we start in last year december
if ($cgiparams{'STOPMONTH'} == 0) {
$cgiparams{'STARTYEAR'} = $now[5]-1;
$cgiparams{'STARTMONTH'} = 11;
}
}
else {
$cgiparams{'STARTMONTH'} = $now[4];
$cgiparams{'STOPMONTH'} = $now[4]+1;
# when we are in december, this periode ends next year january
if ($cgiparams{'STARTMONTH'} == 11) {
$cgiparams{'STOPYEAR'} = $now[5]+1;
$cgiparams{'STOPMONTH'} = 0;
}
}
&Header::getcgihash(\%cgiparams);
&Header::showhttpheaders();
&Header::openpage($Lang::tr{'sstraffic'}, 1, '');
&Header::openbigbox('100%', 'left');
&Header::openbox('100%', 'left', "");
print <<END;
<table width='100%' align='center'>
<tr>
<td width='90%' class='base' align='center'>
<form method='post' action='/cgi-bin/traffics.cgi'>
$Lang::tr{'trafficfrom'}
<select name='STARTDAY'>
END
foreach my $day (@days)
{
print "\t<option ";
if ($day == $cgiparams{'STARTDAY'}) {
print 'selected=\'selected\' '; }
print "value='$day'>$day</option>\n";
}
print <<END;
</select>
<select name='STARTMONTH'>
END
foreach my $month (@NETTRAFF::months)
{
print "\t<option ";
if ($month == $cgiparams{'STARTMONTH'}) {
print 'selected=\'selected\' '; }
print "value='$month'>$NETTRAFF::longmonths[$month]</option>\n";
}
print <<END;
</select>
<select name='STARTYEAR'>
END
foreach my $year (@NETTRAFF::years) {
print "\t<option ";
if ($year == $cgiparams{'STARTYEAR'}) {
print 'selected=\'selected\' '; }
print "value='$year'>$year</option>\n";
}
print <<END;
</select>
$Lang::tr{'trafficto'}
<select name='STOPDAY'>
END
foreach my $day (@days)
{
print "\t<option ";
if ($day == $cgiparams{'STOPDAY'})
{
print 'selected=\'selected\' '; }
print "value='$day'>$day</option>\n";
}
print <<END;
</select>
<select name='STOPMONTH'>
END
foreach my $month (@NETTRAFF::months)
{
print "\t<option ";
if ($month == $cgiparams{'STOPMONTH'}) {
print 'selected=\'selected\' '; }
print "value='$month'>$NETTRAFF::longmonths[$month]</option>\n";
}
print <<END;
</select>
<select name='STOPYEAR'>
END
foreach my $year (@NETTRAFF::years) {
print "\t<option ";
if ($year == $cgiparams{'STOPYEAR'}) {
print 'selected=\'selected\' '; }
print "value='$year'>$year</option>\n";
}
print <<END;
</select>
<input type='submit' name='ACTION' value='$Lang::tr{'update'}' />
</form>
</td>
<td width='5%' align='center'>
<form method='post' action='/cgi-bin/traffic.cgi'>
<input type='submit' name='ACTION' value=' > ' />
</form>
</td>
</tr>
</table>
END
&Header::closebox();
&Header::openbox('100%', 'left', "$Lang::tr{'traffics'}");
my $dateWidth = '20%';
my $netWidth = '34%';
my $inOutWidth = '17%';
# 4 networks
if ($netsettings{'CONFIG_TYPE'} =~ /^(4)$/) {
$dateWidth = '12%';
$netWidth = '22%';
$inOutWidth = '11%';
}
# 3 networks
if ($netsettings{'CONFIG_TYPE'} =~ /^(2|3)$/) {
$dateWidth = '16%';
$netWidth = '28%';
$inOutWidth = '14%';
}
print <<END;
<table width='100%'>
<tr>
<td width='$dateWidth' align='center' class='boldbase'></td>
<td width='$netWidth' align='center' class='boldbase' ><b>$Lang::tr{'trafficgreen'}</b></td>
END
if ($netsettings{'CONFIG_TYPE'} =~ /^(3|4)$/) {
print "<td width='$netWidth' align='center' class='boldbase' ><b>$Lang::tr{'trafficblue'}</b></td>";
}
if ($netsettings{'CONFIG_TYPE'} =~ /^(2|4)$/) {
print "<td width='$netWidth' align='center' class='boldbase' ><b>$Lang::tr{'trafficorange'}</b></td>";
}
if ($netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/)
{
print "<td width='$netWidth' align='center' class='boldbase'><b>$Lang::tr{'trafficred'}</b></td>";
}
print <<END;
</tr>
</table>
<table width='100%'>
<tr>
<td width='$dateWidth' align='center' class='boldbase'><b>$Lang::tr{'trafficdate'}</b></td>
<td width='$inOutWidth' align='center' class='boldbase'><font color='$Header::colourgreen'><b>$Lang::tr{'trafficin'}</b></font></td>
<td width='$inOutWidth' align='center' class='boldbase'><font color='$Header::colourgreen'><b>$Lang::tr{'trafficout'}</b></font></td>
END
if ($netsettings{'CONFIG_TYPE'} =~ /^(3|4)$/)
{
print "<td width='$inOutWidth' align='center' class='boldbase'><font color='${Header::colourblue}'><b>$Lang::tr{'trafficin'}</b></font></td>";
print "<td width='$inOutWidth' align='center' class='boldbase'><font color='${Header::colourblue}'><b>$Lang::tr{'trafficout'}</b></font></td>";
}
if ($netsettings{'CONFIG_TYPE'} =~ /^(2|4)$/)
{
print "<td width='$inOutWidth' align='center' class='boldbase'><font color='$Header::colourorange'><b>$Lang::tr{'trafficin'}</b></font></td>";
print "<td width='$inOutWidth' align='center' class='boldbase'><font color='$Header::colourorange'><b>$Lang::tr{'trafficout'}</b></font></td>";
}
if ($netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/)
{
print "<td width='$inOutWidth' align='center' class='boldbase'><font color='$Header::colourred'><b>$Lang::tr{'trafficin'}</b></font></td>";
print "<td width='$inOutWidth' align='center' class='boldbase'><font color='$Header::colourred'><b>$Lang::tr{'trafficout'}</b></font></td>";
}
print "</tr>";
my $total_blue_in=0;
my $total_blue_out=0;
my $total_green_in=0;
my $total_green_out=0;
my $total_orange_in=0;
my $total_orange_out=0;
my $total_red_in=0;
my $total_red_out=0;
my $lines=0;
my $startyear = $cgiparams{'STARTYEAR'};
my $stopyear = $cgiparams{'STOPYEAR'};
my $startMonth = $cgiparams{'STARTMONTH'}+1;
$startMonth = $startMonth < 10 ? $startMonth = "0".$startMonth : $startMonth;
my $endMonth = $cgiparams{'STOPMONTH'}+1;
$endMonth = $endMonth < 10 ? $endMonth = "0".$endMonth : $endMonth;
my $startDay = $cgiparams{'STARTDAY'};
$startDay = $startDay < 10 ? $startDay = "0".$startDay : $startDay;
my $endDay = $cgiparams{'STOPDAY'}+1;
$endDay = $endDay < 10 ? $endDay = "0".$endDay : $endDay;
my $displayMode = "daily_multi";
my $start = $startyear.$startMonth.$startDay;
my $end = $stopyear.$endMonth.$endDay;
my %allDaysBytes = ();
my @allDays = &Traffic::calcTraffic(\%allDaysBytes,$start,$end, $displayMode);
foreach (@allDays) {
$total_green_in += $allDaysBytes{$_}{${Traffic::green_in}};
$total_green_out += $allDaysBytes{$_}{${Traffic::green_out}};
if ($netsettings{'CONFIG_TYPE'} =~ /^(3|4)$/)
{
$total_blue_in += $allDaysBytes{$_}{${Traffic::blue_in}};
$total_blue_out += $allDaysBytes{$_}{${Traffic::blue_out}};
}
if ($netsettings{'CONFIG_TYPE'} =~ /^(2|4)$/)
{
$total_orange_in += $allDaysBytes{$_}{${Traffic::orange_in}};
$total_orange_out += $allDaysBytes{$_}{${Traffic::orange_out}};
}
if ($netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/)
{
$total_red_in += $allDaysBytes{$_}{${Traffic::red_in}};
$total_red_out += $allDaysBytes{$_}{${Traffic::red_out}};
}
if ($lines % 2) {
print "<tr bgcolor='$color{'color20'}'>"; }
else {
print "<tr bgcolor='$color{'color22'}'>"; }
printf "<td align='center' nowrap='nowrap'>%s</td>\n", $allDaysBytes{$_}{'Day'};
printf "<td align='center' nowrap='nowrap'>%.3f</td>\n", ($allDaysBytes{$_}{${Traffic::green_in}}/1048576);
printf "<td align='center' nowrap='nowrap'>%.3f</td>\n", ($allDaysBytes{$_}{${Traffic::green_out}}/1048576);
if ($netsettings{'CONFIG_TYPE'} =~ /^(3|4)$/)
{
printf "<td align='center' nowrap='nowrap'>%.3f</td>\n", ($allDaysBytes{$_}{${Traffic::blue_in}}/1048576);
printf "<td align='center' nowrap='nowrap'>%.3f</td>\n", ($allDaysBytes{$_}{${Traffic::blue_out}}/1048576);
}
if ($netsettings{'CONFIG_TYPE'} =~ /^(2|4)$/)
{
printf "<td align='center' nowrap='nowrap'>%.3f</td>\n", ($allDaysBytes{$_}{${Traffic::orange_in}}/1048576);
printf "<td align='center' nowrap='nowrap'>%.3f</td>\n", ($allDaysBytes{$_}{${Traffic::orange_out}}/1048576);
}
if ($netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/)
{
printf "<td align='center' nowrap='nowrap'>%.3f</td>\n", ($allDaysBytes{$_}{${Traffic::red_in}}/1048576);
printf "<td align='center' nowrap='nowrap'>%.3f</td></tr>\n", ($allDaysBytes{$_}{${Traffic::red_out}}/1048576);
}
$lines++;
}
$total_green_in=sprintf("%.2f", ($total_green_in/1048576));
$total_green_out=sprintf("%.2f", ($total_green_out/1048576));
$total_blue_in=sprintf("%.2f", ($total_blue_in/1048576));
$total_blue_out=sprintf("%.2f", ($total_blue_out/1048576));
$total_orange_in=sprintf("%.2f", ($total_orange_in/1048576));
$total_orange_out=sprintf("%.2f", ($total_orange_out/1048576));
$total_red_in=sprintf("%.2f", ($total_red_in/1048576));
$total_red_out=sprintf("%.2f", ($total_red_out/1048576));
if ($lines % 2) {print "<tr bgcolor='$color{'color20'}'>"; }
else {print "<tr bgcolor='$color{'color22'}'>"; }
print <<END;
<td align='center' class='boldbase' height='20' nowrap='nowrap'><b>$Lang::tr{'trafficsum'}</b></td>
<td align='center' class='boldbase' nowrap='nowrap'><b>$total_green_in MB</b></td>
<td align='center' class='boldbase' nowrap='nowrap'><b>$total_green_out MB</b></td>
END
if ($netsettings{'CONFIG_TYPE'} =~ /^(3|4)$/)
{
print "<td align='center' class='boldbase' nowrap='nowrap'><b>$total_blue_in MB</b></td>";
print "<td align='center' class='boldbase' nowrap='nowrap'><b>$total_blue_out MB</b></td>";
}
if ($netsettings{'CONFIG_TYPE'} =~ /^(2|4)$/)
{
print "<td align='center' class='boldbase' nowrap='nowrap'><b>$total_orange_in MB</b></td>";
print "<td align='center' class='boldbase' nowrap='nowrap'><b>$total_orange_out MB</b></td>";
}
if ($netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/)
{
print "<td align='center' class='boldbase' nowrap='nowrap'><b>$total_red_in MB</b></td>";
print "<td align='center' class='boldbase' nowrap='nowrap'><b>$total_red_out MB</b></td>";
}
print "</tr></table>";
&Header::closebox();
&Header::closebigbox();
&Header::closepage();

6
html/cgi-bin/urlfilter.cgi
View File

@@ -1443,12 +1443,6 @@ print <<END
<td class='base'>$Lang::tr{'urlfilter msg text 3'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
<td><input type='text' name='MSG_TEXT_3' value='$filtersettings{'MSG_TEXT_3'}' size='40' /></td>
</tr>
<tr>
<td class='base'>$Lang::tr{'urlfilter enable jpeg'}:</td>
<td><input type='checkbox' name='ENABLE_JPEG' $checked{'ENABLE_JPEG'}{'on'} /></td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
</table>
<hr size='1'>
<table width='100%'>

3
langs/de/cgi-bin/de.pl
View File

@@ -789,6 +789,7 @@
'gen static key' => 'Statischen Schlüssel erzeugen',
'generate' => 'Root/Host Zertifikate generieren',
'generate a certificate' => 'Erzeuge ein Zertifikat:',
'generate iso' => 'ISO erstellen',
'generate root/host certificates' => 'Erzeuge Root/Host Zertifikate',
'generate tripwire keys and init' => 'Tripwire Initalisierung',
'generatekeys' => 'Neue Schlüssel erzeugen',
@@ -848,11 +849,11 @@
'idle timeout not set' => 'Leerlauf-Wartezeit nicht angegeben.',
'ids log viewer' => 'Ansicht IDS-Log',
'ids logs' => 'IDS-Logdateien',
'ids preprocessor' => 'IDS Präprozessor',
'ids rules license' => 'Um Sourcefire VRT Zertifizierte Regeln zu nutzen, müssen Sie ich registrieren auf',
'ids rules license2' => 'Bestätigen Sie die Lizenz, empfangen Sie Ihr Passwort per email und gehen Sie auf die Website. Gehen Sie zu',
'ids rules license3' => 'klicken Sie den \'Get Code\' Knopf am Fuß und kopieren den 40-Zeichen Oink Code in das untere Feld.',
'ids rules update' => 'Snort Regeln Update',
'ids preprocessor' => 'Snort Präprozessor',
'iface' => 'Iface',
'ignore filter' => '&quot;Ignorieren&quot;-Filter',
'ike encryption' => 'IKE Verschlüsselung:',

7
langs/en/cgi-bin/en.pl
View File

@@ -818,6 +818,7 @@
'gen static key' => 'Generate a static Key',
'generate' => 'Generate Root/Host Zertifikate',
'generate a certificate' => 'Generate a certificate:',
'generate iso' => 'Generate ISO',
'generate root/host certificates' => 'Generate Root/Host Certificates',
'generate tripwire keys and init' => 'generate tripwire keys and init',
'generatekeys' => 'Generate Keys',
@@ -877,11 +878,11 @@
'idle timeout not set' => 'Idle timeout not set.',
'ids log viewer' => 'IDS log viewer',
'ids logs' => 'IDS Logs',
'ids preprocessor' => 'IDS preprocessor',
'ids rules license' => 'To utilize Sourcefire VRT Certified Rules, you need to register on',
'ids rules license2' => 'Acknowledge the license, receive your password by email, and connect to the site. Go to',
'ids rules license3' => 'press the \'Get Code\' button at the bottom and copy the 40 character Oink Code into the field below.',
'ids rules update' => 'Snort rules update',
'ids preprocessor' => 'Snort preprocessor',
'iface' => 'Iface',
'ignore filter' => 'Ignore filter',
'ike encryption' => 'IKE Encryption:',
@@ -1662,7 +1663,7 @@
'unknown' => 'UNKNOWN',
'unnamed' => 'Unnamed',
'update' => 'Update',
'update accelerator' => 'update booster',
'update accelerator' => 'Update Booster',
'update time' => 'Update the time:',
'update transcript' => 'Update transcript',
'updatedatabase' => 'Update Database with last Report',
@@ -1750,7 +1751,7 @@
'upstream proxy host:port' => 'Upstream proxy (host:port)',
'upstream username' => 'Upstream username:',
'uptime and users' => 'Uptime and users:',
'url filter' => 'content filter',
'url filter' => 'Content Filter',
'urlfilter access' => 'Access',
'urlfilter activity detection' => 'Activity detection',
'urlfilter add new time constraint rule' => 'Add new time constraint rule',

2
lfs/alsa
View File

@@ -34,7 +34,7 @@ ifeq "$(KMOD)" "1"
ifeq "$(SMP)" "1"
TARGET = $(DIR_INFO)/$(THISAPP)-kmod-smp
else
TARGET = $(DIR_INFO)/$(THISAPP)-kmod
TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)
endif
else
TARGET = $(DIR_INFO)/$(THISAPP)

2
lfs/atl2
View File

@@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
ifeq "$(SMP)" "1"
TARGET = $(DIR_INFO)/$(THISAPP)-smp
else
TARGET = $(DIR_INFO)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)
endif

2
lfs/directfb
View File

@@ -82,7 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && sed -i "s/checkfor_matrox=yes/checkfor_matrox=no/g" configure
cd $(DIR_APP) && sed -i "s/checkfor_cle266=no/checkfor_cle266=yes/g" configure
cd $(DIR_APP) && ./configure --prefix=/usr --disable-x11 --enable-sdl \
--enable-video4linux2 --enable-multi
--enable-video4linux2
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
ln -s $(THISAPP) /usr/src/directfb

2
lfs/hostapd
View File

@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = hostapd
PAK_VER = 4
PAK_VER = 5
DEPS = ""

1
lfs/initrd
View File

@@ -61,6 +61,7 @@ $(TARGET) :
# make new dependencies
depmod -a -F /boot/System.map-$(KVER)-ipfire $(KVER)-ipfire
#depmod -a -F /boot/System.map-$(KVER)-ipfire-smp $(KVER)-ipfire-smp
depmod -a -F /boot/System.map-2.6.25.17-ipfire 2.6.25.17-ipfire
cp -a /lib/modules/$(KVER)-ipfire/ /install/initrd/lib/modules/

2
lfs/kqemu
View File

@@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
ifeq "$(SMP)" "1"
TARGET = $(DIR_INFO)/$(THISAPP)-smp
else
TARGET = $(DIR_INFO)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)
endif

91
lfs/linux-fusion
View File

@@ -1,91 +0,0 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# #
# 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 #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program 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 program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
###############################################################################
# Definitions
###############################################################################
include Config
VER = 7.0.1
THISAPP = linux-fusion-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
ifeq "$(SMP)" "1"
TARGET = $(DIR_INFO)/$(THISAPP)-smp
else
TARGET = $(DIR_INFO)/$(THISAPP)
endif
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 937028c98dbfd512f0c570c5ffe13769
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
dist:
$(PAK)
###############################################################################
# Downloading, checking, md5sum
###############################################################################
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
@$(CHECK)
$(patsubst %,$(DIR_DL)/%,$(objects)) :
@$(LOAD)
$(subst %,%_MD5,$(objects)) :
@$(MD5)
###############################################################################
# Installation Details
###############################################################################
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && sed -i "s@MODLIB)/drivers@MODLIB)/misc/drivers@g" Makefile
ifeq "$(SMP)" "1"
cd $(DIR_APP) && sed -i "s/\x24(shell uname -r)/$(KVER)-ipfire-smp/g" Makefile
cd $(DIR_APP) && make
cd $(DIR_APP) && make install
else
cd $(DIR_APP) && sed -i "s/\x24(shell uname -r)/$(KVER)-ipfire/g" Makefile
cd $(DIR_APP) && make
cd $(DIR_APP) && make install
endif
@rm -rf $(DIR_APP)
@$(POSTBUILD)

179
lfs/linux25 Normal file
View File

@@ -0,0 +1,179 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# #
# 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 #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program 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 program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
###############################################################################
# Definitions
###############################################################################
include Config
PATCHLEVEL = .17
VER = 2.6.25.17
THISAPP = linux-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
CFLAGS =
CXXFLAGS =
# Normal build or SMP build.
#
ifeq "$(SMP)" "1"
TARGET = $(DIR_INFO)/linux-$(VER)-smp
else
TARGET = $(DIR_INFO)/linux-$(VER)
endif
###############################################################################
# Top-level Rules
###############################################################################
objects =$(DL_FILE) \
mISDN-1_1_8.tar.gz \
squashfs3.4.tar.gz \
netfilter-layer7-v2.20.tar.gz \
patch-2.6.16-nath323-1.3.bz2 \
reiser4-for-2.6.25.patch.bz2
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
netfilter-layer7-v2.20.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.20.tar.gz
patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
squashfs3.4.tar.gz = $(URL_IPFIRE)/squashfs3.4.tar.gz
mISDN-1_1_8.tar.gz = $(URL_IPFIRE)/mISDN-1_1_8.tar.gz
reiser4-for-2.6.25.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.25.patch.bz2
$(DL_FILE)_MD5 = 30618bff93fd4fd048e20a9a6aab8e5d
netfilter-layer7-v2.20.tar.gz_MD5 = 525a821c973b730c8feaf9eedb57d1e4
patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138
squashfs3.4.tar.gz_MD5 = 2a4d2995ad5aa6840c95a95ffa6b1da6
mISDN-1_1_8.tar.gz_MD5 = 29c55ffe0b35668a41eaed3b1c3ddfe2
reiser4-for-2.6.25.patch.bz2_MD5 = 4294bbcb39e5ee859b94b09ff4fb1e0c
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
###############################################################################
# Downloading, checking, md5sum
###############################################################################
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
@$(CHECK)
$(patsubst %,$(DIR_DL)/%,$(objects)) :
@$(LOAD)
$(subst %,%_MD5,$(objects)) :
@$(MD5)
###############################################################################
# Installation Details
###############################################################################
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) $(DIR_SRC)/linux $(DIR_SRC)/xen-* && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
ln -s linux-$(VER) /usr/src/linux
# Fix crash on Twinhead H12Y notebooks
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-h12y-mmio-quirks.patch
# Openswan
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.x.kernel-2.6.23-natt.patch
# Reiser4
cd $(DIR_APP) && bzip2 -d -c $(DIR_DL)/reiser4-for-2.6.25.patch.bz2 | patch -Np1
# SquashFS
cd $(DIR_SRC) && rm -rf squashfs*
cd $(DIR_SRC) && tar xfz $(DIR_DL)/squashfs3.4.tar.gz
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/squashfs3.4/kernel-patches/linux-2.6.25/squashfs3.4-patch
# ip_conntrack permissions from 440 to 444
# cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/ip_conntrack_standalone-patch-for-ipfire.patch
# ipp2p 0.8.2-pomng
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.25.17-ipp2p-0.8.2-pomng.patch
# Layer7-patch
cd $(DIR_SRC) && rm -rf $(DIR_SRC)/netfilter-layer7-v2.20
cd $(DIR_SRC) && tar xzf $(DIR_DL)/netfilter-layer7-v2.20.tar.gz
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.20/kernel-2.6.25-layer7-2.20.patch
# Linux Intermediate Queueing Device
ifeq "$(XEN)" ""
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.25-imq5.diff
endif
# mISDN
cd $(DIR_SRC) && rm -rf mISDN-*
cd $(DIR_SRC) && tar xfz $(DIR_DL)/mISDN-1_1_8.tar.gz
cd $(DIR_SRC)/mISDN-1_1_8 && yes 'yes' | ./std2kern -k /usr/src/linux
cd $(DIR_APP)/drivers/isdn/hardware/mISDN && patch -Np0 < $(DIR_SRC)/src/patches/mISDN-avmfritz.patch
# Cleanup kernel source
cd $(DIR_APP) && make mrproper
ifeq "$(SMP)" "1"
cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE).smp $(DIR_APP)/.config
else
cp $(DIR_SRC)/config/kernel/kernel25.config.$(MACHINE) $(DIR_APP)/.config
endif
cd $(DIR_APP) && make CC="$(KGCC)" oldconfig
cd $(DIR_APP) && make CC="$(KGCC)" clean
ifeq "$(SMP)" "1"
cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ $(PATCHLEVEL)-ipfire-smp/' Makefile
cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage
cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-ipfire-smp
cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-ipfire-smp
ln -sf vmlinuz-$(VER)-ipfire-smp /boot/vmlinuz-ipfire-smp
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install
else
cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ $(PATCHLEVEL)-ipfire/' Makefile
cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage
cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-ipfire
cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-ipfire
cd $(DIR_APP) && cp -v .config /boot/config-$(VER)-ipfire
# ln -sf vmlinuz-$(VER)-ipfire /boot/vmlinuz-ipfire
# ln -sf System.map-$(VER)-ipfire /boot/System.map-ipfire
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install
endif
ifeq "$(SMP)" ""
# Only do this once on the non-SMP pass
cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/
endif
# Rename ide-cd module to match with old kernel
mv /lib/modules/$(VER)-ipfire/kernel/drivers/ide/ide-cd_mod.ko \
/lib/modules/$(VER)-ipfire/kernel/drivers/ide/ide-cd.ko
@rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/mISDN-* $(DIR_SRC)/netfilter-layer7-*
@$(POSTBUILD)

2
lfs/madwifi
View File

@@ -31,7 +31,7 @@ DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
ifeq "$(SMP)" ""
TARGET = $(DIR_INFO)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)
else
TARGET = $(DIR_INFO)/$(THISAPP)-smp
endif

2
lfs/v4l-dvb
View File

@@ -35,7 +35,7 @@ PAK_VER = 2
ifeq "$(SMP)" "1"
TARGET = $(DIR_INFO)/$(THISAPP)-smp
else
TARGET = $(DIR_INFO)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)
endif

9
make.sh
View File

@@ -177,7 +177,7 @@ prepareenv() {
# Setup environment
set +h
LC_ALL=POSIX
MAKETUNING="-j6"
MAKETUNING="-j8"
export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING
unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
@@ -343,8 +343,13 @@ buildipfire() {
# ipfiremake alsa KMOD=1 SMP=1
# ipfiremake sane KMOD=1 SMP=1
# ipfiremake openswan KMOD=1 SMP=1
ipfiremake linux25
ipfiremake atl2 KVER=2.6.25.17
ipfiremake kqemu KVER=2.6.25.17
ipfiremake v4l-dvb KVER=2.6.25.17
ipfiremake madwifi KVER=2.6.25.17
ipfiremake alsa KMOD=1 KVER=2.6.25.17
ipfiremake linux
ipfiremake linux-fusion
ipfiremake atl2
ipfiremake r8168
ipfiremake r8169

87
src/initscripts/init.d/collectd
View File

@@ -5,25 +5,39 @@
. /etc/sysconfig/rc
. $rc_functions
eval $(/usr/local/bin/readhash /var/ipfire/main/settings)
if [ "$RRDLOG" = '' ]; then
RRDLOG=/var/log/rrd
fi
case "$1" in
start)
if [ ! -e /etc/sysconfig/lm_sensors ]; then
boot_mesg "Searching for Sensors..."
"yes" | /usr/sbin/sensors-detect > /dev/null
evaluate_retval
if [ ! -e /etc/sysconfig/lm_sensors ]; then
echo "#No Sensors detected " > /etc/sysconfig/lm_sensors
fi
boot_mesg "Searching for Sensors..."
"yes" | /usr/sbin/sensors-detect > /dev/null
evaluate_retval
if [ ! -e /etc/sysconfig/lm_sensors ]; then
echo "#No Sensors detected " > /etc/sysconfig/lm_sensors
sed -i -e "s|LoadPlugin sensors|#LoadPlugin sensors|g" /etc/collectd.conf
fi
fi
if [ ! -e $RRDLOG.bak/ ]; then
mkdir $RRDLOG.bak/
fi
/etc/init.d/collectd restore
boot_mesg -n "Loading Sensor Modules..."
for modul in `cat /etc/sysconfig/lm_sensors | grep '^MODULE_' | cut -d"=" -s -f2`; do
modprobe $modul > /dev/null 2>&1;
if [ ${?} = 0 ]; then
boot_mesg -n "$SUCCESS$modul$NORMAL ";
else
boot_mesg -n "$FAILURE$modul$NORMAL ";
fi
modprobe $modul > /dev/null 2>&1;
if [ ${?} = 0 ]; then
boot_mesg -n "$SUCCESS$modul$NORMAL ";
else
boot_mesg -n "$FAILURE$modul$NORMAL ";
fi
done
boot_mesg;
echo_ok;
@@ -31,50 +45,29 @@ case "$1" in
boot_mesg "Starting Collection daemon..."
/usr/sbin/collectd -C /etc/collectd.conf
evaluate_retval
#
# These lines are for furhter implementation of the collectd, atm the temps are
# collected by the makegraphs script because of the standby functions
#
# for disk in `kudzu -qps -c HD | grep device: | cut -d" " -f2 | sort | uniq`; do boot_mesg "Bringing up hddtemp daemon for $disk ..."; /usr/sbin/hddtemp $disk -d -l localhost; evaluate_retval; done
#
# Starting the mbmon in deamon mode to enable sensors reading for collectd
# later mbmon will be replaced by lmsensors, if mbmon is not running on your
# system, we advise to comment out these lines in order to prevent fail
#
# boot_mesg "Bringing up mbmon daemon..."
# /usr/bin/mbmon -P 411 -r
# evaluate_retval
;;
stop)
# if mbmon is not running on your system, we advise to comment out these lines
# in order to prevent fail
# boot_mesg "Stopping mbmon daemon..."
# killproc /usr/bin/mbmon
# evaluate_retval
# boot_mesg "Stopping hddtemp daemon..."
# killproc /usr/sbin/hddtemp
# evaluate_retval
/etc/init.d/collectd backup
boot_mesg "Stopping Collection daemon..."
killproc /usr/sbin/collectd
evaluate_retval
;;
restart)
#
# We need to do this that way because mbmon doesn`t clear the port when killed
# so the next startup it fails with port allready in use -> don´t restart mbmon
#
boot_mesg "Stopping Collection daemon..."
killproc /usr/sbin/collectd
evaluate_retval
${0} stop
sleep 1
boot_mesg "Starting Collection daemon..."
/usr/sbin/collectd -C /etc/collectd.conf
${0} start
;;
backup)
boot_mesg "Save rrd files from ramd..."
cp -pR $RRDLOG/* $RRDLOG.bak/
evaluate_retval
;;
;;
restore)
if [ -e $RRDLOG.bak ];then
boot_mesg "Copying rrd files to ramd..."
cp -pR $RRDLOG.bak/* $RRDLOG/
fi
;;
status)
statusproc /usr/sbin/collectd
;;

19
src/install+setup/install/main.c
View File

@@ -66,6 +66,7 @@ int main(int argc, char *argv[])
int unattended = 0;
struct keyvalue *unattendedkv = initkeyvalues();
int hardyn = 0;
char restore_file[STRING_SIZE] = "";
setlocale (LC_ALL, "");
sethostname( SNAME , 10);
@@ -208,6 +209,7 @@ int main(int argc, char *argv[])
fprintf(flog, "unattended: Reading unattended.conf\n");
(void) readkeyvalues(unattendedkv, UNATTENDED_CONF);
findkey(unattendedkv, "RESTORE_FILE", restore_file);
}
/* Make the hdparms struct and print the contents.
@@ -453,6 +455,11 @@ int main(int argc, char *argv[])
KERNEL_VERSION);
mysystem(commandstring);
*/
snprintf(commandstring, STRING_SIZE,
"/bin/touch /harddisk/lib/modules/2.6.25.17-ipfire/modules.dep");
mysystem(commandstring);
/* Rename uname */
rename ("/harddisk/bin/uname.bak", "/harddisk/bin/uname");
@@ -525,6 +532,11 @@ int main(int argc, char *argv[])
/* snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd-%s-smp.img -k %s-ipfire-smp", KERNEL_VERSION, KERNEL_VERSION );
runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
*/
snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd-2.6.25.17.img -k 2.6.25.17-ipfire");
runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
sprintf(string, "root=%s3", hdparams.devnode_part_run);
replace( "/harddisk/boot/grub/grub.conf", "root=ROOT", string);
mysystem("ln -s grub.conf /harddisk/boot/grub/menu.lst");
@@ -538,6 +550,13 @@ int main(int argc, char *argv[])
goto EXIT;
}
/* Copy restore file from cdrom */
if (unattended && (strlen(restore_file) > 0)) {
fprintf(flog, "unattended: Copy restore file\n");
snprintf(commandstring, STRING_SIZE,
"cp /cdrom/%s /harddisk/var/ipfire/backup", restore_file);
}
mysystem("umount /cdrom");
snprintf(commandstring, STRING_SIZE, "eject /dev/%s", sourcedrive);
mysystem(commandstring);

10
src/install+setup/install/unattended.c
View File

@@ -41,7 +41,7 @@ int unattended_setup(struct keyvalue *unattendedkv) {
char green_broadcast[STRING_SIZE];
char root_password[STRING_SIZE];
char admin_password[STRING_SIZE];
char restore_file[STRING_SIZE];
char restore_file[STRING_SIZE] = "";
findkey(unattendedkv, "DOMAINNAME", domainname);
findkey(unattendedkv, "HOSTNAME", hostname);
@@ -147,13 +147,13 @@ int unattended_setup(struct keyvalue *unattendedkv) {
}
/* restore backup */
if (restore_file != "") {
if (strlen(restore_file) > 0) {
fprintf(flog, "unattended: Restoring Backup\n");
snprintf(commandstring, STRING_SIZE,
"cd /harddisk && /bin/tar -xvz --preserve -f /cdrom/%s", restore_file);
"cd /harddisk && /bin/tar -xvz --preserve -f /harddisk/var/ipfire/%s", restore_file);
if (mysystem(commandstring)) {
errorbox("unattended: ERROR setting admin password");
return 0;
errorbox("unattended: ERROR restoring backup");
}
}
fprintf(flog, "unattended: Setup ended\n");

980
src/patches/linux-2.6.25.17-ipp2p-0.8.2-pomng.patch Normal file
View File

@@ -0,0 +1,980 @@
diff -Naur linux-2.6.25.17.org/include/linux/netfilter_ipv4/ipt_ipp2p.h linux-2.6.25.17/include/linux/netfilter_ipv4/ipt_ipp2p.h
--- linux-2.6.25.17.org/include/linux/netfilter_ipv4/ipt_ipp2p.h 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.25.17/include/linux/netfilter_ipv4/ipt_ipp2p.h 2008-09-29 15:19:39.000000000 +0000
@@ -0,0 +1,31 @@
+#ifndef __IPT_IPP2P_H
+#define __IPT_IPP2P_H
+#define IPP2P_VERSION "0.8.2-pomng"
+
+struct ipt_p2p_info {
+ int cmd;
+ int debug;
+};
+
+#endif //__IPT_IPP2P_H
+
+#define SHORT_HAND_IPP2P 1 /* --ipp2p switch*/
+//#define SHORT_HAND_DATA 4 /* --ipp2p-data switch*/
+#define SHORT_HAND_NONE 5 /* no short hand*/
+
+#define IPP2P_EDK (1 << 1)
+#define IPP2P_DATA_KAZAA (1 << 2)
+#define IPP2P_DATA_EDK (1 << 3)
+#define IPP2P_DATA_DC (1 << 4)
+#define IPP2P_DC (1 << 5)
+#define IPP2P_DATA_GNU (1 << 6)
+#define IPP2P_GNU (1 << 7)
+#define IPP2P_KAZAA (1 << 8)
+#define IPP2P_BIT (1 << 9)
+#define IPP2P_APPLE (1 << 10)
+#define IPP2P_SOUL (1 << 11)
+#define IPP2P_WINMX (1 << 12)
+#define IPP2P_ARES (1 << 13)
+#define IPP2P_MUTE (1 << 14)
+#define IPP2P_WASTE (1 << 15)
+#define IPP2P_XDCC (1 << 16)
diff -Naur linux-2.6.25.17.org/net/ipv4/netfilter/Kconfig linux-2.6.25.17/net/ipv4/netfilter/Kconfig
--- linux-2.6.25.17.org/net/ipv4/netfilter/Kconfig 2008-09-08 10:20:51.000000000 +0000
+++ linux-2.6.25.17/net/ipv4/netfilter/Kconfig 2008-09-29 15:19:39.000000000 +0000
@@ -379,5 +379,15 @@
Allows altering the ARP packet payload: source and destination
hardware and network addresses.
+config IP_NF_MATCH_IPP2P
+ tristate 'IPP2P match support'
+ depends on IP_NF_IPTABLES
+ help
+ This option makes possible to match some P2P packets
+ therefore helps controlling such traffic.
+
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. If unsure, say `N'.
+
endmenu
diff -Naur linux-2.6.25.17.org/net/ipv4/netfilter/Makefile linux-2.6.25.17/net/ipv4/netfilter/Makefile
--- linux-2.6.25.17.org/net/ipv4/netfilter/Makefile 2008-09-08 10:20:51.000000000 +0000
+++ linux-2.6.25.17/net/ipv4/netfilter/Makefile 2008-09-29 15:19:39.000000000 +0000
@@ -45,6 +45,7 @@
obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o
obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o
obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
+obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o
obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
# targets
diff -Naur linux-2.6.25.17.org/net/ipv4/netfilter/ipt_ipp2p.c linux-2.6.25.17/net/ipv4/netfilter/ipt_ipp2p.c
--- linux-2.6.25.17.org/net/ipv4/netfilter/ipt_ipp2p.c 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.25.17/net/ipv4/netfilter/ipt_ipp2p.c 2008-09-29 15:19:39.000000000 +0000
@@ -0,0 +1,911 @@
+#if defined(MODVERSIONS)
+#include <linux/modversions.h>
+#endif
+#include <linux/module.h>
+#include <linux/version.h>
+#include <linux/netfilter_ipv4/ip_tables.h>
+#include <linux/netfilter_ipv4/ipt_ipp2p.h>
+#include <net/tcp.h>
+#include <net/udp.h>
+
+#define get_u8(X,O) (*(__u8 *)(X + O))
+#define get_u16(X,O) (*(__u16 *)(X + O))
+#define get_u32(X,O) (*(__u32 *)(X + O))
+
+MODULE_AUTHOR("Eicke Friedrich/Klaus Degner <ipp2p@ipp2p.org>");
+MODULE_DESCRIPTION("An extension to iptables to identify P2P traffic.");
+MODULE_LICENSE("GPL");
+
+
+/*Search for UDP eDonkey/eMule/Kad commands*/
+int
+udp_search_edk (unsigned char *haystack, int packet_len)
+{
+ unsigned char *t = haystack;
+ t += 8;
+
+ switch (t[0]) {
+ case 0xe3:
+ { /*edonkey*/
+ switch (t[1])
+ {
+ /* client -> server status request */
+ case 0x96:
+ if (packet_len == 14) return ((IPP2P_EDK * 100) + 50);
+ break;
+ /* server -> client status request */
+ case 0x97: if (packet_len == 42) return ((IPP2P_EDK * 100) + 51);
+ break;
+ /* server description request */
+ /* e3 2a ff f0 .. | size == 6 */
+ case 0xa2: if ( (packet_len == 14) && ( get_u16(t,2) == __constant_htons(0xfff0) ) ) return ((IPP2P_EDK * 100) + 52);
+ break;
+ /* server description response */
+ /* e3 a3 ff f0 .. | size > 40 && size < 200 */
+ //case 0xa3: return ((IPP2P_EDK * 100) + 53);
+ // break;
+ case 0x9a: if (packet_len==26) return ((IPP2P_EDK * 100) + 54);
+ break;
+
+ case 0x92: if (packet_len==18) return ((IPP2P_EDK * 100) + 55);
+ break;
+ }
+ break;
+ }
+ case 0xe4:
+ {
+ switch (t[1])
+ {
+ /* e4 20 .. | size == 43 */
+ case 0x20: if ((packet_len == 43) && (t[2] != 0x00) && (t[34] != 0x00)) return ((IPP2P_EDK * 100) + 60);
+ break;
+ /* e4 00 .. 00 | size == 35 ? */
+ case 0x00: if ((packet_len == 35) && (t[26] == 0x00)) return ((IPP2P_EDK * 100) + 61);
+ break;
+ /* e4 10 .. 00 | size == 35 ? */
+ case 0x10: if ((packet_len == 35) && (t[26] == 0x00)) return ((IPP2P_EDK * 100) + 62);
+ break;
+ /* e4 18 .. 00 | size == 35 ? */
+ case 0x18: if ((packet_len == 35) && (t[26] == 0x00)) return ((IPP2P_EDK * 100) + 63);
+ break;
+ /* e4 52 .. | size = 44 */
+ case 0x52: if (packet_len == 44 ) return ((IPP2P_EDK * 100) + 64);
+ break;
+ /* e4 58 .. | size == 6 */
+ case 0x58: if (packet_len == 14 ) return ((IPP2P_EDK * 100) + 65);
+ break;
+ /* e4 59 .. | size == 2 */
+ case 0x59: if (packet_len == 10 )return ((IPP2P_EDK * 100) + 66);
+ break;
+ /* e4 28 .. | packet_len == 52,77,102,127... */
+ case 0x28: if (((packet_len-52) % 25) == 0) return ((IPP2P_EDK * 100) + 67);
+ break;
+ /* e4 50 xx xx | size == 4 */
+ case 0x50: if (packet_len == 12) return ((IPP2P_EDK * 100) + 68);
+ break;
+ /* e4 40 xx xx | size == 48 */
+ case 0x40: if (packet_len == 56) return ((IPP2P_EDK * 100) + 69);
+ break;
+ }
+ break;
+ }
+ } /* end of switch (t[0]) */
+ return 0;
+}/*udp_search_edk*/
+
+
+/*Search for UDP Gnutella commands*/
+int
+udp_search_gnu (unsigned char *haystack, int packet_len)
+{
+ unsigned char *t = haystack;
+ t += 8;
+
+ if (memcmp(t, "GND", 3) == 0) return ((IPP2P_GNU * 100) + 51);
+ if (memcmp(t, "GNUTELLA ", 9) == 0) return ((IPP2P_GNU * 100) + 52);
+ return 0;
+}/*udp_search_gnu*/
+
+
+/*Search for UDP KaZaA commands*/
+int
+udp_search_kazaa (unsigned char *haystack, int packet_len)
+{
+ unsigned char *t = haystack;
+
+ if (t[packet_len-1] == 0x00){
+ t += (packet_len - 6);
+ if (memcmp(t, "KaZaA", 5) == 0) return (IPP2P_KAZAA * 100 +50);
+ }
+
+ return 0;
+}/*udp_search_kazaa*/
+
+/*Search for UDP DirectConnect commands*/
+int
+udp_search_directconnect (unsigned char *haystack, int packet_len)
+{
+ unsigned char *t = haystack;
+ if ((*(t + 8) == 0x24) && (*(t + packet_len - 1) == 0x7c)) {
+ t+=8;
+ if (memcmp(t, "SR ", 3) == 0) return ((IPP2P_DC * 100) + 60);
+ if (memcmp(t, "Ping ", 5) == 0) return ((IPP2P_DC * 100) + 61);
+ }
+ return 0;
+}/*udp_search_directconnect*/
+
+
+
+/*Search for UDP BitTorrent commands*/
+int
+udp_search_bit (unsigned char *haystack, int packet_len)
+{
+ switch(packet_len)
+ {
+ case 24:
+ /* ^ 00 00 04 17 27 10 19 80 */
+ if ((ntohl(get_u32(haystack, 8)) == 0x00000417) && (ntohl(get_u32(haystack, 12)) == 0x27101980))
+ return (IPP2P_BIT * 100 + 50);
+ break;
+ case 44:
+ if (get_u32(haystack, 16) == __constant_htonl(0x00000400) && get_u32(haystack, 36) == __constant_htonl(0x00000104))
+ return (IPP2P_BIT * 100 + 51);
+ if (get_u32(haystack, 16) == __constant_htonl(0x00000400))
+ return (IPP2P_BIT * 100 + 61);
+ break;
+ case 65:
+ if (get_u32(haystack, 16) == __constant_htonl(0x00000404) && get_u32(haystack, 36) == __constant_htonl(0x00000104))
+ return (IPP2P_BIT * 100 + 52);
+ if (get_u32(haystack, 16) == __constant_htonl(0x00000404))
+ return (IPP2P_BIT * 100 + 62);
+ break;
+ case 67:
+ if (get_u32(haystack, 16) == __constant_htonl(0x00000406) && get_u32(haystack, 36) == __constant_htonl(0x00000104))
+ return (IPP2P_BIT * 100 + 53);
+ if (get_u32(haystack, 16) == __constant_htonl(0x00000406))
+ return (IPP2P_BIT * 100 + 63);
+ break;
+ case 211:
+ if (get_u32(haystack, 8) == __constant_htonl(0x00000405))
+ return (IPP2P_BIT * 100 + 54);
+ break;
+ case 29:
+ if ((get_u32(haystack, 8) == __constant_htonl(0x00000401)))
+ return (IPP2P_BIT * 100 + 55);
+ break;
+ case 52:
+ if (get_u32(haystack,8) == __constant_htonl(0x00000827) &&
+ get_u32(haystack,12) == __constant_htonl(0x37502950))
+ return (IPP2P_BIT * 100 + 80);
+ break;
+ default:
+ /* this packet does not have a constant size */
+ if (packet_len >= 40 && get_u32(haystack, 16) == __constant_htonl(0x00000402) && get_u32(haystack, 36) == __constant_htonl(0x00000104))
+ return (IPP2P_BIT * 100 + 56);
+ break;
+ }
+
+ /* some extra-bitcomet rules:
+ * "d1:" [a|r] "d2:id20:"
+ */
+ if (packet_len > 30 && get_u8(haystack, 8) == 'd' && get_u8(haystack, 9) == '1' && get_u8(haystack, 10) == ':' )
+ {
+ if (get_u8(haystack, 11) == 'a' || get_u8(haystack, 11) == 'r')
+ {
+ if (memcmp(haystack+12,"d2:id20:",8)==0)
+ return (IPP2P_BIT * 100 + 57);
+ }
+ }
+
+#if 0
+ /* bitlord rules */
+ /* packetlen must be bigger than 40 */
+ /* first 4 bytes are zero */
+ if (packet_len > 40 && get_u32(haystack, 8) == 0x00000000)
+ {
+ /* first rule: 00 00 00 00 01 00 00 xx xx xx xx 00 00 00 00*/
+ if (get_u32(haystack, 12) == 0x00000000 &&
+ get_u32(haystack, 16) == 0x00010000 &&
+ get_u32(haystack, 24) == 0x00000000 )
+ return (IPP2P_BIT * 100 + 71);
+
+ /* 00 01 00 00 0d 00 00 xx xx xx xx 00 00 00 00*/
+ if (get_u32(haystack, 12) == 0x00000001 &&
+ get_u32(haystack, 16) == 0x000d0000 &&
+ get_u32(haystack, 24) == 0x00000000 )
+ return (IPP2P_BIT * 100 + 71);
+
+
+ }
+#endif
+
+ return 0;
+}/*udp_search_bit*/
+
+
+
+/*Search for Ares commands*/
+//#define IPP2P_DEBUG_ARES
+int
+search_ares (const unsigned char *payload, const u16 plen)
+//int search_ares (unsigned char *haystack, int packet_len, int head_len)
+{
+// const unsigned char *t = haystack + head_len;
+
+ /* all ares packets start with */
+ if (payload[1] == 0 && (plen - payload[0]) == 3)
+ {
+ switch (payload[2])
+ {
+ case 0x5a:
+ /* ares connect */
+ if ( plen == 6 && payload[5] == 0x05 ) return ((IPP2P_ARES * 100) + 1);
+ break;
+ case 0x09:
+ /* ares search, min 3 chars --> 14 bytes
+ * lets define a search can be up to 30 chars --> max 34 bytes
+ */
+ if ( plen >= 14 && plen <= 34 ) return ((IPP2P_ARES * 100) + 1);
+ break;
+#ifdef IPP2P_DEBUG_ARES
+ default:
+ printk(KERN_DEBUG "Unknown Ares command %x recognized, len: %u \n", (unsigned int) payload[2],plen);
+#endif /* IPP2P_DEBUG_ARES */
+ }
+ }
+
+#if 0
+ /* found connect packet: 03 00 5a 04 03 05 */
+ /* new version ares 1.8: 03 00 5a xx xx 05 */
+ if ((plen) == 6){ /* possible connect command*/
+ if ((payload[0] == 0x03) && (payload[1] == 0x00) && (payload[2] == 0x5a) && (payload[5] == 0x05))
+ return ((IPP2P_ARES * 100) + 1);
+ }
+ if ((plen) == 60){ /* possible download command*/
+ if ((payload[59] == 0x0a) && (payload[58] == 0x0a)){
+ if (memcmp(t, "PUSH SHA1:", 10) == 0) /* found download command */
+ return ((IPP2P_ARES * 100) + 2);
+ }
+ }
+#endif
+
+ return 0;
+} /*search_ares*/
+
+/*Search for SoulSeek commands*/
+int
+search_soul (const unsigned char *payload, const u16 plen)
+{
+//#define IPP2P_DEBUG_SOUL
+ /* match: xx xx xx xx | xx = sizeof(payload) - 4 */
+ if (get_u32(payload, 0) == (plen - 4)){
+ const __u32 m=get_u32(payload, 4);
+ /* match 00 yy yy 00, yy can be everything */
+ if ( get_u8(payload, 4) == 0x00 && get_u8(payload, 7) == 0x00 )
+ {
+#ifdef IPP2P_DEBUG_SOUL
+ printk(KERN_DEBUG "0: Soulseek command 0x%x recognized\n",get_u32(payload, 4));
+#endif /* IPP2P_DEBUG_SOUL */
+ return ((IPP2P_SOUL * 100) + 1);
+ }
+
+ /* next match: 01 yy 00 00 | yy can be everything */
+ if ( get_u8(payload, 4) == 0x01 && get_u16(payload, 6) == 0x0000 )
+ {
+#ifdef IPP2P_DEBUG_SOUL
+ printk(KERN_DEBUG "1: Soulseek command 0x%x recognized\n",get_u16(payload, 4));
+#endif /* IPP2P_DEBUG_SOUL */
+ return ((IPP2P_SOUL * 100) + 2);
+ }
+
+ /* other soulseek commandos are: 1-5,7,9,13-18,22,23,26,28,35-37,40-46,50,51,60,62-69,91,92,1001 */
+ /* try to do this in an intelligent way */
+ /* get all small commandos */
+ switch(m)
+ {
+ case 7:
+ case 9:
+ case 22:
+ case 23:
+ case 26:
+ case 28:
+ case 50:
+ case 51:
+ case 60:
+ case 91:
+ case 92:
+ case 1001:
+#ifdef IPP2P_DEBUG_SOUL
+ printk(KERN_DEBUG "2: Soulseek command 0x%x recognized\n",get_u16(payload, 4));
+#endif /* IPP2P_DEBUG_SOUL */
+ return ((IPP2P_SOUL * 100) + 3);
+ }
+
+ if (m > 0 && m < 6 )
+ {
+#ifdef IPP2P_DEBUG_SOUL
+ printk(KERN_DEBUG "3: Soulseek command 0x%x recognized\n",get_u16(payload, 4));
+#endif /* IPP2P_DEBUG_SOUL */
+ return ((IPP2P_SOUL * 100) + 4);
+ }
+ if (m > 12 && m < 19 )
+ {
+#ifdef IPP2P_DEBUG_SOUL
+ printk(KERN_DEBUG "4: Soulseek command 0x%x recognized\n",get_u16(payload, 4));
+#endif /* IPP2P_DEBUG_SOUL */
+ return ((IPP2P_SOUL * 100) + 5);
+ }
+
+ if (m > 34 && m < 38 )
+ {
+#ifdef IPP2P_DEBUG_SOUL
+ printk(KERN_DEBUG "5: Soulseek command 0x%x recognized\n",get_u16(payload, 4));
+#endif /* IPP2P_DEBUG_SOUL */
+ return ((IPP2P_SOUL * 100) + 6);
+ }
+
+ if (m > 39 && m < 47 )
+ {
+#ifdef IPP2P_DEBUG_SOUL
+ printk(KERN_DEBUG "6: Soulseek command 0x%x recognized\n",get_u16(payload, 4));
+#endif /* IPP2P_DEBUG_SOUL */
+ return ((IPP2P_SOUL * 100) + 7);
+ }
+
+ if (m > 61 && m < 70 )
+ {
+#ifdef IPP2P_DEBUG_SOUL
+ printk(KERN_DEBUG "7: Soulseek command 0x%x recognized\n",get_u16(payload, 4));
+#endif /* IPP2P_DEBUG_SOUL */
+ return ((IPP2P_SOUL * 100) + 8);
+ }
+
+#ifdef IPP2P_DEBUG_SOUL
+ printk(KERN_DEBUG "unknown SOULSEEK command: 0x%x, first 16 bit: 0x%x, first 8 bit: 0x%x ,soulseek ???\n",get_u32(payload, 4),get_u16(payload, 4) >> 16,get_u8(payload, 4) >> 24);
+#endif /* IPP2P_DEBUG_SOUL */
+ }
+
+ /* match 14 00 00 00 01 yy 00 00 00 STRING(YY) 01 00 00 00 00 46|50 00 00 00 00 */
+ /* without size at the beginning !!! */
+ if ( get_u32(payload, 0) == 0x14 && get_u8(payload, 4) == 0x01 )
+ {
+ __u32 y=get_u32(payload, 5);
+ /* we need 19 chars + string */
+ if ( (y + 19) <= (plen) )
+ {
+ const unsigned char *w=payload+9+y;
+ if (get_u32(w, 0) == 0x01 && ( get_u16(w, 4) == 0x4600 || get_u16(w, 4) == 0x5000) && get_u32(w, 6) == 0x00);
+#ifdef IPP2P_DEBUG_SOUL
+ printk(KERN_DEBUG "Soulssek special client command recognized\n");
+#endif /* IPP2P_DEBUG_SOUL */
+ return ((IPP2P_SOUL * 100) + 9);
+ }
+ }
+ return 0;
+}
+
+
+/*Search for WinMX commands*/
+int
+search_winmx (const unsigned char *payload, const u16 plen)
+{
+//#define IPP2P_DEBUG_WINMX
+ if (((plen) == 4) && (memcmp(payload, "SEND", 4) == 0)) return ((IPP2P_WINMX * 100) + 1);
+ if (((plen) == 3) && (memcmp(payload, "GET", 3) == 0)) return ((IPP2P_WINMX * 100) + 2);
+ //if (packet_len < (head_len + 10)) return 0;
+ if (plen < 10) return 0;
+
+ if ((memcmp(payload, "SEND", 4) == 0) || (memcmp(payload, "GET", 3) == 0)){
+ u16 c=4;
+ const u16 end=plen-2;
+ u8 count=0;
+ while (c < end)
+ {
+ if (payload[c]== 0x20 && payload[c+1] == 0x22)
+ {
+ c++;
+ count++;
+ if (count>=2) return ((IPP2P_WINMX * 100) + 3);
+ }
+ c++;
+ }
+ }
+
+ if ( plen == 149 && payload[0] == '8' )
+ {
+#ifdef IPP2P_DEBUG_WINMX
+ printk(KERN_INFO "maybe WinMX\n");
+#endif
+ if (get_u32(payload,17) == 0 && get_u32(payload,21) == 0 && get_u32(payload,25) == 0 &&
+// get_u32(payload,33) == __constant_htonl(0x71182b1a) && get_u32(payload,37) == __constant_htonl(0x05050000) &&
+// get_u32(payload,133) == __constant_htonl(0x31097edf) && get_u32(payload,145) == __constant_htonl(0xdcb8f792))
+ get_u16(payload,39) == 0 && get_u16(payload,135) == __constant_htons(0x7edf) && get_u16(payload,147) == __constant_htons(0xf792))
+
+ {
+#ifdef IPP2P_DEBUG_WINMX
+ printk(KERN_INFO "got WinMX\n");
+#endif
+ return ((IPP2P_WINMX * 100) + 4);
+ }
+ }
+ return 0;
+} /*search_winmx*/
+
+
+/*Search for appleJuice commands*/
+int
+search_apple (const unsigned char *payload, const u16 plen)
+{
+ if ( (plen > 7) && (payload[6] == 0x0d) && (payload[7] == 0x0a) && (memcmp(payload, "ajprot", 6) == 0)) return (IPP2P_APPLE * 100);
+
+ return 0;
+}
+
+
+/*Search for BitTorrent commands*/
+int
+search_bittorrent (const unsigned char *payload, const u16 plen)
+{
+ if (plen > 20)
+ {
+ /* test for match 0x13+"BitTorrent protocol" */
+ if (payload[0] == 0x13)
+ {
+ if (memcmp(payload+1, "BitTorrent protocol", 19) == 0) return (IPP2P_BIT * 100);
+ }
+
+ /* get tracker commandos, all starts with GET /
+ * then it can follow: scrape| announce
+ * and then ?hash_info=
+ */
+ if (memcmp(payload,"GET /",5) == 0)
+ {
+ /* message scrape */
+ if ( memcmp(payload+5,"scrape?info_hash=",17)==0 ) return (IPP2P_BIT * 100 + 1);
+ /* message announce */
+ if ( memcmp(payload+5,"announce?info_hash=",19)==0 ) return (IPP2P_BIT * 100 + 2);
+ }
+ }
+ else
+ {
+ /* bitcomet encryptes the first packet, so we have to detect another
+ * one later in the flow */
+ /* first try failed, too many missdetections */
+ //if ( size == 5 && get_u32(t,0) == __constant_htonl(1) && t[4] < 3) return (IPP2P_BIT * 100 + 3);
+
+ /* second try: block request packets */
+ if ( plen == 17 && get_u32(payload,0) == __constant_htonl(0x0d) && payload[4] == 0x06 && get_u32(payload,13) == __constant_htonl(0x4000) ) return (IPP2P_BIT * 100 + 3);
+ }
+
+ return 0;
+}
+
+
+
+/*check for Kazaa get command*/
+int
+search_kazaa (const unsigned char *payload, const u16 plen)
+
+{
+ if ((payload[plen-2] == 0x0d) && (payload[plen-1] == 0x0a) && memcmp(payload, "GET /.hash=", 11) == 0)
+ return (IPP2P_DATA_KAZAA * 100);
+
+ return 0;
+}
+
+
+/*check for gnutella get command*/
+int
+search_gnu (const unsigned char *payload, const u16 plen)
+{
+ if ((payload[plen-2] == 0x0d) && (payload[plen-1] == 0x0a))
+ {
+ if (memcmp(payload, "GET /get/", 9) == 0) return ((IPP2P_DATA_GNU * 100) + 1);
+ if (memcmp(payload, "GET /uri-res/", 13) == 0) return ((IPP2P_DATA_GNU * 100) + 2);
+ }
+ return 0;
+}
+
+
+/*check for gnutella get commands and other typical data*/
+int
+search_all_gnu (const unsigned char *payload, const u16 plen)
+{
+
+ if ((payload[plen-2] == 0x0d) && (payload[plen-1] == 0x0a))
+ {
+
+ if (memcmp(payload, "GNUTELLA CONNECT/", 17) == 0) return ((IPP2P_GNU * 100) + 1);
+ if (memcmp(payload, "GNUTELLA/", 9) == 0) return ((IPP2P_GNU * 100) + 2);
+
+
+ if ((memcmp(payload, "GET /get/", 9) == 0) || (memcmp(payload, "GET /uri-res/", 13) == 0))
+ {
+ u16 c=8;
+ const u16 end=plen-22;
+ while (c < end) {
+ if ( payload[c] == 0x0a && payload[c+1] == 0x0d && ((memcmp(&payload[c+2], "X-Gnutella-", 11) == 0) || (memcmp(&payload[c+2], "X-Queue:", 8) == 0)))
+ return ((IPP2P_GNU * 100) + 3);
+ c++;
+ }
+ }
+ }
+ return 0;
+}
+
+
+/*check for KaZaA download commands and other typical data*/
+int
+search_all_kazaa (const unsigned char *payload, const u16 plen)
+{
+ if ((payload[plen-2] == 0x0d) && (payload[plen-1] == 0x0a))
+ {
+
+ if (memcmp(payload, "GIVE ", 5) == 0) return ((IPP2P_KAZAA * 100) + 1);
+
+ if (memcmp(payload, "GET /", 5) == 0) {
+ u16 c = 8;
+ const u16 end=plen-22;
+ while (c < end) {
+ if ( payload[c] == 0x0a && payload[c+1] == 0x0d && ((memcmp(&payload[c+2], "X-Kazaa-Username: ", 18) == 0) || (memcmp(&payload[c+2], "User-Agent: PeerEnabler/", 24) == 0)))
+ return ((IPP2P_KAZAA * 100) + 2);
+ c++;
+ }
+ }
+ }
+ return 0;
+}
+
+/*fast check for edonkey file segment transfer command*/
+int
+search_edk (const unsigned char *payload, const u16 plen)
+{
+ if (payload[0] != 0xe3)
+ return 0;
+ else {
+ if (payload[5] == 0x47)
+ return (IPP2P_DATA_EDK * 100);
+ else
+ return 0;
+ }
+}
+
+
+
+/*intensive but slower search for some edonkey packets including size-check*/
+int
+search_all_edk (const unsigned char *payload, const u16 plen)
+{
+ if (payload[0] != 0xe3)
+ return 0;
+ else {
+ //t += head_len;
+ const u16 cmd = get_u16(payload, 1);
+ if (cmd == (plen - 5)) {
+ switch (payload[5]) {
+ case 0x01: return ((IPP2P_EDK * 100) + 1); /*Client: hello or Server:hello*/
+ case 0x4c: return ((IPP2P_EDK * 100) + 9); /*Client: Hello-Answer*/
+ }
+ }
+ return 0;
+ }
+}
+
+
+/*fast check for Direct Connect send command*/
+int
+search_dc (const unsigned char *payload, const u16 plen)
+{
+
+ if (payload[0] != 0x24 )
+ return 0;
+ else {
+ if (memcmp(&payload[1], "Send|", 5) == 0)
+ return (IPP2P_DATA_DC * 100);
+ else
+ return 0;
+ }
+
+}
+
+
+/*intensive but slower check for all direct connect packets*/
+int
+search_all_dc (const unsigned char *payload, const u16 plen)
+{
+// unsigned char *t = haystack;
+
+ if (payload[0] == 0x24 && payload[plen-1] == 0x7c)
+ {
+ const unsigned char *t=&payload[1];
+ /* Client-Hub-Protocol */
+ if (memcmp(t, "Lock ", 5) == 0) return ((IPP2P_DC * 100) + 1);
+ /* Client-Client-Protocol, some are already recognized by client-hub (like lock) */
+ if (memcmp(t, "MyNick ", 7) == 0) return ((IPP2P_DC * 100) + 38);
+ }
+ return 0;
+}
+
+/*check for mute*/
+int
+search_mute (const unsigned char *payload, const u16 plen)
+{
+ if ( plen == 209 || plen == 345 || plen == 473 || plen == 609 || plen == 1121 )
+ {
+ //printk(KERN_DEBUG "size hit: %u",size);
+ if (memcmp(payload,"PublicKey: ",11) == 0 )
+ {
+ return ((IPP2P_MUTE * 100) + 0);
+
+/* if (memcmp(t+size-14,"\x0aEndPublicKey\x0a",14) == 0)
+ {
+ printk(KERN_DEBUG "end pubic key hit: %u",size);
+
+ }*/
+ }
+ }
+ return 0;
+}
+
+
+/* check for xdcc */
+int
+search_xdcc (const unsigned char *payload, const u16 plen)
+{
+ /* search in small packets only */
+ if (plen > 20 && plen < 200 && payload[plen-1] == 0x0a && payload[plen-2] == 0x0d && memcmp(payload,"PRIVMSG ",8) == 0)
+ {
+
+ u16 x=10;
+ const u16 end=plen - 13;
+
+ /* is seems to be a irc private massage, chedck for xdcc command */
+ while (x < end)
+ {
+ if (payload[x] == ':')
+ {
+ if ( memcmp(&payload[x+1],"xdcc send #",11) == 0 )
+ return ((IPP2P_XDCC * 100) + 0);
+ }
+ x++;
+ }
+ }
+ return 0;
+}
+
+/* search for waste */
+int search_waste(const unsigned char *payload, const u16 plen)
+{
+ if ( plen >= 8 && memcmp(payload,"GET.sha1:",9) == 0)
+ return ((IPP2P_WASTE * 100) + 0);
+
+ return 0;
+}
+
+
+static struct {
+ int command;
+ __u8 short_hand; /*for fucntions included in short hands*/
+ int packet_len;
+ int (*function_name) (const unsigned char *, const u16);
+} matchlist[] = {
+ {IPP2P_EDK,SHORT_HAND_IPP2P,20, &search_all_edk},
+// {IPP2P_DATA_KAZAA,SHORT_HAND_DATA,200, &search_kazaa},
+// {IPP2P_DATA_EDK,SHORT_HAND_DATA,60, &search_edk},
+// {IPP2P_DATA_DC,SHORT_HAND_DATA,26, &search_dc},
+ {IPP2P_DC,SHORT_HAND_IPP2P,5, search_all_dc},
+// {IPP2P_DATA_GNU,SHORT_HAND_DATA,40, &search_gnu},
+ {IPP2P_GNU,SHORT_HAND_IPP2P,5, &search_all_gnu},
+ {IPP2P_KAZAA,SHORT_HAND_IPP2P,5, &search_all_kazaa},
+ {IPP2P_BIT,SHORT_HAND_IPP2P,20, &search_bittorrent},
+ {IPP2P_APPLE,SHORT_HAND_IPP2P,5, &search_apple},
+ {IPP2P_SOUL,SHORT_HAND_IPP2P,5, &search_soul},
+ {IPP2P_WINMX,SHORT_HAND_IPP2P,2, &search_winmx},
+ {IPP2P_ARES,SHORT_HAND_IPP2P,5, &search_ares},
+ {IPP2P_MUTE,SHORT_HAND_NONE,200, &search_mute},
+ {IPP2P_WASTE,SHORT_HAND_NONE,5, &search_waste},
+ {IPP2P_XDCC,SHORT_HAND_NONE,5, &search_xdcc},
+ {0,0,0,NULL}
+};
+
+
+static struct {
+ int command;
+ __u8 short_hand; /*for fucntions included in short hands*/
+ int packet_len;
+ int (*function_name) (unsigned char *, int);
+} udp_list[] = {
+ { IPP2P_KAZAA, SHORT_HAND_IPP2P, 14, &udp_search_kazaa},
+ { IPP2P_BIT, SHORT_HAND_IPP2P, 23, &udp_search_bit},
+ { IPP2P_GNU, SHORT_HAND_IPP2P, 11, &udp_search_gnu},
+ { IPP2P_EDK, SHORT_HAND_IPP2P, 9, &udp_search_edk},
+ { IPP2P_DC, SHORT_HAND_IPP2P, 12, &udp_search_directconnect},
+ { 0, 0, 0, NULL }
+};
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
+static bool
+#else
+static int
+#endif
+match(const struct sk_buff *skb,
+ const struct net_device *in,
+ const struct net_device *out,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
+ const struct xt_match *match,
+#endif
+ const void *matchinfo,
+ int offset,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+ const void *hdr,
+ u_int16_t datalen,
+#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
+ unsigned int protoff,
+#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
+ bool *hotdrop)
+#else
+ bool *hotdrop)
+#endif
+{
+ const struct ipt_p2p_info *info = matchinfo;
+ unsigned char *haystack;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
+ struct iphdr *ip = ip_hdr(skb);
+#else
+ struct iphdr *ip = skb->nh.iph;
+#endif
+ int p2p_result = 0, i = 0;
+// int head_len;
+ int hlen = ntohs(ip->tot_len)-(ip->ihl*4); /*hlen = packet-data length*/
+
+ /*must not be a fragment*/
+ if (offset) {
+ if (info->debug) printk("IPP2P.match: offset found %i \n",offset);
+ return 0;
+ }
+
+ /*make sure that skb is linear*/
+ if(skb_is_nonlinear(skb)){
+ if (info->debug) printk("IPP2P.match: nonlinear skb found\n");
+ return 0;
+ }
+
+
+ haystack=(char *)ip+(ip->ihl*4); /*haystack = packet data*/
+
+ switch (ip->protocol){
+ case IPPROTO_TCP: /*what to do with a TCP packet*/
+ {
+ struct tcphdr *tcph = (void *) ip + ip->ihl * 4;
+
+ if (tcph->fin) return 0; /*if FIN bit is set bail out*/
+ if (tcph->syn) return 0; /*if SYN bit is set bail out*/
+ if (tcph->rst) return 0; /*if RST bit is set bail out*/
+
+ haystack += tcph->doff * 4; /*get TCP-Header-Size*/
+ hlen -= tcph->doff * 4;
+ while (matchlist[i].command) {
+ if ((((info->cmd & matchlist[i].command) == matchlist[i].command) ||
+ ((info->cmd & matchlist[i].short_hand) == matchlist[i].short_hand)) &&
+ (hlen > matchlist[i].packet_len)) {
+ p2p_result = matchlist[i].function_name(haystack, hlen);
+ if (p2p_result)
+ {
+ if (info->debug) printk("IPP2P.debug:TCP-match: %i from: %u.%u.%u.%u:%i to: %u.%u.%u.%u:%i Length: %i\n",
+ p2p_result, NIPQUAD(ip->saddr),ntohs(tcph->source), NIPQUAD(ip->daddr),ntohs(tcph->dest),hlen);
+ return p2p_result;
+ }
+ }
+ i++;
+ }
+ return p2p_result;
+ }
+
+ case IPPROTO_UDP: /*what to do with an UDP packet*/
+ {
+ struct udphdr *udph = (void *) ip + ip->ihl * 4;
+
+ while (udp_list[i].command){
+ if ((((info->cmd & udp_list[i].command) == udp_list[i].command) ||
+ ((info->cmd & udp_list[i].short_hand) == udp_list[i].short_hand)) &&
+ (hlen > udp_list[i].packet_len)) {
+ p2p_result = udp_list[i].function_name(haystack, hlen);
+ if (p2p_result){
+ if (info->debug) printk("IPP2P.debug:UDP-match: %i from: %u.%u.%u.%u:%i to: %u.%u.%u.%u:%i Length: %i\n",
+ p2p_result, NIPQUAD(ip->saddr),ntohs(udph->source), NIPQUAD(ip->daddr),ntohs(udph->dest),hlen);
+ return p2p_result;
+ }
+ }
+ i++;
+ }
+ return p2p_result;
+ }
+
+ default: return 0;
+ }
+}
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
+static bool
+#else
+static int
+#endif
+checkentry(const char *tablename,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
+ const void *ip,
+#else
+ const struct ipt_ip *ip,
+#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
+ const struct xt_match *match,
+#endif
+ void *matchinfo,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+ unsigned int matchsize,
+#endif
+ unsigned int hook_mask)
+{
+ /* Must specify -p tcp */
+/* if (ip->proto != IPPROTO_TCP || (ip->invflags & IPT_INV_PROTO)) {
+ * printk("ipp2p: Only works on TCP packets, use -p tcp\n");
+ * return 0;
+ * }*/
+ return 1;
+}
+
+
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
+static struct xt_match ipp2p_match = {
+#else
+static struct ipt_match ipp2p_match = {
+#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+ { NULL, NULL },
+ "ipp2p",
+ &ipp2p_match,
+ &ipp2p_checkentry,
+ NULL,
+ THIS_MODULE
+#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+ .name = "ipp2p",
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
+ .family = AF_INET,
+#endif
+ .match = &match,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
+ .matchsize = sizeof(struct ipt_p2p_info),
+#endif
+ .checkentry = &checkentry,
+ .me = THIS_MODULE,
+#endif
+};
+
+
+static int __init init(void)
+{
+ printk(KERN_INFO "IPP2P v%s loading\n", IPP2P_VERSION);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
+ return xt_register_match(&ipp2p_match);
+#else
+ return ipt_register_match(&ipp2p_match);
+#endif
+}
+
+static void __exit fini(void)
+{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
+ xt_unregister_match(&ipp2p_match);
+#else
+ ipt_unregister_match(&ipp2p_match);
+#endif
+ printk(KERN_INFO "IPP2P v%s unloaded\n", IPP2P_VERSION);
+}
+
+module_init(init);
+module_exit(fini);
+
+

52
src/scripts/backupiso Normal file
View File

@@ -0,0 +1,52 @@
#!/bin/sh
# FIXME: edit this lines before release
#URL=http://download.ipfire.org/iso/
#ISO=ipfire-2.3-beta4.i586-full.iso
URL=http://www.rowie.at/ipfire/builds/v2.3test/Beta3/20080929-6uhr/
ISO=ipfire-2.3-test.i586-full.iso
if [ -z "$1" ]; then
echo usage: $0 backup-file
exit
fi
TS=$1
mkdir -p /var/tmp/backupiso
cd /var/tmp/backupiso
echo "Fetching ${URL}${ISO}"
wget --quiet -c ${URL}${ISO}
echo "Fetching ${URL}md5sums.txt"
wget --quiet -O md5sums.txt ${URL}md5sums.txt
echo "Checking md5 of ${ISO}"
cat md5sums.txt | grep iso | tr '\r' '\n' | md5sum --status -c
RETVAR="$?"
if [ $RETVAR -eq 0 -o $RETVAR -eq 24 ]
then
echo "md5 is OK"
else
echo "md5 mismatch"
echo "Fetching again ${URL}${ISO}"
wget --quiet -O ${ISO} ${URL}${ISO}
fi
echo "Remastering iso"
mkdir -p backupiso.tmp.${TS}
mount -o loop ${ISO} backupiso.tmp.${TS}
cp -pr backupiso.tmp.${TS} backupiso.${TS}
umount backupiso.tmp.${TS}
rm -r backupiso.tmp.${TS}
echo "RESTORE=${TS}.ipf" >> backupiso.${TS}/boot/unattended.conf
cp /var/ipfire/backup/${TS}.ipf backupiso.${TS}
echo "Running mkisofs"
mkisofs -J -r -V "ipfire backup ${TS}" \
-b boot/isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \
-c boot/isolinux/boot.catalog backupiso.${TS} > `basename ${ISO} .iso`-${TS}.iso
echo "Cleaning up"
rm -rf backupiso.${TS}

13
src/scripts/makegraphs
View File

@@ -32,7 +32,6 @@ require "${General::swroot}/lang.pl";
# Settings
$ENV{PATH}="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin";
my $temp = '';
my $rrdlog = '/var/log/rrd';
my $ERROR;
my $path_smartctl = "/usr/sbin/smartctl";
@@ -47,9 +46,9 @@ sub updatehdddata
my $standby;
my @array = split(/\//,$disk);
if ( ! -e "$rrdlog/hddshutdown-".$array[$#array].".rrd"){
if ( ! -e "$mainsettings{'RRDLOG'}/hddshutdown-".$array[$#array].".rrd"){
# database did not exist -> create
RRDs::create ("$rrdlog/hddshutdown-".$array[$#array].".rrd", "--step=300",
RRDs::create ("$mainsettings{'RRDLOG'}/hddshutdown-".$array[$#array].".rrd", "--step=300",
"DS:standby:GAUGE:600:0:1",
"RRA:AVERAGE:0.5:1:576",
"RRA:AVERAGE:0.5:6:672",
@@ -62,13 +61,13 @@ sub updatehdddata
if (-e "/tmp/hddshutdown-".$array[$#array]) {$standby = 1;}
else {$standby = 0;}
RRDs::update ("$rrdlog/hddshutdown-".$array[$#array].".rrd", "-t", "standby", "N:$standby");
RRDs::update ("$mainsettings{'RRDLOG'}/hddshutdown-".$array[$#array].".rrd", "-t", "standby", "N:$standby");
$ERROR = RRDs::error;
print "Error in RRD::update for hddshutdown-".$array[$#array].": $ERROR\n" if $ERROR;
if ( ! -e "$rrdlog/hddtemp-".$array[$#array].".rrd"){
if ( ! -e "$mainsettings{'RRDLOG'}/hddtemp-".$array[$#array].".rrd"){
# database did not exist -> create
RRDs::create ("$rrdlog/hddtemp-".$array[$#array].".rrd", "--step=300",
RRDs::create ("$mainsettings{'RRDLOG'}/hddtemp-".$array[$#array].".rrd", "--step=300",
"DS:temperature:GAUGE:600:0:100",
"RRA:AVERAGE:0.5:1:576",
"RRA:AVERAGE:0.5:6:672",
@@ -91,7 +90,7 @@ sub updatehdddata
print "Temperature for ".$array[$#array]."->".$temp."<-\n";
# Nur ins RDD wenn nicht 0 (sonst klappt die min Anzeige nicht)
if ($temp){
RRDs::update ("$rrdlog/hddtemp-".$array[$#array].".rrd", "-t", "temperature", "N:$temp");
RRDs::update ("$mainsettings{'RRDLOG'}/hddtemp-".$array[$#array].".rrd", "-t", "temperature", "N:$temp");
$ERROR = RRDs::error;
print "Error in RRD::update for hdd-".$array[$#array].": $ERROR\n" if $ERROR;
}

30
src/scripts/qosd
View File

@@ -1,4 +1,4 @@
#!/usr/bin/perl -w
#!/usr/bin/perl -w
use strict;
##########################################
@@ -47,8 +47,13 @@ use strict;
# Configuration options:
#
my $device = "$ARGV[0]";
our $rrd_datadir = "/var/log/rrd/";
our $event_datadir = $rrd_datadir;
our %mainsettings = ();
require '/var/ipfire/general-functions.pl';
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
our $rrd_datadir = $mainsettings{'RRDLOG'}."/";
our $event_datadir = $mainsettings{'RRDLOG'};
our $STEP = 10;
our $tc_command = "/sbin/tc";
@@ -58,20 +63,20 @@ our $tc_command = "/sbin/tc";
my $include_dir = '/var/ipfire/qos/bin';
# Create the $rrd_datadir if it doesn't exists
if ( ! -d $rrd_datadir ) {
print "RRD-datadir not found, creating it: $rrd_datadir \n";
my $status = system("mkdir $rrd_datadir");
die "\nERROR cannot create \"$rrd_datadir\"\n" unless $status == 0;
# Create the $mainsettings{'RRDLOG'} if it doesn't exists
if ( ! -d $mainsettings{'RRDLOG'} ) {
print "RRD-datadir not found, creating it: $mainsettings{'RRDLOG'} \n";
my $status = system("mkdir $mainsettings{'RRDLOG'}");
die "\nERROR cannot create \"$mainsettings{'RRDLOG'}\"\n" unless $status == 0;
}
# use POSIX;
#
#POSIX::setsid()
#POSIX::setsid()
# or die "Can't become a daemon: $!";
# The init scripts will do the right "daemon" thing...
# Become a daemon
# Become a daemon
print "Becoming a daemon...\n";
my $pid = fork;
exit if $pid;
@@ -88,6 +93,7 @@ $SIG{PIPE} = 'IGNORE';
our %classes_data;
our %classes_info;
require "$include_dir/parse-func.pl";
require "$include_dir/event-func.pl";
require "$include_dir/RRD-func.pl";
until ($time_to_die) {
@@ -103,10 +109,10 @@ until ($time_to_die) {
#if ( $res ) {
# print " Error updating RRDs: \"$res\"\n";
#}
# my $timestamp = time;
# print "$timestamp\n";
sleep($STEP);
}

28
src/scripts/setddns.pl
View File

@@ -75,7 +75,6 @@ if ( &General::IpInSubnet ($ip,'10.0.0.0','255.0.0.0') ||
}
}
if ($ARGV[0] eq '-f') {
unlink ($cachefile); # next regular calls will try again if this force update fails.
} else {
@@ -175,6 +174,33 @@ if ($ip ne $ipcache) {
&General::log("Dynamic DNS ip-update for cjb.net ($settings{'LOGIN'}) : failure (could not connect to server)");
}
}
elsif ($settings{'SERVICE'} eq 'mydyn') {
# use proxy ?
my %proxysettings;
&General::readhash("${General::swroot}/proxy/settings", \%proxysettings);
if ($_=$proxysettings{'UPSTREAM_PROXY'}) {
my ($peer, $peerport) = (/^(?:[a-zA-Z ]+\:\/\/)?(?:[A-Za-z0-9\_\.\-]*?(?:\:[A-Za-z0-9\_\.\-]*?)?\@)?([a-zA-Z0-9\.\_\-]*?)(?:\:([0-9]{1,5}))?(?:\/.*?)?$/);
Net::SSLeay::set_proxy($peer,$peerport,$proxysettings{'UPSTREAM_USER'},$proxysettings{'UPSTREAM_PASSWORD'} );
}
my ($out, $response) = Net::SSLeay::get_http( 'www.mydyn.de',
80,
"/cgi-bin/update.pl?$settings{'LOGIN'}-$settings{'PASSWORD'}",
Net::SSLeay::make_headers('User-Agent' => 'IPFire' )
);
if ($response =~ m%HTTP/1\.. 200 OK%) {
if ( $out !~ m/The IP address of the subdomain/ ) {
&General::log("Dynamic DNS ip-update for mydyn.de ($settings{'LOGIN'}) : failure (bad password or login)");
} else {
&General::log("Dynamic DNS ip-update for mydyn.de ($settings{'LOGIN'}) : success");
$success++;
}
} else {
&General::log("Dynamic DNS ip-update for mydyn.de ($settings{'LOGIN'}) : failure (could not connect to server)");
}
}
elsif ($settings{'SERVICE'} eq 'selfhost') {
# use proxy ?
my %proxysettings;