IPFire-SCM May 2014

ipfire-scm@lists.ipfire.org

1 participants
65 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d2dcd8b2e28face37be18ced3c2f22624e7e567a
by git＠ipfire.org 21 May '14

21 May '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via d2dcd8b2e28face37be18ced3c2f22624e7e567a (commit) via 3e8286210f4e167c9ad2bb20b7fe3a56d2435b52 (commit) via 53c07248cdb749275d9ba7023f4684f2946cf4b0 (commit) via 33df321e1b0eea578250af4d5155a23f8891076a (commit) via 3555cff1028e046dea96b7f9c98fb982b884ca54 (commit) via e898660a30c7fac19e8ba495d6094e7f9a2aa03a (commit) via 707fd3ff72cc486a80424beec7fe76d772503b27 (commit) from 30b1c1c72855e469034d9f7a6d4410367fa3069c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d2dcd8b2e28face37be18ced3c2f22624e7e567a Merge: 30b1c1c 3e82862 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed May 21 22:47:13 2014 +0200 Merge remote-tracking branch 'origin/master' into next ----------------------------------------------------------------------- Summary of changes: .../kernel/kernel.config.armv5tel-ipfire-kirkwood | 1 + config/kernel/kernel.config.armv5tel-ipfire-multi | 1 + config/kernel/kernel.config.armv5tel-ipfire-rpi | 1 + config/kernel/kernel.config.i586-ipfire | 37 +- config/kernel/kernel.config.i586-ipfire-pae | 41 +- config/rootfiles/common/armv5tel/linux-kirkwood | 1 + config/rootfiles/common/armv5tel/linux-multi | 1 + config/rootfiles/common/armv5tel/linux-rpi | 1 + config/rootfiles/common/i586/linux | 16 + config/rootfiles/packages/linux-pae | 16 + lfs/linux | 13 +- src/initscripts/init.d/sshd | 5 +- src/patches/linux-3.10.39-pie_packet_sch.patch | 674 +++++++++++++++++++++ 13 files changed, 761 insertions(+), 47 deletions(-) create mode 100644 src/patches/linux-3.10.39-pie_packet_sch.patch Difference in files: diff --git a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood index 2d9b115..9bc1d43 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood +++ b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood @@ -953,6 +953,7 @@ CONFIG_NET_SCH_CHOKE=m CONFIG_NET_SCH_QFQ=m CONFIG_NET_SCH_CODEL=m CONFIG_NET_SCH_FQ_CODEL=m +CONFIG_NET_SCH_PIE=m CONFIG_NET_SCH_INGRESS=m CONFIG_NET_SCH_PLUG=m diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi index dcc177d..127542f 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-multi +++ b/config/kernel/kernel.config.armv5tel-ipfire-multi @@ -1142,6 +1142,7 @@ CONFIG_NET_SCH_CHOKE=m CONFIG_NET_SCH_QFQ=m CONFIG_NET_SCH_CODEL=m CONFIG_NET_SCH_FQ_CODEL=m +CONFIG_NET_SCH_PIE=m CONFIG_NET_SCH_INGRESS=m CONFIG_NET_SCH_PLUG=m diff --git a/config/kernel/kernel.config.armv5tel-ipfire-rpi b/config/kernel/kernel.config.armv5tel-ipfire-rpi index 0c9b3d2..2c709cc 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-rpi +++ b/config/kernel/kernel.config.armv5tel-ipfire-rpi @@ -888,6 +888,7 @@ CONFIG_NET_SCH_CHOKE=m CONFIG_NET_SCH_QFQ=m CONFIG_NET_SCH_CODEL=m CONFIG_NET_SCH_FQ_CODEL=m +CONFIG_NET_SCH_PIE=m CONFIG_NET_SCH_INGRESS=m CONFIG_NET_SCH_PLUG=m diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 246e436..8a3e089 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.10.33 Kernel Configuration +# Linux/x86 3.10.40-ipfire Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -582,29 +582,29 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # x86 CPU frequency scaling drivers # CONFIG_X86_INTEL_PSTATE=y -CONFIG_X86_PCC_CPUFREQ=y -CONFIG_X86_ACPI_CPUFREQ=y +CONFIG_X86_PCC_CPUFREQ=m +CONFIG_X86_ACPI_CPUFREQ=m # CONFIG_X86_ACPI_CPUFREQ_CPB is not set -# CONFIG_X86_POWERNOW_K6 is not set -CONFIG_X86_POWERNOW_K7=y +CONFIG_X86_POWERNOW_K6=m +CONFIG_X86_POWERNOW_K7=m CONFIG_X86_POWERNOW_K7_ACPI=y -CONFIG_X86_POWERNOW_K8=y -# CONFIG_X86_AMD_FREQ_SENSITIVITY is not set -# CONFIG_X86_GX_SUSPMOD is not set +CONFIG_X86_POWERNOW_K8=m +CONFIG_X86_AMD_FREQ_SENSITIVITY=m +CONFIG_X86_GX_SUSPMOD=m # CONFIG_X86_SPEEDSTEP_CENTRINO is not set -CONFIG_X86_SPEEDSTEP_ICH=y -CONFIG_X86_SPEEDSTEP_SMI=y -CONFIG_X86_P4_CLOCKMOD=y -# CONFIG_X86_CPUFREQ_NFORCE2 is not set -CONFIG_X86_LONGRUN=y -# CONFIG_X86_LONGHAUL is not set +CONFIG_X86_SPEEDSTEP_ICH=m +CONFIG_X86_SPEEDSTEP_SMI=m +CONFIG_X86_P4_CLOCKMOD=m +CONFIG_X86_CPUFREQ_NFORCE2=m +CONFIG_X86_LONGRUN=m +CONFIG_X86_LONGHAUL=m # CONFIG_X86_E_POWERSAVER is not set # # shared options # -CONFIG_X86_SPEEDSTEP_LIB=y -# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set +CONFIG_X86_SPEEDSTEP_LIB=m +CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y CONFIG_CPU_IDLE=y # CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set CONFIG_CPU_IDLE_GOV_LADDER=y @@ -913,6 +913,8 @@ CONFIG_NETFILTER_XT_MATCH_HELPER=m CONFIG_NETFILTER_XT_MATCH_HL=m CONFIG_NETFILTER_XT_MATCH_IPRANGE=m # CONFIG_NETFILTER_XT_MATCH_IPVS is not set +CONFIG_NETFILTER_XT_MATCH_LAYER7=m +# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set CONFIG_NETFILTER_XT_MATCH_LENGTH=m CONFIG_NETFILTER_XT_MATCH_LIMIT=m CONFIG_NETFILTER_XT_MATCH_MAC=m @@ -931,8 +933,6 @@ CONFIG_NETFILTER_XT_MATCH_RECENT=m CONFIG_NETFILTER_XT_MATCH_SCTP=m CONFIG_NETFILTER_XT_MATCH_SOCKET=m CONFIG_NETFILTER_XT_MATCH_STATE=m -CONFIG_NETFILTER_XT_MATCH_LAYER7=m -# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set CONFIG_NETFILTER_XT_MATCH_STATISTIC=m CONFIG_NETFILTER_XT_MATCH_STRING=m CONFIG_NETFILTER_XT_MATCH_TCPMSS=m @@ -1140,6 +1140,7 @@ CONFIG_NET_SCH_CHOKE=m CONFIG_NET_SCH_QFQ=m CONFIG_NET_SCH_CODEL=m CONFIG_NET_SCH_FQ_CODEL=m +CONFIG_NET_SCH_PIE=m CONFIG_NET_SCH_INGRESS=m CONFIG_NET_SCH_PLUG=m diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index 8dc185b..775ed0e 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.10.33 Kernel Configuration +# Linux/x86 3.10.39-ipfire Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -55,9 +55,9 @@ CONFIG_HAVE_KERNEL_LZMA=y CONFIG_HAVE_KERNEL_XZ=y CONFIG_HAVE_KERNEL_LZO=y # CONFIG_KERNEL_GZIP is not set -# CONFIG_KERNEL_BZIP2 is not set +CONFIG_KERNEL_BZIP2=y # CONFIG_KERNEL_LZMA is not set -CONFIG_KERNEL_XZ=y +# CONFIG_KERNEL_XZ is not set # CONFIG_KERNEL_LZO is not set CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_SWAP=y @@ -594,29 +594,29 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # x86 CPU frequency scaling drivers # CONFIG_X86_INTEL_PSTATE=y -CONFIG_X86_PCC_CPUFREQ=y -CONFIG_X86_ACPI_CPUFREQ=y +CONFIG_X86_PCC_CPUFREQ=m +CONFIG_X86_ACPI_CPUFREQ=m # CONFIG_X86_ACPI_CPUFREQ_CPB is not set -# CONFIG_X86_POWERNOW_K6 is not set -CONFIG_X86_POWERNOW_K7=y +CONFIG_X86_POWERNOW_K6=m +CONFIG_X86_POWERNOW_K7=m CONFIG_X86_POWERNOW_K7_ACPI=y -CONFIG_X86_POWERNOW_K8=y -# CONFIG_X86_AMD_FREQ_SENSITIVITY is not set -# CONFIG_X86_GX_SUSPMOD is not set +CONFIG_X86_POWERNOW_K8=m +CONFIG_X86_AMD_FREQ_SENSITIVITY=m +CONFIG_X86_GX_SUSPMOD=m # CONFIG_X86_SPEEDSTEP_CENTRINO is not set -CONFIG_X86_SPEEDSTEP_ICH=y -CONFIG_X86_SPEEDSTEP_SMI=y -CONFIG_X86_P4_CLOCKMOD=y -# CONFIG_X86_CPUFREQ_NFORCE2 is not set -CONFIG_X86_LONGRUN=y -# CONFIG_X86_LONGHAUL is not set +CONFIG_X86_SPEEDSTEP_ICH=m +CONFIG_X86_SPEEDSTEP_SMI=m +CONFIG_X86_P4_CLOCKMOD=m +CONFIG_X86_CPUFREQ_NFORCE2=m +CONFIG_X86_LONGRUN=m +CONFIG_X86_LONGHAUL=m # CONFIG_X86_E_POWERSAVER is not set # # shared options # -CONFIG_X86_SPEEDSTEP_LIB=y -# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set +CONFIG_X86_SPEEDSTEP_LIB=m +CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y CONFIG_CPU_IDLE=y # CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set CONFIG_CPU_IDLE_GOV_LADDER=y @@ -925,6 +925,8 @@ CONFIG_NETFILTER_XT_MATCH_HELPER=m CONFIG_NETFILTER_XT_MATCH_HL=m CONFIG_NETFILTER_XT_MATCH_IPRANGE=m # CONFIG_NETFILTER_XT_MATCH_IPVS is not set +CONFIG_NETFILTER_XT_MATCH_LAYER7=m +# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set CONFIG_NETFILTER_XT_MATCH_LENGTH=m CONFIG_NETFILTER_XT_MATCH_LIMIT=m CONFIG_NETFILTER_XT_MATCH_MAC=m @@ -943,8 +945,6 @@ CONFIG_NETFILTER_XT_MATCH_RECENT=m CONFIG_NETFILTER_XT_MATCH_SCTP=m CONFIG_NETFILTER_XT_MATCH_SOCKET=m CONFIG_NETFILTER_XT_MATCH_STATE=m -CONFIG_NETFILTER_XT_MATCH_LAYER7=m -# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set CONFIG_NETFILTER_XT_MATCH_STATISTIC=m CONFIG_NETFILTER_XT_MATCH_STRING=m CONFIG_NETFILTER_XT_MATCH_TCPMSS=m @@ -1152,6 +1152,7 @@ CONFIG_NET_SCH_CHOKE=m CONFIG_NET_SCH_QFQ=m CONFIG_NET_SCH_CODEL=m CONFIG_NET_SCH_FQ_CODEL=m +CONFIG_NET_SCH_PIE=m CONFIG_NET_SCH_INGRESS=m CONFIG_NET_SCH_PLUG=m diff --git a/config/rootfiles/common/armv5tel/linux-kirkwood b/config/rootfiles/common/armv5tel/linux-kirkwood index 9cb3057..4880b60 100644 --- a/config/rootfiles/common/armv5tel/linux-kirkwood +++ b/config/rootfiles/common/armv5tel/linux-kirkwood @@ -2243,6 +2243,7 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_mqprio.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_multiq.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_netem.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_pie.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_plug.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_prio.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_qfq.ko diff --git a/config/rootfiles/common/armv5tel/linux-multi b/config/rootfiles/common/armv5tel/linux-multi index 1fd840c..3c20c52 100644 --- a/config/rootfiles/common/armv5tel/linux-multi +++ b/config/rootfiles/common/armv5tel/linux-multi @@ -2195,6 +2195,7 @@ lib/modules/KVER-ipfire-multi #lib/modules/KVER-ipfire-multi/kernel/net/sched/sch_mqprio.ko #lib/modules/KVER-ipfire-multi/kernel/net/sched/sch_multiq.ko #lib/modules/KVER-ipfire-multi/kernel/net/sched/sch_netem.ko +#lib/modules/KVER-ipfire-multi/kernel/net/sched/sch_pie.ko #lib/modules/KVER-ipfire-multi/kernel/net/sched/sch_plug.ko #lib/modules/KVER-ipfire-multi/kernel/net/sched/sch_prio.ko #lib/modules/KVER-ipfire-multi/kernel/net/sched/sch_qfq.ko diff --git a/config/rootfiles/common/armv5tel/linux-rpi b/config/rootfiles/common/armv5tel/linux-rpi index 2ea9efe..01f9312 100644 --- a/config/rootfiles/common/armv5tel/linux-rpi +++ b/config/rootfiles/common/armv5tel/linux-rpi @@ -1804,6 +1804,7 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_mqprio.ko #lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_multiq.ko #lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_netem.ko +#lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_pie.ko #lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_plug.ko #lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_prio.ko #lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_qfq.ko diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux index 48bd9ce..3f364ae 100644 --- a/config/rootfiles/common/i586/linux +++ b/config/rootfiles/common/i586/linux @@ -240,10 +240,25 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/clocksource/cs5535-clockevt.ko #lib/modules/KVER-ipfire/kernel/drivers/clocksource/scx200_hrt.ko #lib/modules/KVER-ipfire/kernel/drivers/cpufreq +#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/acpi-cpufreq.ko +#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/amd_freq_sensitivity.ko +#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/cpufreq-nforce2.ko #lib/modules/KVER-ipfire/kernel/drivers/cpufreq/cpufreq_conservative.ko #lib/modules/KVER-ipfire/kernel/drivers/cpufreq/cpufreq_ondemand.ko #lib/modules/KVER-ipfire/kernel/drivers/cpufreq/cpufreq_powersave.ko #lib/modules/KVER-ipfire/kernel/drivers/cpufreq/cpufreq_stats.ko +#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/gx-suspmod.ko +#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/longhaul.ko +#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/longrun.ko +#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/mperf.ko +#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/p4-clockmod.ko +#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/pcc-cpufreq.ko +#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/powernow-k6.ko +#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/powernow-k7.ko +#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/powernow-k8.ko +#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/speedstep-ich.ko +#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/speedstep-lib.ko +#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/speedstep-smi.ko #lib/modules/KVER-ipfire/kernel/drivers/crypto #lib/modules/KVER-ipfire/kernel/drivers/crypto/geode-aes.ko #lib/modules/KVER-ipfire/kernel/drivers/crypto/hifn_795x.ko @@ -2663,6 +2678,7 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/net/sched/sch_mqprio.ko #lib/modules/KVER-ipfire/kernel/net/sched/sch_multiq.ko #lib/modules/KVER-ipfire/kernel/net/sched/sch_netem.ko +#lib/modules/KVER-ipfire/kernel/net/sched/sch_pie.ko #lib/modules/KVER-ipfire/kernel/net/sched/sch_plug.ko #lib/modules/KVER-ipfire/kernel/net/sched/sch_prio.ko #lib/modules/KVER-ipfire/kernel/net/sched/sch_qfq.ko diff --git a/config/rootfiles/packages/linux-pae b/config/rootfiles/packages/linux-pae index eaaa3e5..9b198c2 100644 --- a/config/rootfiles/packages/linux-pae +++ b/config/rootfiles/packages/linux-pae @@ -238,10 +238,25 @@ lib/modules/KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/kernel/drivers/clocksource #lib/modules/KVER-ipfire-pae/kernel/drivers/clocksource/cs5535-clockevt.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq +#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/acpi-cpufreq.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/amd_freq_sensitivity.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/cpufreq-nforce2.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/cpufreq_conservative.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/cpufreq_ondemand.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/cpufreq_powersave.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/cpufreq_stats.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/gx-suspmod.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/longhaul.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/longrun.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/mperf.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/p4-clockmod.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/pcc-cpufreq.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/powernow-k6.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/powernow-k7.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/powernow-k8.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/speedstep-ich.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/speedstep-lib.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/speedstep-smi.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/crypto #lib/modules/KVER-ipfire-pae/kernel/drivers/crypto/geode-aes.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/crypto/padlock-aes.ko @@ -2675,6 +2690,7 @@ lib/modules/KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_mqprio.ko #lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_multiq.ko #lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_netem.ko +#lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_pie.ko #lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_plug.ko #lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_prio.ko #lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_qfq.ko diff --git a/lfs/linux b/lfs/linux index 2bf32d3..5dd5cc0 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,10 +24,10 @@ include Config -VER = 3.10.39 +VER = 3.10.40 RPI_PATCHES = linux-3.10.38-grsec-1b49b45 -GRS_PATCHES = grsecurity-2.9.1-3.10.39-ipfire1.patch.xz +GRS_PATCHES = grsecurity-2.9.1-3.10.40-ipfire1.patch.xz THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -36,7 +36,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -PAK_VER = 44 +PAK_VER = 45 DEPS = "" VERSUFIX=ipfire$(KCFG) @@ -74,9 +74,9 @@ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz $(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES) -$(DL_FILE)_MD5 = 74db7cc558a1a72ebf5044d286e2bc47 +$(DL_FILE)_MD5 = c1dca08f0f1a60f29b7caa9ff45582a8 rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = a7408e8bad57b4b2cb677dd5a0bfb7ff -$(GRS_PATCHES)_MD5 = 6296b7ec4146544249075249e338ceb3 +$(GRS_PATCHES)_MD5 = f46506dd67e459fc41d60d0641323668 install : $(TARGET) @@ -120,6 +120,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Layer7-patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10-layer7-filter.patch + # pie packet scheduler + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.39-pie_packet_sch.patch + # Grsecurity-patches ifneq "$(KCFG)" "-headers" cd $(DIR_APP) && xz -c -d $(DIR_DL)/$(GRS_PATCHES) | patch -Np1 diff --git a/src/initscripts/init.d/sshd b/src/initscripts/init.d/sshd index 1d61a63..0ed8661 100644 --- a/src/initscripts/init.d/sshd +++ b/src/initscripts/init.d/sshd @@ -43,10 +43,7 @@ case "$1" in ( sleep 3 pid=$(cat /var/run/sshd.pid 2>/dev/null) - [ -n "${pid}" ] && [ -e "/proc/${pid}/oom_score_adj" ] && \ - echo "-16" > "/proc/${pid}/oom_score_adj" || \ - [ -e "/proc/${pid}/oom_adj" ] && \ - echo "-16" > "/proc/${pid}/oom_adj" + [ -n "${pid}" ] && echo "-16" > "/proc/${pid}/oom_score_adj" ) & ;; diff --git a/src/patches/linux-3.10.39-pie_packet_sch.patch b/src/patches/linux-3.10.39-pie_packet_sch.patch new file mode 100644 index 0000000..6bec374 --- /dev/null +++ b/src/patches/linux-3.10.39-pie_packet_sch.patch @@ -0,0 +1,674 @@ +From d4b36210c2e6ecef0ce52fb6c18c51144f5c2d88 Mon Sep 17 00:00:00 2001 +From: Vijay Subramanian <vijaynsu(a)cisco.com> +Date: Sat, 4 Jan 2014 17:33:55 -0800 +Subject: net: pkt_sched: PIE AQM scheme + +Proportional Integral controller Enhanced (PIE) is a scheduler to address the +bufferbloat problem. + +>From the IETF draft below: +" Bufferbloat is a phenomenon where excess buffers in the network cause high +latency and jitter. As more and more interactive applications (e.g. voice over +IP, real time video streaming and financial transactions) run in the Internet, +high latency and jitter degrade application performance. There is a pressing +need to design intelligent queue management schemes that can control latency and +jitter; and hence provide desirable quality of service to users. + +We present here a lightweight design, PIE(Proportional Integral controller +Enhanced) that can effectively control the average queueing latency to a target +value. Simulation results, theoretical analysis and Linux testbed results have +shown that PIE can ensure low latency and achieve high link utilization under +various congestion situations. The design does not require per-packet +timestamp, so it incurs very small overhead and is simple enough to implement +in both hardware and software. " + +Many thanks to Dave Taht for extensive feedback, reviews, testing and +suggestions. Thanks also to Stephen Hemminger and Eric Dumazet for reviews and +suggestions. Naeem Khademi and Dave Taht independently contributed to ECN +support. + +For more information, please see technical paper about PIE in the IEEE +Conference on High Performance Switching and Routing 2013. A copy of the paper +can be found at ftp://ftpeng.cisco.com/pie/. + +Please also refer to the IETF draft submission at +http://tools.ietf.org/html/draft-pan-tsvwg-pie-00 + +All relevant code, documents and test scripts and results can be found at +ftp://ftpeng.cisco.com/pie/. + +For problems with the iproute2/tc or Linux kernel code, please contact Vijay +Subramanian (vijaynsu(a)cisco.com or subramanian.vijay(a)gmail.com) Mythili Prabhu +(mysuryan(a)cisco.com) + +Signed-off-by: Vijay Subramanian <subramanian.vijay(a)gmail.com> +Signed-off-by: Mythili Prabhu <mysuryan(a)cisco.com> +CC: Dave Taht <dave.taht(a)bufferbloat.net> +Signed-off-by: David S. Miller <davem(a)davemloft.net> + +diff -Naur linux-3.10.39.org/include/uapi/linux/pkt_sched.h linux-3.10.39/include/uapi/linux/pkt_sched.h +--- linux-3.10.39.org/include/uapi/linux/pkt_sched.h 2014-05-06 16:56:24.000000000 +0200 ++++ linux-3.10.39/include/uapi/linux/pkt_sched.h 2014-05-15 10:33:08.296828477 +0200 +@@ -744,4 +744,29 @@ + }; + }; + ++/* PIE */ ++enum { ++ TCA_PIE_UNSPEC, ++ TCA_PIE_TARGET, ++ TCA_PIE_LIMIT, ++ TCA_PIE_TUPDATE, ++ TCA_PIE_ALPHA, ++ TCA_PIE_BETA, ++ TCA_PIE_ECN, ++ TCA_PIE_BYTEMODE, ++ __TCA_PIE_MAX ++}; ++#define TCA_PIE_MAX (__TCA_PIE_MAX - 1) ++ ++struct tc_pie_xstats { ++ __u32 prob; /* current probability */ ++ __u32 delay; /* current delay in ms */ ++ __u32 avg_dq_rate; /* current average dq_rate in bits/pie_time */ ++ __u32 packets_in; /* total number of packets enqueued */ ++ __u32 dropped; /* packets dropped due to pie_action */ ++ __u32 overlimit; /* dropped due to lack of space in queue */ ++ __u32 maxq; /* maximum queue size */ ++ __u32 ecn_mark; /* packets marked with ecn*/ ++}; ++ + #endif +diff -Naur linux-3.10.39.org/net/sched/Kconfig linux-3.10.39/net/sched/Kconfig +--- linux-3.10.39.org/net/sched/Kconfig 2014-05-06 16:56:24.000000000 +0200 ++++ linux-3.10.39/net/sched/Kconfig 2014-05-15 09:30:29.866632326 +0200 +@@ -272,6 +272,19 @@ + + If unsure, say N. + ++config NET_SCH_PIE ++ tristate "Proportional Integral controller Enhanced (PIE) scheduler" ++ help ++ Say Y here if you want to use the Proportional Integral controller ++ Enhanced scheduler packet scheduling algorithm. ++ For more information, please see ++ http://tools.ietf.org/html/draft-pan-tsvwg-pie-00 ++ ++ To compile this driver as a module, choose M here: the module ++ will be called sch_pie. ++ ++ If unsure, say N. ++ + config NET_SCH_INGRESS + tristate "Ingress Qdisc" + depends on NET_CLS_ACT +diff -Naur linux-3.10.39.org/net/sched/Makefile linux-3.10.39/net/sched/Makefile +--- linux-3.10.39.org/net/sched/Makefile 2014-05-06 16:56:24.000000000 +0200 ++++ linux-3.10.39/net/sched/Makefile 2014-05-15 10:34:55.533502406 +0200 +@@ -39,6 +39,7 @@ + obj-$(CONFIG_NET_SCH_QFQ) += sch_qfq.o + obj-$(CONFIG_NET_SCH_CODEL) += sch_codel.o + obj-$(CONFIG_NET_SCH_FQ_CODEL) += sch_fq_codel.o ++obj-$(CONFIG_NET_SCH_PIE) += sch_pie.o + + obj-$(CONFIG_NET_CLS_U32) += cls_u32.o + obj-$(CONFIG_NET_CLS_ROUTE4) += cls_route.o +diff -Naur linux-3.10.39.org/net/sched/sch_pie.c linux-3.10.39/net/sched/sch_pie.c +--- linux-3.10.39.org/net/sched/sch_pie.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.10.39/net/sched/sch_pie.c 2014-05-15 09:30:29.869966724 +0200 +@@ -0,0 +1,555 @@ ++/* Copyright (C) 2013 Cisco Systems, Inc, 2013. ++ * ++ * 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 2 ++ * of the License. ++ * ++ * 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. ++ * ++ * Author: Vijay Subramanian <vijaynsu(a)cisco.com> ++ * Author: Mythili Prabhu <mysuryan(a)cisco.com> ++ * ++ * ECN support is added by Naeem Khademi <naeemk(a)ifi.uio.no> ++ * University of Oslo, Norway. ++ */ ++ ++#include <linux/module.h> ++#include <linux/slab.h> ++#include <linux/types.h> ++#include <linux/kernel.h> ++#include <linux/errno.h> ++#include <linux/skbuff.h> ++#include <net/pkt_sched.h> ++#include <net/inet_ecn.h> ++ ++#define QUEUE_THRESHOLD 10000 ++#define DQCOUNT_INVALID -1 ++#define MAX_PROB 0xffffffff ++#define PIE_SCALE 8 ++ ++/* parameters used */ ++struct pie_params { ++ psched_time_t target; /* user specified target delay in pschedtime */ ++ u32 tupdate; /* timer frequency (in jiffies) */ ++ u32 limit; /* number of packets that can be enqueued */ ++ u32 alpha; /* alpha and beta are between -4 and 4 */ ++ u32 beta; /* and are used for shift relative to 1 */ ++ bool ecn; /* true if ecn is enabled */ ++ bool bytemode; /* to scale drop early prob based on pkt size */ ++}; ++ ++/* variables used */ ++struct pie_vars { ++ u32 prob; /* probability but scaled by u32 limit. */ ++ psched_time_t burst_time; ++ psched_time_t qdelay; ++ psched_time_t qdelay_old; ++ u64 dq_count; /* measured in bytes */ ++ psched_time_t dq_tstamp; /* drain rate */ ++ u32 avg_dq_rate; /* bytes per pschedtime tick,scaled */ ++ u32 qlen_old; /* in bytes */ ++}; ++ ++/* statistics gathering */ ++struct pie_stats { ++ u32 packets_in; /* total number of packets enqueued */ ++ u32 dropped; /* packets dropped due to pie_action */ ++ u32 overlimit; /* dropped due to lack of space in queue */ ++ u32 maxq; /* maximum queue size */ ++ u32 ecn_mark; /* packets marked with ECN */ ++}; ++ ++/* private data for the Qdisc */ ++struct pie_sched_data { ++ struct pie_params params; ++ struct pie_vars vars; ++ struct pie_stats stats; ++ struct timer_list adapt_timer; ++}; ++ ++static void pie_params_init(struct pie_params *params) ++{ ++ params->alpha = 2; ++ params->beta = 20; ++ params->tupdate = usecs_to_jiffies(30 * USEC_PER_MSEC); /* 30 ms */ ++ params->limit = 1000; /* default of 1000 packets */ ++ params->target = PSCHED_NS2TICKS(20 * NSEC_PER_MSEC); /* 20 ms */ ++ params->ecn = false; ++ params->bytemode = false; ++} ++ ++static void pie_vars_init(struct pie_vars *vars) ++{ ++ vars->dq_count = DQCOUNT_INVALID; ++ vars->avg_dq_rate = 0; ++ /* default of 100 ms in pschedtime */ ++ vars->burst_time = PSCHED_NS2TICKS(100 * NSEC_PER_MSEC); ++} ++ ++static bool drop_early(struct Qdisc *sch, u32 packet_size) ++{ ++ struct pie_sched_data *q = qdisc_priv(sch); ++ u32 rnd; ++ u32 local_prob = q->vars.prob; ++ u32 mtu = psched_mtu(qdisc_dev(sch)); ++ ++ /* If there is still burst allowance left skip random early drop */ ++ if (q->vars.burst_time > 0) ++ return false; ++ ++ /* If current delay is less than half of target, and ++ * if drop prob is low already, disable early_drop ++ */ ++ if ((q->vars.qdelay < q->params.target / 2) ++ && (q->vars.prob < MAX_PROB / 5)) ++ return false; ++ ++ /* If we have fewer than 2 mtu-sized packets, disable drop_early, ++ * similar to min_th in RED ++ */ ++ if (sch->qstats.backlog < 2 * mtu) ++ return false; ++ ++ /* If bytemode is turned on, use packet size to compute new ++ * probablity. Smaller packets will have lower drop prob in this case ++ */ ++ if (q->params.bytemode && packet_size <= mtu) ++ local_prob = (local_prob / mtu) * packet_size; ++ else ++ local_prob = q->vars.prob; ++ ++ rnd = net_random(); ++ if (rnd < local_prob) ++ return true; ++ ++ return false; ++} ++ ++static int pie_qdisc_enqueue(struct sk_buff *skb, struct Qdisc *sch) ++{ ++ struct pie_sched_data *q = qdisc_priv(sch); ++ bool enqueue = false; ++ ++ if (unlikely(qdisc_qlen(sch) >= sch->limit)) { ++ q->stats.overlimit++; ++ goto out; ++ } ++ ++ if (!drop_early(sch, skb->len)) { ++ enqueue = true; ++ } else if (q->params.ecn && (q->vars.prob <= MAX_PROB / 10) && ++ INET_ECN_set_ce(skb)) { ++ /* If packet is ecn capable, mark it if drop probability ++ * is lower than 10%, else drop it. ++ */ ++ q->stats.ecn_mark++; ++ enqueue = true; ++ } ++ ++ /* we can enqueue the packet */ ++ if (enqueue) { ++ q->stats.packets_in++; ++ if (qdisc_qlen(sch) > q->stats.maxq) ++ q->stats.maxq = qdisc_qlen(sch); ++ ++ return qdisc_enqueue_tail(skb, sch); ++ } ++ ++out: ++ q->stats.dropped++; ++ return qdisc_drop(skb, sch); ++} ++ ++static const struct nla_policy pie_policy[TCA_PIE_MAX + 1] = { ++ [TCA_PIE_TARGET] = {.type = NLA_U32}, ++ [TCA_PIE_LIMIT] = {.type = NLA_U32}, ++ [TCA_PIE_TUPDATE] = {.type = NLA_U32}, ++ [TCA_PIE_ALPHA] = {.type = NLA_U32}, ++ [TCA_PIE_BETA] = {.type = NLA_U32}, ++ [TCA_PIE_ECN] = {.type = NLA_U32}, ++ [TCA_PIE_BYTEMODE] = {.type = NLA_U32}, ++}; ++ ++static int pie_change(struct Qdisc *sch, struct nlattr *opt) ++{ ++ struct pie_sched_data *q = qdisc_priv(sch); ++ struct nlattr *tb[TCA_PIE_MAX + 1]; ++ unsigned int qlen; ++ int err; ++ ++ if (!opt) ++ return -EINVAL; ++ ++ err = nla_parse_nested(tb, TCA_PIE_MAX, opt, pie_policy); ++ if (err < 0) ++ return err; ++ ++ sch_tree_lock(sch); ++ ++ /* convert from microseconds to pschedtime */ ++ if (tb[TCA_PIE_TARGET]) { ++ /* target is in us */ ++ u32 target = nla_get_u32(tb[TCA_PIE_TARGET]); ++ ++ /* convert to pschedtime */ ++ q->params.target = PSCHED_NS2TICKS((u64)target * NSEC_PER_USEC); ++ } ++ ++ /* tupdate is in jiffies */ ++ if (tb[TCA_PIE_TUPDATE]) ++ q->params.tupdate = usecs_to_jiffies(nla_get_u32(tb[TCA_PIE_TUPDATE])); ++ ++ if (tb[TCA_PIE_LIMIT]) { ++ u32 limit = nla_get_u32(tb[TCA_PIE_LIMIT]); ++ ++ q->params.limit = limit; ++ sch->limit = limit; ++ } ++ ++ if (tb[TCA_PIE_ALPHA]) ++ q->params.alpha = nla_get_u32(tb[TCA_PIE_ALPHA]); ++ ++ if (tb[TCA_PIE_BETA]) ++ q->params.beta = nla_get_u32(tb[TCA_PIE_BETA]); ++ ++ if (tb[TCA_PIE_ECN]) ++ q->params.ecn = nla_get_u32(tb[TCA_PIE_ECN]); ++ ++ if (tb[TCA_PIE_BYTEMODE]) ++ q->params.bytemode = nla_get_u32(tb[TCA_PIE_BYTEMODE]); ++ ++ /* Drop excess packets if new limit is lower */ ++ qlen = sch->q.qlen; ++ while (sch->q.qlen > sch->limit) { ++ struct sk_buff *skb = __skb_dequeue(&sch->q); ++ ++ sch->qstats.backlog -= qdisc_pkt_len(skb); ++ qdisc_drop(skb, sch); ++ } ++ qdisc_tree_decrease_qlen(sch, qlen - sch->q.qlen); ++ ++ sch_tree_unlock(sch); ++ return 0; ++} ++ ++static void pie_process_dequeue(struct Qdisc *sch, struct sk_buff *skb) ++{ ++ ++ struct pie_sched_data *q = qdisc_priv(sch); ++ int qlen = sch->qstats.backlog; /* current queue size in bytes */ ++ ++ /* If current queue is about 10 packets or more and dq_count is unset ++ * we have enough packets to calculate the drain rate. Save ++ * current time as dq_tstamp and start measurement cycle. ++ */ ++ if (qlen >= QUEUE_THRESHOLD && q->vars.dq_count == DQCOUNT_INVALID) { ++ q->vars.dq_tstamp = psched_get_time(); ++ q->vars.dq_count = 0; ++ } ++ ++ /* Calculate the average drain rate from this value. If queue length ++ * has receded to a small value viz., <= QUEUE_THRESHOLD bytes,reset ++ * the dq_count to -1 as we don't have enough packets to calculate the ++ * drain rate anymore The following if block is entered only when we ++ * have a substantial queue built up (QUEUE_THRESHOLD bytes or more) ++ * and we calculate the drain rate for the threshold here. dq_count is ++ * in bytes, time difference in psched_time, hence rate is in ++ * bytes/psched_time. ++ */ ++ if (q->vars.dq_count != DQCOUNT_INVALID) { ++ q->vars.dq_count += skb->len; ++ ++ if (q->vars.dq_count >= QUEUE_THRESHOLD) { ++ psched_time_t now = psched_get_time(); ++ u32 dtime = now - q->vars.dq_tstamp; ++ u32 count = q->vars.dq_count << PIE_SCALE; ++ ++ if (dtime == 0) ++ return; ++ ++ count = count / dtime; ++ ++ if (q->vars.avg_dq_rate == 0) ++ q->vars.avg_dq_rate = count; ++ else ++ q->vars.avg_dq_rate = ++ (q->vars.avg_dq_rate - ++ (q->vars.avg_dq_rate >> 3)) + (count >> 3); ++ ++ /* If the queue has receded below the threshold, we hold ++ * on to the last drain rate calculated, else we reset ++ * dq_count to 0 to re-enter the if block when the next ++ * packet is dequeued ++ */ ++ if (qlen < QUEUE_THRESHOLD) ++ q->vars.dq_count = DQCOUNT_INVALID; ++ else { ++ q->vars.dq_count = 0; ++ q->vars.dq_tstamp = psched_get_time(); ++ } ++ ++ if (q->vars.burst_time > 0) { ++ if (q->vars.burst_time > dtime) ++ q->vars.burst_time -= dtime; ++ else ++ q->vars.burst_time = 0; ++ } ++ } ++ } ++} ++ ++static void calculate_probability(struct Qdisc *sch) ++{ ++ struct pie_sched_data *q = qdisc_priv(sch); ++ u32 qlen = sch->qstats.backlog; /* queue size in bytes */ ++ psched_time_t qdelay = 0; /* in pschedtime */ ++ psched_time_t qdelay_old = q->vars.qdelay; /* in pschedtime */ ++ s32 delta = 0; /* determines the change in probability */ ++ u32 oldprob; ++ u32 alpha, beta; ++ bool update_prob = true; ++ ++ q->vars.qdelay_old = q->vars.qdelay; ++ ++ if (q->vars.avg_dq_rate > 0) ++ qdelay = (qlen << PIE_SCALE) / q->vars.avg_dq_rate; ++ else ++ qdelay = 0; ++ ++ /* If qdelay is zero and qlen is not, it means qlen is very small, less ++ * than dequeue_rate, so we do not update probabilty in this round ++ */ ++ if (qdelay == 0 && qlen != 0) ++ update_prob = false; ++ ++ /* Add ranges for alpha and beta, more aggressive for high dropping ++ * mode and gentle steps for light dropping mode ++ * In light dropping mode, take gentle steps; in medium dropping mode, ++ * take medium steps; in high dropping mode, take big steps. ++ */ ++ if (q->vars.prob < MAX_PROB / 100) { ++ alpha = ++ (q->params.alpha * (MAX_PROB / PSCHED_TICKS_PER_SEC)) >> 7; ++ beta = ++ (q->params.beta * (MAX_PROB / PSCHED_TICKS_PER_SEC)) >> 7; ++ } else if (q->vars.prob < MAX_PROB / 10) { ++ alpha = ++ (q->params.alpha * (MAX_PROB / PSCHED_TICKS_PER_SEC)) >> 5; ++ beta = ++ (q->params.beta * (MAX_PROB / PSCHED_TICKS_PER_SEC)) >> 5; ++ } else { ++ alpha = ++ (q->params.alpha * (MAX_PROB / PSCHED_TICKS_PER_SEC)) >> 4; ++ beta = ++ (q->params.beta * (MAX_PROB / PSCHED_TICKS_PER_SEC)) >> 4; ++ } ++ ++ /* alpha and beta should be between 0 and 32, in multiples of 1/16 */ ++ delta += alpha * ((qdelay - q->params.target)); ++ delta += beta * ((qdelay - qdelay_old)); ++ ++ oldprob = q->vars.prob; ++ ++ /* to ensure we increase probability in steps of no more than 2% */ ++ if (delta > (s32) (MAX_PROB / (100 / 2)) && ++ q->vars.prob >= MAX_PROB / 10) ++ delta = (MAX_PROB / 100) * 2; ++ ++ /* Non-linear drop: ++ * Tune drop probability to increase quickly for high delays(>= 250ms) ++ * 250ms is derived through experiments and provides error protection ++ */ ++ ++ if (qdelay > (PSCHED_NS2TICKS(250 * NSEC_PER_MSEC))) ++ delta += MAX_PROB / (100 / 2); ++ ++ q->vars.prob += delta; ++ ++ if (delta > 0) { ++ /* prevent overflow */ ++ if (q->vars.prob < oldprob) { ++ q->vars.prob = MAX_PROB; ++ /* Prevent normalization error. If probability is at ++ * maximum value already, we normalize it here, and ++ * skip the check to do a non-linear drop in the next ++ * section. ++ */ ++ update_prob = false; ++ } ++ } else { ++ /* prevent underflow */ ++ if (q->vars.prob > oldprob) ++ q->vars.prob = 0; ++ } ++ ++ /* Non-linear drop in probability: Reduce drop probability quickly if ++ * delay is 0 for 2 consecutive Tupdate periods. ++ */ ++ ++ if ((qdelay == 0) && (qdelay_old == 0) && update_prob) ++ q->vars.prob = (q->vars.prob * 98) / 100; ++ ++ q->vars.qdelay = qdelay; ++ q->vars.qlen_old = qlen; ++ ++ /* We restart the measurement cycle if the following conditions are met ++ * 1. If the delay has been low for 2 consecutive Tupdate periods ++ * 2. Calculated drop probability is zero ++ * 3. We have atleast one estimate for the avg_dq_rate ie., ++ * is a non-zero value ++ */ ++ if ((q->vars.qdelay < q->params.target / 2) && ++ (q->vars.qdelay_old < q->params.target / 2) && ++ (q->vars.prob == 0) && ++ (q->vars.avg_dq_rate > 0)) ++ pie_vars_init(&q->vars); ++} ++ ++static void pie_timer(unsigned long arg) ++{ ++ struct Qdisc *sch = (struct Qdisc *)arg; ++ struct pie_sched_data *q = qdisc_priv(sch); ++ spinlock_t *root_lock = qdisc_lock(qdisc_root_sleeping(sch)); ++ ++ spin_lock(root_lock); ++ calculate_probability(sch); ++ ++ /* reset the timer to fire after 'tupdate'. tupdate is in jiffies. */ ++ if (q->params.tupdate) ++ mod_timer(&q->adapt_timer, jiffies + q->params.tupdate); ++ spin_unlock(root_lock); ++ ++} ++ ++static int pie_init(struct Qdisc *sch, struct nlattr *opt) ++{ ++ struct pie_sched_data *q = qdisc_priv(sch); ++ ++ pie_params_init(&q->params); ++ pie_vars_init(&q->vars); ++ sch->limit = q->params.limit; ++ ++ setup_timer(&q->adapt_timer, pie_timer, (unsigned long)sch); ++ mod_timer(&q->adapt_timer, jiffies + HZ / 2); ++ ++ if (opt) { ++ int err = pie_change(sch, opt); ++ ++ if (err) ++ return err; ++ } ++ ++ return 0; ++} ++ ++static int pie_dump(struct Qdisc *sch, struct sk_buff *skb) ++{ ++ struct pie_sched_data *q = qdisc_priv(sch); ++ struct nlattr *opts; ++ ++ opts = nla_nest_start(skb, TCA_OPTIONS); ++ if (opts == NULL) ++ goto nla_put_failure; ++ ++ /* convert target from pschedtime to us */ ++ if (nla_put_u32(skb, TCA_PIE_TARGET, ++ ((u32) PSCHED_TICKS2NS(q->params.target)) / ++ NSEC_PER_USEC) || ++ nla_put_u32(skb, TCA_PIE_LIMIT, sch->limit) || ++ nla_put_u32(skb, TCA_PIE_TUPDATE, jiffies_to_usecs(q->params.tupdate)) || ++ nla_put_u32(skb, TCA_PIE_ALPHA, q->params.alpha) || ++ nla_put_u32(skb, TCA_PIE_BETA, q->params.beta) || ++ nla_put_u32(skb, TCA_PIE_ECN, q->params.ecn) || ++ nla_put_u32(skb, TCA_PIE_BYTEMODE, q->params.bytemode)) ++ goto nla_put_failure; ++ ++ return nla_nest_end(skb, opts); ++ ++nla_put_failure: ++ nla_nest_cancel(skb, opts); ++ return -1; ++ ++} ++ ++static int pie_dump_stats(struct Qdisc *sch, struct gnet_dump *d) ++{ ++ struct pie_sched_data *q = qdisc_priv(sch); ++ struct tc_pie_xstats st = { ++ .prob = q->vars.prob, ++ .delay = ((u32) PSCHED_TICKS2NS(q->vars.qdelay)) / ++ NSEC_PER_USEC, ++ /* unscale and return dq_rate in bytes per sec */ ++ .avg_dq_rate = q->vars.avg_dq_rate * ++ (PSCHED_TICKS_PER_SEC) >> PIE_SCALE, ++ .packets_in = q->stats.packets_in, ++ .overlimit = q->stats.overlimit, ++ .maxq = q->stats.maxq, ++ .dropped = q->stats.dropped, ++ .ecn_mark = q->stats.ecn_mark, ++ }; ++ ++ return gnet_stats_copy_app(d, &st, sizeof(st)); ++} ++ ++static struct sk_buff *pie_qdisc_dequeue(struct Qdisc *sch) ++{ ++ struct sk_buff *skb; ++ skb = __qdisc_dequeue_head(sch, &sch->q); ++ ++ if (!skb) ++ return NULL; ++ ++ pie_process_dequeue(sch, skb); ++ return skb; ++} ++ ++static void pie_reset(struct Qdisc *sch) ++{ ++ struct pie_sched_data *q = qdisc_priv(sch); ++ qdisc_reset_queue(sch); ++ pie_vars_init(&q->vars); ++} ++ ++static void pie_destroy(struct Qdisc *sch) ++{ ++ struct pie_sched_data *q = qdisc_priv(sch); ++ q->params.tupdate = 0; ++ del_timer_sync(&q->adapt_timer); ++} ++ ++static struct Qdisc_ops pie_qdisc_ops __read_mostly = { ++ .id = "pie", ++ .priv_size = sizeof(struct pie_sched_data), ++ .enqueue = pie_qdisc_enqueue, ++ .dequeue = pie_qdisc_dequeue, ++ .peek = qdisc_peek_dequeued, ++ .init = pie_init, ++ .destroy = pie_destroy, ++ .reset = pie_reset, ++ .change = pie_change, ++ .dump = pie_dump, ++ .dump_stats = pie_dump_stats, ++ .owner = THIS_MODULE, ++}; ++ ++static int __init pie_module_init(void) ++{ ++ return register_qdisc(&pie_qdisc_ops); ++} ++ ++static void __exit pie_module_exit(void) ++{ ++ unregister_qdisc(&pie_qdisc_ops); ++} ++ ++module_init(pie_module_init); ++module_exit(pie_module_exit); ++ ++MODULE_DESCRIPTION("Proportional Integral controller Enhanced (PIE) scheduler"); ++MODULE_AUTHOR("Vijay Subramanian"); ++MODULE_AUTHOR("Mythili Prabhu"); ++MODULE_LICENSE("GPL"); hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 3e8286210f4e167c9ad2bb20b7fe3a56d2435b52
by git＠ipfire.org 21 May '14

