Changeset 269

Show
Ignore:
Timestamp:
10/31/10 03:56:00 (19 months ago)
Author:
root
Message:

Quite a few changes, new release 3.0.13 and many changes to accomodate a better VLAN setup.

Location:
floppyfw-3.0
Files:
13 modified

Legend:

Unmodified
Added
Removed

  • floppyfw-3.0/Makefile

    r268 r269  
    3838 
    3939# Which version of floppyfw is this? 
    40 FLOPPYFW_VERSION=3.0.13rc1 
     40FLOPPYFW_VERSION=3.0.13 
    4141 
    4242# What sortof target system shall we compile this for? 

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

    r257 r269  
    679679# CONFIG_FEATURE_NAMEIF_EXTENDED is not set 
    680680CONFIG_NC=y 
    681 # CONFIG_NC_SERVER is not set 
     681CONFIG_NC_SERVER=y 
    682682# CONFIG_NC_EXTRA is not set 
    683683CONFIG_NETSTAT=y 

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

    r253 r269  
    679679# CONFIG_FEATURE_NAMEIF_EXTENDED is not set 
    680680CONFIG_NC=y 
    681 # CONFIG_NC_SERVER is not set 
     681CONFIG_NC_SERVER=y 
    682682# CONFIG_NC_EXTRA is not set 
    683683CONFIG_NETSTAT=y 

  • floppyfw-3.0/makefiles/busybox.mk

    r257 r269  
    55############################################################# 
    66 
    7 # BUSYBOX_VERSION=1.2.2.1 
    8 # BUSYBOX_VERSION=1.10.4 
    9 BUSYBOX_VERSION=1.11.3 
     7BUSYBOX_VERSION=1.11.2 
    108BUSYBOX_CONFIG_VERSION=1.11 
     9# Newest version did not compile. 
     10#BUSYBOX_VERSION=1.17.3 
     11#BUSYBOX_CONFIG_VERSION=1.17 
    1112 
    1213ifeq ($(USE_BUSYBOX_SNAPSHOT),true) 

  • floppyfw-3.0/makefiles/linux.mk

    r266 r269  
    2727 
    2828# Version of Linux to download and then apply patches to 
    29 DOWNLOAD_LINUX_VERSION=2.4.37.9 
     29DOWNLOAD_LINUX_VERSION=2.4.37.10 
    3030# Version of Linux AFTER patches 
    3131LINUX_VERSION=$(DOWNLOAD_LINUX_VERSION)-floppyfw-$(FLOPPYFW_VERSION) 

  • floppyfw-3.0/scripts/config

    r230 r269  
    133133# and it will use ip aliasing to make it all work. 
    134134# 
     135# You can also use device.VLAN-ID to automatically set it as a VLAN. 
     136# 
    135137OUTSIDE_DEV=eth0  
    136138INSIDE_DEV=eth1 
    … …  
    186188# DMZ settings.  
    187189# 
    188 # This is just to set up the network, you have to edit firewall.ini to  
    189 # be able to do anything useful with this. 
     190# You can also fine tune the firewall settings in dmz-fw.ini 
    190191# 
    191192# This can also be set up as the device/LAN for an open WLAN. 
     193# As with the other interfaces, you can use device.VLAN-ID to automatically 
     194# set it as a VLAN. 
    192195# 
    193196# Please note that enabling this automatically opens up for DNS requests to 
    … …  
    196199 
    197200USE_DMZ=n 
     201DMZ_DOMAIN= 
    198202DMZ_DEV=eth2 
    199203DMZ_IP=10.42.69.1 
    … …  
    274278 
    275279HOSTNAME=floppyfw 
    276 DOMAIN=floppyfwsecured.com 
     280# Set this if you don't want your outside DHCP server decide. 
     281# DOMAIN=floppyfwsecured.local 
    277282 
    278283# 

  • floppyfw-3.0/scripts/config.pppoe

    r1 r269  
    11# 
    22# Configuration for floppyfw 
     3# Not in use, a sed in config is. 
    34 
    45# $Id: config.pppoe,v 1.3 2005/02/05 14:23:13 thomasez Exp $ 

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

    r258 r269  
    2828iptables -A INPUT -i ${DMZ_DEVICE} -p UDP --dport 53 -j ACCEPT 
    2929 
    30 if [ "$DMZ_DHCP_SERVER" = y ] 
     30if [ "$DMZ_DHCP_SERVER" = "y" ] 
    3131then 
    3232  iptables -A INPUT -i ${DMZ_DEVICE} -p TCP --dport 67 -j ACCEPT 

  • floppyfw-3.0/scripts/dmz-udhcpd.conf.sh

    r258 r269  
    66. /etc/dmz.info 
    77 
    8 DHCPDDOMAIN=`for DOMAINS in $(grep search /etc/resolv.conf | sed 's/^search//'); do echo $DOMAINS; break; done` 
     8if [ "$DMZ_DOMAIN" ] 
     9  then 
     10    DMZ_DHCPDDOMAIN=$DMZ_DOMAIN 
     11  else 
     12    DMZ_DHCPDDOMAIN=`for DOMAINS in $(grep search /etc/resolv.conf | sed 's/^search//'); do echo $DOMAINS; break; done` 
     13fi 
    914 
    10 cat >> /etc/dmz-udhcpd.conf <<EOF 
     15# Just a default to be sure we have something. 
     16[ -z "$DMZ_DHCPDDOMAIN" ] && DMZ_DHCPDDOMAIN=dmz.floppyfwsecured.local 
     17 
     18echo "DMZ_DOMAIN:$DMZ_DHCPDDOMAIN" >> $DEBUG_LOG 
     19 
     20cat > /etc/dmz-udhcpd.conf <<EOF 
    1121interface       $DMZ_DEVICE 
    1222start           $DMZ_DHCP_RANGE_START 
    … …  
    1929option          broadcast       $DMZ_BROADCAST 
    2030option          router          $DMZ_IP 
    21 option          domain          $DHCPDDOMAIN 
     31option          domain          $DMZ_DHCPDDOMAIN 
    2232option          lease           864000                                    
    2333$OPS 
    … …  
    2636# Adding the /etc/dmz-ethers file: 
    2737# I'll use the same file for both. shouldn't matter. 
    28 sed -e '/^#/d;/^$/d;s/^/static_lease /' /etc/dmz-ethers >> /etc/dmz-udhcpd.conf 
     38[ -f /etc/dmz-ethers ] && sed -e '/^#/d;/^$/d;s/^/static_lease /' /etc/dmz-ethers >> /etc/dmz-udhcpd.conf 

  • floppyfw-3.0/scripts/network.ini

    r268 r269  
    6969# some bootp/dhcp servers and arp. 
    7070# 
    71 if [ "$OUTSIDE_MAC" != "" ] 
     71if [ -n "$OUTSIDE_MAC" ] 
    7272then 
    7373        echo "Faking MAC address." 
    … …  
    7979# it's the outside stuff that starts firewall.ini 
    8080# 
    81 if [ "$USE_DMZ" = y ] 
     81if bool_value $USE_DMZ 
    8282then 
    8383        # 
    … …  
    210210DNSMASQ_OPTS="-i $INSIDE_DEV" 
    211211 
    212 if [ "$USE_DMZ" = y ] 
     212if bool_value "$USE_DMZ" 
    213213then 
    214214  DNSMASQ_OPTS="$DNSMASQ_OPTS -i $DMZ_DEV" 
    215215fi 
    216216 
    217 if [ "$DHCP_SERVER" = y ] 
     217if bool_value "$DHCP_SERVER" 
    218218then 
    219219        /etc/udhcpd.conf.sh 
    … …  
    221221        pidof dnsmasq > /dev/null || /sbin/dnsmasq $DNSMASQ_OPTS  
    222222else 
    223         if [ "$DNSMASQ" = y ] 
     223        if bool_value "$DNSMASQ" 
    224224        then 
    225225                pidof dnsmasq > /dev/null || /sbin/dnsmasq $DNSMASQ_OPTS  
    … …  
    227227fi 
    228228 
    229 if [ "$DMZ_DHCP_SERVER" = y ] 
     229if bool_value "$DMZ_DHCP_SERVER" 
    230230then 
    231231        /etc/dmz-udhcpd.conf.sh 

  • floppyfw-3.0/scripts/renew-dnsmasq.sh

    r1 r269  
    22 
    33. /etc/config 
     4. /etc/functions.inc 
    45 
    5 [ "$DNSMASQ" = y ] || [ "$DHCP_SERVER" = y ] && { 
     6bool_value "$DNSMASQ" || bool_value "$DHCP_SERVER" && { 
    67        # Find out if dnsmasq is running 
    78        p=`pidof dnsmasq` 

  • floppyfw-3.0/scripts/udhcpcrenew.sh

    r268 r269  
    119119        echo "firewall.init was run" 
    120120 
    121         if [ "$USE_SYSLOG" = y ]; 
     121        if bool_value "$USE_SYSLOG" 
    122122        then 
    123123                logger "firewall.init was run." 

  • floppyfw-3.0/scripts/udhcpd.conf.sh

    r71 r269  
    66. /etc/inside.info 
    77 
    8 DHCPDDOMAIN=`for DOMAINS in $(grep search /etc/resolv.conf | sed 's/^search//'); do echo $DOMAINS; break; done` 
     8if [ "$DOMAIN" ] 
     9  then 
     10    DHCPDDOMAIN=$DOMAIN 
     11  else 
     12    DHCPDDOMAIN=`for DOMAINS in $(grep search /etc/resolv.conf | sed 's/^search//'); do echo $DOMAINS; break; done` 
     13fi 
    914 
    10 echo "DOMAIN:$DHCPDDOMAIN" 
     15# Just a default to be sure we have something. 
     16[ -z "$DHCPDDOMAIN" ] && DHCPDDOMAIN=floppyfwsecured.local 
    1117 
    12 cat >> /etc/udhcpd.conf <<EOF 
     18echo "DOMAIN:$DHCPDDOMAIN" >> $DEBUG_LOG 
     19 
     20cat > /etc/udhcpd.conf <<EOF 
    1321interface       $INSIDE_DEVICE 
    1422start           $DHCP_RANGE_START 
    … …  
    2735 
    2836# Adding the /etc/ethers file: 
    29 sed -e '/^#/d;/^$/d;s/^/static_lease /' /etc/ethers >> /etc/udhcpd.conf 
     37[ -f /etc/ethers ] && sed -e '/^#/d;/^$/d;s/^/static_lease /' /etc/ethers >> /etc/udhcpd.conf