Update Kernel to 2.6.27.20

Update alsa to 1.0.19
Update cdrtools to 2.01.01...
Update mISDN 2 to current socket branch
This commit is contained in:
Arne Fitzenreiter
2009-03-22 16:02:34 +01:00
parent 5dbaf998a2
commit a3b414d38a
21 changed files with 3349 additions and 382 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -32,3 +32,204 @@ usr/bin/mkisofs
#usr/man/man8/mkhybrid.8
#usr/man/man8/mkisofs.8
#usr/sbin/rscsi
#etc/default/cdrecord
#etc/default/rscsi
#usr/bin/btcflash
#usr/bin/scgskeleton
#usr/include/scg
#usr/include/scg/aspi-dos.h
#usr/include/scg/aspi-win32.h
#usr/include/scg/scgcmd.h
#usr/include/scg/scgio.h
#usr/include/scg/scgops.h
#usr/include/scg/scsicdb.h
#usr/include/scg/scsidefs.h
#usr/include/scg/scsireg.h
#usr/include/scg/scsisense.h
#usr/include/scg/scsitransp.h
#usr/include/scg/spti-wnt.h
#usr/include/scg/srb_os2.h
#usr/include/schily
#usr/include/schily/align.h
#usr/include/schily/alloca.h
#usr/include/schily/archdefs.h
#usr/include/schily/avoffset.h
#usr/include/schily/btorder.h
#usr/include/schily/ccomdefs.h
#usr/include/schily/checkerr.h
#usr/include/schily/deflts.h
#usr/include/schily/device.h
#usr/include/schily/dirent.h
#usr/include/schily/errno.h
#usr/include/schily/fcntl.h
#usr/include/schily/fetchdir.h
#usr/include/schily/find.h
#usr/include/schily/fnmatch.h
#usr/include/schily/fstream.h
#usr/include/schily/getargs.h
#usr/include/schily/getcwd.h
#usr/include/schily/hostname.h
#usr/include/schily/i586-linux-cc
#usr/include/schily/i586-linux-cc/align.h
#usr/include/schily/i586-linux-cc/avoffset.h
#usr/include/schily/i586-linux-cc/xconfig.h
#usr/include/schily/iconv.h
#usr/include/schily/idcache.h
#usr/include/schily/intcvt.h
#usr/include/schily/ioctl.h
#usr/include/schily/jmpdefs.h
#usr/include/schily/libport.h
#usr/include/schily/librmt.h
#usr/include/schily/maxpath.h
#usr/include/schily/mconfig.h
#usr/include/schily/mman.h
#usr/include/schily/mtio.h
#usr/include/schily/nlsdefs.h
#usr/include/schily/param.h
#usr/include/schily/patmatch.h
#usr/include/schily/prototyp.h
#usr/include/schily/rmtio.h
#usr/include/schily/schily.h
#usr/include/schily/schilyp.h
#usr/include/schily/siconv.h
#usr/include/schily/sigblk.h
#usr/include/schily/signal.h
#usr/include/schily/standard.h
#usr/include/schily/stat.h
#usr/include/schily/stdio.h
#usr/include/schily/stdlib.h
#usr/include/schily/stkframe.h
#usr/include/schily/string.h
#usr/include/schily/sysexits.h
#usr/include/schily/termcap.h
#usr/include/schily/termios.h
#usr/include/schily/time.h
#usr/include/schily/types.h
#usr/include/schily/unistd.h
#usr/include/schily/utime.h
#usr/include/schily/utypes.h
#usr/include/schily/varargs.h
#usr/include/schily/wait.h
#usr/include/schily/walk.h
#usr/include/schily/wchar.h
#usr/include/schily/xconfig.h
#usr/include/schily/xmconfig.h
#usr/lib/libcdrdeflt.a
#usr/lib/libedc_ecc_dec.a
#usr/lib/libfind.a
#usr/lib/libscgcmd.a
#usr/lib/libsiconv.a
#usr/lib/profiled
#usr/lib/profiled/libcdrdeflt.a
#usr/lib/profiled/libdeflt.a
#usr/lib/profiled/libedc_ecc.a
#usr/lib/profiled/libedc_ecc_dec.a
#usr/lib/profiled/libfile.a
#usr/lib/profiled/libfind.a
#usr/lib/profiled/libhfs.a
#usr/lib/profiled/libparanoia.a
#usr/lib/profiled/librscg.a
#usr/lib/profiled/libscg.a
#usr/lib/profiled/libscgcmd.a
#usr/lib/profiled/libschily.a
#usr/lib/profiled/libsiconv.a
#usr/lib/siconv
#usr/lib/siconv/cp10000
#usr/lib/siconv/cp10006
#usr/lib/siconv/cp10007
#usr/lib/siconv/cp10029
#usr/lib/siconv/cp10079
#usr/lib/siconv/cp10081
#usr/lib/siconv/cp1250
#usr/lib/siconv/cp1251
#usr/lib/siconv/cp1252
#usr/lib/siconv/cp1253
#usr/lib/siconv/cp1254
#usr/lib/siconv/cp1255
#usr/lib/siconv/cp1256
#usr/lib/siconv/cp1257
#usr/lib/siconv/cp1258
#usr/lib/siconv/cp437
#usr/lib/siconv/cp737
#usr/lib/siconv/cp775
#usr/lib/siconv/cp850
#usr/lib/siconv/cp852
#usr/lib/siconv/cp855
#usr/lib/siconv/cp857
#usr/lib/siconv/cp860
#usr/lib/siconv/cp861
#usr/lib/siconv/cp862
#usr/lib/siconv/cp863
#usr/lib/siconv/cp864
#usr/lib/siconv/cp865
#usr/lib/siconv/cp866
#usr/lib/siconv/cp869
#usr/lib/siconv/cp874
#usr/lib/siconv/iso8859-1
#usr/lib/siconv/iso8859-10
#usr/lib/siconv/iso8859-11
#usr/lib/siconv/iso8859-13
#usr/lib/siconv/iso8859-14
#usr/lib/siconv/iso8859-15
#usr/lib/siconv/iso8859-16
#usr/lib/siconv/iso8859-2
#usr/lib/siconv/iso8859-3
#usr/lib/siconv/iso8859-4
#usr/lib/siconv/iso8859-5
#usr/lib/siconv/iso8859-6
#usr/lib/siconv/iso8859-7
#usr/lib/siconv/iso8859-8
#usr/lib/siconv/iso8859-9
#usr/lib/siconv/koi8-r
#usr/lib/siconv/koi8-u
#usr/man/man1/btcflash.1
#usr/man/man1/rscsi.1
#usr/man/man8/devdump.8
#usr/man/man8/isodebug.8
#usr/man/man8/isodump.8
#usr/man/man8/isovfy.8
#usr/share/doc/cdda2wav
#usr/share/doc/cdda2wav/README
#usr/share/doc/cdrecord
#usr/share/doc/cdrecord/README
#usr/share/doc/cdrecord/README.ATAPI
#usr/share/doc/cdrecord/README.DiskT@2
#usr/share/doc/cdrecord/README.WORM
#usr/share/doc/cdrecord/README.audio
#usr/share/doc/cdrecord/README.cdplus
#usr/share/doc/cdrecord/README.cdrw
#usr/share/doc/cdrecord/README.cdtext
#usr/share/doc/cdrecord/README.clone
#usr/share/doc/cdrecord/README.copy
#usr/share/doc/cdrecord/README.multi
#usr/share/doc/cdrecord/README.parallel
#usr/share/doc/cdrecord/README.raw
#usr/share/doc/cdrecord/README.rscsi
#usr/share/doc/cdrecord/README.solaris-x86-ATAPI-DMA
#usr/share/doc/cdrecord/README.solaris-x86-ata-DMA
#usr/share/doc/cdrecord/README.sony
#usr/share/doc/cdrecord/README.sun-lofi
#usr/share/doc/cdrecord/README.verify
#usr/share/doc/cdrecord/README.volmgt
#usr/share/doc/libparanoia
#usr/share/doc/libparanoia/README.interface
#usr/share/doc/libparanoia/README.paranoia
#usr/share/doc/mkisofs
#usr/share/doc/mkisofs/README
#usr/share/doc/mkisofs/README.compression
#usr/share/doc/mkisofs/README.eltorito
#usr/share/doc/mkisofs/README.graft_dirs
#usr/share/doc/mkisofs/README.hfs_boot
#usr/share/doc/mkisofs/README.hfs_magic
#usr/share/doc/mkisofs/README.hide
#usr/share/doc/mkisofs/README.joliet
#usr/share/doc/mkisofs/README.macosx
#usr/share/doc/mkisofs/README.mkhybrid
#usr/share/doc/mkisofs/README.prep_boot
#usr/share/doc/mkisofs/README.rootinfo
#usr/share/doc/mkisofs/README.session
#usr/share/doc/mkisofs/README.sort
#usr/share/doc/mkisofs/README.sparcboot
#usr/share/doc/mkisofs/README.sunx86boot
#usr/share/doc/rscsi
#usr/share/doc/rscsi/default-rscsi.sample