21 May '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 3e8286210f4e167c9ad2bb20b7fe3a56d2435b52 (commit) from 53c07248cdb749275d9ba7023f4684f2946cf4b0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3e8286210f4e167c9ad2bb20b7fe3a56d2435b52 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed May 21 22:29:47 2014 +0200 kernel: change compression of pae kernel to bz2. Many xen systems does not support load of xz compressed kernel. fixes #10542 ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.i586-ipfire-pae | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index 4f71362..775ed0e 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.10.40-ipfire Kernel Configuration +# Linux/x86 3.10.39-ipfire Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -55,9 +55,9 @@ CONFIG_HAVE_KERNEL_LZMA=y CONFIG_HAVE_KERNEL_XZ=y CONFIG_HAVE_KERNEL_LZO=y # CONFIG_KERNEL_GZIP is not set -# CONFIG_KERNEL_BZIP2 is not set +CONFIG_KERNEL_BZIP2=y # CONFIG_KERNEL_LZMA is not set -CONFIG_KERNEL_XZ=y +# CONFIG_KERNEL_XZ is not set # CONFIG_KERNEL_LZO is not set CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_SWAP=y hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 53c07248cdb749275d9ba7023f4684f2946cf4b0
by git＠ipfire.org 20 May '14

20 May '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 53c07248cdb749275d9ba7023f4684f2946cf4b0 (commit) from 33df321e1b0eea578250af4d5155a23f8891076a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 53c07248cdb749275d9ba7023f4684f2946cf4b0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue May 20 11:23:57 2014 +0200 kernel: build cpufreq hardware drivers as module. ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.i586-ipfire | 32 ++++++++++++------------- config/kernel/kernel.config.i586-ipfire-pae | 36 ++++++++++++++--------------- config/rootfiles/common/i586/linux | 15 ++++++++++++ config/rootfiles/packages/linux-pae | 15 ++++++++++++ 4 files changed, 64 insertions(+), 34 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index ba63a29..8a3e089 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.10.39 Kernel Configuration +# Linux/x86 3.10.40-ipfire Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -582,29 +582,29 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # x86 CPU frequency scaling drivers # CONFIG_X86_INTEL_PSTATE=y -CONFIG_X86_PCC_CPUFREQ=y -CONFIG_X86_ACPI_CPUFREQ=y +CONFIG_X86_PCC_CPUFREQ=m +CONFIG_X86_ACPI_CPUFREQ=m # CONFIG_X86_ACPI_CPUFREQ_CPB is not set -# CONFIG_X86_POWERNOW_K6 is not set -CONFIG_X86_POWERNOW_K7=y +CONFIG_X86_POWERNOW_K6=m +CONFIG_X86_POWERNOW_K7=m CONFIG_X86_POWERNOW_K7_ACPI=y -CONFIG_X86_POWERNOW_K8=y -# CONFIG_X86_AMD_FREQ_SENSITIVITY is not set -# CONFIG_X86_GX_SUSPMOD is not set +CONFIG_X86_POWERNOW_K8=m +CONFIG_X86_AMD_FREQ_SENSITIVITY=m +CONFIG_X86_GX_SUSPMOD=m # CONFIG_X86_SPEEDSTEP_CENTRINO is not set -CONFIG_X86_SPEEDSTEP_ICH=y -CONFIG_X86_SPEEDSTEP_SMI=y -CONFIG_X86_P4_CLOCKMOD=y -# CONFIG_X86_CPUFREQ_NFORCE2 is not set -CONFIG_X86_LONGRUN=y -# CONFIG_X86_LONGHAUL is not set +CONFIG_X86_SPEEDSTEP_ICH=m +CONFIG_X86_SPEEDSTEP_SMI=m +CONFIG_X86_P4_CLOCKMOD=m +CONFIG_X86_CPUFREQ_NFORCE2=m +CONFIG_X86_LONGRUN=m +CONFIG_X86_LONGHAUL=m # CONFIG_X86_E_POWERSAVER is not set # # shared options # -CONFIG_X86_SPEEDSTEP_LIB=y -# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set +CONFIG_X86_SPEEDSTEP_LIB=m +CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y CONFIG_CPU_IDLE=y # CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set CONFIG_CPU_IDLE_GOV_LADDER=y diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index 88e557a..4f71362 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.10.33 Kernel Configuration +# Linux/x86 3.10.40-ipfire Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -594,29 +594,29 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # x86 CPU frequency scaling drivers # CONFIG_X86_INTEL_PSTATE=y -CONFIG_X86_PCC_CPUFREQ=y -CONFIG_X86_ACPI_CPUFREQ=y +CONFIG_X86_PCC_CPUFREQ=m +CONFIG_X86_ACPI_CPUFREQ=m # CONFIG_X86_ACPI_CPUFREQ_CPB is not set -# CONFIG_X86_POWERNOW_K6 is not set -CONFIG_X86_POWERNOW_K7=y +CONFIG_X86_POWERNOW_K6=m +CONFIG_X86_POWERNOW_K7=m CONFIG_X86_POWERNOW_K7_ACPI=y -CONFIG_X86_POWERNOW_K8=y -# CONFIG_X86_AMD_FREQ_SENSITIVITY is not set -# CONFIG_X86_GX_SUSPMOD is not set +CONFIG_X86_POWERNOW_K8=m +CONFIG_X86_AMD_FREQ_SENSITIVITY=m +CONFIG_X86_GX_SUSPMOD=m # CONFIG_X86_SPEEDSTEP_CENTRINO is not set -CONFIG_X86_SPEEDSTEP_ICH=y -CONFIG_X86_SPEEDSTEP_SMI=y -CONFIG_X86_P4_CLOCKMOD=y -# CONFIG_X86_CPUFREQ_NFORCE2 is not set -CONFIG_X86_LONGRUN=y -# CONFIG_X86_LONGHAUL is not set +CONFIG_X86_SPEEDSTEP_ICH=m +CONFIG_X86_SPEEDSTEP_SMI=m +CONFIG_X86_P4_CLOCKMOD=m +CONFIG_X86_CPUFREQ_NFORCE2=m +CONFIG_X86_LONGRUN=m +CONFIG_X86_LONGHAUL=m # CONFIG_X86_E_POWERSAVER is not set # # shared options # -CONFIG_X86_SPEEDSTEP_LIB=y -# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set +CONFIG_X86_SPEEDSTEP_LIB=m +CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y CONFIG_CPU_IDLE=y # CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set CONFIG_CPU_IDLE_GOV_LADDER=y @@ -925,6 +925,8 @@ CONFIG_NETFILTER_XT_MATCH_HELPER=m CONFIG_NETFILTER_XT_MATCH_HL=m CONFIG_NETFILTER_XT_MATCH_IPRANGE=m # CONFIG_NETFILTER_XT_MATCH_IPVS is not set +CONFIG_NETFILTER_XT_MATCH_LAYER7=m +# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set CONFIG_NETFILTER_XT_MATCH_LENGTH=m CONFIG_NETFILTER_XT_MATCH_LIMIT=m CONFIG_NETFILTER_XT_MATCH_MAC=m @@ -943,8 +945,6 @@ CONFIG_NETFILTER_XT_MATCH_RECENT=m CONFIG_NETFILTER_XT_MATCH_SCTP=m CONFIG_NETFILTER_XT_MATCH_SOCKET=m CONFIG_NETFILTER_XT_MATCH_STATE=m -CONFIG_NETFILTER_XT_MATCH_LAYER7=m -# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set CONFIG_NETFILTER_XT_MATCH_STATISTIC=m CONFIG_NETFILTER_XT_MATCH_STRING=m CONFIG_NETFILTER_XT_MATCH_TCPMSS=m diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux index fac2631..3f364ae 100644 --- a/config/rootfiles/common/i586/linux +++ b/config/rootfiles/common/i586/linux @@ -240,10 +240,25 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/clocksource/cs5535-clockevt.ko #lib/modules/KVER-ipfire/kernel/drivers/clocksource/scx200_hrt.ko #lib/modules/KVER-ipfire/kernel/drivers/cpufreq +#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/acpi-cpufreq.ko +#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/amd_freq_sensitivity.ko +#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/cpufreq-nforce2.ko #lib/modules/KVER-ipfire/kernel/drivers/cpufreq/cpufreq_conservative.ko #lib/modules/KVER-ipfire/kernel/drivers/cpufreq/cpufreq_ondemand.ko #lib/modules/KVER-ipfire/kernel/drivers/cpufreq/cpufreq_powersave.ko #lib/modules/KVER-ipfire/kernel/drivers/cpufreq/cpufreq_stats.ko +#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/gx-suspmod.ko +#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/longhaul.ko +#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/longrun.ko +#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/mperf.ko +#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/p4-clockmod.ko +#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/pcc-cpufreq.ko +#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/powernow-k6.ko +#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/powernow-k7.ko +#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/powernow-k8.ko +#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/speedstep-ich.ko +#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/speedstep-lib.ko +#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/speedstep-smi.ko #lib/modules/KVER-ipfire/kernel/drivers/crypto #lib/modules/KVER-ipfire/kernel/drivers/crypto/geode-aes.ko #lib/modules/KVER-ipfire/kernel/drivers/crypto/hifn_795x.ko diff --git a/config/rootfiles/packages/linux-pae b/config/rootfiles/packages/linux-pae index fdba462..9b198c2 100644 --- a/config/rootfiles/packages/linux-pae +++ b/config/rootfiles/packages/linux-pae @@ -238,10 +238,25 @@ lib/modules/KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/kernel/drivers/clocksource #lib/modules/KVER-ipfire-pae/kernel/drivers/clocksource/cs5535-clockevt.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq +#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/acpi-cpufreq.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/amd_freq_sensitivity.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/cpufreq-nforce2.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/cpufreq_conservative.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/cpufreq_ondemand.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/cpufreq_powersave.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/cpufreq_stats.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/gx-suspmod.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/longhaul.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/longrun.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/mperf.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/p4-clockmod.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/pcc-cpufreq.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/powernow-k6.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/powernow-k7.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/powernow-k8.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/speedstep-ich.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/speedstep-lib.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/speedstep-smi.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/crypto #lib/modules/KVER-ipfire-pae/kernel/drivers/crypto/geode-aes.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/crypto/padlock-aes.ko hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 33df321e1b0eea578250af4d5155a23f8891076a
by git＠ipfire.org 19 May '14

