Changeset 3401


Ignore:
Timestamp:
2006-03-18T18:27:20+01:00 (12 years ago)
Author:
nbd
Message:

precompile ppp active filter (reduces libpcap overhead to only a few k), enable by default to support proper demand dialling, fixes #307

Files:
8 added
9 edited

Legend:

Unmodified
Added
Removed
  • branches/whiterussian/openwrt/package/ppp/Config.in

    r3227 r3401  
    88 
    99config BR2_PACKAGE_PPP_WITH_FILTER 
    10         bool "Enable filter support" 
    11         default n 
    12         depends BR2_PACKAGE_LIBPCAP 
     10        bool "Enable filter support" 
     11        depends on BR2_PACKAGE_PPP 
     12        default y 
    1313 
    1414config BR2_PACKAGE_PPP_MOD_PPPOE 
  • branches/whiterussian/openwrt/package/ppp/Makefile

    r3149 r3401  
    4040PKG_DEPEND:="kmod-ppp" 
    4141ifeq ($(BR2_PACKAGE_PPP_WITH_FILTER),y) 
    42 ENABLE_FILTER:="FILTER=1" 
    43 PKG_DEPEND += ", libpcap" 
     42ENABLE_FILTER:="PRECOMPILED_FILTER=1" 
    4443endif 
    4544 
     
    8483        touch $@ 
    8584 
     85ifeq ($(BR2_PACKAGE_PPP_WITH_FILTER),y) 
     86INSTALL_FILTER=install -m0644 ./files/etc/ppp/filter $(IDIR_PPP)/etc/ppp/ 
     87endif 
     88 
    8689$(IPKG_PPP): 
    8790        install -d -m0755 $(IDIR_PPP)/etc/ppp 
     
    8992        install -m0600 ./files/etc/ppp/chap-secrets $(IDIR_PPP)/etc/ppp/ 
    9093        install -m0644 ./files/etc/ppp/options $(IDIR_PPP)/etc/ppp/ 
     94        $(INSTALL_FILTER) 
    9195        install -m0755 ./files/etc/ppp/ip-up $(IDIR_PPP)/etc/ppp/ 
    9296        install -m0755 ./files/etc/ppp/ip-down $(IDIR_PPP)/etc/ppp/ 
  • branches/whiterussian/openwrt/package/ppp/files/ifup.pppoe

    r3191 r3401  
    2424                        DEMAND=$(nvram get ppp_idletime) 
    2525                        DEMAND=${DEMAND:+demand idle $DEMAND} 
     26                        [ -f /etc/ppp/filter ] && DEMAND=${DEMAND:+precompiled-active-filter /etc/ppp/filter $DEMAND} 
    2627                ;; 
    2728                *) DEMAND="";; 
  • branches/whiterussian/openwrt/package/pptp/files/ifup.pptp

    r2992 r3401  
    2525                        DEMAND=$(nvram get ppp_idletime) 
    2626                        DEMAND=${IDLETIME:+demand idle $IDLETIME} 
     27                        [ -f /etc/ppp/filter ] && DEMAND=${DEMAND:+precompiled-active-filter /etc/ppp/filter $DEMAND} 
    2728                ;; 
    2829                *) DEMAND="";; 
  • trunk/openwrt/package/ppp/Config.in

    r3227 r3401  
    99 
    1010config BR2_PACKAGE_PPP_WITH_FILTER 
    11         prompt "Enable filter support" 
     11        prompt "Enable filter support" 
    1212        bool 
    13         default n 
    14         depends BR2_PACKAGE_LIBPCAP 
     13        default y 
    1514 
    1615config BR2_PACKAGE_PPP_MOD_PPPOA 
  • trunk/openwrt/package/ppp/Makefile

    r3147 r3401  
    4242PKG_DEPEND:="kmod-ppp" 
    4343ifeq ($(BR2_PACKAGE_PPP_WITH_FILTER),y) 
    44 ENABLE_FILTER:="FILTER=1" 
    45 PKG_DEPEND += ", libpcap" 
     44ENABLE_FILTER:="PRECOMPILED_FILTER=1" 
    4645endif 
    4746 
     
    8685        touch $@ 
    8786 
     87ifeq ($(BR2_PACKAGE_PPP_WITH_FILTER),y) 
     88INSTALL_FILTER=install -m0644 ./files/etc/ppp/filter $(IDIR_PPP)/etc/ppp/ 
     89endif 
     90 
    8891$(IPKG_PPP): 
    8992        install -d -m0755 $(IDIR_PPP)/etc/ppp 
     
    9194        install -m0600 ./files/etc/ppp/chap-secrets $(IDIR_PPP)/etc/ppp/ 
    9295        install -m0644 ./files/etc/ppp/options $(IDIR_PPP)/etc/ppp/ 
     96        $(INSTALL_FILTER) 
    9397        install -m0755 ./files/etc/ppp/ip-up $(IDIR_PPP)/etc/ppp/ 
    9498        install -m0755 ./files/etc/ppp/ip-down $(IDIR_PPP)/etc/ppp/ 
  • trunk/openwrt/package/ppp/files/ifup.pppoa

    r3191 r3401  
    2626                DEMAND=$(nvram get ppp_idletime) 
    2727                DEMAND=${IDLETIME:+demand idle $IDLETIME} 
     28                [ -f /etc/ppp/filter ] && DEMAND=${DEMAND:+precompiled-active-filter /etc/ppp/filter $DEMAND} 
    2829        ;; 
    2930        *) DEMAND="persist";; 
  • trunk/openwrt/package/ppp/files/ifup.pppoe

    r3191 r3401  
    2525                DEMAND=$(nvram get ppp_idletime) 
    2626                DEMAND=${IDLETIME:+demand idle $IDLETIME} 
     27                [ -f /etc/ppp/filter ] && DEMAND=${DEMAND:+precompiled-active-filter /etc/ppp/filter $DEMAND} 
    2728        ;; 
    2829        *) DEMAND="persist";; 
  • trunk/openwrt/package/pptp/files/ifup.pptp

    r2993 r3401  
    2424                DEMAND=$(nvram get ppp_idletime) 
    2525                DEMAND=${IDLETIME:+demand idle $IDLETIME} 
     26                [ -f /etc/ppp/filter ] && DEMAND=${DEMAND:+precompiled-active-filter /etc/ppp/filter $DEMAND} 
    2627        ;; 
    2728        *) DEMAND="persist";; 
Note: See TracChangeset for help on using the changeset viewer.