View File

@@ -2346,3 +2346,130 @@ usr/lib/klibc/bin/sync
#usr/lib/klibc/include/linux/xilinxfb.h
#usr/lib/klibc/include/linux/thermal.h
#usr/lib/klibc/include/linux/veth.h
#usr/lib/klibc/include/asm-generic/bitops/__fls.h
#usr/lib/klibc/include/asm-generic/dma-coherent.h
#usr/lib/klibc/include/asm-generic/int-l64.h
#usr/lib/klibc/include/asm-generic/int-ll64.h
#usr/lib/klibc/include/asm-generic/syscall.h
#usr/lib/klibc/include/asm/amd_iommu.h
#usr/lib/klibc/include/asm/amd_iommu_types.h
#usr/lib/klibc/include/asm/bios_ebda.h
#usr/lib/klibc/include/asm/ftrace.h
#usr/lib/klibc/include/asm/hugetlb.h
#usr/lib/klibc/include/asm/irq_vectors.h
#usr/lib/klibc/include/asm/kgdb.h
#usr/lib/klibc/include/asm/mmconfig.h
#usr/lib/klibc/include/asm/olpc.h
#usr/lib/klibc/include/asm/pat.h
#usr/lib/klibc/include/asm/pvclock-abi.h
#usr/lib/klibc/include/asm/pvclock.h
#usr/lib/klibc/include/asm/trampoline.h
#usr/lib/klibc/include/asm/traps.h
#usr/lib/klibc/include/asm/uv
#usr/lib/klibc/include/asm/uv/bios.h
#usr/lib/klibc/include/asm/uv/uv_bau.h
#usr/lib/klibc/include/asm/uv/uv_hub.h
#usr/lib/klibc/include/asm/uv/uv_mmrs.h
#usr/lib/klibc/include/asm/visws
#usr/lib/klibc/include/asm/visws/cobalt.h
#usr/lib/klibc/include/asm/visws/lithium.h
#usr/lib/klibc/include/asm/visws/piix4.h
#usr/lib/klibc/include/asm/visws/sgivw.h
#usr/lib/klibc/include/asm/xen/events.h
#usr/lib/klibc/include/asm/xen/grant_table.h
#usr/lib/klibc/include/asm/xen/interface_32.h
#usr/lib/klibc/include/asm/xen/interface_64.h
#usr/lib/klibc/include/asm/xen/page.h
#usr/lib/klibc/include/linux/atmel-pwm-bl.h
#usr/lib/klibc/include/linux/atmel_tc.h
#usr/lib/klibc/include/linux/bounds.h
#usr/lib/klibc/include/linux/brcmphy.h
#usr/lib/klibc/include/linux/byteorder.h
#usr/lib/klibc/include/linux/cnt32_to_63.h
#usr/lib/klibc/include/linux/crc-t10dif.h
#usr/lib/klibc/include/linux/cred.h
#usr/lib/klibc/include/linux/debugobjects.h
#usr/lib/klibc/include/linux/device_cgroup.h
#usr/lib/klibc/include/linux/dlm_plock.h
#usr/lib/klibc/include/linux/dm-dirty-log.h
#usr/lib/klibc/include/linux/dm-io.h
#usr/lib/klibc/include/linux/dm-kcopyd.h
#usr/lib/klibc/include/linux/dma-attrs.h
#usr/lib/klibc/include/linux/dw_dmac.h
#usr/lib/klibc/include/linux/fdtable.h
#usr/lib/klibc/include/linux/firmware-map.h
#usr/lib/klibc/include/linux/ftrace.h
#usr/lib/klibc/include/linux/i2c-pca-platform.h
#usr/lib/klibc/include/linux/i2c/at24.h
#usr/lib/klibc/include/linux/i2c/max732x.h
#usr/lib/klibc/include/linux/ihex.h
#usr/lib/klibc/include/linux/ip_vs.h
#usr/lib/klibc/include/linux/iscsi_ibft.h
#usr/lib/klibc/include/linux/kbuild.h
#usr/lib/klibc/include/linux/kgdb.h
#usr/lib/klibc/include/linux/leds-pca9532.h
#usr/lib/klibc/include/linux/lmb.h
#usr/lib/klibc/include/linux/mISDNhw.h
#usr/lib/klibc/include/linux/math64.h
#usr/lib/klibc/include/linux/mbus.h
#usr/lib/klibc/include/linux/mfd/core.h
#usr/lib/klibc/include/linux/mfd/htc-egpio.h
#usr/lib/klibc/include/linux/mfd/htc-pasic3.h
#usr/lib/klibc/include/linux/mfd/t7l66xb.h
#usr/lib/klibc/include/linux/mfd/tc6387xb.h
#usr/lib/klibc/include/linux/mfd/tc6393xb.h
#usr/lib/klibc/include/linux/mfd/tmio.h
#usr/lib/klibc/include/linux/mmiotrace.h
#usr/lib/klibc/include/linux/mmu_notifier.h
#usr/lib/klibc/include/linux/mroute6.h
#usr/lib/klibc/include/linux/netfilter/nf_conntrack_dccp.h
#usr/lib/klibc/include/linux/netfilter/xt_IMQ.h
#usr/lib/klibc/include/linux/netfilter_bridge/ebt_ip6.h
#usr/lib/klibc/include/linux/netfilter_bridge/ebt_nflog.h
#usr/lib/klibc/include/linux/nfs_iostat.h
#usr/lib/klibc/include/linux/of_gpio.h
#usr/lib/klibc/include/linux/of_i2c.h
#usr/lib/klibc/include/linux/of_spi.h
#usr/lib/klibc/include/linux/pci-aspm.h
#usr/lib/klibc/include/linux/pim.h
#usr/lib/klibc/include/linux/pm_wakeup.h
#usr/lib/klibc/include/linux/pwm.h
#usr/lib/klibc/include/linux/pwm_backlight.h
#usr/lib/klibc/include/linux/ratelimit.h
#usr/lib/klibc/include/linux/rculist.h
#usr/lib/klibc/include/linux/regulator
#usr/lib/klibc/include/linux/regulator/bq24022.h
#usr/lib/klibc/include/linux/regulator/consumer.h
#usr/lib/klibc/include/linux/regulator/driver.h
#usr/lib/klibc/include/linux/regulator/fixed.h
#usr/lib/klibc/include/linux/regulator/machine.h
#usr/lib/klibc/include/linux/semaphore.h
#usr/lib/klibc/include/linux/seq_file_net.h
#usr/lib/klibc/include/linux/smc911x.h
#usr/lib/klibc/include/linux/smc91x.h
#usr/lib/klibc/include/linux/spi/ds1305.h
#usr/lib/klibc/include/linux/spi/max7301.h
#usr/lib/klibc/include/linux/spi/orion_spi.h
#usr/lib/klibc/include/linux/ssb/ssb_driver_gige.h
#usr/lib/klibc/include/linux/swab.h
#usr/lib/klibc/include/linux/tracehook.h
#usr/lib/klibc/include/linux/typecheck.h
#usr/lib/klibc/include/linux/unaligned
#usr/lib/klibc/include/linux/unaligned/access_ok.h
#usr/lib/klibc/include/linux/unaligned/be_byteshift.h
#usr/lib/klibc/include/linux/unaligned/be_memmove.h
#usr/lib/klibc/include/linux/unaligned/be_struct.h
#usr/lib/klibc/include/linux/unaligned/generic.h
#usr/lib/klibc/include/linux/unaligned/le_byteshift.h
#usr/lib/klibc/include/linux/unaligned/le_memmove.h
#usr/lib/klibc/include/linux/unaligned/le_struct.h
#usr/lib/klibc/include/linux/unaligned/memmove.h
#usr/lib/klibc/include/linux/unaligned/packed_struct.h
#usr/lib/klibc/include/linux/usb/association.h
#usr/lib/klibc/include/linux/usb/atmel_usba_udc.h
#usr/lib/klibc/include/linux/usb/c67x00.h
#usr/lib/klibc/include/linux/usb/composite.h
#usr/lib/klibc/include/linux/usb/irda.h
#usr/lib/klibc/include/linux/usb/musb.h
#usr/lib/klibc/include/linux/virtio_rng.h
#usr/lib/klibc/include/linux/wm97xx.h