19 May '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 33df321e1b0eea578250af4d5155a23f8891076a (commit) from 3555cff1028e046dea96b7f9c98fb982b884ca54 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 33df321e1b0eea578250af4d5155a23f8891076a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon May 19 20:12:00 2014 +0200 Revert "sshd: add fallback for oom setings with old kernel." This reverts commit 1566fb6b5531247bd60d291716da1d5a017e9dce. xen kernel was dropped and in the code are missing brackets. ----------------------------------------------------------------------- Summary of changes: src/initscripts/init.d/sshd | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) Difference in files: diff --git a/src/initscripts/init.d/sshd b/src/initscripts/init.d/sshd index 1d61a63..0ed8661 100644 --- a/src/initscripts/init.d/sshd +++ b/src/initscripts/init.d/sshd @@ -43,10 +43,7 @@ case "$1" in ( sleep 3 pid=$(cat /var/run/sshd.pid 2>/dev/null) - [ -n "${pid}" ] && [ -e "/proc/${pid}/oom_score_adj" ] && \ - echo "-16" > "/proc/${pid}/oom_score_adj" || \ - [ -e "/proc/${pid}/oom_adj" ] && \ - echo "-16" > "/proc/${pid}/oom_adj" + [ -n "${pid}" ] && echo "-16" > "/proc/${pid}/oom_score_adj" ) & ;; hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 3555cff1028e046dea96b7f9c98fb982b884ca54
by git＠ipfire.org 19 May '14

