IMQ Device in den Kernel kompiliert.

QoS Fit fuer die neue Version gemacht.
NTPd Startscript angepasst. (Das andere dauerte einfach zu lange zum starten!)

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@405 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/kernel/kernel.config.i586 b/config/kernel/kernel.config.i586
index 637e49c538cfc7b8f22c9dc04d9ec349916d87bf..94e4f9687ce3aa435d9c6e26327ae1dfc3ba1573 100644 (file)
--- 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 40f23f86def240dfe91d8c55ec685aade5a7bc70..a3a7c5573138f012220eb18c48282edb3c7697dd 100644 (file)
--- 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 bd0560c25a0695b033717cb072f476a9ee224012..c0b26d0a27ffe782aa0329e7ddd2581892ac6e93 100644 (file)
--- 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 887eea81794213e23c91f469bbf480b6a39a7eaa..7b005b139c250a550e0d0c8f998f886865183153 100644 (file)
--- 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 61f80586267e2873866cceedf14bc0bd79ece676..f21bb31cb4d45eab335ad5a2c35c349787b8b6b8 100644 (file)
--- 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 42321c96fa7586031e6f98e9166537a263e9127c..df96a5d25cbecdcb3efd52d3964dd5d77655cb51 100644 (file)
--- a/html/cgi-bin/qos.cgi
+++ b/html/cgi-bin/qos.cgi
@@ -687,7 +687,7 @@ print <<END
                <tr><td colspan='9' align='right' valign='middle'><b>TOS-Bits:</b>&nbsp;&nbsp;<b>0</b> - Deaktiviert | <b>8</b> - Minimale Verzoegerung | <b>4</b> - Maximaler Durchsatz | <b>2</b> - Maximale Zuverlaessigkeit | <b>1</b> - Minimale Kosten &nbsp;
 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 <<END
                <tr><td colspan='9' align='center'><img src="/graphs/qos-graph-$qossettings{'RED_DEV'}.png">
                <tr><td colspan='9' align='center'><img src="/graphs/qos-graph-$qossettings{'IMQ_DEV'}.png">
@@ -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
                                        <tr><td colspan='9' align='center'><img src='/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}-packets.png'>
 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 b7417878f368ec092eeef51e3352cd38ab95c526..98e3d5c260abac9cf2d365446d77784f26c81edb 100644 (file)
--- 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 5cb6782ad7e5a4f3c7caf1eeee598dc8f621044c..825a0e810cdd8d38ed34ac97f6cafb94fae66e57 100644 (file)
--- 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 b89916ce13ea9e9f5da3be6f97f4f6f107fc80a2..416f5cef0324dc6575f891281e172a6a321bc2ef 100644 (file)
--- 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;
 }