View File

@@ -1501,3 +1501,192 @@ sbin/gen_init_cpio
#lib/modules/KVER-ipfire/modules.alias.bin
#lib/modules/KVER-ipfire/modules.dep.bin
#lib/modules/KVER-ipfire/modules.symbols.bin
#lib/firmware/atmsar11.fw
#lib/firmware/cpia2
#lib/firmware/cpia2/stv0672_vp4.bin
#lib/firmware/dabusb
#lib/firmware/dabusb/bitstream.bin
#lib/firmware/dabusb/firmware.fw
#lib/firmware/dsp56k
#lib/firmware/dsp56k/bootstrap.bin
#lib/firmware/edgeport
#lib/firmware/edgeport/boot.fw
#lib/firmware/edgeport/boot2.fw
#lib/firmware/edgeport/down.fw
#lib/firmware/edgeport/down2.fw
#lib/firmware/edgeport/down3.bin
#lib/firmware/emi26
#lib/firmware/emi26/bitstream.fw
#lib/firmware/emi26/firmware.fw
#lib/firmware/emi26/loader.fw
#lib/firmware/emi62
#lib/firmware/emi62/bitstream.fw
#lib/firmware/emi62/loader.fw
#lib/firmware/emi62/midi.fw
#lib/firmware/emi62/spdif.fw
#lib/firmware/ess
#lib/firmware/ess/maestro3_assp_kernel.fw
#lib/firmware/ess/maestro3_assp_minisrc.fw
#lib/firmware/intelliport2.bin
#lib/firmware/kaweth
lib/firmware/kaweth/new_code.bin
lib/firmware/kaweth/new_code_fix.bin
lib/firmware/kaweth/trigger_code.bin
lib/firmware/kaweth/trigger_code_fix.bin
#lib/firmware/keyspan
#lib/firmware/keyspan/mpr.fw
#lib/firmware/keyspan/usa18x.fw
#lib/firmware/keyspan/usa19.fw
#lib/firmware/keyspan/usa19qi.fw
#lib/firmware/keyspan/usa19qw.fw
#lib/firmware/keyspan/usa19w.fw
#lib/firmware/keyspan/usa28.fw
#lib/firmware/keyspan/usa28x.fw
#lib/firmware/keyspan/usa28xa.fw
#lib/firmware/keyspan/usa28xb.fw
#lib/firmware/keyspan/usa49w.fw
#lib/firmware/keyspan/usa49wlc.fw
#lib/firmware/keyspan_pda
#lib/firmware/keyspan_pda/keyspan_pda.fw
#lib/firmware/keyspan_pda/xircom_pgs.fw
#lib/firmware/korg
#lib/firmware/korg/k1212.dsp
#lib/firmware/sb16
#lib/firmware/sb16/alaw_main.csp
#lib/firmware/sb16/ima_adpcm_capture.csp
#lib/firmware/sb16/ima_adpcm_init.csp
#lib/firmware/sb16/ima_adpcm_playback.csp
#lib/firmware/sb16/mulaw_main.csp
#lib/firmware/ti_3410.fw
#lib/firmware/ti_5052.fw
#lib/firmware/tr_smctr.bin
#lib/firmware/ttusb-budget
#lib/firmware/ttusb-budget/dspbootcode.bin
#lib/firmware/vicam
#lib/firmware/vicam/firmware.fw
#lib/firmware/whiteheat.fw
#lib/firmware/whiteheat_loader.fw
#lib/firmware/yamaha
#lib/firmware/yamaha/ds1_ctrl.fw
#lib/firmware/yamaha/ds1_dsp.fw
#lib/firmware/yamaha/ds1e_ctrl.fw
#lib/modules/2.6.27.20-ipfire/kernel/crypto/cts.ko
#lib/modules/2.6.27.20-ipfire/kernel/crypto/rmd128.ko
#lib/modules/2.6.27.20-ipfire/kernel/crypto/rmd160.ko
#lib/modules/2.6.27.20-ipfire/kernel/crypto/rmd256.ko
#lib/modules/2.6.27.20-ipfire/kernel/crypto/rmd320.ko
#lib/modules/2.6.27.20-ipfire/kernel/crypto/sha512_generic.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/acpi/asus_acpi.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/acpi/pci_slot.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/acpi/sbs.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/acpi/sbshc.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/acpi/toshiba_acpi.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/ata/pata_sch.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/bluetooth/btusb.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/char/hw_random/virtio-rng.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/dma/dmatest.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/firmware
#lib/modules/2.6.27.20-ipfire/kernel/drivers/firmware/iscsi_ibft.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu
#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm
#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/drm.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/i810
#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/i810/i810.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/i830
#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/i830/i830.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/i915
#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/i915/i915.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/mga
#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/mga/mga.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/r128
#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/r128/r128.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/radeon
#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/radeon/radeon.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/savage
#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/savage/savage.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/sis
#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/sis/sis.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/tdfx
#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/tdfx/tdfx.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/via
#lib/modules/2.6.27.20-ipfire/kernel/drivers/gpu/drm/via/via.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/hwmon/ad7414.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/hwmon/ibmaem.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/i2c/busses/i2c-isch.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/i2c/busses/i2c-nforce2-s4985.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/i2c/busses/i2c-pca-platform.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/i2c/chips/at24.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/i2c/chips/pca9539.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/isdn/hardware/mISDN/mISDN_l1loop.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/isdn/mISDN
#lib/modules/2.6.27.20-ipfire/kernel/drivers/isdn/mISDN/l1oip.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/isdn/mISDN/mISDN_core.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/isdn/mISDN/mISDN_dsp.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/isdn/mISDN/mISDN_dsp_kb1ec.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/isdn/mISDN/mISDN_dsp_mec2.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/isdn/mISDN/mISDN_dsp_mg2ec.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/isdn/mISDN/mISDN_dsp_octwareec.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/isdn/mISDN/mISDN_dsp_oslec.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/isdn/mISDN/mISDN_dtmf.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/isdn/mISDN/octvqe
#lib/modules/2.6.27.20-ipfire/kernel/drivers/isdn/mISDN/octvqe/octvqe.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/leds/leds-pca9532.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/leds/leds-pca955x.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/leds/ledtrig-default-on.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/md/dm-log.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/mfd/htc-pasic3.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/misc/compal-laptop.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/misc/eeepc-laptop.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/misc/hp-wmi.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/misc/hpilo.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/mmc/card/mmc_test.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/mmc/host/sdhci-pci.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/mmc/host/sdricoh_cs.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/mtd/ar7part.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/net/8390p.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/net/atl1e
#lib/modules/2.6.27.20-ipfire/kernel/drivers/net/atl1e/atl1e.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/net/atlx
#lib/modules/2.6.27.20-ipfire/kernel/drivers/net/atlx/atl1.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/net/sfc
#lib/modules/2.6.27.20-ipfire/kernel/drivers/net/sfc/sfc.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/net/usb/hso.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/net/wireless/ath9k
#lib/modules/2.6.27.20-ipfire/kernel/drivers/net/wireless/ath9k/ath9k.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/net/wireless/iwlwifi/iwlagn.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/net/wireless/iwlwifi/iwlcore.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/net/wireless/mac80211_hwsim.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/net/wireless/p54
#lib/modules/2.6.27.20-ipfire/kernel/drivers/net/wireless/p54/p54common.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/net/wireless/p54/p54pci.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/net/wireless/p54/p54usb.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/rtc/rtc-fm3130.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/scsi/device_handler
#lib/modules/2.6.27.20-ipfire/kernel/drivers/scsi/device_handler/scsi_dh.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/scsi/device_handler/scsi_dh_alua.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/scsi/device_handler/scsi_dh_emc.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/scsi/device_handler/scsi_dh_hp_sw.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/scsi/device_handler/scsi_dh_rdac.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/uio/uio_pdrv.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/uio/uio_pdrv_genirq.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/uio/uio_smx.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/usb/class/cdc-wdm.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/usb/misc/isight_firmware.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/usb/serial/moto_modem.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/usb/serial/spcp8x5.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/video/backlight/mbp_nvidia_bl.ko
#lib/modules/2.6.27.20-ipfire/kernel/drivers/video/backlight/platform_lcd.ko
#lib/modules/2.6.27.20-ipfire/kernel/lib/crc-t10dif.ko
#lib/modules/2.6.27.20-ipfire/kernel/net/802/garp.ko
#lib/modules/2.6.27.20-ipfire/kernel/net/802/stp.ko
#lib/modules/2.6.27.20-ipfire/kernel/net/bridge/netfilter/ebt_nflog.ko
#lib/modules/2.6.27.20-ipfire/kernel/net/ipv4/netfilter/nf_nat_proto_dccp.ko
#lib/modules/2.6.27.20-ipfire/kernel/net/ipv4/netfilter/nf_nat_proto_sctp.ko
#lib/modules/2.6.27.20-ipfire/kernel/net/ipv4/netfilter/nf_nat_proto_udplite.ko
#lib/modules/2.6.27.20-ipfire/kernel/net/netfilter/nf_conntrack_proto_dccp.ko
#lib/modules/2.6.27.20-ipfire/kernel/net/netfilter/xt_IMQ.ko
#lib/modules/2.6.27.20-ipfire/kernel/net/xfrm/xfrm_ipcomp.ko
#lib/modules/2.6.27.20-ipfire/kernel/sound/core/seq/oss
#lib/modules/2.6.27.20-ipfire/kernel/sound/core/seq/oss/snd-seq-oss.ko
#lib/modules/2.6.27.20-ipfire/kernel/sound/core/seq/snd-seq-dummy.ko
#lib/modules/2.6.27.20-ipfire/kernel/sound/core/seq/snd-seq-midi-event.ko