19 May '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 3555cff1028e046dea96b7f9c98fb982b884ca54 (commit) via e898660a30c7fac19e8ba495d6094e7f9a2aa03a (commit) via 707fd3ff72cc486a80424beec7fe76d772503b27 (commit) from 1a200cffc994858c8cad91b9b00093d24f00e79a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3555cff1028e046dea96b7f9c98fb982b884ca54 Merge: e898660 707fd3f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon May 19 20:07:18 2014 +0200 Merge remote-tracking branch 'arne_f/kernel-test' commit e898660a30c7fac19e8ba495d6094e7f9a2aa03a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon May 19 10:04:06 2014 +0200 kernel: add pie packet sheduler. commit 707fd3ff72cc486a80424beec7fe76d772503b27 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed May 14 09:20:40 2014 +0200 kernel: update to 3.10.40. ----------------------------------------------------------------------- Summary of changes: .../kernel/kernel.config.armv5tel-ipfire-kirkwood | 1 + config/kernel/kernel.config.armv5tel-ipfire-multi | 1 + config/kernel/kernel.config.armv5tel-ipfire-rpi | 1 + config/kernel/kernel.config.i586-ipfire | 7 +- config/kernel/kernel.config.i586-ipfire-pae | 1 + config/rootfiles/common/armv5tel/linux-kirkwood | 1 + config/rootfiles/common/armv5tel/linux-multi | 1 + config/rootfiles/common/armv5tel/linux-rpi | 1 + config/rootfiles/common/i586/linux | 1 + config/rootfiles/packages/linux-pae | 1 + lfs/linux | 13 +- src/patches/linux-3.10.39-pie_packet_sch.patch | 674 +++++++++++++++++++++ 12 files changed, 695 insertions(+), 8 deletions(-) create mode 100644 src/patches/linux-3.10.39-pie_packet_sch.patch Difference in files: diff --git a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood index 2d9b115..9bc1d43 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood +++ b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood @@ -953,6 +953,7 @@ CONFIG_NET_SCH_CHOKE=m CONFIG_NET_SCH_QFQ=m CONFIG_NET_SCH_CODEL=m CONFIG_NET_SCH_FQ_CODEL=m +CONFIG_NET_SCH_PIE=m CONFIG_NET_SCH_INGRESS=m CONFIG_NET_SCH_PLUG=m diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi index dcc177d..127542f 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-multi +++ b/config/kernel/kernel.config.armv5tel-ipfire-multi @@ -1142,6 +1142,7 @@ CONFIG_NET_SCH_CHOKE=m CONFIG_NET_SCH_QFQ=m CONFIG_NET_SCH_CODEL=m CONFIG_NET_SCH_FQ_CODEL=m +CONFIG_NET_SCH_PIE=m CONFIG_NET_SCH_INGRESS=m CONFIG_NET_SCH_PLUG=m diff --git a/config/kernel/kernel.config.armv5tel-ipfire-rpi b/config/kernel/kernel.config.armv5tel-ipfire-rpi index 0c9b3d2..2c709cc 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-rpi +++ b/config/kernel/kernel.config.armv5tel-ipfire-rpi @@ -888,6 +888,7 @@ CONFIG_NET_SCH_CHOKE=m CONFIG_NET_SCH_QFQ=m CONFIG_NET_SCH_CODEL=m CONFIG_NET_SCH_FQ_CODEL=m +CONFIG_NET_SCH_PIE=m CONFIG_NET_SCH_INGRESS=m CONFIG_NET_SCH_PLUG=m diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 246e436..ba63a29 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.10.33 Kernel Configuration +# Linux/x86 3.10.39 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -913,6 +913,8 @@ CONFIG_NETFILTER_XT_MATCH_HELPER=m CONFIG_NETFILTER_XT_MATCH_HL=m CONFIG_NETFILTER_XT_MATCH_IPRANGE=m # CONFIG_NETFILTER_XT_MATCH_IPVS is not set +CONFIG_NETFILTER_XT_MATCH_LAYER7=m +# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set CONFIG_NETFILTER_XT_MATCH_LENGTH=m CONFIG_NETFILTER_XT_MATCH_LIMIT=m CONFIG_NETFILTER_XT_MATCH_MAC=m @@ -931,8 +933,6 @@ CONFIG_NETFILTER_XT_MATCH_RECENT=m CONFIG_NETFILTER_XT_MATCH_SCTP=m CONFIG_NETFILTER_XT_MATCH_SOCKET=m CONFIG_NETFILTER_XT_MATCH_STATE=m -CONFIG_NETFILTER_XT_MATCH_LAYER7=m -# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set CONFIG_NETFILTER_XT_MATCH_STATISTIC=m CONFIG_NETFILTER_XT_MATCH_STRING=m CONFIG_NETFILTER_XT_MATCH_TCPMSS=m @@ -1140,6 +1140,7 @@ CONFIG_NET_SCH_CHOKE=m CONFIG_NET_SCH_QFQ=m CONFIG_NET_SCH_CODEL=m CONFIG_NET_SCH_FQ_CODEL=m +CONFIG_NET_SCH_PIE=m CONFIG_NET_SCH_INGRESS=m CONFIG_NET_SCH_PLUG=m diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index 8dc185b..88e557a 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -1152,6 +1152,7 @@ CONFIG_NET_SCH_CHOKE=m CONFIG_NET_SCH_QFQ=m CONFIG_NET_SCH_CODEL=m CONFIG_NET_SCH_FQ_CODEL=m +CONFIG_NET_SCH_PIE=m CONFIG_NET_SCH_INGRESS=m CONFIG_NET_SCH_PLUG=m diff --git a/config/rootfiles/common/armv5tel/linux-kirkwood b/config/rootfiles/common/armv5tel/linux-kirkwood index 9cb3057..4880b60 100644 --- a/config/rootfiles/common/armv5tel/linux-kirkwood +++ b/config/rootfiles/common/armv5tel/linux-kirkwood @@ -2243,6 +2243,7 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_mqprio.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_multiq.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_netem.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_pie.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_plug.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_prio.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_qfq.ko diff --git a/config/rootfiles/common/armv5tel/linux-multi b/config/rootfiles/common/armv5tel/linux-multi index 1fd840c..3c20c52 100644 --- a/config/rootfiles/common/armv5tel/linux-multi +++ b/config/rootfiles/common/armv5tel/linux-multi @@ -2195,6 +2195,7 @@ lib/modules/KVER-ipfire-multi #lib/modules/KVER-ipfire-multi/kernel/net/sched/sch_mqprio.ko #lib/modules/KVER-ipfire-multi/kernel/net/sched/sch_multiq.ko #lib/modules/KVER-ipfire-multi/kernel/net/sched/sch_netem.ko +#lib/modules/KVER-ipfire-multi/kernel/net/sched/sch_pie.ko #lib/modules/KVER-ipfire-multi/kernel/net/sched/sch_plug.ko #lib/modules/KVER-ipfire-multi/kernel/net/sched/sch_prio.ko #lib/modules/KVER-ipfire-multi/kernel/net/sched/sch_qfq.ko diff --git a/config/rootfiles/common/armv5tel/linux-rpi b/config/rootfiles/common/armv5tel/linux-rpi index 2ea9efe..01f9312 100644 --- a/config/rootfiles/common/armv5tel/linux-rpi +++ b/config/rootfiles/common/armv5tel/linux-rpi @@ -1804,6 +1804,7 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_mqprio.ko #lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_multiq.ko #lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_netem.ko +#lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_pie.ko #lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_plug.ko #lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_prio.ko #lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_qfq.ko diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux index 48bd9ce..fac2631 100644 --- a/config/rootfiles/common/i586/linux +++ b/config/rootfiles/common/i586/linux @@ -2663,6 +2663,7 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/net/sched/sch_mqprio.ko #lib/modules/KVER-ipfire/kernel/net/sched/sch_multiq.ko #lib/modules/KVER-ipfire/kernel/net/sched/sch_netem.ko +#lib/modules/KVER-ipfire/kernel/net/sched/sch_pie.ko #lib/modules/KVER-ipfire/kernel/net/sched/sch_plug.ko #lib/modules/KVER-ipfire/kernel/net/sched/sch_prio.ko #lib/modules/KVER-ipfire/kernel/net/sched/sch_qfq.ko diff --git a/config/rootfiles/packages/linux-pae b/config/rootfiles/packages/linux-pae index eaaa3e5..fdba462 100644 --- a/config/rootfiles/packages/linux-pae +++ b/config/rootfiles/packages/linux-pae @@ -2675,6 +2675,7 @@ lib/modules/KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_mqprio.ko #lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_multiq.ko #lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_netem.ko +#lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_pie.ko #lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_plug.ko #lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_prio.ko #lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_qfq.ko diff --git a/lfs/linux b/lfs/linux index 2bf32d3..5dd5cc0 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,10 +24,10 @@ include Config -VER = 3.10.39 +VER = 3.10.40 RPI_PATCHES = linux-3.10.38-grsec-1b49b45 -GRS_PATCHES = grsecurity-2.9.1-3.10.39-ipfire1.patch.xz +GRS_PATCHES = grsecurity-2.9.1-3.10.40-ipfire1.patch.xz THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -36,7 +36,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -PAK_VER = 44 +PAK_VER = 45 DEPS = "" VERSUFIX=ipfire$(KCFG) @@ -74,9 +74,9 @@ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz $(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES) -$(DL_FILE)_MD5 = 74db7cc558a1a72ebf5044d286e2bc47 +$(DL_FILE)_MD5 = c1dca08f0f1a60f29b7caa9ff45582a8 rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = a7408e8bad57b4b2cb677dd5a0bfb7ff -$(GRS_PATCHES)_MD5 = 6296b7ec4146544249075249e338ceb3 +$(GRS_PATCHES)_MD5 = f46506dd67e459fc41d60d0641323668 install : $(TARGET) @@ -120,6 +120,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Layer7-patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10-layer7-filter.patch + # pie packet scheduler + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.39-pie_packet_sch.patch + # Grsecurity-patches ifneq "$(KCFG)" "-headers" cd $(DIR_APP) && xz -c -d $(DIR_DL)/$(GRS_PATCHES) | patch -Np1 diff --git a/src/patches/linux-3.10.39-pie_packet_sch.patch b/src/patches/linux-3.10.39-pie_packet_sch.patch new file mode 100644 index 0000000..6bec374 --- /dev/null +++ b/src/patches/linux-3.10.39-pie_packet_sch.patch @@ -0,0 +1,674 @@ +From d4b36210c2e6ecef0ce52fb6c18c51144f5c2d88 Mon Sep 17 00:00:00 2001 +From: Vijay Subramanian <vijaynsu(a)cisco.com> +Date: Sat, 4 Jan 2014 17:33:55 -0800 +Subject: net: pkt_sched: PIE AQM scheme + +Proportional Integral controller Enhanced (PIE) is a scheduler to address the +bufferbloat problem. + +>From the IETF draft below: +" Bufferbloat is a phenomenon where excess buffers in the network cause high +latency and jitter. As more and more interactive applications (e.g. voice over +IP, real time video streaming and financial transactions) run in the Internet, +high latency and jitter degrade application performance. There is a pressing +need to design intelligent queue management schemes that can control latency and +jitter; and hence provide desirable quality of service to users. + +We present here a lightweight design, PIE(Proportional Integral controller +Enhanced) that can effectively control the average queueing latency to a target +value. Simulation results, theoretical analysis and Linux testbed results have +shown that PIE can ensure low latency and achieve high link utilization under +various congestion situations. The design does not require per-packet +timestamp, so it incurs very small overhead and is simple enough to implement +in both hardware and software. " + +Many thanks to Dave Taht for extensive feedback, reviews, testing and +suggestions. Thanks also to Stephen Hemminger and Eric Dumazet for reviews and +suggestions. Naeem Khademi and Dave Taht independently contributed to ECN +support. + +For more information, please see technical paper about PIE in the IEEE +Conference on High Performance Switching and Routing 2013. A copy of the paper +can be found at ftp://ftpeng.cisco.com/pie/. + +Please also refer to the IETF draft submission at +http://tools.ietf.org/html/draft-pan-tsvwg-pie-00 + +All relevant code, documents and test scripts and results can be found at +ftp://ftpeng.cisco.com/pie/. + +For problems with the iproute2/tc or Linux kernel code, please contact Vijay +Subramanian (vijaynsu(a)cisco.com or subramanian.vijay(a)gmail.com) Mythili Prabhu +(mysuryan(a)cisco.com) + +Signed-off-by: Vijay Subramanian <subramanian.vijay(a)gmail.com> +Signed-off-by: Mythili Prabhu <mysuryan(a)cisco.com> +CC: Dave Taht <dave.taht(a)bufferbloat.net> +Signed-off-by: David S. Miller <davem(a)davemloft.net> + +diff -Naur linux-3.10.39.org/include/uapi/linux/pkt_sched.h linux-3.10.39/include/uapi/linux/pkt_sched.h +--- linux-3.10.39.org/include/uapi/linux/pkt_sched.h 2014-05-06 16:56:24.000000000 +0200 ++++ linux-3.10.39/include/uapi/linux/pkt_sched.h 2014-05-15 10:33:08.296828477 +0200 +@@ -744,4 +744,29 @@ + }; + }; + ++/* PIE */ ++enum { ++ TCA_PIE_UNSPEC, ++ TCA_PIE_TARGET, ++ TCA_PIE_LIMIT, ++ TCA_PIE_TUPDATE, ++ TCA_PIE_ALPHA, ++ TCA_PIE_BETA, ++ TCA_PIE_ECN, ++ TCA_PIE_BYTEMODE, ++ __TCA_PIE_MAX ++}; ++#define TCA_PIE_MAX (__TCA_PIE_MAX - 1) ++ ++struct tc_pie_xstats { ++ __u32 prob; /* current probability */ ++ __u32 delay; /* current delay in ms */ ++ __u32 avg_dq_rate; /* current average dq_rate in bits/pie_time */ ++ __u32 packets_in; /* total number of packets enqueued */ ++ __u32 dropped; /* packets dropped due to pie_action */ ++ __u32 overlimit; /* dropped due to lack of space in queue */ ++ __u32 maxq; /* maximum queue size */ ++ __u32 ecn_mark; /* packets marked with ecn*/ ++}; ++ + #endif +diff -Naur linux-3.10.39.org/net/sched/Kconfig linux-3.10.39/net/sched/Kconfig +--- linux-3.10.39.org/net/sched/Kconfig 2014-05-06 16:56:24.000000000 +0200 ++++ linux-3.10.39/net/sched/Kconfig 2014-05-15 09:30:29.866632326 +0200 +@@ -272,6 +272,19 @@ + + If unsure, say N. + ++config NET_SCH_PIE ++ tristate "Proportional Integral controller Enhanced (PIE) scheduler" ++ help ++ Say Y here if you want to use the Proportional Integral controller ++ Enhanced scheduler packet scheduling algorithm. ++ For more information, please see ++ http://tools.ietf.org/html/draft-pan-tsvwg-pie-00 ++ ++ To compile this driver as a module, choose M here: the module ++ will be called sch_pie. ++ ++ If unsure, say N. ++ + config NET_SCH_INGRESS + tristate "Ingress Qdisc" + depends on NET_CLS_ACT +diff -Naur linux-3.10.39.org/net/sched/Makefile linux-3.10.39/net/sched/Makefile +--- linux-3.10.39.org/net/sched/Makefile 2014-05-06 16:56:24.000000000 +0200 ++++ linux-3.10.39/net/sched/Makefile 2014-05-15 10:34:55.533502406 +0200 +@@ -39,6 +39,7 @@ + obj-$(CONFIG_NET_SCH_QFQ) += sch_qfq.o + obj-$(CONFIG_NET_SCH_CODEL) += sch_codel.o + obj-$(CONFIG_NET_SCH_FQ_CODEL) += sch_fq_codel.o ++obj-$(CONFIG_NET_SCH_PIE) += sch_pie.o + + obj-$(CONFIG_NET_CLS_U32) += cls_u32.o + obj-$(CONFIG_NET_CLS_ROUTE4) += cls_route.o +diff -Naur linux-3.10.39.org/net/sched/sch_pie.c linux-3.10.39/net/sched/sch_pie.c +--- linux-3.10.39.org/net/sched/sch_pie.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.10.39/net/sched/sch_pie.c 2014-05-15 09:30:29.869966724 +0200 +@@ -0,0 +1,555 @@ ++/* Copyright (C) 2013 Cisco Systems, Inc, 2013. ++ * ++ * 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 2 ++ * of the License. ++ * ++ * 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. ++ * ++ * Author: Vijay Subramanian <vijaynsu(a)cisco.com> ++ * Author: Mythili Prabhu <mysuryan(a)cisco.com> ++ * ++ * ECN support is added by Naeem Khademi <naeemk(a)ifi.uio.no> ++ * University of Oslo, Norway. ++ */ ++ ++#include <linux/module.h> ++#include <linux/slab.h> ++#include <linux/types.h> ++#include <linux/kernel.h> ++#include <linux/errno.h> ++#include <linux/skbuff.h> ++#include <net/pkt_sched.h> ++#include <net/inet_ecn.h> ++ ++#define QUEUE_THRESHOLD 10000 ++#define DQCOUNT_INVALID -1 ++#define MAX_PROB 0xffffffff ++#define PIE_SCALE 8 ++ ++/* parameters used */ ++struct pie_params { ++ psched_time_t target; /* user specified target delay in pschedtime */ ++ u32 tupdate; /* timer frequency (in jiffies) */ ++ u32 limit; /* number of packets that can be enqueued */ ++ u32 alpha; /* alpha and beta are between -4 and 4 */ ++ u32 beta; /* and are used for shift relative to 1 */ ++ bool ecn; /* true if ecn is enabled */ ++ bool bytemode; /* to scale drop early prob based on pkt size */ ++}; ++ ++/* variables used */ ++struct pie_vars { ++ u32 prob; /* probability but scaled by u32 limit. */ ++ psched_time_t burst_time; ++ psched_time_t qdelay; ++ psched_time_t qdelay_old; ++ u64 dq_count; /* measured in bytes */ ++ psched_time_t dq_tstamp; /* drain rate */ ++ u32 avg_dq_rate; /* bytes per pschedtime tick,scaled */ ++ u32 qlen_old; /* in bytes */ ++}; ++ ++/* statistics gathering */ ++struct pie_stats { ++ u32 packets_in; /* total number of packets enqueued */ ++ u32 dropped; /* packets dropped due to pie_action */ ++ u32 overlimit; /* dropped due to lack of space in queue */ ++ u32 maxq; /* maximum queue size */ ++ u32 ecn_mark; /* packets marked with ECN */ ++}; ++ ++/* private data for the Qdisc */ ++struct pie_sched_data { ++ struct pie_params params; ++ struct pie_vars vars; ++ struct pie_stats stats; ++ struct timer_list adapt_timer; ++}; ++ ++static void pie_params_init(struct pie_params *params) ++{ ++ params->alpha = 2; ++ params->beta = 20; ++ params->tupdate = usecs_to_jiffies(30 * USEC_PER_MSEC); /* 30 ms */ ++ params->limit = 1000; /* default of 1000 packets */ ++ params->target = PSCHED_NS2TICKS(20 * NSEC_PER_MSEC); /* 20 ms */ ++ params->ecn = false; ++ params->bytemode = false; ++} ++ ++static void pie_vars_init(struct pie_vars *vars) ++{ ++ vars->dq_count = DQCOUNT_INVALID; ++ vars->avg_dq_rate = 0; ++ /* default of 100 ms in pschedtime */ ++ vars->burst_time = PSCHED_NS2TICKS(100 * NSEC_PER_MSEC); ++} ++ ++static bool drop_early(struct Qdisc *sch, u32 packet_size) ++{ ++ struct pie_sched_data *q = qdisc_priv(sch); ++ u32 rnd; ++ u32 local_prob = q->vars.prob; ++ u32 mtu = psched_mtu(qdisc_dev(sch)); ++ ++ /* If there is still burst allowance left skip random early drop */ ++ if (q->vars.burst_time > 0) ++ return false; ++ ++ /* If current delay is less than half of target, and ++ * if drop prob is low already, disable early_drop ++ */ ++ if ((q->vars.qdelay < q->params.target / 2) ++ && (q->vars.prob < MAX_PROB / 5)) ++ return false; ++ ++ /* If we have fewer than 2 mtu-sized packets, disable drop_early, ++ * similar to min_th in RED ++ */ ++ if (sch->qstats.backlog < 2 * mtu) ++ return false; ++ ++ /* If bytemode is turned on, use packet size to compute new ++ * probablity. Smaller packets will have lower drop prob in this case ++ */ ++ if (q->params.bytemode && packet_size <= mtu) ++ local_prob = (local_prob / mtu) * packet_size; ++ else ++ local_prob = q->vars.prob; ++ ++ rnd = net_random(); ++ if (rnd < local_prob) ++ return true; ++ ++ return false; ++} ++ ++static int pie_qdisc_enqueue(struct sk_buff *skb, struct Qdisc *sch) ++{ ++ struct pie_sched_data *q = qdisc_priv(sch); ++ bool enqueue = false; ++ ++ if (unlikely(qdisc_qlen(sch) >= sch->limit)) { ++ q->stats.overlimit++; ++ goto out; ++ } ++ ++ if (!drop_early(sch, skb->len)) { ++ enqueue = true; ++ } else if (q->params.ecn && (q->vars.prob <= MAX_PROB / 10) && ++ INET_ECN_set_ce(skb)) { ++ /* If packet is ecn capable, mark it if drop probability ++ * is lower than 10%, else drop it. ++ */ ++ q->stats.ecn_mark++; ++ enqueue = true; ++ } ++ ++ /* we can enqueue the packet */ ++ if (enqueue) { ++ q->stats.packets_in++; ++ if (qdisc_qlen(sch) > q->stats.maxq) ++ q->stats.maxq = qdisc_qlen(sch); ++ ++ return qdisc_enqueue_tail(skb, sch); ++ } ++ ++out: ++ q->stats.dropped++; ++ return qdisc_drop(skb, sch); ++} ++ ++static const struct nla_policy pie_policy[TCA_PIE_MAX + 1] = { ++ [TCA_PIE_TARGET] = {.type = NLA_U32}, ++ [TCA_PIE_LIMIT] = {.type = NLA_U32}, ++ [TCA_PIE_TUPDATE] = {.type = NLA_U32}, ++ [TCA_PIE_ALPHA] = {.type = NLA_U32}, ++ [TCA_PIE_BETA] = {.type = NLA_U32}, ++ [TCA_PIE_ECN] = {.type = NLA_U32}, ++ [TCA_PIE_BYTEMODE] = {.type = NLA_U32}, ++}; ++ ++static int pie_change(struct Qdisc *sch, struct nlattr *opt) ++{ ++ struct pie_sched_data *q = qdisc_priv(sch); ++ struct nlattr *tb[TCA_PIE_MAX + 1]; ++ unsigned int qlen; ++ int err; ++ ++ if (!opt) ++ return -EINVAL; ++ ++ err = nla_parse_nested(tb, TCA_PIE_MAX, opt, pie_policy); ++ if (err < 0) ++ return err; ++ ++ sch_tree_lock(sch); ++ ++ /* convert from microseconds to pschedtime */ ++ if (tb[TCA_PIE_TARGET]) { ++ /* target is in us */ ++ u32 target = nla_get_u32(tb[TCA_PIE_TARGET]); ++ ++ /* convert to pschedtime */ ++ q->params.target = PSCHED_NS2TICKS((u64)target * NSEC_PER_USEC); ++ } ++ ++ /* tupdate is in jiffies */ ++ if (tb[TCA_PIE_TUPDATE]) ++ q->params.tupdate = usecs_to_jiffies(nla_get_u32(tb[TCA_PIE_TUPDATE])); ++ ++ if (tb[TCA_PIE_LIMIT]) { ++ u32 limit = nla_get_u32(tb[TCA_PIE_LIMIT]); ++ ++ q->params.limit = limit; ++ sch->limit = limit; ++ } ++ ++ if (tb[TCA_PIE_ALPHA]) ++ q->params.alpha = nla_get_u32(tb[TCA_PIE_ALPHA]); ++ ++ if (tb[TCA_PIE_BETA]) ++ q->params.beta = nla_get_u32(tb[TCA_PIE_BETA]); ++ ++ if (tb[TCA_PIE_ECN]) ++ q->params.ecn = nla_get_u32(tb[TCA_PIE_ECN]); ++ ++ if (tb[TCA_PIE_BYTEMODE]) ++ q->params.bytemode = nla_get_u32(tb[TCA_PIE_BYTEMODE]); ++ ++ /* Drop excess packets if new limit is lower */ ++ qlen = sch->q.qlen; ++ while (sch->q.qlen > sch->limit) { ++ struct sk_buff *skb = __skb_dequeue(&sch->q); ++ ++ sch->qstats.backlog -= qdisc_pkt_len(skb); ++ qdisc_drop(skb, sch); ++ } ++ qdisc_tree_decrease_qlen(sch, qlen - sch->q.qlen); ++ ++ sch_tree_unlock(sch); ++ return 0; ++} ++ ++static void pie_process_dequeue(struct Qdisc *sch, struct sk_buff *skb) ++{ ++ ++ struct pie_sched_data *q = qdisc_priv(sch); ++ int qlen = sch->qstats.backlog; /* current queue size in bytes */ ++ ++ /* If current queue is about 10 packets or more and dq_count is unset ++ * we have enough packets to calculate the drain rate. Save ++ * current time as dq_tstamp and start measurement cycle. ++ */ ++ if (qlen >= QUEUE_THRESHOLD && q->vars.dq_count == DQCOUNT_INVALID) { ++ q->vars.dq_tstamp = psched_get_time(); ++ q->vars.dq_count = 0; ++ } ++ ++ /* Calculate the average drain rate from this value. If queue length ++ * has receded to a small value viz., <= QUEUE_THRESHOLD bytes,reset ++ * the dq_count to -1 as we don't have enough packets to calculate the ++ * drain rate anymore The following if block is entered only when we ++ * have a substantial queue built up (QUEUE_THRESHOLD bytes or more) ++ * and we calculate the drain rate for the threshold here. dq_count is ++ * in bytes, time difference in psched_time, hence rate is in ++ * bytes/psched_time. ++ */ ++ if (q->vars.dq_count != DQCOUNT_INVALID) { ++ q->vars.dq_count += skb->len; ++ ++ if (q->vars.dq_count >= QUEUE_THRESHOLD) { ++ psched_time_t now = psched_get_time(); ++ u32 dtime = now - q->vars.dq_tstamp; ++ u32 count = q->vars.dq_count << PIE_SCALE; ++ ++ if (dtime == 0) ++ return; ++ ++ count = count / dtime; ++ ++ if (q->vars.avg_dq_rate == 0) ++ q->vars.avg_dq_rate = count; ++ else ++ q->vars.avg_dq_rate = ++ (q->vars.avg_dq_rate - ++ (q->vars.avg_dq_rate >> 3)) + (count >> 3); ++ ++ /* If the queue has receded below the threshold, we hold ++ * on to the last drain rate calculated, else we reset ++ * dq_count to 0 to re-enter the if block when the next ++ * packet is dequeued ++ */ ++ if (qlen < QUEUE_THRESHOLD) ++ q->vars.dq_count = DQCOUNT_INVALID; ++ else { ++ q->vars.dq_count = 0; ++ q->vars.dq_tstamp = psched_get_time(); ++ } ++ ++ if (q->vars.burst_time > 0) { ++ if (q->vars.burst_time > dtime) ++ q->vars.burst_time -= dtime; ++ else ++ q->vars.burst_time = 0; ++ } ++ } ++ } ++} ++ ++static void calculate_probability(struct Qdisc *sch) ++{ ++ struct pie_sched_data *q = qdisc_priv(sch); ++ u32 qlen = sch->qstats.backlog; /* queue size in bytes */ ++ psched_time_t qdelay = 0; /* in pschedtime */ ++ psched_time_t qdelay_old = q->vars.qdelay; /* in pschedtime */ ++ s32 delta = 0; /* determines the change in probability */ ++ u32 oldprob; ++ u32 alpha, beta; ++ bool update_prob = true; ++ ++ q->vars.qdelay_old = q->vars.qdelay; ++ ++ if (q->vars.avg_dq_rate > 0) ++ qdelay = (qlen << PIE_SCALE) / q->vars.avg_dq_rate; ++ else ++ qdelay = 0; ++ ++ /* If qdelay is zero and qlen is not, it means qlen is very small, less ++ * than dequeue_rate, so we do not update probabilty in this round ++ */ ++ if (qdelay == 0 && qlen != 0) ++ update_prob = false; ++ ++ /* Add ranges for alpha and beta, more aggressive for high dropping ++ * mode and gentle steps for light dropping mode ++ * In light dropping mode, take gentle steps; in medium dropping mode, ++ * take medium steps; in high dropping mode, take big steps. ++ */ ++ if (q->vars.prob < MAX_PROB / 100) { ++ alpha = ++ (q->params.alpha * (MAX_PROB / PSCHED_TICKS_PER_SEC)) >> 7; ++ beta = ++ (q->params.beta * (MAX_PROB / PSCHED_TICKS_PER_SEC)) >> 7; ++ } else if (q->vars.prob < MAX_PROB / 10) { ++ alpha = ++ (q->params.alpha * (MAX_PROB / PSCHED_TICKS_PER_SEC)) >> 5; ++ beta = ++ (q->params.beta * (MAX_PROB / PSCHED_TICKS_PER_SEC)) >> 5; ++ } else { ++ alpha = ++ (q->params.alpha * (MAX_PROB / PSCHED_TICKS_PER_SEC)) >> 4; ++ beta = ++ (q->params.beta * (MAX_PROB / PSCHED_TICKS_PER_SEC)) >> 4; ++ } ++ ++ /* alpha and beta should be between 0 and 32, in multiples of 1/16 */ ++ delta += alpha * ((qdelay - q->params.target)); ++ delta += beta * ((qdelay - qdelay_old)); ++ ++ oldprob = q->vars.prob; ++ ++ /* to ensure we increase probability in steps of no more than 2% */ ++ if (delta > (s32) (MAX_PROB / (100 / 2)) && ++ q->vars.prob >= MAX_PROB / 10) ++ delta = (MAX_PROB / 100) * 2; ++ ++ /* Non-linear drop: ++ * Tune drop probability to increase quickly for high delays(>= 250ms) ++ * 250ms is derived through experiments and provides error protection ++ */ ++ ++ if (qdelay > (PSCHED_NS2TICKS(250 * NSEC_PER_MSEC))) ++ delta += MAX_PROB / (100 / 2); ++ ++ q->vars.prob += delta; ++ ++ if (delta > 0) { ++ /* prevent overflow */ ++ if (q->vars.prob < oldprob) { ++ q->vars.prob = MAX_PROB; ++ /* Prevent normalization error. If probability is at ++ * maximum value already, we normalize it here, and ++ * skip the check to do a non-linear drop in the next ++ * section. ++ */ ++ update_prob = false; ++ } ++ } else { ++ /* prevent underflow */ ++ if (q->vars.prob > oldprob) ++ q->vars.prob = 0; ++ } ++ ++ /* Non-linear drop in probability: Reduce drop probability quickly if ++ * delay is 0 for 2 consecutive Tupdate periods. ++ */ ++ ++ if ((qdelay == 0) && (qdelay_old == 0) && update_prob) ++ q->vars.prob = (q->vars.prob * 98) / 100; ++ ++ q->vars.qdelay = qdelay; ++ q->vars.qlen_old = qlen; ++ ++ /* We restart the measurement cycle if the following conditions are met ++ * 1. If the delay has been low for 2 consecutive Tupdate periods ++ * 2. Calculated drop probability is zero ++ * 3. We have atleast one estimate for the avg_dq_rate ie., ++ * is a non-zero value ++ */ ++ if ((q->vars.qdelay < q->params.target / 2) && ++ (q->vars.qdelay_old < q->params.target / 2) && ++ (q->vars.prob == 0) && ++ (q->vars.avg_dq_rate > 0)) ++ pie_vars_init(&q->vars); ++} ++ ++static void pie_timer(unsigned long arg) ++{ ++ struct Qdisc *sch = (struct Qdisc *)arg; ++ struct pie_sched_data *q = qdisc_priv(sch); ++ spinlock_t *root_lock = qdisc_lock(qdisc_root_sleeping(sch)); ++ ++ spin_lock(root_lock); ++ calculate_probability(sch); ++ ++ /* reset the timer to fire after 'tupdate'. tupdate is in jiffies. */ ++ if (q->params.tupdate) ++ mod_timer(&q->adapt_timer, jiffies + q->params.tupdate); ++ spin_unlock(root_lock); ++ ++} ++ ++static int pie_init(struct Qdisc *sch, struct nlattr *opt) ++{ ++ struct pie_sched_data *q = qdisc_priv(sch); ++ ++ pie_params_init(&q->params); ++ pie_vars_init(&q->vars); ++ sch->limit = q->params.limit; ++ ++ setup_timer(&q->adapt_timer, pie_timer, (unsigned long)sch); ++ mod_timer(&q->adapt_timer, jiffies + HZ / 2); ++ ++ if (opt) { ++ int err = pie_change(sch, opt); ++ ++ if (err) ++ return err; ++ } ++ ++ return 0; ++} ++ ++static int pie_dump(struct Qdisc *sch, struct sk_buff *skb) ++{ ++ struct pie_sched_data *q = qdisc_priv(sch); ++ struct nlattr *opts; ++ ++ opts = nla_nest_start(skb, TCA_OPTIONS); ++ if (opts == NULL) ++ goto nla_put_failure; ++ ++ /* convert target from pschedtime to us */ ++ if (nla_put_u32(skb, TCA_PIE_TARGET, ++ ((u32) PSCHED_TICKS2NS(q->params.target)) / ++ NSEC_PER_USEC) || ++ nla_put_u32(skb, TCA_PIE_LIMIT, sch->limit) || ++ nla_put_u32(skb, TCA_PIE_TUPDATE, jiffies_to_usecs(q->params.tupdate)) || ++ nla_put_u32(skb, TCA_PIE_ALPHA, q->params.alpha) || ++ nla_put_u32(skb, TCA_PIE_BETA, q->params.beta) || ++ nla_put_u32(skb, TCA_PIE_ECN, q->params.ecn) || ++ nla_put_u32(skb, TCA_PIE_BYTEMODE, q->params.bytemode)) ++ goto nla_put_failure; ++ ++ return nla_nest_end(skb, opts); ++ ++nla_put_failure: ++ nla_nest_cancel(skb, opts); ++ return -1; ++ ++} ++ ++static int pie_dump_stats(struct Qdisc *sch, struct gnet_dump *d) ++{ ++ struct pie_sched_data *q = qdisc_priv(sch); ++ struct tc_pie_xstats st = { ++ .prob = q->vars.prob, ++ .delay = ((u32) PSCHED_TICKS2NS(q->vars.qdelay)) / ++ NSEC_PER_USEC, ++ /* unscale and return dq_rate in bytes per sec */ ++ .avg_dq_rate = q->vars.avg_dq_rate * ++ (PSCHED_TICKS_PER_SEC) >> PIE_SCALE, ++ .packets_in = q->stats.packets_in, ++ .overlimit = q->stats.overlimit, ++ .maxq = q->stats.maxq, ++ .dropped = q->stats.dropped, ++ .ecn_mark = q->stats.ecn_mark, ++ }; ++ ++ return gnet_stats_copy_app(d, &st, sizeof(st)); ++} ++ ++static struct sk_buff *pie_qdisc_dequeue(struct Qdisc *sch) ++{ ++ struct sk_buff *skb; ++ skb = __qdisc_dequeue_head(sch, &sch->q); ++ ++ if (!skb) ++ return NULL; ++ ++ pie_process_dequeue(sch, skb); ++ return skb; ++} ++ ++static void pie_reset(struct Qdisc *sch) ++{ ++ struct pie_sched_data *q = qdisc_priv(sch); ++ qdisc_reset_queue(sch); ++ pie_vars_init(&q->vars); ++} ++ ++static void pie_destroy(struct Qdisc *sch) ++{ ++ struct pie_sched_data *q = qdisc_priv(sch); ++ q->params.tupdate = 0; ++ del_timer_sync(&q->adapt_timer); ++} ++ ++static struct Qdisc_ops pie_qdisc_ops __read_mostly = { ++ .id = "pie", ++ .priv_size = sizeof(struct pie_sched_data), ++ .enqueue = pie_qdisc_enqueue, ++ .dequeue = pie_qdisc_dequeue, ++ .peek = qdisc_peek_dequeued, ++ .init = pie_init, ++ .destroy = pie_destroy, ++ .reset = pie_reset, ++ .change = pie_change, ++ .dump = pie_dump, ++ .dump_stats = pie_dump_stats, ++ .owner = THIS_MODULE, ++}; ++ ++static int __init pie_module_init(void) ++{ ++ return register_qdisc(&pie_qdisc_ops); ++} ++ ++static void __exit pie_module_exit(void) ++{ ++ unregister_qdisc(&pie_qdisc_ops); ++} ++ ++module_init(pie_module_init); ++module_exit(pie_module_exit); ++ ++MODULE_DESCRIPTION("Proportional Integral controller Enhanced (PIE) scheduler"); ++MODULE_AUTHOR("Vijay Subramanian"); ++MODULE_AUTHOR("Mythili Prabhu"); ++MODULE_LICENSE("GPL"); hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core77, updated. a4da0b6e311ba28bcbc4f276c4030b6425fc4c4b
by git＠ipfire.org 18 May '14

