diff --git a/config/kernel/kernel.config.i586 b/config/kernel/kernel.config.i586 index 637e49c53..94e4f9687 100644 --- a/config/kernel/kernel.config.i586 +++ b/config/kernel/kernel.config.i586 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16 -# Sat Jan 20 16:28:39 2007 +# Sun Feb 4 15:26:41 2007 # CONFIG_X86_32=y CONFIG_SEMAPHORE_SLEEPERS=y @@ -453,6 +453,7 @@ CONFIG_IP_NF_NAT_FTP=m CONFIG_IP_NF_NAT_PPTP=m CONFIG_IP_NF_NAT_H323=m CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_IMQ=m CONFIG_IP_NF_TARGET_TOS=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_DSCP=m @@ -471,26 +472,7 @@ CONFIG_IP_NF_SIP=m # # Bridge: Netfilter Configuration # -CONFIG_BRIDGE_NF_EBTABLES=m -CONFIG_BRIDGE_EBT_BROUTE=m -CONFIG_BRIDGE_EBT_T_FILTER=m -CONFIG_BRIDGE_EBT_T_NAT=m -CONFIG_BRIDGE_EBT_802_3=m -CONFIG_BRIDGE_EBT_AMONG=m -CONFIG_BRIDGE_EBT_ARP=m -CONFIG_BRIDGE_EBT_IP=m -CONFIG_BRIDGE_EBT_LIMIT=m -CONFIG_BRIDGE_EBT_MARK=m -CONFIG_BRIDGE_EBT_PKTTYPE=m -CONFIG_BRIDGE_EBT_STP=m -CONFIG_BRIDGE_EBT_VLAN=m -CONFIG_BRIDGE_EBT_ARPREPLY=m -CONFIG_BRIDGE_EBT_DNAT=m -CONFIG_BRIDGE_EBT_MARK_T=m -CONFIG_BRIDGE_EBT_REDIRECT=m -CONFIG_BRIDGE_EBT_SNAT=m -CONFIG_BRIDGE_EBT_LOG=m -CONFIG_BRIDGE_EBT_ULOG=m +# CONFIG_BRIDGE_NF_EBTABLES is not set # # DCCP Configuration (EXPERIMENTAL) @@ -988,6 +970,12 @@ CONFIG_NETDEVICES=y CONFIG_DUMMY=m CONFIG_BONDING=m CONFIG_EQUALIZER=m +CONFIG_IMQ=m +# CONFIG_IMQ_BEHAVIOR_AA is not set +# CONFIG_IMQ_BEHAVIOR_AB is not set +CONFIG_IMQ_BEHAVIOR_BA=y +# CONFIG_IMQ_BEHAVIOR_BB is not set +CONFIG_IMQ_NUM_DEVS=2 CONFIG_TUN=m CONFIG_NET_SB1000=m diff --git a/config/kernel/kernel.config.i586.smp b/config/kernel/kernel.config.i586.smp index 40f23f86d..a3a7c5573 100644 --- a/config/kernel/kernel.config.i586.smp +++ b/config/kernel/kernel.config.i586.smp @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.16-smp -# Sat Jan 20 16:12:30 2007 +# Linux kernel version: 2.6.16 +# Sun Feb 4 15:27:11 2007 # CONFIG_X86_32=y CONFIG_SEMAPHORE_SLEEPERS=y @@ -459,6 +459,7 @@ CONFIG_IP_NF_NAT_FTP=m CONFIG_IP_NF_NAT_PPTP=m CONFIG_IP_NF_NAT_H323=m CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_IMQ=m CONFIG_IP_NF_TARGET_TOS=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_DSCP=m @@ -477,26 +478,7 @@ CONFIG_IP_NF_SIP=m # # Bridge: Netfilter Configuration # -CONFIG_BRIDGE_NF_EBTABLES=m -CONFIG_BRIDGE_EBT_BROUTE=m -CONFIG_BRIDGE_EBT_T_FILTER=m -CONFIG_BRIDGE_EBT_T_NAT=m -CONFIG_BRIDGE_EBT_802_3=m -CONFIG_BRIDGE_EBT_AMONG=m -CONFIG_BRIDGE_EBT_ARP=m -CONFIG_BRIDGE_EBT_IP=m -CONFIG_BRIDGE_EBT_LIMIT=m -CONFIG_BRIDGE_EBT_MARK=m -CONFIG_BRIDGE_EBT_PKTTYPE=m -CONFIG_BRIDGE_EBT_STP=m -CONFIG_BRIDGE_EBT_VLAN=m -CONFIG_BRIDGE_EBT_ARPREPLY=m -CONFIG_BRIDGE_EBT_DNAT=m -CONFIG_BRIDGE_EBT_MARK_T=m -CONFIG_BRIDGE_EBT_REDIRECT=m -CONFIG_BRIDGE_EBT_SNAT=m -CONFIG_BRIDGE_EBT_LOG=m -CONFIG_BRIDGE_EBT_ULOG=m +# CONFIG_BRIDGE_NF_EBTABLES is not set # # DCCP Configuration (EXPERIMENTAL) @@ -990,6 +972,12 @@ CONFIG_NETDEVICES=y CONFIG_DUMMY=m CONFIG_BONDING=m CONFIG_EQUALIZER=m +CONFIG_IMQ=m +# CONFIG_IMQ_BEHAVIOR_AA is not set +# CONFIG_IMQ_BEHAVIOR_AB is not set +CONFIG_IMQ_BEHAVIOR_BA=y +# CONFIG_IMQ_BEHAVIOR_BB is not set +CONFIG_IMQ_NUM_DEVS=2 CONFIG_TUN=m CONFIG_NET_SB1000=m diff --git a/config/qos/parse-func.pl b/config/qos/parse-func.pl index bd0560c25..c0b26d0a2 100644 --- a/config/qos/parse-func.pl +++ b/config/qos/parse-func.pl @@ -145,20 +145,21 @@ sub parse_class($) { my $burst = $11; my $cburst= $12; -# print "class: $class\n"."parent: $parent\n"."leaf: $leaf\n"."prio: $prio\n"; -# print "rate: $rate\n"."ceil: $ceil\n"."burst: $burst\n"."cburst: $cburst\n"; + #print "class: $class\n"."parent: $parent\n"."leaf: $leaf\n"."prio: $prio\n"; + #print "rate: $rate\n"."ceil: $ceil\n"."burst: $burst\n"."cburst: $cburst\n"; my ($bytes, $pkts, $dropped, $overlimits); - if ($tc_output[$i + 1] =~ m/Sent (\d+) bytes (\d+) pkts \(dropped (\d+), overlimits (\d+)\)/ ) { + if ($tc_output[$i + 1] =~ m/Sent (\d+) bytes (\d+) pkt \(dropped (\d+), overlimits (\d+) requeues (\d+)\)/ ) { $bytes = $1; $pkts = $2; $dropped = $3; $overlimits = $4; -# print "bytes: $bytes\n"."pkts: $pkts\n"; -# print "dropped: $dropped\n"."overlimits: $overlimits\n"; + $requeues = $5; + #print "bytes: $bytes\n"."pkts: $pkts\n"; + #print "dropped: $dropped\n"."overlimits: $overlimits\n"."requeues: $requeues\n"; } else { -# print "$timestamp: ERROR(+1) - Unable to parse (class ${class}_$device): "; -# print "\"$tc_output[$i + 1]\"\n"; + print "$timestamp: ERROR(+1) - Unable to parse (class ${class}_$device): "; + print "\"$tc_output[$i + 1]\"\n"; $return_val=""; next; } diff --git a/config/rootfiles/common/ipp2p b/config/rootfiles/common/ipp2p index 887eea817..7b005b139 100644 --- a/config/rootfiles/common/ipp2p +++ b/config/rootfiles/common/ipp2p @@ -1,3 +1,3 @@ -lib/modules/2.6.16/kernel/net/ipv4/netfilter/ipt_ipp2p.ko +#lib/modules/2.6.16/kernel/net/ipv4/netfilter/ipt_ipp2p.ko lib/iptables/libipt_ipp2p.o -lib/modules/2.6.16-smp/kernel/net/ipv4/netfilter/ipt_ipp2p.ko +#lib/modules/2.6.16-smp/kernel/net/ipv4/netfilter/ipt_ipp2p.ko diff --git a/config/rootfiles/common/linux b/config/rootfiles/common/linux index 61f805862..f21bb31cb 100644 --- a/config/rootfiles/common/linux +++ b/config/rootfiles/common/linux @@ -647,6 +647,8 @@ lib/modules/2.6.16 #lib/modules/2.6.16/modules.symbols #lib/modules/2.6.16/modules.usbmap #lib/modules/2.6.16/source +#lib/modules/2.6.16/kernel/drivers/net/imq.ko +#lib/modules/2.6.16/kernel/net/ipv4/netfilter/ipt_IMQ.ko boot/System.map-2.6.16-smp boot/config-2.6.16 boot/vmlinuz-2.6.16-smp @@ -1297,3 +1299,5 @@ lib/modules/2.6.16-smp #lib/modules/2.6.16-smp/modules.symbols #lib/modules/2.6.16-smp/modules.usbmap #lib/modules/2.6.16-smp/source +#lib/modules/2.6.16-smp/kernel/drivers/net/imq.ko +#lib/modules/2.6.16-smp/kernel/net/ipv4/netfilter/ipt_IMQ.ko diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index 42321c96f..df96a5d25 100644 --- a/html/cgi-bin/qos.cgi +++ b/html/cgi-bin/qos.cgi @@ -687,7 +687,7 @@ print <TOS-Bits:  0 - Deaktiviert | 8 - Minimale Verzoegerung | 4 - Maximaler Durchsatz | 2 - Maximale Zuverlaessigkeit | 1 - Minimale Kosten   END ; -if (( -e "/home/httpd/html/graphs/qos-graph-$qossettings{'RED_DEV'}.png") && ( -e "/home/httpd/html/graphs/qos-graph-$qossettings{'IMQ_DEV'}.png")) { +if (( -e "/srv/web/ipfire/html/graphs/qos-graph-$qossettings{'RED_DEV'}.png") && ( -e "/srv/web/ipfire/html/graphs/qos-graph-$qossettings{'IMQ_DEV'}.png")) { print < @@ -1300,7 +1300,7 @@ END } } - if ( -e "/home/httpd/html/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}-packets.png") { + if ( -e "/srv/web/ipfire/html/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}-packets.png") { print < END @@ -1463,7 +1463,7 @@ sub gengraph { } my $color=random_hex_color(6); - RRDs::graph ("/home/httpd/html/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}-packets.png", + RRDs::graph ("/srv/web/ipfire/html/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}-packets.png", "--start", "-3240", "-aPNG", "-i", "-z", "--alt-y-grid", "-w 600", "-h 150", "-r", "--color", "SHADEA#EAE9EE", @@ -1494,7 +1494,7 @@ sub overviewgraph { my $ERROR=""; my $count="1"; my $color="#000000"; - my @command=("/home/httpd/html/graphs/qos-graph-$qossettings{'DEV'}.png", + my @command=("/srv/web/ipfire/html/graphs/qos-graph-$qossettings{'DEV'}.png", "--start", "-3240", "-aPNG", "-i", "-z", "--alt-y-grid", "-w 600", "-h 150", "-r", "--color", "SHADEA#EAE9EE", diff --git a/lfs/linux b/lfs/linux index b7417878f..98e3d5c26 100644 --- a/lfs/linux +++ b/lfs/linux @@ -153,6 +153,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_SRC) && tar xzf $(DIR_DL)/netfilter-layer7-v2.6.tar.gz cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.6/for_older_kernels/kernel-2.6.13-2.6.16-layer7-2.2.patch + # Linux Intermediate Queueing Device + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.16-imq2.diff + # ip_conntrack permissions from 440 to 444 cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/ip_conntrack_standalone-patch-for-ipfire.patch diff --git a/src/initscripts/init.d/ntp b/src/initscripts/init.d/ntp index 5cb6782ad..825a0e810 100644 --- a/src/initscripts/init.d/ntp +++ b/src/initscripts/init.d/ntp @@ -1,17 +1,13 @@ #!/bin/sh # Begin $rc_base/init.d/ntp -#$LastChangedBy: bdubbs $ -#$Date: 2005-08-01 14:29:19 -0500 (Mon, 01 Aug 2005) $ - . /etc/sysconfig/rc . $rc_functions case "$1" in start) boot_mesg "Starting ntpd..." - ntpd -gqx - loadproc /usr/bin/ntpd + loadproc /usr/bin/ntpd -Ap /var/run/ntpd.pid ;; stop) diff --git a/src/misc-progs/restartntpd.c b/src/misc-progs/restartntpd.c index b89916ce1..416f5cef0 100644 --- a/src/misc-progs/restartntpd.c +++ b/src/misc-progs/restartntpd.c @@ -1,10 +1,6 @@ -/* Ipcop helper program - restartntpd +/* IPFire helper program - restartntpd * * Starts or stops the ntpd daemon - * - * (c) Darren Critchley 2003 - * - * $Id: restartntpd.c,v 1.5 2003/12/19 14:29:09 riddles Exp $ * */ @@ -25,7 +21,7 @@ int main(void) if (!(initsetuid())) exit(1); - safe_system("/etc/rc.d/init.d/ntp stop 2> /dev/null"); + safe_system("/etc/rc.d/init.d/ntp stop 2>&1 >/dev/null"); sleep(3); if ((fd = open(CONFIG_ROOT "/time/allowclients", O_RDONLY)) != -1) @@ -36,7 +32,7 @@ int main(void) if (enable) { - safe_system("/etc/rc.d/init.d/ntp start"); + safe_system("/etc/rc.d/init.d/ntp start 2>&1 >/dev/null"); } return 0; }