View File

@@ -0,0 +1,69 @@
lib/firmware/atmsar11.fw
#lib/firmware/cpia2
lib/firmware/cpia2/stv0672_vp4.bin
#lib/firmware/dabusb
lib/firmware/dabusb/bitstream.bin
lib/firmware/dabusb/firmware.fw
#lib/firmware/dsp56k
lib/firmware/dsp56k/bootstrap.bin
#lib/firmware/edgeport
lib/firmware/edgeport/boot.fw
lib/firmware/edgeport/boot2.fw
lib/firmware/edgeport/down.fw
lib/firmware/edgeport/down2.fw
lib/firmware/edgeport/down3.bin
#lib/firmware/emi26
lib/firmware/emi26/bitstream.fw
lib/firmware/emi26/firmware.fw
lib/firmware/emi26/loader.fw
#lib/firmware/emi62
lib/firmware/emi62/bitstream.fw
lib/firmware/emi62/loader.fw
lib/firmware/emi62/midi.fw
lib/firmware/emi62/spdif.fw
#lib/firmware/ess
lib/firmware/ess/maestro3_assp_kernel.fw
lib/firmware/ess/maestro3_assp_minisrc.fw
lib/firmware/intelliport2.bin
#lib/firmware/kaweth
lib/firmware/kaweth/new_code.bin
lib/firmware/kaweth/new_code_fix.bin
lib/firmware/kaweth/trigger_code.bin
lib/firmware/kaweth/trigger_code_fix.bin
#lib/firmware/keyspan
lib/firmware/keyspan/mpr.fw
lib/firmware/keyspan/usa18x.fw
lib/firmware/keyspan/usa19.fw
lib/firmware/keyspan/usa19qi.fw
lib/firmware/keyspan/usa19qw.fw
lib/firmware/keyspan/usa19w.fw
lib/firmware/keyspan/usa28.fw
lib/firmware/keyspan/usa28x.fw
lib/firmware/keyspan/usa28xa.fw
lib/firmware/keyspan/usa28xb.fw
lib/firmware/keyspan/usa49w.fw
lib/firmware/keyspan/usa49wlc.fw
#lib/firmware/keyspan_pda
lib/firmware/keyspan_pda/keyspan_pda.fw
lib/firmware/keyspan_pda/xircom_pgs.fw
#lib/firmware/korg
lib/firmware/korg/k1212.dsp
#lib/firmware/sb16
lib/firmware/sb16/alaw_main.csp
lib/firmware/sb16/ima_adpcm_capture.csp
lib/firmware/sb16/ima_adpcm_init.csp
lib/firmware/sb16/ima_adpcm_playback.csp
lib/firmware/sb16/mulaw_main.csp
lib/firmware/ti_3410.fw
lib/firmware/ti_5052.fw
lib/firmware/tr_smctr.bin
#lib/firmware/ttusb-budget
lib/firmware/ttusb-budget/dspbootcode.bin
#lib/firmware/vicam
lib/firmware/vicam/firmware.fw
lib/firmware/whiteheat.fw
lib/firmware/whiteheat_loader.fw
#lib/firmware/yamaha
lib/firmware/yamaha/ds1_ctrl.fw
lib/firmware/yamaha/ds1_dsp.fw
lib/firmware/yamaha/ds1e_ctrl.fw