18 May '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, core77 has been updated via a4da0b6e311ba28bcbc4f276c4030b6425fc4c4b (commit) from a257ce6b8dab0186455692f847c4dc6517198062 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a4da0b6e311ba28bcbc4f276c4030b6425fc4c4b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun May 18 14:39:16 2014 +0200 core77: drop xen kernel support. The legacy xen kernel is incompatible to grsecurity and new udev so we are forced to drop the support. We have anounced this step 8 month ago. http://planet.ipfire.org/post/dropping-support-for-xen-3-x-deprecation-warn… ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/77/update.sh | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) Difference in files: diff --git a/config/rootfiles/core/77/update.sh b/config/rootfiles/core/77/update.sh index e9cf770..9a4f781 100644 --- a/config/rootfiles/core/77/update.sh +++ b/config/rootfiles/core/77/update.sh @@ -44,20 +44,12 @@ done # # Do some sanity checks. case $(uname -r) in - *-ipfire-versatile ) + *-ipfire-xen ) /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: ERROR cannot update. versatile support is dropped." - # Report no error to pakfire. So it does not try to install it again. + "core-update-${core}: ERROR cannot update. legacy-xen support was dropped." + echo "IPFire 2.13 (i586) - core 76 - xen-legacy (EOL) No support!" > /etc/system-release exit 0 ;; - *-ipfire-xen ) - BOOTSIZE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f2 | tail -n 1` - if [ $BOOTSIZE -lt 28000 ]; then - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: ERROR cannot update because not enough space on boot." - exit 2 - fi - ;; *-ipfire* ) # Ok. ;; @@ -475,18 +467,6 @@ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then fi fi -# Force reinstall xen kernel if it was installed -if [ -e "/opt/pakfire/db/installed/meta-linux-xen" ]; then - echo "Name: linux-xen" > /opt/pakfire/db/installed/meta-linux-xen - echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-xen - echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-xen - echo "Name: linux-xen" > /opt/pakfire/db/meta/meta-linux-xen - echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-xen - echo "Release: 0" >> /opt/pakfire/db/meta/meta-linux-xen - # Add xvc0 to /etc/securetty - echo "xvc0" >> /etc/securetty -fi - # # After pakfire has ended run it again and update the lists and do upgrade # hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 30b1c1c72855e469034d9f7a6d4410367fa3069c
by git＠ipfire.org 18 May '14

