Update of /cvsroot/leaf/src/bering-uclibc4/source/pppoesrv
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21768
Modified Files:
buildtool.cfg pppoesrv.default pppoesrv.init
Log Message:
Added posibility to specify interfaces list via mawk regular expression; added
possibility to run more than one copy of daemon (to avoiding 64 interfaces
limitation)
Index: pppoesrv.init
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/pppoesrv/pppoesrv.init,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** pppoesrv.init 26 Apr 2010 09:02:47 -0000 1.1.1.1
--- pppoesrv.init 11 Nov 2010 17:59:20 -0000 1.2
***************
*** 6,12 ****
--- 6,16 ----
test -x /usr/lib/pppd/rp-pppoe.so || exit 0
+ IFACES=""
+ MAX_IARGS=128
+
[ -f /etc/default/pppoe-server ] && . /etc/default/pppoe-server
ARGS="-k"
+ IARGS=""
check_arg () {
***************
*** 14,23 ****
}
! if [ -n "$IFACES" ]; then
! for i in $IFACES; do
! ARGS="$ARGS -I $i"
! done
! fi
!
check_arg T TIMEOUT
--- 18,26 ----
}
! if [ -n "$IFREGEXP" ]; then
! for i in `ip l | awk '$2 ~ '"/$IFREGEXP/"'{split($2,A,"(@|:)"); print
A[1]}' | sort`; do
! IFACES="$IFACES $i"
! done
! fi
check_arg T TIMEOUT
***************
*** 33,41 ****
start)
echo -n "Starting PPPoE server daemon... "
! if start-stop-daemon --start --quiet --exec /usr/sbin/pppoe-server --
$ARGS
! then
! echo done.
else
! echo failed.
fi
;;
--- 36,72 ----
start)
echo -n "Starting PPPoE server daemon... "
! if [ -n "$IFACES" ]; then
! INST=0
! for i in $IFACES; do
! IARGS="$IARGS -I $i"
! if [ `echo $IARGS | wc -w` -ge $MAX_IARGS ]; then
! if start-stop-daemon --start --quiet --exec
/usr/sbin/pppoe-server -- $ARGS $IARGS
! then
! echo -n "done #$INST... "
! else
! echo -n "failed #$INST... "
! fi
! IARGS=""
! INST=`eval $INST + 1`
! fi
! done
! if [ `echo $IARGS | wc -w` -gt 0 ]; then
! if start-stop-daemon --start --quiet --exec /usr/sbin/pppoe-server
-- $ARGS $IARGS
! then
! echo "done #$INST."
! else
! echo "failed #$INST."
! fi
! IARGS=""
! else
! echo ""
! fi
else
! if start-stop-daemon --start --quiet --exec /usr/sbin/pppoe-server --
$ARGS
! then
! echo done.
! else
! echo failed.
! fi
fi
;;
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/pppoesrv/buildtool.cfg,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** buildtool.cfg 26 Apr 2010 09:02:47 -0000 1.1.1.1
--- buildtool.cfg 11 Nov 2010 17:59:20 -0000 1.2
***************
*** 36,40 ****
<pppoesrv>
Version = 3.8
! Revision = 4
Help <<EOF
--- 36,40 ----
<pppoesrv>
Version = 3.8
! Revision = 5
Help <<EOF
Index: pppoesrv.default
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/pppoesrv/pppoesrv.default,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** pppoesrv.default 26 Apr 2010 09:02:47 -0000 1.1.1.1
--- pppoesrv.default 11 Nov 2010 17:59:20 -0000 1.2
***************
*** 1,5 ****
! # Interface to use
#IFACES="eth0"
# Inactivity timeout (in seconds)
#TIMEOUT=180
--- 1,8 ----
! # Interface to use; on blank - use default
#IFACES="eth0"
+ # mawk regexp for selecting ifaces among present in system
+ #IFREGEXP="vlan[1-3][0-9][0-9][0-9]"
+
# Inactivity timeout (in seconds)
#TIMEOUT=180
------------------------------------------------------------------------------
Centralized Desktop Delivery: Dell and VMware Reference Architecture
Simplifying enterprise desktop deployment and management using
Dell EqualLogic storage and VMware View: A highly scalable, end-to-end
client virtualization framework. Read more!
http://p.sf.net/sfu/dell-eql-dev2dev
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
