Changeset 230 for floppyfw-3.0

Show
Ignore:
Timestamp:
11/14/07 14:36:08 (5 years ago)
Author:
root
Message:

Too much for one commit but it's what I have. Also floppyfw-3.0.3

Location:
floppyfw-3.0
Files:
1 added
14 modified

Legend:

Unmodified
Added
Removed

  • floppyfw-3.0/Makefile

    r227 r230  
    7878# This one sets j<amount of CPUs> but it may be just as good or even better 
    7979# with amount +1 
    80 JLEVEL=-j$(shell expr $(shell grep -i -c '^processor[[:space:]]*:[[:space:]]*[0-9]\+' /proc/cpuinfo) \+ 1) 
     80# JLEVEL=-j$(shell expr $(shell grep -i -c '^processor[[:space:]]*:[[:space:]]*[0-9]\+' /proc/cpuinfo) \+ 1) 
    8181# Or if running distcc:  
    8282# JLEVEL=-j5 
    … …  
    105105# I could have used base but some of the patches has a problem. 
    106106# It's alot here, probably not so smart, cut back later. 
    107 POM_PATCHES=h323-conntrack-nat quake3-conntrack-nat connlimit dstlimit pptp-conntrack-nat directx8-conntrack-nat time cuseeme-nat rtsp-conntrack iprange random ipp2p mms-conntrack-nat connrate msnp-conntrack-nat nth sip-conntrack-nat set expire psd time TARPIT 
     107POM_PATCHES=h323-conntrack-nat quake3-conntrack-nat connlimit dstlimit pptp-conntrack-nat directx8-conntrack-nat time cuseeme-nat rtsp-conntrack iprange random ipp2p mms-conntrack-nat connrate msnp-conntrack-nat nth sip-conntrack-nat set expire psd TARPIT 
    108108 
    109109# After switching to a newer p-o-m; 
    … …  
    127127# This works the same way as NIC_MODULES. 
    128128# If you want options to the module, put them in a () after the module. 
    129 IPTABLES_MODULES=ip_conntrack arp_tables iptable_filter arptable_filter iptable_mangle ipt_state ipt_MASQUERADE ipt_SET ipt_DSCP ipt_REJECT ipt_DSCP ipt_ECN ipt_LOG ipt_MARK ipt_REDIRECT ipt_TCPMSS ipt_TOS ipt_ULOG ipt_conntrack ipt_connlimit ipt_dscp ipt_ecn ipt_helper ipt_length ipt_limit ipt_mac ipt_mark ipt_physdev ipt_pkttype ipt_tcpmss ipt_tos ipt_ttl ipt_unclean ip_conntrack_ftp ip_nat_ftp ip_conntrack_irc(ports=6666,6667,6668,7000) ip_nat_irc sch_htb ip_conntrack_h323 ip_conntrack_mms ip_nat_mms ip_conntrack_rtsp ip_conntrack_pptp ip_conntrack_quake3 ipt_iprange ipt_multiport ip_nat_proto_gre ipt_ipp2p 
     129IPTABLES_MODULES=ip_conntrack arp_tables iptable_filter arptable_filter iptable_mangle ipt_state ipt_MASQUERADE ipt_SET ipt_DSCP ipt_REJECT ipt_DSCP ipt_ECN ipt_LOG ipt_MARK ipt_REDIRECT ipt_TCPMSS ipt_TOS ipt_ULOG ipt_conntrack ipt_connlimit ipt_dscp ipt_ecn ipt_helper ipt_length ipt_limit ipt_mac ipt_mark ipt_physdev ipt_pkttype ipt_tcpmss ipt_tos ipt_ttl ipt_unclean ip_conntrack_ftp ip_nat_ftp ip_conntrack_irc(ports=6666,6667,6668,7000) ip_nat_irc sch_htb ip_conntrack_h323 ip_conntrack_mms ip_nat_mms ip_conntrack_rtsp ip_conntrack_pptp ip_conntrack_quake3 ipt_iprange ipt_multiport ip_nat_proto_gre ipt_ipp2p ipt_time 
    130130 
    131131#ipt_MIRROR  
    … …  
    188188TARGETS+=tcpdump 
    189189TARGETS+=madwifi 
     190TARGETS+=muninlite 
     191TARGETS+=micro_proxy 
    190192# TARGETS+=quagga 
    191193 
    … …  
    251253SSTRIP=$(shell command type sstrip >/dev/null 2>&1 && echo sstrip || echo $(STRIP)) 
    252254 
    253 DEPMOD=(cd $(LINUX_DIR); \ 
    254         /sbin/depmod -ae -F System.map -b $(MODULES_DIR) -r $(LINUX_VERSION)) 
     255#DEPMOD=(cd $(LINUX_DIR); \ 
     256#       /sbin/depmod -ae -F System.map -b $(MODULES_DIR) -r $(LINUX_VERSION)) 
     257 
     258DEPMOD=([ -d $(MODULES_DIR)/lib/modules/$(LINUX_VERSION) ] && \ 
     259        $(BASE_DIR)/perl/depmod.pl -n \ 
     260                -b $(MODULES_DIR)/lib/modules/$(LINUX_VERSION)/ \ 
     261                -k $(LINUX_DIR)/vmlinux \ 
     262                > $(LINUX_MODULES_DEP) ) 
    255263 
    256264# SED=/bin/sed -i -e 

  • floppyfw-3.0/configs/config-busybox-1.2.2.1

    r228 r230  
    494494# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set 
    495495# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set 
    496 # CONFIG_IFCONFIG is not set 
     496CONFIG_IFCONFIG=y 
    497497CONFIG_FEATURE_IFCONFIG_STATUS=y 
    498498CONFIG_FEATURE_IFCONFIG_SLIP=y 

  • floppyfw-3.0/configs/config-kernel

    r219 r230  
    11# 
    2 # Automatically generated by make menuconfig: don't edit 
    3 # 
     2# Automatically generated make config: don't edit 
     3# 
     4# CONFIG_X86_64 is not set 
    45CONFIG_X86=y 
    56# CONFIG_SBUS is not set 
    … …  
    300301# CONFIG_IP_VS_DEBUG is not set 
    301302CONFIG_IP_VS_TAB_BITS=12 
     303 
     304# 
     305# IPVS scheduler 
     306# 
    302307CONFIG_IP_VS_RR=m 
    303308CONFIG_IP_VS_WRR=m 
    … …  
    310315CONFIG_IP_VS_SED=m 
    311316CONFIG_IP_VS_NQ=m 
     317 
     318# 
     319# IPVS application helper 
     320# 
    312321CONFIG_IP_VS_FTP=m 
    313322# CONFIG_IPV6 is not set 
    … …  
    325334# CONFIG_ATM is not set 
    326335CONFIG_VLAN_8021Q=y 
     336 
     337# 
     338#   
     339# 
    327340CONFIG_IPX=m 
    328341# CONFIG_IPX_INTERN is not set 
    … …  
    410423# 
    411424CONFIG_BLK_DEV_IDE=m 
     425 
     426# 
     427# Please see Documentation/ide.txt for help/info on IDE drives 
     428# 
    412429# CONFIG_BLK_DEV_HD_IDE is not set 
    413430# CONFIG_BLK_DEV_HD is not set 
    … …  
    423440# CONFIG_BLK_DEV_IDESCSI is not set 
    424441# CONFIG_IDE_TASK_IOCTL is not set 
     442 
     443# 
     444# IDE chipset support/bugfixes 
     445# 
    425446# CONFIG_BLK_DEV_CMD640 is not set 
    426447# CONFIG_BLK_DEV_CMD640_ENHANCED is not set 
    … …  
    480501# 
    481502CONFIG_SCSI=m 
     503 
     504# 
     505# SCSI support type (disk, tape, CD-ROM) 
     506# 
    482507CONFIG_BLK_DEV_SD=m 
    483508CONFIG_SD_EXTRA_DEVS=40 
    … …  
    488513CONFIG_SR_EXTRA_DEVS=2 
    489514CONFIG_CHR_DEV_SG=m 
     515 
     516# 
     517# Some SCSI devices (e.g. CD jukebox) support multiple LUNs 
     518# 
    490519CONFIG_SCSI_DEBUG_QUEUES=y 
    491520# CONFIG_SCSI_MULTI_LUN is not set 
    … …  
    741770CONFIG_YELLOWFIN=m 
    742771CONFIG_R8169=m 
     772CONFIG_SKGE=m 
     773CONFIG_SKY2=m 
    743774CONFIG_SK98LIN=m 
    744775CONFIG_TIGON3=m 
    … …  
    778809CONFIG_TMD_HERMES=m 
    779810CONFIG_PCI_HERMES=m 
     811 
     812# 
     813# Wireless Pcmcia cards support 
     814# 
    780815CONFIG_PCMCIA_HERMES=m 
    781816CONFIG_AIRO_CS=m 
    782817CONFIG_PCMCIA_ATMEL=m 
     818 
     819# 
     820# Prism54 PCI/PCMCIA GT/Duette Driver - 802.11(a/b/g) 
     821# 
    783822CONFIG_PRISM54=m 
    784823CONFIG_FW_LOADER=m 
    … …  
    898937# CONFIG_INPUT_SERIO is not set 
    899938# CONFIG_INPUT_SERPORT is not set 
     939 
     940# 
     941# Joysticks 
     942# 
    900943# CONFIG_INPUT_ANALOG is not set 
    901944# CONFIG_INPUT_A3D is not set 
    … …  
    11291172CONFIG_USB=m 
    11301173# CONFIG_USB_DEBUG is not set 
     1174 
     1175# 
     1176# Miscellaneous USB options 
     1177# 
    11311178# CONFIG_USB_DEVICEFS is not set 
    11321179# CONFIG_USB_BANDWIDTH is not set 
     1180 
     1181# 
     1182# USB Host Controller Drivers 
     1183# 
    11331184CONFIG_USB_EHCI_HCD=m 
    11341185CONFIG_USB_UHCI=m 
    … …  
    11371188CONFIG_USB_SL811HS_ALT=m 
    11381189CONFIG_USB_SL811HS=m 
     1190 
     1191# 
     1192# USB Device Class drivers 
     1193# 
    11391194# CONFIG_USB_AUDIO is not set 
    11401195# CONFIG_USB_EMI26 is not set 
     1196 
     1197# 
     1198#   USB Bluetooth can only be used with disabled Bluetooth subsystem 
     1199# 
    11411200# CONFIG_USB_MIDI is not set 
    11421201CONFIG_USB_STORAGE=m 
    … …  
    11521211CONFIG_USB_ACM=m 
    11531212CONFIG_USB_PRINTER=m 
     1213 
     1214# 
     1215# USB Human Interface Devices (HID) 
     1216# 
    11541217CONFIG_USB_HID=m 
    11551218CONFIG_USB_HIDINPUT=y 
    … …  
    11611224# CONFIG_USB_KBTAB is not set 
    11621225# CONFIG_USB_POWERMATE is not set 
     1226 
     1227# 
     1228# USB Imaging devices 
     1229# 
    11631230# CONFIG_USB_DC2XX is not set 
    11641231# CONFIG_USB_MDC800 is not set 
    … …  
    11661233# CONFIG_USB_MICROTEK is not set 
    11671234# CONFIG_USB_HPUSBSCSI is not set 
     1235 
     1236# 
     1237# USB Multimedia devices 
     1238# 
     1239 
     1240# 
     1241#   Video4Linux support is needed for USB Multimedia device support 
     1242# 
     1243 
     1244# 
     1245# USB Network adaptors 
     1246# 
    11681247CONFIG_USB_PEGASUS=m 
    11691248CONFIG_USB_RTL8150=m 
    … …  
    11721251CONFIG_USB_CDCETHER=m 
    11731252CONFIG_USB_USBNET=m 
     1253 
     1254# 
     1255# USB port drivers 
     1256# 
    11741257# CONFIG_USB_USS720 is not set 
    11751258 
    … …  
    11781261# 
    11791262# CONFIG_USB_SERIAL is not set 
     1263 
     1264# 
     1265# USB Miscellaneous drivers 
     1266# 
    11801267# CONFIG_USB_RIO500 is not set 
    11811268CONFIG_USB_AUERSWALD=m 
    … …  
    11941281CONFIG_USB_GADGET_CONTROLLER=m 
    11951282CONFIG_USB_GADGET_DUALSPEED=y 
     1283 
     1284# 
     1285# USB Gadget Drivers 
     1286# 
    11961287CONFIG_USB_ZERO=m 
    11971288CONFIG_USB_ETH=m 

  • floppyfw-3.0/makefiles/add.mk

    r227 r230  
    1313        cp $(SCRIPTS_DIR)/udhcpcrenew.sh $(ADD_MASTER)/etc/. 
    1414        cp $(SCRIPTS_DIR)/renew-dnsmasq.sh $(ADD_MASTER)/etc/. 
     15        cp $(SCRIPTS_DIR)/renew-outside.sh $(ADD_MASTER)/etc/. 
    1516        # cp $(SCRIPTS_DIR)/fakeleases.sh $(ADD_MASTER)/etc/. 
    1617        cp $(SCRIPTS_DIR)/udhcpd.conf.sh $(ADD_MASTER)/etc/. 

  • floppyfw-3.0/makefiles/iptables.mk

    r227 r230  
    55############################################################# 
    66 
    7 IPTABLES_VERSION=1.3.7 
     7IPTABLES_VERSION=1.3.8 
    88 
    99IPTABLES_SOURCE_URL=http://netfilter.org/projects/iptables/files/ 

  • floppyfw-3.0/makefiles/linux.mk

    r228 r230  
    2727 
    2828# Version of Linux to download and then apply patches to 
    29 DOWNLOAD_LINUX_VERSION=2.4.35.1 
     29DOWNLOAD_LINUX_VERSION=2.4.35.3 
    3030# Version of Linux AFTER patches 
    3131LINUX_VERSION=$(DOWNLOAD_LINUX_VERSION)-floppyfw-$(FLOPPYFW_VERSION) 
    … …  
    133133        $(SED) 's/^EXTRAVERSION\s=\s(.*)/EXTRAVERSION = $$1-floppyfw-$(FLOPPYFW_VERSION)/;' \ 
    134134                $(LINUX_DIR)/Makefile 
    135         $(MAKE) -C $(LINUX_DIR) oldconfig include/linux/version.h 
     135        $(MAKE) D=1 V=1 ARCH=$(ARCH) -C $(LINUX_DIR) oldconfig include/linux/version.h 
     136        # Annoying but hopefully this is enough: 
     137        # And I'm using perl as sed... 
     138        $(SED) 's/CONFIG_X86_64.*//' $(LINUX_DIR)/.config 
    136139        touch $(LINUX_DIR)/.configured 
    137140 
    … …  
    139142 
    140143$(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured 
    141         $(MAKE) -C $(LINUX_DIR) dep 
     144        $(MAKE) D=1 V=1 ARCH=i386 -C $(LINUX_DIR) dep 
    142145        touch $(LINUX_DIR)/.depend_done 
    143146 
    144147$(LINUX_DIR)/$(LINUX_BINLOC): $(LINUX_DIR)/.depend_done 
    145         $(MAKE) CC="$(TARGET_CC)" -C $(LINUX_DIR) $(LINUX_FORMAT) 
    146         $(MAKE) CC="$(TARGET_CC)" -C $(LINUX_DIR) modules 
     148        $(MAKE) D=1 V=1 ARCH=i386 CC="$(TARGET_CC)" -C $(LINUX_DIR) $(LINUX_FORMAT) 
     149        $(MAKE) D=1 V=1 ARCH=i386 CC="$(TARGET_CC)" -C $(LINUX_DIR) modules 
    147150 
    148151$(LINUX_MODULES_DEP): $(LINUX_DIR)/.depend_done 
    149152        $(RM) -r $(MODULES_DIR)/lib/modules 
    150         $(MAKE) -C $(LINUX_DIR) INSTALL_MOD_PATH=$(MODULES_DIR) modules_install 
     153        $(MAKE) D=1 V=1 ARCH=i386 -C $(LINUX_DIR) INSTALL_MOD_PATH=$(MODULES_DIR) modules_install 
     154 
     155        [ -d $(MODULES_DIR)/lib/modules/$(LINUX_VERSION) ] && \ 
     156        $(BASE_DIR)/perl/depmod.pl -n \ 
     157                -b $(MODULES_DIR)/lib/modules/$(LINUX_VERSION)/ \ 
     158                -k $(LINUX_DIR)/vmlinux \ 
     159                > $(LINUX_MODULES_DEP) 
    151160 
    152161        (cd $(MODULES_BASE_DIR) ; cat $(LINUX_MODULES_DEP) | $(BASE_DIR)/perl/capsfix.pl > $(TMP_DIR)/moddep ) 
    … …  
    177186        # busybox perl. 
    178187        [ -d $(MODULES_DIR)/lib/modules/$(LINUX_VERSION) ] && \ 
    179         $(BUSYBOX_DIR)/examples/depmod.pl -n \ 
     188        $(BASE_DIR)/perl/depmod.pl -n \ 
    180189                -b $(MODULES_DIR)/lib/modules/$(LINUX_VERSION)/ \ 
    181190                -k $(LINUX_DIR)/vmlinux \ 
    … …  
    190199linuxclean: clean 
    191200        $(RM) $(LINUX_KERNEL) 
    192         -$(MAKE) -C $(LINUX_DIR) clean 
     201        -$(MAKE) ARCH=i386 -C $(LINUX_DIR) clean 
    193202 
    194203linux-dirclean: 

  • floppyfw-3.0/makefiles/madwifi.mk

    r206 r230  
    55############################################################# 
    66 
    7 MADWIFI_VER=r1842-20061207 
     7# MADWIFI_VER=r1842-20061207 
     8MADWIFI_VER=r2826-20071105 
    89MADWIFI_SOURCE_URL=http://snapshots.madwifi.org/madwifi-ng/ 
    910MADWIFI_SOURCE=madwifi-ng-$(MADWIFI_VER).tar.gz 
    … …  
    2829 
    2930$(MADWIFI_DIR)/tools/wlanconfig: $(MADWIFI_DIR)/.configured 
    30         $(MAKE) KERNELPATH=$(LINUX_DIR) -C $(MADWIFI_DIR)  
     31        $(MAKE) ARCH=$(ARCH) KERNELPATH=$(LINUX_DIR) -C $(MADWIFI_DIR)  
    3132        # KMODPATH=$(MODULES_DIR)  
    3233         
    … …  
    3435        -$(RM) -r  $(MADWIFI_PKG_DIR) 
    3536        mkdir -p  $(MADWIFI_PKG_DIR) 
    36         $(MAKE) KERNELPATH=$(LINUX_DIR) \ 
     37        $(MAKE) ARCH=$(ARCH) KERNELPATH=$(LINUX_DIR) \ 
    3738                MANDIR=/usr/man \ 
    3839                BINDIR=/usr/bin \ 
    … …  
    4142        -$(RM) -r $(MADWIFI_PKG_DIR)/usr/man 
    4243        -$(SSTRIP) $(MADWIFI_PKG_DIR)/usr/bin/* 
     44        -$(STRIP_KMOD) $(MADWIFI_PKG_DIR)/lib/modules/$(LINUX_VERSION)/net/* 
     45        # Nice to put the modules in the full module tree. 
     46        cp -a $(MADWIFI_PKG_DIR)/lib/modules/$(LINUX_VERSION)/net/* \ 
     47                $(MODULES_DIR)/lib/modules/$(LINUX_VERSION)/kernel/drivers/net/. 
    4348 
    4449 

  • floppyfw-3.0/makefiles/micro_proxy.mk

    r229 r230  
    5252        $(MAKE) -C $(MICRO_PROXY_DIR) 
    5353        cp $(MICRO_PROXY_DIR)/micro_proxy $(MICRO_PROXY_PKG_DIR)/usr/bin/micro_proxy 
     54        mkdir -p $(MICRO_PROXY_PKG_DIR)/etc/. 
    5455        cp $(PACKAGES_DIR)/scripts/post-micro_proxy.ini $(MICRO_PROXY_PKG_DIR)/etc/. 
    5556 
    … …  
    5859# /floppyfw/packages. 
    5960 
    60 $(PACKAGES_DIR)/micro_proxy.bz2: $(MICRO_PROXY_PKG_DIR)/usr/bin/micro_proxy 
     61$(PACKAGES_DIR)/micro_proxy.ffw: $(MICRO_PROXY_PKG_DIR)/usr/bin/micro_proxy 
    6162# here we should copy the .ini-file... Needs to be fixed. 
    6263        (cd $(PACKAGES_DIR); sh mkpack micro_proxy) 
    … …  
    6566# dir. 
    6667 
    67 micro_proxy: $(PACKAGES_DIR)/micro_proxy.bz2 
     68micro_proxy: $(PACKAGES_DIR)/micro_proxy.ffw 
    6869 
    6970# Makes it possible to write 'make micro_proxy-clean' from the 

  • floppyfw-3.0/makefiles/muninlite.mk

    r229 r230  
    5050# /floppyfw/packages. 
    5151 
    52 $(PACKAGES_DIR)/muninlite.bz2: $(MUNINLITE_PKG_DIR)/usr/bin/munin-node 
     52$(PACKAGES_DIR)/muninlite.ffw: $(MUNINLITE_PKG_DIR)/usr/bin/munin-node 
    5353        cp $(MUNINLITE_DIR)/examples/post-muninlite.ini $(PACKAGES_DIR)/post-muninlite.ini 
    5454        (cd $(PACKAGES_DIR); sh mkpack muninlite) 
    … …  
    5757# dir. 
    5858 
    59 muninlite: $(PACKAGES_DIR)/muninlite.bz2 
     59muninlite: $(PACKAGES_DIR)/muninlite.ffw 
    6060 
    6161# Makes it possible to write 'make muninlite-clean' from the 

  • floppyfw-3.0/makefiles/soekris.mk

    r101 r230  
    11SOEKRIS_DIR=$(BASE_DIR)/floppyfw-$(FLOPPYFW_VERSION)-soekris 
    22 
    3 soekrisdir: $(PACKAGES_DIR)/ppp.ffw $(PACKAGES_DIR)/wireless-tools.ffw $(PACKAGES_DIR)/pcmcia-cs.ffw initrd-ide add-package  
     3soekrisdir: $(PACKAGES_DIR)/ppp.ffw $(PACKAGES_DIR)/wireless-tools.ffw $(PACKAGES_DIR)/pcmcia-cs.ffw $(PACKAGES_DIR)/madwifi.ffw initrd-ide add-package  
    44        -mv $(SOEKRIS_DIR).old $(SOEKRIS_DIR).old2 
    55        -mv $(SOEKRIS_DIR) $(SOEKRIS_DIR).old 
    … …  
    3232        cp $(PACKAGES_DIR)/pcmcia-cs.ffw $(SOEKRIS_DIR)/packages/. 
    3333        cp $(PACKAGES_DIR)/wireless-tools.ffw $(SOEKRIS_DIR)/packages/. 
     34        cp $(PACKAGES_DIR)/madwifi.ffw $(SOEKRIS_DIR)/packages/. 
    3435        cp $(PACKAGES_DIR)/scripts/pre-pcmcia.ini $(SOEKRIS_DIR)/packages/. 
    3536        cp $(PACKAGES_DIR)/scripts/pre-wireless.ini $(SOEKRIS_DIR)/packages/. 

  • floppyfw-3.0/makefiles/wireless-tools.mk

    r50 r230  
    2121# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 
    2222# USA 
    23 WIRELESS_TOOLS_SITE:=http://pcmcia-cs.sourceforge.net/ftp/contrib/ 
    24 WIRELESS_TOOLS_SOURCE:=wireless_tools.28.tar.gz 
    25 WIRELESS_TOOLS_DIR:=$(BUILD_DIR)/wireless_tools.28 
     23# WIRELESS_TOOLS_SITE:=http://pcmcia-cs.sourceforge.net/ftp/contrib/ 
     24WIRELESS_TOOLS_SITE:=http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/ 
     25WIRELESS_TOOLS_SOURCE:=wireless_tools.29.tar.gz 
     26WIRELESS_TOOLS_DIR:=$(BUILD_DIR)/wireless_tools.29 
    2627WIRELESS_TOOLS_CAT:=zcat 
    2728 

  • floppyfw-3.0/scripts/bridge.ini

    r1 r230  
    1010echo "0" > /proc/sys/net/ipv4/ip_forward 
    1111 
    12 ( ifconfig eth0 > /dev/null 2> /dev/null) || { 
     12( ifconfig $INSIDE_DEV > /dev/null 2> /dev/null) || { 
    1313        echo  
    1414        echo "WARNING" 
    … …  
    1818} 
    1919 
    20 ( ifconfig eth1 > /dev/null 2> /dev/null) || { 
     20( ifconfig $OUTSIDE_DEV > /dev/null 2> /dev/null) || { 
    2121        echo  
    2222        echo "WARNING" 
    … …  
    5252 
    5353 
    54 brctl addbr br0             # create bridge interface 
     54brctl addbr br0               # create bridge interface 
    5555# brctl stp br0 off           # disable spanning tree protocol on br0 
    56 brctl addif br0 eth0        # add eth0 to br0 
    57 brctl addif br0 eth1        # add eth0 to br0 
     56brctl addif br0 $OUTSIDE_DEV  # add outside device to br0 
     57brctl addif br0 $INSIDE_DEV   # add inside device to br0 
    5858 
    5959ifconfig $OUTSIDE_DEV up 

  • floppyfw-3.0/scripts/config

    r105 r230  
    187187# 
    188188# This is just to set up the network, you have to edit firewall.ini to  
    189 # be able to do ahything useful with this. 
     189# be able to do anything useful with this. 
    190190# 
    191191# This can also be set up as the device/LAN for an open WLAN. 
     192# 
     193# Please note that enabling this automatically opens up for DNS requests to 
     194# the floppyfw from DMZ. 
    192195# 
    193196 
    … …  
    201204 
    202205# 
    203 # This switch (is not working yet) will turn on or off NAT to the outside  
    204 # network. 
     206# This switch will turn on or off NAT to the outside network. 
    205207# 
    206208 
    207209DMZ_USE_NAT=y 
    208210 
    209 # This is the ports you will allow to the inside. SSH is the only one I'd  
    210 # trust, if any. 
    211 DMZ_ALLOW_PORTS_INSIDE="ssh" 
    212  
    213 # And for the outside. NEVER ALLOW SMTP if used as an open WLAN. 
    214 DMZ_ALLOW_PORTS_OUTSIDE="ssh,www,https,ftp,domain,pop3,pop3s,imap3,imaps" 
     211# What traffic do you want to allow from DMZ to OUTSIDE? 
     212# Specifying "all" will allow all traffic, "none" will block all. TCP based 
     213# protocols can be specified in a comma separated list like this: 
     214# DMZ_ALLOW_TO_OUTSIDE="ssh,www,https,ftp,domain,pop3,pop3s,imap3,imaps" 
     215DMZ_ALLOW_TO_OUTSIDE="all" 
     216 
     217# What traffic do you want to allow from DMZ to INSIDE? 
     218# Specifying "all" will allow all traffic, "none" will block all. TCP based 
     219# protocols can be specified in a comma separated list like this: 
     220# DMZ_ALLOW_TO_INSIDE="ssh,ftp" 
     221DMZ_ALLOW_TO_INSIDE="none" 
     222 
     223# What traffic do you want to allow from INSIDE to DMZ? 
     224# Specifying "all" will allow all traffic, "none" will block all. TCP based 
     225# protocols can be specified in a comma separated list like this: 
     226# DMZ_ALLOW_FROM_INSIDE="ssh,ftp,http,https,smtp" 
     227DMZ_ALLOW_FROM_INSIDE="all" 
    215228 
    216229# This is to set a traffic shaping rule to restrict the bandwidth. 

  • floppyfw-3.0/scripts/dmz-fw.ini

    r105 r230  
    2424echo "Setting up DMZ." 
    2525 
     26# We will automatically accept DNS requests. 
     27iptables -A INPUT -i ${DMZ_DEVICE} -p TCP --dport 53 -j ACCEPT 
     28iptables -A INPUT -i ${DMZ_DEVICE} -p UDP --dport 53 -j ACCEPT 
     29 
    2630if [ "$DMZ_USE_NAT" = "y" ] 
    2731 then 
    … …  
    3135# Open ports: 
    3236# The big caveat here is thet multiport only supports 15 ports.. 
    33 if [ -n "$DMZ_ALLOW_PORTS_INSIDE" ] 
     37# We will try to pad that by giving the admin more options.. 
     38if [ -n "$DMZ_ALLOW_TO_OUTSIDE" ] 
    3439then 
    35   iptables -A FORWARD -p tcp -i $DMZ_DEVICE -m multiport --dports $DMZ_ALLOW_PORTS_INSIDE -o $INSIDE_DEVICE -j ACCEPT 
     40  case "$DMZ_ALLOW_TO_OUTSIDE" in 
     41    all) iptables -A FORWARD -i $DMZ_DEVICE -o $OUTSIDE_DEVICE -j ACCEPT 
     42    none) echo "No ports opened to OUTSIDE from DMZ" 
     43    *) iptables -A FORWARD -p tcp -i $DMZ_DEVICE -m multiport --dports $DMZ_ALLOW_TO_OUTSIDE -o $OUTSIDE_DEVICE -j ACCEPT 
     44  esac 
    3645fi 
    3746 
    38 if [ -n "$DMZ_ALLOW_PORTS_OUTSIDE" ] 
     47if [ -n "$DMZ_ALLOW_TO_INSIDE" ] 
    3948then 
    40   iptables -A FORWARD -p tcp -i $DMZ_DEVICE -m multiport --dports $DMZ_ALLOW_PORTS_OUTSIDE -o $OUTSIDE_DEVICE -j ACCEPT 
     49  case "$DMZ_ALLOW_TO_INSIDE" in 
     50    all) iptables -A FORWARD -i $DMZ_DEVICE -o $INSIDE_DEVICE -j ACCEPT 
     51    none) echo "No ports opened to INSIDE from DMZ" 
     52    *) iptables -A FORWARD -p tcp -i $DMZ_DEVICE -m multiport --dports $DMZ_ALLOW_TO_INSIDE -o $INSIDE_DEVICE -j ACCEPT 
     53  esac 
     54fi 
     55 
     56if [ -n "$DMZ_ALLOW_FROM_INSIDE" ] 
     57then 
     58  case "$DMZ_ALLOW_FROM_INSIDE" in 
     59    all) iptables -A FORWARD -i $INSIDE_DEVICE -o $DMZ_DEVICE -j ACCEPT 
     60    none) echo "No ports opened to DMZ from INSIDE" 
     61    *) iptables -A FORWARD -p tcp -i $INSIDE_DEVICE -m multiport --dports $DMZ_ALLOW_FROM_INSIDE -o $DMZ_DEVICE -j ACCEPT 
     62  esac 
    4163fi 
    4264