18 May '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 30b1c1c72855e469034d9f7a6d4410367fa3069c (commit) via 4be45949e9629cc141401957e291e1e5206adb39 (commit) via 53ce51761fb21c630ce547660cc0b2778835d210 (commit) via 754066e6c3c6c1185fc25f8ae25b5e90c6e11f99 (commit) from e3b5a052ecd0eb5c53f669c5218f360b016fe128 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 30b1c1c72855e469034d9f7a6d4410367fa3069c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun May 18 13:35:02 2014 +0200 Re-add missing language string "DNS Servers". commit 4be45949e9629cc141401957e291e1e5206adb39 Author: Erik Kapfer <erik.kapfer(a)ipfire.org> Date: Sat May 17 21:59:45 2014 +0200 openvpn: Changed directioning and added additional generation for ta.key. Deleted the direction parameter 0 and 1 in ta.key directive for compatibility purposes. Added the ta.key generation also in PKI build process. Replaced the ta.key to /certs instead of /ca and adapted the apropriate paths. commit 53ce51761fb21c630ce547660cc0b2778835d210 Author: Erik Kapfer <erik.kapfer(a)ipfire.org> Date: Sat May 17 21:48:50 2014 +0200 openvpn: Drop unused code from cgi file. Deleted the following unused functions: * checkportfw * checkportoverlap * checkportinc * disallowreserved commit 754066e6c3c6c1185fc25f8ae25b5e90c6e11f99 Author: Erik Kapfer <erik.kapfer(a)ipfire.org> Date: Sat May 17 21:32:55 2014 +0200 openvpn: Deleted double entries for TLSAUTH and DAUTH. Also drop remaining if clauses for Engines. ----------------------------------------------------------------------- Summary of changes: doc/language_issues.de | 1 - doc/language_issues.en | 1 - doc/language_missings | 4 ++ html/cgi-bin/ovpnmain.cgi | 153 +++++++--------------------------------------- langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + 6 files changed, 28 insertions(+), 133 deletions(-) Difference in files: diff --git a/doc/language_issues.de b/doc/language_issues.de index 650d415..2140296 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -615,7 +615,6 @@ WARNING: untranslated string: addons WARNING: untranslated string: bytes WARNING: untranslated string: community rules WARNING: untranslated string: dead peer detection -WARNING: untranslated string: dns servers WARNING: untranslated string: downlink WARNING: untranslated string: emerging rules WARNING: untranslated string: first diff --git a/doc/language_issues.en b/doc/language_issues.en index 732e2aa..3a0a4c7 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -647,7 +647,6 @@ WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs WARNING: untranslated string: bytes -WARNING: untranslated string: dns servers WARNING: untranslated string: downlink WARNING: untranslated string: first WARNING: untranslated string: fwhost err hostip diff --git a/doc/language_missings b/doc/language_missings index 7a55460..2def481 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -92,6 +92,7 @@ < dnsforward entries < dnsforward forward_server < dnsforward zone +< dns servers < dpd delay < dpd timeout < drop action @@ -607,6 +608,7 @@ < dnsforward entries < dnsforward forward_server < dnsforward zone +< dns servers < dpd delay < dpd timeout < drop action @@ -1114,6 +1116,7 @@ < dnsforward entries < dnsforward forward_server < dnsforward zone +< dns servers < dpd delay < dpd timeout < drop action @@ -1600,6 +1603,7 @@ < dnsforward entries < dnsforward forward_server < dnsforward zone +< dns servers < dpd delay < dpd timeout < drop action diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 907e8c0..0e8fad8 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -172,105 +172,6 @@ sub deletebackupcert unlink ("${General::swroot}/ovpn/certs/$hexvalue.pem"); } } -sub checkportfw { - my $DPORT = shift; - my $DPROT = shift; - my %natconfig =(); - my $confignat = "${General::swroot}/firewall/config"; - $DPROT= uc ($DPROT); - &General::readhasharray($confignat, \%natconfig); - foreach my $key (sort keys %natconfig){ - my @portarray = split (/\|/,$natconfig{$key}[30]); - foreach my $value (@portarray){ - if ($value =~ /:/i){ - my ($a,$b) = split (":",$value); - if ($DPROT eq $natconfig{$key}[12] && $DPORT gt $a && $DPORT lt $b){ - $errormessage= "$Lang::tr{'source port in use'} $DPORT"; - } - }else{ - if ($DPROT eq $natconfig{$key}[12] && $DPORT eq $value){ - $errormessage= "$Lang::tr{'source port in use'} $DPORT"; - } - } - } - } - return; -} - -sub checkportoverlap -{ - my $portrange1 = $_[0]; # New port range - my $portrange2 = $_[1]; # existing port range - my @tempr1 = split(/\:/,$portrange1); - my @tempr2 = split(/\:/,$portrange2); - - unless (&checkportinc($tempr1[0], $portrange2)){ return 0;} - unless (&checkportinc($tempr1[1], $portrange2)){ return 0;} - - unless (&checkportinc($tempr2[0], $portrange1)){ return 0;} - unless (&checkportinc($tempr2[1], $portrange1)){ return 0;} - - return 1; # Everything checks out! -} - -# Darren Critchley - we want to make sure that a port entry is not within an already existing range -sub checkportinc -{ - my $port1 = $_[0]; # Port - my $portrange2 = $_[1]; # Port range - my @tempr1 = split(/\:/,$portrange2); - - if ($port1 < $tempr1[0] || $port1 > $tempr1[1]) { - return 1; - } else { - return 0; - } -} - -# Darren Critchley - certain ports are reserved for IPFire -# TCP 67,68,81,222,444 -# UDP 67,68 -# Params passed in -> port, rangeyn, protocol -sub disallowreserved -{ - # port 67 and 68 same for tcp and udp, don't bother putting in an array - my $msg = ""; - my @tcp_reserved = (81,222,444); - my $prt = $_[0]; # the port or range - my $ryn = $_[1]; # tells us whether or not it is a port range - my $prot = $_[2]; # protocol - my $srcdst = $_[3]; # source or destination - if ($ryn) { # disect port range - if ($srcdst eq "src") { - $msg = "$Lang::tr{'rsvd src port overlap'}"; - } else { - $msg = "$Lang::tr{'rsvd dst port overlap'}"; - } - my @tmprng = split(/\:/,$prt); - unless (67 < $tmprng[0] || 67 > $tmprng[1]) { $errormessage="$msg 67"; return; } - unless (68 < $tmprng[0] || 68 > $tmprng[1]) { $errormessage="$msg 68"; return; } - if ($prot eq "tcp") { - foreach my $prange (@tcp_reserved) { - unless ($prange < $tmprng[0] || $prange > $tmprng[1]) { $errormessage="$msg $prange"; return; } - } - } - } else { - if ($srcdst eq "src") { - $msg = "$Lang::tr{'reserved src port'}"; - } else { - $msg = "$Lang::tr{'reserved dst port'}"; - } - if ($prt == 67) { $errormessage="$msg 67"; return; } - if ($prt == 68) { $errormessage="$msg 68"; return; } - if ($prot eq "tcp") { - foreach my $prange (@tcp_reserved) { - if ($prange == $prt) { $errormessage="$msg $prange"; return; } - } - } - } - return; -} - sub writeserverconf { my %sovpnsettings = (); @@ -369,7 +270,7 @@ sub writeserverconf { print CONF "auth $sovpnsettings{'DAUTH'}\n"; } if ($sovpnsettings{'TLSAUTH'} eq 'on') { - print CONF "tls-auth ${General::swroot}/ovpn/ca/ta.key 0\n"; + print CONF "tls-auth ${General::swroot}/ovpn/certs/ta.key\n"; } if ($sovpnsettings{DCOMPLZO} eq 'on') { print CONF "comp-lzo\n"; @@ -810,13 +711,6 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) { $vpnsettings{'MSSFIX'} = $cgiparams{'MSSFIX'}; } - # Create ta.key for tls-auth if not presant - if ($cgiparams{'TLSAUTH'} eq 'on') { - if ( ! -e "${General::swroot}/ovpn/ca/ta.key") { - system('/usr/sbin/openvpn', '--genkey', '--secret', "${General::swroot}/ovpn/ca/ta.key") - } - } - if (($cgiparams{'PMTU_DISCOVERY'} eq 'yes') || ($cgiparams{'PMTU_DISCOVERY'} eq 'maybe') || ($cgiparams{'PMTU_DISCOVERY'} eq 'no' )) { @@ -915,6 +809,16 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) { $errormessage = $Lang::tr{'invalid input for keepalive 1:2'}; goto ADV_ERROR; } + # Create ta.key for tls-auth if not presant + if ($cgiparams{'TLSAUTH'} eq 'on') { + if ( ! -e "${General::swroot}/ovpn/certs/ta.key") { + system('/usr/sbin/openvpn', '--genkey', '--secret', "${General::swroot}/ovpn/certs/ta.key"); + if ($?) { + $errormessage = "$Lang::tr{'openssl produced an error'}: $?"; + goto ADV_ERROR; + } + } + } &General::writehash("${General::swroot}/ovpn/settings", \%vpnsettings); &writeserverconf();#hier ok @@ -1131,11 +1035,6 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq '' && $cg } } if ($errormessage) { goto SETTINGS_ERROR; } - - if ($cgiparams{'ENABLED'} eq 'on'){ - &checkportfw($cgiparams{'DDEST_PORT'},$cgiparams{'DPROTOCOL'}); - } - if ($errormessage) { goto SETTINGS_ERROR; } if (! &General::validipandmask($cgiparams{'DOVPN_SUBNET'})) { $errormessage = $Lang::tr{'ovpn subnet is invalid'}; @@ -1944,7 +1843,14 @@ END goto ROOTCERT_ERROR; # } else { # &cleanssldatabase(); - } + } + # Create ta.key for tls-auth + system('/usr/sbin/openvpn', '--genkey', '--secret', "${General::swroot}/ovpn/certs/ta.key"); + if ($?) { + $errormessage = "$Lang::tr{'openssl produced an error'}: $?"; + &cleanssldatabase(); + goto ROOTCERT_ERROR; + } goto ROOTCERT_SUCCESS; } ROOTCERT_ERROR: @@ -2286,8 +2192,8 @@ else print CLIENTCONF "auth $vpnsettings{'DAUTH'}\r\n"; } if ($vpnsettings{'TLSAUTH'} eq 'on') { - print CLIENTCONF "tls-auth ta.key 1\r\n"; - $zip->addFile( "${General::swroot}/ovpn/ca/ta.key", "ta.key") or die "Can't add file ta.key\n"; + print CLIENTCONF "tls-auth ta.key\r\n"; + $zip->addFile( "${General::swroot}/ovpn/certs/ta.key", "ta.key") or die "Can't add file ta.key\n"; } if ($vpnsettings{DCOMPLZO} eq 'on') { print CLIENTCONF "comp-lzo\r\n"; @@ -2511,20 +2417,8 @@ ADV_ERROR: if ($cgiparams{'DAUTH'} eq '') { $cgiparams{'DAUTH'} = 'SHA1'; } - if ($cgiparams{'DAUTH'} eq '') { - $cgiparams{'DAUTH'} = 'SHA1'; - } - if ($cgiparams{'ENGINES'} eq '') { - $cgiparams{'ENGINES'} = 'disabled'; - } if ($cgiparams{'TLSAUTH'} eq '') { - $cgiparams{'TLSAUTH'} = 'off'; - } - if ($cgiparams{'DAUTH'} eq '') { - $cgiparams{'DAUTH'} = 'SHA1'; - } - if ($cgiparams{'TLSAUTH'} eq '') { - $cgiparams{'TLSAUTH'} = 'off'; + $cgiparams{'TLSAUTH'} = 'off'; } $checked{'CLIENT2CLIENT'}{'off'} = ''; $checked{'CLIENT2CLIENT'}{'on'} = ''; @@ -4927,9 +4821,6 @@ END if ($cgiparams{'DAUTH'} eq '') { $cgiparams{'DAUTH'} = 'SHA1'; } - if ($cgiparams{'ENGINES'} eq '') { - $cgiparams{'ENGINES'} = 'disabled'; - } if ($cgiparams{'DOVPN_SUBNET'} eq '') { $cgiparams{'DOVPN_SUBNET'} = '10.' . int(rand(256)) . '.' . int(rand(256)) . '.0/255.255.255.0'; } diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index aee46df..6d27012 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -739,6 +739,7 @@ 'dns saved' => 'Erfolgreich gespeichert!', 'dns saved txt' => 'Die beiden eingegebenen DNS-Server-Adressen wurde erfolgreich gespeichert.<br/>Um die Änderung wirksam zu machen, müssen Sie neustarten oder wiederverbinden!', 'dns server' => 'DNS Server', +'dns servers' => 'DNS-Server', 'dns title' => 'Domain Name System', 'dnsforward' => 'DNS-Weiterleitung', 'dnsforward add a new entry' => 'Neuen Eintrag hinzufügen', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 20e9db3..f7bfcd8 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -764,6 +764,7 @@ 'dns saved' => 'Successfully saved!', 'dns saved txt' => 'The two entered DNS server addresses have been saved successfully.<br />You have to reboot or reconnect that the changes have effect!', 'dns server' => 'DNS Server', +'dns servers' => 'DNS Servers', 'dns title' => 'Domain Name System', 'dnsforward' => 'DNS Forwarding', 'dnsforward add a new entry' => 'Add a new entry', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e3b5a052ecd0eb5c53f669c5218f360b016fe128
by git＠ipfire.org 17 May '14