View File

@@ -1,42 +1,20 @@
usr/bin/isdnbridge
usr/bin/loadfirm
usr/bin/mISDNdebugtool
usr/bin/misdnportinfo
usr/bin/sendhwctrl
usr/bin/testcon
usr/bin/testcon_l2
usr/bin/testlayer1
usr/bin/testlayer3
usr/bin/testlib
usr/bin/tstlib
usr/bin/voipisdn
usr/bin/l1oipctrl
usr/bin/misdn_bridge
usr/bin/misdn_cleanl2
usr/bin/misdn_info
usr/bin/misdn_log
usr/bin/misdn_rename
#usr/include/mISDNuser
#usr/include/mISDNuser/asn1.h
#usr/include/mISDNuser/asn1_diversion.h
#usr/include/mISDNuser/bchannel.h
#usr/include/mISDNuser/fsm.h
#usr/include/mISDNuser/g711.h
#usr/include/mISDNuser/helper.h
#usr/include/mISDNuser/ibuffer.h
#usr/include/mISDNuser/isdn_debug.h
#usr/include/mISDNuser/isdn_msg.h
#usr/include/mISDNuser/compat_af_isdn.h
#usr/include/mISDNuser/isdn_net.h
#usr/include/mISDNuser/isound.h
#usr/include/mISDNuser/l3dss1.h
#usr/include/mISDNuser/mISDNlib.h
#usr/include/mISDNuser/net_l2.h
#usr/include/mISDNuser/net_l3.h
#usr/include/mISDNuser/suppserv.h
#usr/include/mISDNuser/tone.h
#usr/lib/libisdnnet.a
usr/lib/libisdnnet.so
#usr/lib/libisdnnet_pic.a
#usr/lib/libmISDN.a
usr/lib/libmISDN.so
#usr/lib/libmISDN_pic.a
#usr/lib/libsuppserv.a
usr/lib/libsuppserv.so
#usr/lib/libsuppserv_pic.a
#usr/include/mISDNuser/mISDNif.h
#usr/include/mISDNuser/mbuffer.h
#usr/include/mISDNuser/mlayer3.h
#usr/include/mISDNuser/q931.h
#usr/lib/libmisdn.a
usr/lib/libmisdn.so
#usr/lib/libmisdn_pic.a
#usr/lib/mISDN
usr/lib/mISDN/mISDN.conf.bnx.xsl
usr/lib/mISDN/mISDN.conf.hfcmulti.xsl

View File

@@ -0,0 +1 @@
../../../common/linux-firmware

View File