17 May '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via e3b5a052ecd0eb5c53f669c5218f360b016fe128 (commit) via 53ac77f61004852ad7a593e0a4441619aaecd300 (commit) via ace810a3f85f58a59c4ca430b61d052817e7362c (commit) via cf6abf539ed973c6bb053293cafeee01e60ac0d1 (commit) via 080568824d60c86189a49d272a390f81c86a0eba (commit) via 5a9f40613eea53a15e3cf6dc6348114329871ac3 (commit) via f353972f3f84da9873f0512dc8810a20408fde2c (commit) via edb7235c38554f9a02a03cd1b58f027cae43cf8c (commit) via 9cf34ad1ed74f88a139e620fff476e6ae0a9707f (commit) via b1ab4a4dd0cce83c838b9946f42d601776e9ca8a (commit) via 02c542d173228b45bde7895d9ecd1e00b7129769 (commit) via 1a200cffc994858c8cad91b9b00093d24f00e79a (commit) from 0f7ee3ea4e63a646ae5d02207530493016240f43 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e3b5a052ecd0eb5c53f669c5218f360b016fe128 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat May 17 15:32:56 2014 +0200 core78: Update filelist. commit 53ac77f61004852ad7a593e0a4441619aaecd300 Merge: ace810a 5a9f406 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat May 17 15:27:53 2014 +0200 Merge remote-tracking branch 'stevee/ddns-providers' into next commit ace810a3f85f58a59c4ca430b61d052817e7362c Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri May 16 22:07:14 2014 +0200 snort: Update url's for rule download. commit cf6abf539ed973c6bb053293cafeee01e60ac0d1 Merge: 0805688 edb7235 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat May 17 15:18:52 2014 +0200 Merge remote-tracking branch 'alpha197/patch-1' into next commit 080568824d60c86189a49d272a390f81c86a0eba Merge: 0f7ee3e 1a200cf Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat May 17 15:18:43 2014 +0200 Merge remote-tracking branch 'origin/master' into next commit 5a9f40613eea53a15e3cf6dc6348114329871ac3 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu May 15 18:47:13 2014 +0200 setddns.pl: Switch off debuging output. Switch off accidently enabled debugging output from commit dc98645fd42873dfeda01188243565e2f977f4a9 commit f353972f3f84da9873f0512dc8810a20408fde2c Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed May 14 19:52:06 2014 +0200 Change update url for spDNS.de. commit edb7235c38554f9a02a03cd1b58f027cae43cf8c Author: alpha197 <alpha197(a)users.noreply.github.com> Date: Tue May 13 19:00:04 2014 +0200 xen-image-maker: Fix wrong menu entry for pygrub Should fix https://bugzilla.ipfire.org/show_bug.cgi?id=10499 commit 9cf34ad1ed74f88a139e620fff476e6ae0a9707f Author: Bernhard Bitsch <bbitsch(a)ipfire.org> Date: Mon May 12 19:50:50 2014 +0200 DDNS: Add support for spdns.de. This commit adds support for the dynamic dns service provider spdns.de. Fixes #10533. commit b1ab4a4dd0cce83c838b9946f42d601776e9ca8a Author: Stefan Ernst <sternst(a)ernx.de> Date: Sun May 11 19:53:00 2014 +0200 DDNS: Add support for variomedia.de. This commit adds support for the dynamic dns service provider variomedia.de. Fixes #10485. commit 02c542d173228b45bde7895d9ecd1e00b7129769 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed Jan 29 15:31:23 2014 +0100 DDNS: Add support for twodns.de. This commit adds support for the dynamic dns service provider twodns.de. Fixes #10418. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/78/filelists/files | 4 ++ config/rootfiles/packages/clamav | 8 ++- config/xen-image/xen-image-maker.sh | 2 +- html/cgi-bin/ddns.cgi | 6 ++ html/cgi-bin/ids.cgi | 4 +- lfs/clamav | 7 ++- src/scripts/setddns.pl | 104 ++++++++++++++++++++++++++++++- 7 files changed, 125 insertions(+), 10 deletions(-) Difference in files: diff --git a/config/rootfiles/core/78/filelists/files b/config/rootfiles/core/78/filelists/files index 91b624e..15c629b 100644 --- a/config/rootfiles/core/78/filelists/files +++ b/config/rootfiles/core/78/filelists/files @@ -1,12 +1,16 @@ etc/system-release etc/issue +srv/web/ipfire/cgi-bin/ddns.cgi +srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat srv/web/ipfire/cgi-bin/modem-status.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/html/themes/ipfire/include/functions.pl +usr/local/bin/setddns.pl var/ipfire/langs var/ipfire/menu.d/20-status.menu var/ipfire/menu.d/70-log.menu +var/ipfire/modem-lib.pl var/ipfire/ovpn/openssl/ovpn.cnf diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav index 885af45..e27eba6 100644 --- a/config/rootfiles/packages/clamav +++ b/config/rootfiles/packages/clamav @@ -4,21 +4,22 @@ usr/bin/clamconf usr/bin/clamdscan usr/bin/clamdtop usr/bin/clamscan +usr/bin/clamsubmit usr/bin/freshclam usr/bin/sigtool #usr/include/clamav.h #usr/lib/libclamav.la usr/lib/libclamav.so usr/lib/libclamav.so.6 -usr/lib/libclamav.so.6.1.20 +usr/lib/libclamav.so.6.1.22 #usr/lib/libclamunrar.la usr/lib/libclamunrar.so usr/lib/libclamunrar.so.6 -usr/lib/libclamunrar.so.6.1.20 +usr/lib/libclamunrar.so.6.1.22 #usr/lib/libclamunrar_iface.la usr/lib/libclamunrar_iface.so usr/lib/libclamunrar_iface.so.6 -usr/lib/libclamunrar_iface.so.6.1.20 +usr/lib/libclamunrar_iface.so.6.1.22 #usr/lib/pkgconfig/libclamav.pc usr/sbin/clamd usr/share/clamav @@ -27,6 +28,7 @@ usr/share/clamav #usr/share/man/man1/clamdscan.1 #usr/share/man/man1/clamdtop.1 #usr/share/man/man1/clamscan.1 +#usr/share/man/man1/clamsubmit.1 #usr/share/man/man1/freshclam.1 #usr/share/man/man1/sigtool.1 #usr/share/man/man5/clamav-milter.conf.5 diff --git a/config/xen-image/xen-image-maker.sh b/config/xen-image/xen-image-maker.sh index a42ad5b..1a2a004 100644 --- a/config/xen-image/xen-image-maker.sh +++ b/config/xen-image/xen-image-maker.sh @@ -121,7 +121,7 @@ mkdir $MNThdd/boot/grub echo "timeout 10" > $MNThdd/boot/grub/grub.conf echo "default 0" >> $MNThdd/boot/grub/grub.conf echo "title IPFire ($KERN_TYPE-kernel)" >> $MNThdd/boot/grub/grub.conf -echo " kernel /vmlinuz-$KVER-ipfire-xen root=/dev/xvda3 rootdelay=10 panic=10 console=$CONSOLE ro" \ +echo " kernel /vmlinuz-$KVER-ipfire-$KERN_TYPE root=/dev/xvda3 rootdelay=10 panic=10 console=$CONSOLE ro" \ >> $MNThdd/boot/grub/grub.conf echo " initrd /ipfirerd-$KVER-$KERN_TYPE.img" >> $MNThdd/boot/grub/grub.conf echo "# savedefault 0" >> $MNThdd/boot/grub/grub.conf diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi index 4e51ab6..4b4bc63 100644 --- a/html/cgi-bin/ddns.cgi +++ b/html/cgi-bin/ddns.cgi @@ -253,8 +253,11 @@ $checked{'SERVICE'}{'nsupdate'} = ''; $checked{'SERVICE'}{'ovh.com'} = ''; $checked{'SERVICE'}{'regfish.com'} = ''; $checked{'SERVICE'}{'selfhost.de'} = ''; +$checked{'SERVICE'}{'spdns.org'} = ''; $checked{'SERVICE'}{'strato.com'} = ''; +$checked{'SERVICE'}{'twodns.de'} = ''; $checked{'SERVICE'}{'tzo.com'} = ''; +$checked{'SERVICE'}{'variomedia.de'} = ''; $checked{'SERVICE'}{'zoneedit.com'} = ''; $checked{'SERVICE'}{$settings{'SERVICE'}} = "selected='selected'"; @@ -349,8 +352,11 @@ print <<END <option $checked{'SERVICE'}{'ovh.com'}>ovh.com</option> <option $checked{'SERVICE'}{'regfish.com'}>regfish.com</option> <option $checked{'SERVICE'}{'selfhost.de'}>selfhost.de</option> + <option $checked{'SERVICE'}{'spdns.org'}>spdns.org</option> <option $checked{'SERVICE'}{'strato.com'}>strato.com</option> + <option $checked{'SERVICE'}{'twodns.de'}>twodns.de</option>  + <option $checked{'SERVICE'}{'variomedia.de'}>variomedia.de</option> <option $checked{'SERVICE'}{'zoneedit.com'}>zoneedit.com</option> </select></td> <td width='20%' class='base'>$Lang::tr{'hostname'}: <img src='/blob.gif' alt='*' /></td> diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 55e2645..5a28daa 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -263,9 +263,9 @@ if (-e "/etc/snort/snort.conf") { ####################### End added for snort rules control ################################# if ($snortsettings{'RULES'} eq 'subscripted') { - $url=" http://www.snort.org/sub-rules/snortrules-snapshot-2953.tar.gz/$snortsettin…'OINKCODE'}"; + $url=" http://www.snort.org/sub-rules/snortrules-snapshot-2961.tar.gz/$snortsettin…'OINKCODE'}"; } elsif ($snortsettings{'RULES'} eq 'registered') { - $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2950.tar.gz/$snortsettin…'OINKCODE'}"; + $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2960.tar.gz/$snortsettin…'OINKCODE'}"; } elsif ($snortsettings{'RULES'} eq 'community') { $url=" http://s3.amazonaws.com/snort-org/www/rules/community/community-rules.tar.gz"; } else { diff --git a/lfs/clamav b/lfs/clamav index 4a9a5a2..8cb849b 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -24,7 +24,7 @@ include Config -VER = 0.98.1 +VER = 0.98.3 THISAPP = clamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = clamav -PAK_VER = 24 +PAK_VER = 25 DEPS = "" @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b1ec7b19dea8385954515ef1d63576d8 +$(DL_FILE)_MD5 = b649d35ee85d4d6075a98173dd255c17 install : $(TARGET) @@ -96,6 +96,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Disable PaX mprotect for clamd and freshclam paxctl -cm /usr/sbin/clamd + paxctl -cm /usr/bin/clamscan paxctl -cm /usr/bin/freshclam @rm -rf $(DIR_APP) diff --git a/src/scripts/setddns.pl b/src/scripts/setddns.pl index f97e750..e26c524 100644 --- a/src/scripts/setddns.pl +++ b/src/scripts/setddns.pl @@ -51,7 +51,7 @@ if ($ip eq "unavailable") { exit(0); } -&General::log("Dynamic DNS public router IP is: $ip"); +#&General::log("Dynamic DNS public router IP is: $ip"); if ($ARGV[0] eq '-f') { unlink ($cachefile); # next regular calls will try again if this force update fails. @@ -400,6 +400,41 @@ if ($ip ne $ipcache) { &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : failure (could not connect to server)"); } } + elsif ($settings{'SERVICE'} eq 'spdns.de') { + # 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'} ); + } + + if ($settings{'HOSTNAME'} eq '') { + $settings{'HOSTDOMAIN'} = $settings{'DOMAIN'}; + } else { + $settings{'HOSTDOMAIN'} = "$settings{'HOSTNAME'}.$settings{'DOMAIN'}"; + } + + my ($out, $response) = Net::SSLeay::get_https( 'update.spdns.de', 443, + "/nic/update?&hostname=$settings{'HOSTDOMAIN'}&myip=$ip", + Net::SSLeay::make_headers('User-Agent' => 'IPFire' , + 'Authorization' => 'Basic ' . encode_base64("$settings{'LOGIN'}:$settings{'PASSWORD'}")) + ); + + #Valid responses from service are: + # good xxx.xxx.xxx.xxx + # nochg xxx.xxx.xxx.xxx + if ($response =~ m%HTTP/1\.. 200 OK%) { + if ($out !~ m/good |nochg /ig) { + &General::log("Dynamic DNS ip-update for $settings{'HOSTDOMAIN'} : failure ($out)"); + } else { + &General::log("Dynamic DNS ip-update for $settings{'HOSTDOMAIN'} : success"); + $success++; + } + } else { + &General::log("Dynamic DNS ip-update for $settings{'HOSTDOMAIN'} : failure (could not connect to server)"); + } + } elsif ($settings{'SERVICE'} eq 'strato') { # use proxy ? my %proxysettings; @@ -650,6 +685,73 @@ if ($ip ne $ipcache) { &General::log("Dynamic DNS ip-update for $settings{'HOSTDOMAIN'} : failure (could not connect to server, check your credentials---$out-$response--)"); } } + elsif ($settings{'SERVICE'} eq 'twodns.de') { + # 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'} ); + } + + if ($settings{'HOSTNAME'} eq '') { + $settings{'HOSTDOMAIN'} = $settings{'DOMAIN'}; + } else { + $settings{'HOSTDOMAIN'} = "$settings{'HOSTNAME'}.$settings{'DOMAIN'}"; + } + + my ($out, $response) = Net::SSLeay::get_https( 'update.twodns.de', + 443, + "/update?hostname=$settings{'HOSTDOMAIN'}&ip=$ip", + Net::SSLeay::make_headers('User-Agent' => 'IPFire', + 'Authorization' => 'Basic ' . encode_base64("$settings{'LOGIN'}:$settings{'PASSWORD'}")) ); + + # Valid response are 'ok' 'nochange' + if ($response =~ m%HTTP/1\.. 200 OK%) { + if ( $out !~ m/^(good|nochg)/ ) { + $out =~ s/\n/ /g; + &General::log("Dynamic DNS ip-update for $settings{'HOSTDOMAIN'} : failure ($out)"); + } else { + &General::log("Dynamic DNS ip-update for $settings{'HOSTDOMAIN'} : success"); + $success++; + } + } else { + &General::log("Dynamic DNS ip-update for $settings{'HOSTDOMAIN'} : failure (could not connect to server, check your credentials---$out-$response--)"); + } + } + elsif ($settings{'SERVICE'} eq 'variomedia') { + # 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'} ); + } + + if ($settings{'HOSTNAME'} eq '') { + $settings{'HOSTDOMAIN'} = $settings{'DOMAIN'}; + } else { + $settings{'HOSTDOMAIN'} = "$settings{'HOSTNAME'}.$settings{'DOMAIN'}"; + } + + my ($out, $response) = Net::SSLeay::get_https( 'dyndns.variomedia.de', + 443, + "/nic/update?hostname=$settings{'HOSTDOMAIN'}&myip=$ip", + Net::SSLeay::make_headers('User-Agent' => 'IPFire', + 'Authorization' => 'Basic ' . encode_base64("$settings{'LOGIN'}:$settings{'PASSWORD'}")) ); + + # Valid response is 'good $ip' + if ($response =~ m%HTTP/1\.. 200 OK%) { + if ( $out !~ m/^good $ip/ ) { + &General::log("Dynamic DNS ip-update for $settings{'HOSTDOMAIN'} ($ip) : failure ($out)"); + } else { + &General::log("Dynamic DNS ip-update for $settings{'HOSTDOMAIN'} ($ip) : success"); + $success++; + } + } else { + &General::log("Dynamic DNS ip-update for $settings{'HOSTDOMAIN'} : failure (could not connect to server, check your credentials---$out-$response--)"); + } + } else { if ($settings{'WILDCARDS'} eq 'on') { $settings{'WILDCARDS'} = '-w'; hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0f7ee3ea4e63a646ae5d02207530493016240f43
by git＠ipfire.org 16 May '14