@@ -24,7 +24,7 @@
. /opt/pakfire/lib/functions.sh
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
#
KVER="2.6.25.20"
KVER="2.6.27.20"
ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1`
MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
# Nur den letzten Parameter verwenden

View File

@@ -333,3 +333,50 @@ usr/share/sounds/alsa
#usr/share/sounds/alsa/Rear_Right.wav
#usr/share/sounds/alsa/Side_Left.wav
#usr/share/sounds/alsa/Side_Right.wav
lib/firmware/pcxhr/dspb1222e.b56
lib/firmware/pcxhr/dspb1222hr.b56
lib/firmware/pcxhr/dspb882e.b56
lib/firmware/pcxhr/dspb882hr.b56
lib/firmware/pcxhr/dspb924.b56
lib/firmware/pcxhr/dspd1222.d56
lib/firmware/pcxhr/dspd222.d56
lib/firmware/pcxhr/dspd882.d56
lib/firmware/pcxhr/dspe882.e56
lib/firmware/pcxhr/dspe924.e56
lib/firmware/pcxhr/xlxc1222e.dat
lib/firmware/pcxhr/xlxc1222hr.dat
lib/firmware/pcxhr/xlxc222.dat
lib/firmware/pcxhr/xlxc882e.dat
lib/firmware/pcxhr/xlxc882hr.dat
lib/firmware/pcxhr/xlxc924.dat
lib/firmware/pcxhr/xlxint.dat
#usr/local/share/alsa/firmware/pcxhrloader/dspb1222e.b56
#usr/local/share/alsa/firmware/pcxhrloader/dspb1222hr.b56
#usr/local/share/alsa/firmware/pcxhrloader/dspb882e.b56
#usr/local/share/alsa/firmware/pcxhrloader/dspb882hr.b56
#usr/local/share/alsa/firmware/pcxhrloader/dspb924.b56
#usr/local/share/alsa/firmware/pcxhrloader/dspd1222.d56
#usr/local/share/alsa/firmware/pcxhrloader/dspd222.d56
#usr/local/share/alsa/firmware/pcxhrloader/dspd882.d56
#usr/local/share/alsa/firmware/pcxhrloader/dspe882.e56
#usr/local/share/alsa/firmware/pcxhrloader/dspe924.e56
#usr/local/share/alsa/firmware/pcxhrloader/pcxhr0.conf
#usr/local/share/alsa/firmware/pcxhrloader/pcxhr1.conf
#usr/local/share/alsa/firmware/pcxhrloader/pcxhr2.conf
#usr/local/share/alsa/firmware/pcxhrloader/pcxhr3.conf
#usr/local/share/alsa/firmware/pcxhrloader/pcxhr4.conf
#usr/local/share/alsa/firmware/pcxhrloader/pcxhr5.conf
#usr/local/share/alsa/firmware/pcxhrloader/xlxc1222e.dat
#usr/local/share/alsa/firmware/pcxhrloader/xlxc1222hr.dat
#usr/local/share/alsa/firmware/pcxhrloader/xlxc222.dat
#usr/local/share/alsa/firmware/pcxhrloader/xlxc882e.dat
#usr/local/share/alsa/firmware/pcxhrloader/xlxc882hr.dat
#usr/local/share/alsa/firmware/pcxhrloader/xlxc924.dat
#usr/local/share/alsa/firmware/pcxhrloader/xlxint.dat
#usr/share/alsa/init
#usr/share/alsa/init/00main
#usr/share/alsa/init/default
#usr/share/alsa/init/hda
#usr/share/alsa/init/help
#usr/share/alsa/init/info
#usr/share/alsa/init/test

View File

@@ -33,15 +33,14 @@
* URI-1.35
* Unix-Syslog-0.100
* XML-Parser-2.34
* alsa-lib-1.0.17
* alsa-lib-1.0.17-kmod-2.6.25.20
* alsa-lib-1.0.19
* alsa-lib-1.0.19-kmod-2.6.27.20
* amavisd-new-2.5.2
* apcupsd-3.14.4
* applejuice-0.31
* arping-2.05
* as86-0.16.17
* asterisk-1.4.18
* atl2-2.0.5-kmod-2.6.25.20
* atl2-2.0.5-kmod-2.6.27.20
* autoconf-2.59
* automake-1.9.6
* backup-ipfire
@@ -60,7 +59,7 @@
* calamaris-2.59
* capi4k-utils-2005-07-18
* ccache-2.4
* cdrtools-2.01
* cdrtools-2.01.01
* centerim-4.22.1
* clamav-0.94.2
* cmake-2.4.8
@@ -144,7 +143,7 @@
* jpegsrc.v6b
* kbd-1.12
* klibc-1.5.14
* kqemu-1.4.0pre1-kmod-2.6.25.20
* kqemu-1.4.0pre1-kmod-2.6.27.20
* kudzu-1.2.64
* l7-protocols-2008-12-18
* lame-3.97
@@ -173,7 +172,7 @@
* libwww-perl-5.803
* libxml2-2.6.26
* libxslt-1.1.17
* linux-2.6.25.20
* linux-2.6.27.20
* linux-atm-2.4.1
* linux-libc-headers-2.6.12.0
* lm_sensors-3.0.3
@@ -183,8 +182,8 @@
* lynis-1.2.3
* lzo-2.02
* m4-1.4.4
* mISDNuser.git-8e7bf2f11cc108d4b52949c2a26e38df24821b01
* madwifi-hal-0.10.5.6-r3942-20090205-kmod-2.6.25.20
* mISDNuser-20090322
* madwifi-hal-0.10.5.6-r3942-20090205-kmod-2.6.27.20
* make-3.81
* man-db-2.4.3
* man-pages-2.34
@@ -301,7 +300,7 @@
* urlgrabber-3.1.0
* usbutils-0.72
* util-linux-2.12r
* v4l-dvb-e9a442d3b53a-kmod-2.6.25.20
* v4l-dvb-e9a442d3b53a-kmod-2.6.27.20
* vdr-1.6.0
* vdradmin-am-3.6.4
* vim-7.0
@@ -315,7 +314,7 @@
* whatmask-1.2
* which-2.16
* wireless_tools.30.pre6
* wpa_supplicant-0.5.11
* wpa_supplicant-0.6.8
* xfsprogs-2.9.4
* xvidcore-1.2.1
* zlib-1.2.3

View File

@@ -24,7 +24,7 @@
include Config
VER = 1.0.17
VER = 1.0.19
THISAPP = alsa-lib-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ else
TARGET = $(DIR_INFO)/$(THISAPP)
endif
PROG = alsa
PAK_VER = 4
PAK_VER = 5
DEPS = ""
@@ -55,10 +55,10 @@ alsa-utils-$(VER).tar.bz2 = $(DL_FROM)/alsa-utils-$(VER).tar.bz2
alsa-firmware-$(VER).tar.bz2 = $(DL_FROM)/alsa-firmware-$(VER).tar.bz2
alsa-driver-$(VER).tar.bz2 = $(DL_FROM)/alsa-driver-$(VER).tar.bz2
$(DL_FILE)_MD5 = 9bbbdc502478cdc75074c9ba42c385b3
alsa-utils-$(VER).tar.bz2_MD5 = 14ccd0c900bf663afb36eac6f92d41d6
alsa-firmware-$(VER).tar.bz2_MD5 = a334a2b736cc6244162d7cc83247075d
alsa-driver-$(VER).tar.bz2_MD5 = 6044062d13dbfe61c0330fe9915cfdb4
$(DL_FILE)_MD5 = 73db3666c211e5fb023bb77450cf430d
alsa-utils-$(VER).tar.bz2_MD5 = 5ff0379c707c1a29083233edc9ab4e06
alsa-firmware-$(VER).tar.bz2_MD5 = bb93a1a58066bdb2308dc7b117df2b67
alsa-driver-$(VER).tar.bz2_MD5 = 7045d69c49e70bb88278b8015d5eb509
install : $(TARGET)
@@ -104,7 +104,7 @@ else
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
cd $(DIR_SRC) && tar xfj $(DIR_DL)/alsa-utils-$(VER).tar.bz2
cd $(DIR_SRC)/alsa-utils-$(VER) && ./configure
cd $(DIR_SRC)/alsa-utils-$(VER) && ./configure --disable-xmlto
cd $(DIR_SRC)/alsa-utils-$(VER) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_SRC)/alsa-utils-$(VER) && make install
cd $(DIR_SRC) && tar xfj $(DIR_DL)/alsa-firmware-$(VER).tar.bz2

View File

@@ -24,10 +24,10 @@
include Config
VER = 2.01
VER = 2.01.01a58
THISAPP = cdrtools-$(VER)
DL_FILE = $(THISAPP).tar.bz2
THISAPP = cdrtools-2.01.01
DL_FILE = cdrtools-$(VER).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = d44a81460e97ae02931c31188fe8d3fd
$(DL_FILE)_MD5 = 6a17354df11c325bba9941d69e9c0294
install : $(TARGET)
@@ -69,9 +69,9 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-mkisofs_iconv-1.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-ascii-2.patch
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
#cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cdrtools-2.01-mkisofs_iconv-1.patch
#cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cdrtools-2.01-ascii-2.patch
cd $(DIR_APP) && make INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root $(MAKETUNING)
cd $(DIR_APP) && make INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root install
@rm -rf $(DIR_APP)

View File

@@ -64,8 +64,8 @@ $(TARGET) :
cp -a /lib/modules/$(KVER)-ipfire/ /install/initrd/lib/modules/
rm -rf /install/initrd/lib/modules/$(KVER)-ipfire/{build,source,misc/*,kernel/{sound,drivers/{media,video}}} \
/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/message/fusion/mptlan*
rm -rf /install/initrd/lib/modules/$(KVER)-ipfire/{build,source,misc/*,kernel/{sound,drivers/{bluetooth,hwmon,media,video,watchdog}}} \
/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/message/fusion/mptlan* \
cp /opt/$(MACHINE)-uClibc/lib/libgcc_s.so.1 /install/initrd/lib/
@@ -79,6 +79,9 @@ $(TARGET) :
# make new dependencies for installer
depmod -a -F /boot/System.map-$(KVER)-ipfire \
-b /install/initrd $(KVER)-ipfire
# Remove binary depmod files
rm -rf /install/initrd/lib/modules/$(KVER)-ipfire/modules.*.bin
mksquashfs /install/initrd /install/images/initrd
cd /install/initrd && find ./ -ls > $(DIR_INFO)/_build.initrd.log

View File

@@ -87,7 +87,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# ipp2p 0.8.2-pomng
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.1.1-ipp2p-0.8.2-pomng.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.1-imq.diff
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.2-imq.patch
chmod +x $(DIR_APP)/extensions/.IMQ-test*
# hack to disable IPv6 compilation as the configuration variable does not work when ip6.h is present

View File

@@ -25,7 +25,7 @@
include Config
PATCHLEVEL = .20
VER = 2.6.25.20
VER = 2.6.27.20
THISAPP = linux-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -46,25 +46,25 @@ endif
# Top-level Rules
###############################################################################
objects =$(DL_FILE) \
mISDN.git-12dca7cf4cf38590d30cdeaf8ced30aaca6d875f.tar.gz \
mISDN-20090322.tar.gz \
squashfs3.4.tar.gz \
netfilter-layer7-v2.21.tar.gz \
patch-2.6.16-nath323-1.3.bz2 \
reiser4-for-2.6.25.patch.bz2
reiser4-for-2.6.27.19.patch.bz2
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
netfilter-layer7-v2.21.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.21.tar.gz
patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
squashfs3.4.tar.gz = $(URL_IPFIRE)/squashfs3.4.tar.gz
mISDN.git-12dca7cf4cf38590d30cdeaf8ced30aaca6d875f.tar.gz = $(URL_IPFIRE)/mISDN.git-12dca7cf4cf38590d30cdeaf8ced30aaca6d875f.tar.gz
reiser4-for-2.6.25.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.25.patch.bz2
mISDN-20090322.tar.gz = $(URL_IPFIRE)/mISDN-20090322.tar.gz
reiser4-for-2.6.27.19.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.27.19.patch.bz2
$(DL_FILE)_MD5 = 0da698edccf03e2235abc2830a495114
$(DL_FILE)_MD5 = 58bd12ef5348e5e44b7d7b678299ff9f
netfilter-layer7-v2.21.tar.gz_MD5 = 838422e7d9a06b42e682e9064e5210b5
patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138
squashfs3.4.tar.gz_MD5 = 2a4d2995ad5aa6840c95a95ffa6b1da6
mISDN.git-12dca7cf4cf38590d30cdeaf8ced30aaca6d875f.tar.gz_MD5 = a46a2d15bd0341edfbd77d257ed3fe4d
reiser4-for-2.6.25.patch.bz2_MD5 = 4294bbcb39e5ee859b94b09ff4fb1e0c
mISDN-20090322.tar.gz_MD5 = 8495c13ef09dacf4a5e42b93da2ac3fc
reiser4-for-2.6.27.19.patch.bz2_MD5 = 22988387f64f299489b90b484b2642cc
install : $(TARGET)
@@ -108,15 +108,18 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
#cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.x.kernel-2.6.23-natt.patch
# Reiser4
cd $(DIR_APP) && bzip2 -d -c $(DIR_DL)/reiser4-for-2.6.25.patch.bz2 | patch -Np1
cd $(DIR_APP) && bzip2 -d -c $(DIR_DL)/reiser4-for-2.6.27.19.patch.bz2 | patch -Np1
# SquashFS
cd $(DIR_SRC) && rm -rf squashfs*
cd $(DIR_SRC) && tar xfz $(DIR_DL)/squashfs3.4.tar.gz
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/squashfs3.4/kernel-patches/linux-2.6.25/squashfs3.4-patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/squashfs3.4/kernel-patches/linux-2.6.27-rc4/squashfs3.4-patch
# ip_conntrack permissions from 440 to 444
# cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/ip_conntrack_standalone-patch-for-ipfire.patch
# ipp2p 0.8.2-pomng
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.25.17-ipp2p-0.8.2-pomng.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27.19-ipp2p-0.8.2-pomng.patch
# Layer7-patch
cd $(DIR_SRC) && rm -rf $(DIR_SRC)/netfilter-layer7-v2.21
@@ -125,13 +128,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Linux Intermediate Queueing Device
ifeq "$(XEN)" ""
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.25-imq5.diff
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27-imq.patch
endif
# mISDN
cd $(DIR_SRC) && rm -rf mISDN-*
cd $(DIR_SRC) && tar xfz $(DIR_DL)/mISDN.git-12dca7cf4cf38590d30cdeaf8ced30aaca6d875f.tar.gz
cd $(DIR_SRC)/mISDN.git && yes 'yes' | ./std2kern -k /usr/src/linux
cd $(DIR_SRC) && rm -rf mISDN-* && mkdir mISDN-socket
cd $(DIR_SRC)/mISDN-socket && tar xfz $(DIR_DL)/mISDN-20090322.tar.gz
cd $(DIR_SRC)/mISDN-socket && yes 'yes' | ./std2kern -k /usr/src/linux
# Cleanup kernel source
cd $(DIR_APP) && make mrproper
@@ -153,6 +156,7 @@ ifeq "$(SMP)" "1"
ln -sf vmlinuz-$(VER)-ipfire-smp /boot/vmlinuz-ipfire-smp
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) firmware_install
else
cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ $(PATCHLEVEL)-ipfire/' Makefile
cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage
@@ -163,6 +167,7 @@ else
ln -sf System.map-$(VER)-ipfire /boot/System.map-ipfire
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) firmware_install
endif
ifeq "$(SMP)" ""

View File

@@ -24,12 +24,12 @@
include Config
VER = git-081106
VER = 20090322
THISAPP = mISDNuser.git-8e7bf2f11cc108d4b52949c2a26e38df24821b01
THISAPP = mISDNuser-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/mISDNuser.git
DIR_APP = $(DIR_SRC)/mISDNuser
TARGET = $(DIR_INFO)/$(THISAPP)
###############################################################################
@@ -40,8 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 4eddac75aac4b997e6f2061e10f20862
$(DL_FILE)_MD5 = 90d180518d5bcc8157c290275299e8bc
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
@@ -69,7 +68,9 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
@rm -rf $(DIR_APP)
cd $(DIR_SRC) && mkdir mISDNuser
cd $(DIR_SRC)/mISDNuser && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && make MISDNDIR=/usr/src/linux
cd $(DIR_APP) && make install MISDNDIR=/usr/src/linux
-mkdir -p /usr/lib/mISDN
@@ -77,3 +78,4 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_SRC)/mISDN.git && cp -v config/*.xsl /usr/lib/mISDN
@rm -rf $(DIR_SRC)/mISDN*
@$(POSTBUILD)

View File

@@ -508,7 +508,7 @@ buildipfire() {
ipfiremake libmpeg2
ipfiremake cmake
ipfiremake libpri
ipfiremake asterisk
# ipfiremake asterisk
ipfiremake gnump3d
ipfiremake libsigc++
ipfiremake applejuice

View File

@@ -0,0 +1,99 @@
diff -Naur iptables-1.4.2/extensions/.IMQ-test iptables/extensions/.IMQ-test
--- iptables-1.4.2/extensions/.IMQ-test 1970-01-01 10:00:00.000000000 +1000
+++ iptables/extensions/.IMQ-test 2008-06-08 22:41:49.000000000 +1000
@@ -0,0 +1,3 @@
+#!/bin/sh
+# True if IMQ target patch is applied.
+[ -f $KERNEL_DIR/include/linux/netfilter/xt_IMQ.h ] && echo IMQ
diff -Naur iptables-1.4.2/extensions/libipt_IMQ.c iptables/extensions/libipt_IMQ.c
--- iptables-1.4.2/extensions/libipt_IMQ.c 1970-01-01 10:00:00.000000000 +1000
+++ iptables/extensions/libipt_IMQ.c 2008-06-08 22:46:25.000000000 +1000
@@ -0,0 +1,88 @@
+/* Shared library add-on to iptables to add IMQ target support. */
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <getopt.h>
+
+#include <xtables.h>
+#include <linux/netfilter/x_tables.h>
+#include <linux/netfilter/xt_IMQ.h>
+
+/* Function which prints out usage message. */
+static void IMQ_help(void)
+{
+ printf(
+"IMQ target v%s options:\n"
+" --todev <N> enqueue to imq<N>, defaults to 0\n",
+XTABLES_VERSION);
+}
+
+static struct option IMQ_opts[] = {
+ { "todev", 1, 0, '1' },
+ { 0 }
+};
+
+/* Initialize the target. */
+static void IMQ_init(struct xt_entry_target *t)
+{
+ struct xt_imq_info *mr = (struct xt_imq_info*)t->data;
+
+ mr->todev = 0;
+}
+
+/* Function which parses command options; returns true if it
+ ate an option */
+static int IMQ_parse(int c, char **argv, int invert, unsigned int *flags,
+ const void *entry, struct xt_entry_target **target)
+{
+ struct xt_imq_info *mr = (struct xt_imq_info*)(*target)->data;
+
+ switch(c) {
+ case '1':
+ if (check_inverse(optarg, &invert, NULL, 0))
+ exit_error(PARAMETER_PROBLEM,
+ "Unexpected `!' after --todev");
+ mr->todev=atoi(optarg);
+ break;
+ default:
+ return 0;
+ }
+ return 1;
+}
+
+/* Prints out the targinfo. */
+static void IMQ_print(const void *ip,
+ const struct xt_entry_target *target,
+ int numeric)
+{
+ struct xt_imq_info *mr = (struct xt_imq_info*)target->data;
+
+ printf("IMQ: todev %u ", mr->todev);
+}
+
+/* Saves the union ipt_targinfo in parsable form to stdout. */
+static void IMQ_save(const void *ip, const struct xt_entry_target *target)
+{
+ struct xt_imq_info *mr = (struct xt_imq_info*)target->data;
+
+ printf("--todev %u", mr->todev);
+}
+
+static struct xtables_target imq = {
+ .name = "IMQ",
+ .version = XTABLES_VERSION,
+ .family = PF_INET,
+ .size = XT_ALIGN(sizeof(struct xt_imq_info)),
+ .userspacesize = XT_ALIGN(sizeof(struct xt_imq_info)),
+ .help = IMQ_help,
+ .init = IMQ_init,
+ .parse = IMQ_parse,
+ .print = IMQ_print,
+ .save = IMQ_save,
+ .extra_opts = IMQ_opts,
+};
+
+void _init(void)
+{
+ xtables_register_target(&imq);
+}

File diff suppressed because it is too large Load Diff

View File

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