16 May '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 0f7ee3ea4e63a646ae5d02207530493016240f43 (commit) from 1638682beb691a4bf40f4db155c109d9a34536a4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0f7ee3ea4e63a646ae5d02207530493016240f43 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri May 16 17:12:43 2014 +0200 sslscan: New package. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/sslscan | 2 ++ lfs/{ipvsadm => sslscan} | 16 ++++++++-------- make.sh | 1 + 3 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 config/rootfiles/packages/sslscan copy lfs/{ipvsadm => sslscan} (90%) Difference in files: diff --git a/config/rootfiles/packages/sslscan b/config/rootfiles/packages/sslscan new file mode 100644 index 0000000..603c36e --- /dev/null +++ b/config/rootfiles/packages/sslscan @@ -0,0 +1,2 @@ +usr/bin/sslscan +#usr/share/man/man1/sslscan.1 diff --git a/lfs/sslscan b/lfs/sslscan new file mode 100644 index 0000000..a384db1 --- /dev/null +++ b/lfs/sslscan @@ -0,0 +1,83 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2014 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 = 1.10.2 + +THISAPP = sslscan-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = sslscan +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 41ecff92303cecfd00bf3c7de509af14 + +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 axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && make $(MAKETUNING) CFLAGS="$(CFLAGS)" + cd $(DIR_APP) && make install PREFIX=/usr + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 0056ee5..041f696 100755 --- a/make.sh +++ b/make.sh @@ -797,6 +797,7 @@ buildipfire() { ipfiremake iptraf-ng ipfiremake iotop ipfiremake stunnel + ipfiremake sslscan } buildinstaller() { hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1638682beb691a4bf40f4db155c109d9a34536a4
by git＠ipfire.org 14 May '14

14 May '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 1638682beb691a4bf40f4db155c109d9a34536a4 (commit) via a9fb14d0513d71accacfded36f46e471cb3a88d6 (commit) via 040b8b0c5ed052025d9c35e26eb7092510deb25c (commit) via bc2b3e9483f37ec497b3460faf0208cfb87cdfc5 (commit) via d9fe569366e9dca7f833b53a212ea2ef4311d45f (commit) via ed4b4c19b9e47229ead960bd43bcc9cd6a01413a (commit) from 7e8d00649625a1f8f77e086d402e02b2ab2dce79 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1638682beb691a4bf40f4db155c109d9a34536a4 Author: Alf Høgemark <alf(a)i100.no> Date: Wed May 14 21:56:42 2014 +0200 cgi-bin: Add title attribute to input type image where missing Almost all of <input type="image"... has both an alt and a title attribute, but some are missing title, and when the icon is not very clear, it makes it harder to understand what the icon does. By adding title, the browser displays text when mouse pointer is over the icon. Also add missing quotes for alt and title attributes where needed. commit a9fb14d0513d71accacfded36f46e471cb3a88d6 Author: Alf Høgemark <alf(a)i100.no> Date: Tue Feb 18 17:48:57 2014 +0000 cgi-bin: Use readonly="readonly" attribute on html input elements The proper way to mark readonly is to use readonly="readonly", not readonly="true", like it was done some places. commit 040b8b0c5ed052025d9c35e26eb7092510deb25c Author: Alf Høgemark <alf(a)i100.no> Date: Wed May 14 21:54:27 2014 +0200 ovpnmain.cgi: Use language string keys already defined commit bc2b3e9483f37ec497b3460faf0208cfb87cdfc5 Author: Alf Høgemark <alf(a)i100.no> Date: Wed May 14 21:51:50 2014 +0200 vpnmain.cgi: htmlcleanup, change html tags from uppercase to lowercase commit d9fe569366e9dca7f833b53a212ea2ef4311d45f Author: Alexander Marx <amarx(a)ipfire.org> Date: Fri Jan 31 21:23:21 2014 +0100 openvpn: Wrong subnet calculation bug fix. Fixes #10466. commit ed4b4c19b9e47229ead960bd43bcc9cd6a01413a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jan 12 15:40:50 2014 +0100 Re-apply: OpenVPN: Fix daemon stuck in WAIT state. When the client is in the WAIT state, it is usally connected to the server. Conflicts: html/cgi-bin/index.cgi html/cgi-bin/ovpnmain.cgi ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/ovpnmain.cgi | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) Difference in files: diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index a051b5d..907e8c0 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -567,7 +567,7 @@ sub getccdadresses my @iprange=(); my %ccdhash=(); &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%ccdhash); - $iprange[0]=$ip1.".".$ip2.".".$ip3.".".2; + $iprange[0]=$ip1.".".$ip2.".".$ip3.".".($ip4+2); for (my $i=1;$i<=$count;$i++) { my $tmpip=$iprange[$i-1]; my $stepper=$i*4; @@ -2698,7 +2698,7 @@ print <<END; <option value='SHA1' $selected{'DAUTH'}{'SHA1'}>SHA1 (160 $Lang::tr{'bit'})</option> </select> </td> - <td>Default: <span class="base">SHA1 (160 $Lang::tr{'bit'})</span></td> + <td>$Lang::tr{'openvpn default'}: <span class="base">SHA1 (160 $Lang::tr{'bit'})</span></td> </tr> </table> @@ -2793,7 +2793,7 @@ if ($cgiparams{'ACTION'} eq "edit"){ <table width='100%' border='0'> <tr><form method='post'> <td width='10%' nowrap='nowrap'>$Lang::tr{'ccd name'}:</td><td><input type='TEXT' name='ccdname' value='$cgiparams{'ccdname'}' /></td> - <td width='8%'>$Lang::tr{'ccd subnet'}:</td><td><input type='TEXT' name='ccdsubnet' value='$cgiparams{'ccdsubnet'}' readonly /></td></tr> + <td width='8%'>$Lang::tr{'ccd subnet'}:</td><td><input type='TEXT' name='ccdsubnet' value='$cgiparams{'ccdsubnet'}' readonly='readonly' /></td></tr> <tr><td colspan='4' align='right'><hr><input type='submit' value='$Lang::tr{'save'}' /><input type='hidden' name='ACTION' value='editsave'/> <input type='hidden' name='ccdname' value='$cgiparams{'ccdname'}'/><input type='submit' value='$Lang::tr{'cancel'}' /> </td></tr> @@ -2853,7 +2853,7 @@ END print"<td>$ccdconf[0]</td><td align='center'>$ccdconf[1]</td><td align='center'>$ccdhosts/".(&ccdmaxclients($ccdconf[1])+1)."</td><td>"; print <<END; <form method='post' /> - <input type='image' src='/images/edit.gif' align='middle' alt=$Lang::tr{'edit'} title=$Lang::tr{'edit'} /> + <input type='image' src='/images/edit.gif' align='middle' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' /> <input type='hidden' name='ACTION' value='edit'/> <input type='hidden' name='ccdname' value='$ccdconf[0]' /> <input type='hidden' name='ccdsubnet' value='$ccdconf[1]' /> @@ -2862,7 +2862,7 @@ END <td><input type='hidden' name='ACTION' value='kill'/> <input type='hidden' name='number' value='$count' /> <input type='hidden' name='net' value='$ccdconf[0]' /> - <input type='image' src='/images/delete.gif' align='middle' alt=$Lang::tr{'remove'} title=$Lang::tr{'remove'} /></form></td></tr> + <input type='image' src='/images/delete.gif' align='middle' alt='$Lang::tr{'remove'}' title='$Lang::tr{'remove'}' /></form></td></tr> END ; } @@ -3092,7 +3092,7 @@ if ( -s "${General::swroot}/ovpn/settings") { <td class='base'>$Lang::tr{'net to net vpn'} (Upload Client Package)</td></tr> <tr><td> </td><td class='base'><input type='file' name='FH' size='30'></td></tr> <tr><td> </td><td>Import Connection Name <img src='/blob.gif' /></td></tr> - <tr><td> </td><td class='base'><input type='text' name='n2nname' size='30'>Default : Client Packagename</td></tr> + <tr><td> </td><td class='base'><input type='text' name='n2nname' size='30'>$Lang::tr{'openvpn default'}: Client Packagename</td></tr> <tr><td colspan='3'><hr /></td></tr> <tr><td align='right' colspan='3'><input type='submit' name='ACTION' value='$Lang::tr{'add'}' /></td></tr> <tr><td class='base' colspan='3' align='left'><img src='/blob.gif' alt='*' /> $Lang::tr{'this field may be blank'}</td></tr> @@ -4729,7 +4729,7 @@ if ($cgiparams{'TYPE'} eq 'host') { <tr><td> </td> <td class='base'>$Lang::tr{'pkcs12 file password'}:</td> <td class='base' nowrap='nowrap'><input type='password' name='CERT_PASS1' value='$cgiparams{'CERT_PASS1'}' size='32' $cakeydisabled /></td></tr> - <tr><td> </td><td class='base'>$Lang::tr{'pkcs12 file password'}:<BR>($Lang::tr{'confirmation'})</td> + <tr><td> </td><td class='base'>$Lang::tr{'pkcs12 file password'}:<br>($Lang::tr{'confirmation'})</td> <td class='base' nowrap='nowrap'><input type='password' name='CERT_PASS2' value='$cgiparams{'CERT_PASS2'}' size='32' $cakeydisabled /></td></tr> <tr><td colspan='3'> </td></tr> <tr><td colspan='3'><hr /></td></tr> @@ -5046,7 +5046,7 @@ END <td class='boldbase'>$Lang::tr{'destination port'}:</td> <td><input type='TEXT' name='DDEST_PORT' value='$cgiparams{'DDEST_PORT'}' size='5' /></td></tr> <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'MTU'} </td> - <td> <input type='TEXT' name='DMTU' VALUE='$cgiparams{'DMTU'}'size='5' /></td> + <td> <input type='TEXT' name='DMTU' VALUE='$cgiparams{'DMTU'}' size='5' /></td> <td class='boldbase' nowrap='nowrap'>$Lang::tr{'cipher'}</td> <td><select name='DCIPHER'> @@ -5177,7 +5177,7 @@ END #EXITING -- A graceful exit is in progress. #### - if ($tustate[1] eq 'CONNECTED') { + if (($tustate[1] eq 'CONNECTED') || ($tustate[1] eq 'WAIT')) { $col1="bgcolor='${Header::colourgreen}'"; $active = "<b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b>"; }else { hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM May 2014