Menu
▾
▴
linux-atm-commits — Description of commits to our CVS repository
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
(164) |
Oct
(104) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
(17) |
Jun
|
Jul
(11) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2004 |
Jan
|
Feb
(8) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(4) |
Oct
(1) |
Nov
|
Dec
(6) |
| 2005 |
Jan
(1) |
Feb
(2) |
Mar
|
Apr
(13) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(7) |
Oct
(2) |
Nov
(6) |
Dec
|
| 2007 |
Jan
|
Feb
(3) |
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
(6) |
Aug
(36) |
Sep
(3) |
Oct
(1) |
Nov
|
Dec
(23) |
| 2008 |
Jan
(33) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
(13) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(32) |
Sep
|
Oct
|
Nov
(14) |
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(13) |
| 2011 |
Jan
(16) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
|
From: chas w. <ch...@us...> - 2007-12-29 21:05:07
|
Update of /cvsroot/linux-atm/linux-atm/src/br2684 In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv5403/src/br2684 Modified Files: Tag: V2_5_0 br2684ctl.8 Log Message: correct manpage about bridged versus routed Index: br2684ctl.8 =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/br2684/Attic/br2684ctl.8,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -C2 -d -r1.1.2.6 -r1.1.2.7 *** br2684ctl.8 23 Dec 2007 22:30:45 -0000 1.1.2.6 --- br2684ctl.8 29 Dec 2007 21:05:03 -0000 1.1.2.7 *************** *** 33,37 **** .TP 15 .BI \-p\ 0|1 ! Payload method: 0=Bridged, 1=Routed (the default is 0 or Bridged) .TP 15 .BI \-s\ sndbuf --- 33,37 ---- .TP 15 .BI \-p\ 0|1 ! Payload method: 0=Routed, 1=Bridged (the default is 1 or Bridged) .TP 15 .BI \-s\ sndbuf |
|
From: chas w. <ch...@us...> - 2007-12-29 20:59:53
|
Update of /cvsroot/linux-atm/linux-atm/src/br2684 In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv3370/src/br2684 Modified Files: Tag: V2_5_0 br2684ctl.c Log Message: allow br2684ctl to build with routed support even if the kernel doesnt have the support yet Index: br2684ctl.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/br2684/Attic/br2684ctl.c,v retrieving revision 1.1.2.12 retrieving revision 1.1.2.13 diff -C2 -d -r1.1.2.12 -r1.1.2.13 *** br2684ctl.c 21 Oct 2007 20:08:12 -0000 1.1.2.12 --- br2684ctl.c 29 Dec 2007 20:59:49 -0000 1.1.2.13 *************** *** 11,14 **** --- 11,18 ---- #include <linux/atmdev.h> #include <linux/atmbr2684.h> + #ifndef BR2684_FLAG_ROUTED + #warning "Kernel missing routed support for br2684" + #define BR2684_FLAG_ROUTED (1<<16) /* payload is routed, not bridged */ + #endif /* Written by Marcell GAL <ce...@sc...> to make use of the */ |
|
From: chas w. <ch...@us...> - 2007-12-29 20:38:30
|
Update of /cvsroot/linux-atm/linux-atm/src/config/init-redhat In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv27673/src/config/init-redhat Modified Files: Tag: V2_5_0 atm Log Message: oopsy; just needed a little space Index: atm =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/config/init-redhat/atm,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -d -r1.2.2.3 -r1.2.2.4 *** atm 29 Dec 2007 20:09:34 -0000 1.2.2.3 --- atm 29 Dec 2007 20:38:26 -0000 1.2.2.4 *************** *** 40,44 **** rc_failed() { ! if [ -z "$1"]; then RETVAL=1; elif [ "$1" -ne 0 ]; then --- 40,44 ---- rc_failed() { ! if [ -z "$1" ]; then RETVAL=1; elif [ "$1" -ne 0 ]; then |
|
From: chas w. <ch...@us...> - 2007-12-29 20:30:48
|
Update of /cvsroot/linux-atm/linux-atm/src/extra In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24172/src/extra Modified Files: Tag: V2_5_0 Makefile.am Log Message: this gets rid of the some of the Makefile's "accidentally" included in the rpm distros doc/ is still broken, but it needs more than just a quick fix. Index: Makefile.am =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/extra/Makefile.am,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -C2 -d -r1.2.2.2 -r1.2.2.3 *** Makefile.am 23 Dec 2007 22:30:17 -0000 1.2.2.2 --- Makefile.am 29 Dec 2007 20:30:43 -0000 1.2.2.3 *************** *** 1,4 **** ! SUBDIRS = ANS ! ! EXTRA_DIST = linux-atm.spec.in ! --- 1,4 ---- ! EXTRA_DIST = linux-atm.spec.in \ ! ANS/127.0.0 ANS/atm-reverse ANS/e164_cc ANS/pdf2e164_cc.pl ANS/resolv.conf \ ! ANS/192.168.27 ANS/bind-498-REL.patch ANS/hosts2ans.pl ANS/README ANS/atm \ ! ANS/named.conf ANS/README.DNS |
|
From: chas w. <ch...@us...> - 2007-12-29 20:30:48
|
Update of /cvsroot/linux-atm/linux-atm In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24172 Modified Files: Tag: V2_5_0 configure.in Log Message: this gets rid of the some of the Makefile's "accidentally" included in the rpm distros doc/ is still broken, but it needs more than just a quick fix. Index: configure.in =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/configure.in,v retrieving revision 1.2.2.11 retrieving revision 1.2.2.12 diff -C2 -d -r1.2.2.11 -r1.2.2.12 *** configure.in 23 Dec 2007 22:31:25 -0000 1.2.2.11 --- configure.in 29 Dec 2007 20:30:43 -0000 1.2.2.12 *************** *** 231,238 **** src/br2684/Makefile \ src/config/Makefile \ - src/config/init-redhat/Makefile \ src/extra/Makefile \ ! src/extra/linux-atm.spec \ ! src/extra/ANS/Makefile ) - --- 231,235 ---- src/br2684/Makefile \ src/config/Makefile \ src/extra/Makefile \ ! src/extra/linux-atm.spec ) |
|
From: chas w. <ch...@us...> - 2007-12-29 20:30:48
|
Update of /cvsroot/linux-atm/linux-atm/src/config In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24172/src/config Modified Files: Tag: V2_5_0 Makefile.am Log Message: this gets rid of the some of the Makefile's "accidentally" included in the rpm distros doc/ is still broken, but it needs more than just a quick fix. Index: Makefile.am =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/config/Makefile.am,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** Makefile.am 9 Oct 2001 22:33:06 -0000 1.2 --- Makefile.am 29 Dec 2007 20:30:43 -0000 1.2.2.1 *************** *** 1,5 **** ! SUBDIRS = init-redhat ! ! EXTRA_DIST = hosts.atm install-exec-local: --- 1,4 ---- ! EXTRA_DIST = hosts.atm init-redhat/README init-redhat/atm init-redhat/atm-sysconfig \ ! init-redhat/ifcfg-atm0 init-redhat/ifcfg-lec0 init-redhat/ifcfg-nas0 install-exec-local: |
|
From: chas w. <ch...@us...> - 2007-12-29 20:30:48
|
Update of /cvsroot/linux-atm/linux-atm/src/extra/ANS In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24172/src/extra/ANS Removed Files: Tag: V2_5_0 Makefile.am Log Message: this gets rid of the some of the Makefile's "accidentally" included in the rpm distros doc/ is still broken, but it needs more than just a quick fix. --- Makefile.am DELETED --- |
|
From: chas w. <ch...@us...> - 2007-12-29 20:30:48
|
Update of /cvsroot/linux-atm/linux-atm/src/config/init-redhat In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24172/src/config/init-redhat Removed Files: Tag: V2_5_0 Makefile.am Log Message: this gets rid of the some of the Makefile's "accidentally" included in the rpm distros doc/ is still broken, but it needs more than just a quick fix. --- Makefile.am DELETED --- |
|
From: chas w. <ch...@us...> - 2007-12-29 20:09:37
|
Update of /cvsroot/linux-atm/linux-atm/src/config/init-redhat In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16115/src/config/init-redhat Modified Files: Tag: V2_5_0 atm Log Message: add dist tag (or _vendor) to the built rpms try to make the startup script a bit more cross-platform Index: atm =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/config/init-redhat/atm,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -C2 -d -r1.2.2.2 -r1.2.2.3 *** atm 28 Dec 2007 15:11:51 -0000 1.2.2.2 --- atm 29 Dec 2007 20:09:34 -0000 1.2.2.3 *************** *** 1,15 **** #!/bin/sh # ! # /etc/rc.d/init.d/atm - Bring up/down ATM # # chkconfig: 2345 09 91 ! # description: loads/unloads atm drivers and starts/stops basic services # # Source function library. ! . /etc/rc.d/init.d/functions if [ ! -f /etc/sysconfig/atm ]; then ! exit 0 fi --- 1,64 ---- #!/bin/sh # ! # /etc/rc.d/init.d/atm - Bring up/down ATM # # chkconfig: 2345 09 91 ! # description: Loads/Unloads ATM drivers and starts/stops basic services # + ### BEGIN INIT INFO + # Provides: atm + # Required-Start: $local_fs dbus haldaemon + # Should-Start: + # Required-Stop: + # Should-Stop: + # Default-Start: 2 3 5 + # Default-Stop: + # Description: Loads/Unloads ATM drivers and starts/stops basic services + ### END INIT INFO # Source function library. ! ! # source function library ! if [ -f /etc/init.d/functions ]; then ! . /etc/init.d/functions ! alias start_daemon=daemon ! elif [ -f /etc/rc.d/init.d/functions ]; then ! . /etc/rc.d/init.d/functions ! alias start_daemon=daemon ! elif [ -f /lib/lsb/init-functions ]; then ! . /lib/lsb/init-functions ! elif [ -f /sbin/startproc ]; then ! alias start_daemon=/sbin/startproc ! else ! exit 0 ! fi ! ! if [ -f /etc/rc.status ]; then ! . /etc/rc.status ! else ! rc_reset() { RETVAL=0; } ! rc_failed() ! { ! if [ -z "$1"]; then ! RETVAL=1; ! elif [ "$1" -ne 0 ]; then ! RETVAL=$1; ! fi ! } ! rc_check() { rc_failed $?; } ! rc_exit() { exit $RETVAL; } ! rc_status() ! { ! if [ "$?" = "-v" ]; then ! [ $RETVAL -eq 0 ] && success || failure ! fi ! } ! ! fi ! rc_reset if [ ! -f /etc/sysconfig/atm ]; then ! rc_failed 6 ! rc_exit fi *************** *** 18,22 **** [ "$ATM" != yes ] && exit 0 ! cd /etc/sysconfig/network-scripts clipinterfaces=$(ls ifcfg-atm[0-9] 2> /dev/null | sed -e 's/^ifcfg-//g') --- 67,79 ---- [ "$ATM" != yes ] && exit 0 ! if [ -d /etc/sysconfig/network-scripts ]; then ! cd /etc/sysconfig/network-scripts ! elif [ -d /etc/sysconfig/network ]; then ! cd /etc/sysconfig/network ! else ! rc_failed ! rc_status -v ! rc_exit ! fi clipinterfaces=$(ls ifcfg-atm[0-9] 2> /dev/null | sed -e 's/^ifcfg-//g') *************** *** 26,39 **** case "$1" in start) ! echo -n "Starting ATM demons: " [ -z "$ATMMODULES" ] || /sbin/modprobe "$ATMMODULES" ! daemon /usr/sbin/atmsigd -b ${ATMSIGD_OPTIONS:+ $ATMSIGD_OPTIONS} ! daemon /usr/sbin/ilmid -b ${ILMID_OPTIONS:+ $ILMID_OPTIONS} ${ILMIQOS:+ -q $ILMIQOS} if [ "$IPATM" = yes ]; then ! daemon /usr/sbin/atmarpd -b -l syslog -m for i in $clipinterfaces; do /usr/sbin/atmarp -c $i done fi --- 83,100 ---- case "$1" in start) ! echo -n "Starting ATM demons" [ -z "$ATMMODULES" ] || /sbin/modprobe "$ATMMODULES" ! start_daemon /usr/sbin/atmsigd -b -u uni31 -l syslog -D /var/tmp -t 20 -c /etc/atmsigd.conf ! rc_check ! start_daemon /usr/sbin/ilmid -b -u 3.1 -l syslog ${ILMIQOS:+ -q $ILMIQOS} ! rc_check if [ "$IPATM" = yes ]; then ! start_daemon /usr/sbin/atmarpd -b -l syslog -m ! rc_check for i in $clipinterfaces; do /usr/sbin/atmarp -c $i + rc_check done fi *************** *** 43,47 **** ITF=`echo $i | sed -e 's/nas//'` ! daemon /usr/sbin/br2684ctl -b \ -c $ITF \ ${PAYLOAD:+ -p $PAYLOAD } \ --- 104,108 ---- ITF=`echo $i | sed -e 's/nas//'` ! start_daemon /usr/sbin/br2684ctl -b \ -c $ITF \ ${PAYLOAD:+ -p $PAYLOAD } \ *************** *** 49,52 **** --- 110,114 ---- ${QOS:+ -q $QOS} \ ${VPIVCI:+ -a $VPIVCI} + rc_check ) done *************** *** 57,61 **** ITF=`echo $i | sed -e 's/lec//'` ! daemon /usr/sbin/zeppelin -b \ -i $ITF -l $ITF \ ${VLAN:+ -n $VLAN} \ --- 119,123 ---- ITF=`echo $i | sed -e 's/lec//'` ! start_daemon /usr/sbin/zeppelin -b \ -i $ITF -l $ITF \ ${VLAN:+ -n $VLAN} \ *************** *** 67,77 **** ${DEBUG:+ -m $DEBUG} \ -F /var/log/${DEVICE} ) done fi touch /var/lock/subsys/atm ;; stop) ! echo -n "Stopping ATM demons: " if [ "$LANE" = yes ]; then for i in $laneinterfaces; do --- 129,142 ---- ${DEBUG:+ -m $DEBUG} \ -F /var/log/${DEVICE} + rc_check ) done fi touch /var/lock/subsys/atm + rc_status -v ;; + stop) ! echo -n "Stopping ATM demons" if [ "$LANE" = yes ]; then for i in $laneinterfaces; do *************** *** 97,105 **** [ -z "$ATMMODULES" ] || /sbin/modprobe -r "$ATMMODULES" - echo rm -f /var/lock/subsys/atm ;; *) ! echo "Usage: atm {start|stop}" exit 1 esac --- 162,177 ---- [ -z "$ATMMODULES" ] || /sbin/modprobe -r "$ATMMODULES" rm -f /var/lock/subsys/atm + rc_status -v + ;; + + restart) + $0 stop + $0 start ;; + *) ! echo "Usage: atm {start|stop|restart}" exit 1 esac + rc_exit |
|
From: chas w. <ch...@us...> - 2007-12-29 20:09:37
|
Update of /cvsroot/linux-atm/linux-atm/src/extra In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16115/src/extra Modified Files: Tag: V2_5_0 linux-atm.spec.in Log Message: add dist tag (or _vendor) to the built rpms try to make the startup script a bit more cross-platform Index: linux-atm.spec.in =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/extra/linux-atm.spec.in,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -d -r1.2.2.3 -r1.2.2.4 *** linux-atm.spec.in 28 Dec 2007 15:11:51 -0000 1.2.2.3 --- linux-atm.spec.in 29 Dec 2007 20:09:34 -0000 1.2.2.4 *************** *** 7,11 **** Version: %{linux_atm_version} %define includedir /usr/include ! Release: 1 License: BSD License, GNU General Public License (GPL), GNU Lesser General Public License (LGPL) Group: System Environment/Daemons --- 7,11 ---- Version: %{linux_atm_version} %define includedir /usr/include ! Release: 1%{?dist}%{!?dist:.%{_vendor}} License: BSD License, GNU General Public License (GPL), GNU Lesser General Public License (LGPL) Group: System Environment/Daemons |
|
From: chas w. <ch...@us...> - 2007-12-28 15:11:55
|
Update of /cvsroot/linux-atm/linux-atm/src/config/init-redhat In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28109/src/config/init-redhat Modified Files: Tag: V2_5_0 Makefile.am atm atm-sysconfig Log Message: more init-scripts updates Index: Makefile.am =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/config/init-redhat/Makefile.am,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** Makefile.am 9 Oct 2001 22:33:06 -0000 1.2 --- Makefile.am 28 Dec 2007 15:11:51 -0000 1.2.2.1 *************** *** 1,2 **** ! EXTRA_DIST = atm atm-sysconfig ifcfg-lec0 README --- 1,2 ---- ! EXTRA_DIST = atm atm-sysconfig ifcfg-lec0 README ifcfg-atm0 ifcfg-nas0 Index: atm =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/config/init-redhat/atm,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** atm 23 Dec 2007 22:33:19 -0000 1.2.2.1 --- atm 28 Dec 2007 15:11:51 -0000 1.2.2.2 *************** *** 30,35 **** [ -z "$ATMMODULES" ] || /sbin/modprobe "$ATMMODULES" ! daemon /usr/sbin/atmsigd -b -u uni31 -l syslog -D /var/tmp -t 20 -c /etc/atmsigd.conf ! daemon /usr/sbin/ilmid -b -u 3.1 -l syslog ${ILMIQOS:+ -q $ILMIQOS} if [ "$IPATM" = yes ]; then daemon /usr/sbin/atmarpd -b -l syslog -m --- 30,35 ---- [ -z "$ATMMODULES" ] || /sbin/modprobe "$ATMMODULES" ! daemon /usr/sbin/atmsigd -b ${ATMSIGD_OPTIONS:+ $ATMSIGD_OPTIONS} ! daemon /usr/sbin/ilmid -b ${ILMID_OPTIONS:+ $ILMID_OPTIONS} ${ILMIQOS:+ -q $ILMIQOS} if [ "$IPATM" = yes ]; then daemon /usr/sbin/atmarpd -b -l syslog -m *************** *** 76,79 **** --- 76,80 ---- if [ "$LANE" = yes ]; then for i in $laneinterfaces; do + ./ifdown $i [ -f "/var/run/${i}.pid" ] && kill -TERM `cat /var/run/${i}.pid` done *************** *** 81,84 **** --- 82,86 ---- if [ "$BR2684" = yes ]; then for i in $nasinterfaces; do + ./ifdown $i [ -f "/var/run/br2684ctl-${i}.pid" ] && kill -TERM `cat /var/run/br2684ctl-${i}.pid` done Index: atm-sysconfig =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/config/init-redhat/atm-sysconfig,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** atm-sysconfig 23 Dec 2007 22:33:19 -0000 1.2.2.1 --- atm-sysconfig 28 Dec 2007 15:11:51 -0000 1.2.2.2 *************** *** 4,9 **** ATM=yes # enable ATM support at all IPATM=no # Classical IP over ATM (using ATMARP) ! BR2864=no # RFC1483/2684 ! LANE=yes # LAN Emulation (client) # ILMIQOS="ubr:pcr=100kbps" # optional: QOS to use on the ILMI VC ATMMODULES= --- 4,11 ---- ATM=yes # enable ATM support at all IPATM=no # Classical IP over ATM (using ATMARP) ! BR2684=no # RFC1483/2684 ! LANE=no # LAN Emulation (client) # ILMIQOS="ubr:pcr=100kbps" # optional: QOS to use on the ILMI VC ATMMODULES= + ATMSIGD_OPTIONS="-u uni31 -l syslog -D /var/tmp -t 20 -c /etc/atmsigd.conf" + ILMID_OPTIONS="-u 3.1 -l syslog" |
|
From: chas w. <ch...@us...> - 2007-12-28 15:11:55
|
Update of /cvsroot/linux-atm/linux-atm/src/sigd In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28109/src/sigd Modified Files: Tag: V2_5_0 atmsigd.conf Log Message: more init-scripts updates Index: atmsigd.conf =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/sigd/atmsigd.conf,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** atmsigd.conf 9 Oct 2001 22:33:07 -0000 1.2 --- atmsigd.conf 28 Dec 2007 15:11:51 -0000 1.2.2.1 *************** *** 11,12 **** --- 11,13 ---- } + entity 0.0.5 |
|
From: chas w. <ch...@us...> - 2007-12-28 15:11:55
|
Update of /cvsroot/linux-atm/linux-atm/src/extra In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28109/src/extra Modified Files: Tag: V2_5_0 linux-atm.spec.in Log Message: more init-scripts updates Index: linux-atm.spec.in =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/extra/linux-atm.spec.in,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -C2 -d -r1.2.2.2 -r1.2.2.3 *** linux-atm.spec.in 23 Dec 2007 22:33:19 -0000 1.2.2.2 --- linux-atm.spec.in 28 Dec 2007 15:11:51 -0000 1.2.2.3 *************** *** 18,21 **** --- 18,22 ---- Source: linux-atm-%{linux_atm_version}.tar.gz + %define multipoint 1 %description *************** *** 27,31 **** %build ! ./configure --prefix=/usr --sysconfdir=%{_sysconfdir} --libdir=%{_libdir} --mandir=%{_mandir} make --- 28,33 ---- %build ! ./configure --prefix=/usr --sysconfdir=%{_sysconfdir} --libdir=%{_libdir} --mandir=%{_mandir} \ ! %{?multipoint:--enable-multipoint} make *************** *** 38,42 **** install -c -m 644 src/config/init-redhat/atm-sysconfig $RPM_BUILD_ROOT/etc/sysconfig/atm mkdir -p $RPM_BUILD_ROOT/etc/init.d ! install -c -m 644 src/config/init-redhat/atm $RPM_BUILD_ROOT/etc/init.d/atm mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/network-scripts --- 40,44 ---- install -c -m 644 src/config/init-redhat/atm-sysconfig $RPM_BUILD_ROOT/etc/sysconfig/atm mkdir -p $RPM_BUILD_ROOT/etc/init.d ! install -c -m 755 src/config/init-redhat/atm $RPM_BUILD_ROOT/etc/init.d/atm mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/network-scripts *************** *** 45,52 **** %files ! %defattr(644, root, root, 755) %doc AUTHORS BUGS ChangeLog COPYING COPYING.GPL COPYING.LGPL %doc INSTALL NEWS README THANKS ! %doc doc/ src/config/init-redhat/ src/extra/ANS /usr/include/atm.h /usr/include/atmd.h --- 47,59 ---- %files ! %defattr(-, root, root, -) ! %config(noreplace) /etc/hosts.atm ! %config(noreplace) /etc/sysconfig/atm ! %config(noreplace) /etc/atmsigd.conf ! %config /etc/init.d/atm %doc AUTHORS BUGS ChangeLog COPYING COPYING.GPL COPYING.LGPL %doc INSTALL NEWS README THANKS ! %doc doc/ src/extra/ANS src/config/init-redhat/ ! %{_mandir}/man[478]/* /usr/include/atm.h /usr/include/atmd.h *************** *** 63,66 **** --- 70,76 ---- /usr/bin/svc_send /usr/bin/svc_recv + %if multipoint + /usr/bin/pmp_send + %endif /usr/bin/atmswitch /usr/bin/ttcp_atm *************** *** 87,95 **** /usr/sbin/lecs /usr/sbin/mpcd - %{_mandir}/man[478]/* - %config /etc/hosts.atm - %config /etc/sysconfig/atm - %config /etc/atmsigd.conf - /etc/init.d/atm %post --- 97,100 ---- |
|
From: chas w. <ch...@us...> - 2007-12-23 22:33:22
|
Update of /cvsroot/linux-atm/linux-atm/src/config/init-redhat In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv19237/src/config/init-redhat Modified Files: Tag: V2_5_0 atm atm-sysconfig ifcfg-lec0 Added Files: Tag: V2_5_0 ifcfg-atm0 ifcfg-nas0 Log Message: update .spec and init scripts/examples --- NEW FILE: ifcfg-atm0 --- DEVICE=atm0 BOOTPROTO=static BROADCAST=169.144.155.255 IPADDR=169.144.155.52 NETMASK=255.255.255.0 NETWORK=169.144.155.0 ONBOOT=yes --- NEW FILE: ifcfg-nas0 --- DEVICE=nas0 BOOTPROTO=static BROADCAST=169.144.155.255 IPADDR=169.144.155.52 NETMASK=255.255.255.0 NETWORK=169.144.155.0 # PAYLOAD=0|1 ENCAPSULATION=0 VPIVCI=0.100 # QOS= Index: atm =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/config/init-redhat/atm,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** atm 9 Oct 2001 22:33:06 -0000 1.2 --- atm 23 Dec 2007 22:33:19 -0000 1.2.2.1 *************** *** 3,6 **** --- 3,9 ---- # /etc/rc.d/init.d/atm - Bring up/down ATM # + # chkconfig: 2345 09 91 + # description: loads/unloads atm drivers and starts/stops basic services + # # Source function library. *************** *** 8,12 **** if [ ! -f /etc/sysconfig/atm ]; then ! exit 0 fi --- 11,15 ---- if [ ! -f /etc/sysconfig/atm ]; then ! exit 0 fi *************** *** 17,61 **** cd /etc/sysconfig/network-scripts case "$1" in ! start) echo -n "Starting ATM demons: " ! daemon atmsigd -b -l syslog -D /var/tmp -t 20 ! daemon ilmid -b -l syslog `[ -z "$ILMIQOS" ] || echo -q $ILMIQOS` ! sleep 3 # let's rest a second give signalling and ilmid a chance to get started. if [ "$LANE" = yes ]; then ! for i in /etc/sysconfig/network-scripts/ifcfg-lec[0-9]; do ! source $i ! zeppelin -n $ELAN -i $INTERFACEID -l $SELBYTE -F syslog & done fi - [ "$IPATM" = yes ] && daemon atmarpd -b -l syslog -m - # launch LANE demon(s) ... - [ "$AREQUIPA" = yes ] && daemon arequipad -b -l syslog - echo touch /var/lock/subsys/atm ;; ! stop) if [ "$LANE" = yes ]; then ! for n in ifcfg-lec[0-9]; do ! ./ifdown $n ! killproc zeppelin ! done ! fi ! if [ "$IPATM" = yes ]; then ! for n in ifcfg-atm[0-9]; do ! ./ifdown $n ! done fi ! echo -n "Stopping ATM demons: " ! if [ "$IPATM" = yes ]; then ! [ "$AREQUIPA" = yes ] && killproc arequipad ! killproc atmarpd fi killproc atmsigd # kill ILMID later, so we don't get complaints killproc ilmid echo rm -f /var/lock/subsys/atm ;; ! *) echo "Usage: atm {start|stop}" exit 1 esac --- 20,103 ---- cd /etc/sysconfig/network-scripts + clipinterfaces=$(ls ifcfg-atm[0-9] 2> /dev/null | sed -e 's/^ifcfg-//g') + laneinterfaces=$(ls ifcfg-lec[0-9] 2> /dev/null | sed -e 's/^ifcfg-//g') + nasinterfaces=$(ls ifcfg-nas[0-9] 2> /dev/null | sed -e 's/^ifcfg-//g') + case "$1" in ! start) echo -n "Starting ATM demons: " ! ! [ -z "$ATMMODULES" ] || /sbin/modprobe "$ATMMODULES" ! ! daemon /usr/sbin/atmsigd -b -u uni31 -l syslog -D /var/tmp -t 20 -c /etc/atmsigd.conf ! daemon /usr/sbin/ilmid -b -u 3.1 -l syslog ${ILMIQOS:+ -q $ILMIQOS} ! if [ "$IPATM" = yes ]; then ! daemon /usr/sbin/atmarpd -b -l syslog -m ! for i in $clipinterfaces; do ! /usr/sbin/atmarp -c $i ! done ! fi ! if [ "$BR2684" = yes ]; then ! for i in $nasinterfaces; do ! (. ifcfg-$i ! ! ITF=`echo $i | sed -e 's/nas//'` ! daemon /usr/sbin/br2684ctl -b \ ! -c $ITF \ ! ${PAYLOAD:+ -p $PAYLOAD } \ ! ${ENCAPSULATION:+ -e $ENCAPSULATION} \ ! ${QOS:+ -q $QOS} \ ! ${VPIVCI:+ -a $VPIVCI} ! ) ! done ! fi if [ "$LANE" = yes ]; then ! for i in $laneinterfaces; do ! (. ifcfg-$i ! ! ITF=`echo $i | sed -e 's/lec//'` ! daemon /usr/sbin/zeppelin -b \ ! -i $ITF -l $ITF \ ! ${VLAN:+ -n $VLAN} \ ! ${LECS:+ -c $LECS} \ ! ${VERSION:+ -$VERSION} \ ! ${MTU:+ -t $MTU} \ ! ${ESI:+ -e $ESI} \ ! ${V2CAPABLE:+ -2} \ ! ${DEBUG:+ -m $DEBUG} \ ! -F /var/log/${DEVICE} ! ) done fi touch /var/lock/subsys/atm ;; ! stop) ! echo -n "Stopping ATM demons: " if [ "$LANE" = yes ]; then ! for i in $laneinterfaces; do ! [ -f "/var/run/${i}.pid" ] && kill -TERM `cat /var/run/${i}.pid` ! done fi ! if [ "$BR2684" = yes ]; then ! for i in $nasinterfaces; do ! [ -f "/var/run/br2684ctl-${i}.pid" ] && kill -TERM `cat /var/run/br2684ctl-${i}.pid` ! done fi + if [ "$IPATM" = yes ]; then + for i in $clipinterfaces; do + ./ifdown $i + done + killproc atmarpd + fi killproc atmsigd # kill ILMID later, so we don't get complaints killproc ilmid + + [ -z "$ATMMODULES" ] || /sbin/modprobe -r "$ATMMODULES" + echo rm -f /var/lock/subsys/atm ;; ! *) ! echo "Usage: atm {start|stop}" exit 1 esac Index: atm-sysconfig =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/config/init-redhat/atm-sysconfig,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** atm-sysconfig 9 Oct 2001 22:33:06 -0000 1.2 --- atm-sysconfig 23 Dec 2007 22:33:19 -0000 1.2.2.1 *************** *** 4,8 **** ATM=yes # enable ATM support at all IPATM=no # Classical IP over ATM (using ATMARP) ! AREQUIPA=no # Application REQUested IP over ATM ! LANE=yes # LAN Emulation (client; doesn't work yet) # ILMIQOS="ubr:pcr=100kbps" # optional: QOS to use on the ILMI VC --- 4,9 ---- ATM=yes # enable ATM support at all IPATM=no # Classical IP over ATM (using ATMARP) ! BR2864=no # RFC1483/2684 ! LANE=yes # LAN Emulation (client) # ILMIQOS="ubr:pcr=100kbps" # optional: QOS to use on the ILMI VC + ATMMODULES= Index: ifcfg-lec0 =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/config/init-redhat/ifcfg-lec0,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** ifcfg-lec0 9 Oct 2001 22:33:06 -0000 1.2 --- ifcfg-lec0 23 Dec 2007 22:33:19 -0000 1.2.2.1 *************** *** 6,10 **** NETWORK=169.144.155.0 ELAN=canvas - SELBYTE=00 - INTERFACEID=0 ONBOOT=yes --- 6,8 ---- |
|
From: chas w. <ch...@us...> - 2007-12-23 22:33:22
|
Update of /cvsroot/linux-atm/linux-atm/src/extra In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv19237/src/extra Modified Files: Tag: V2_5_0 linux-atm.spec.in Log Message: update .spec and init scripts/examples Index: linux-atm.spec.in =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/extra/linux-atm.spec.in,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** linux-atm.spec.in 15 Oct 2001 23:19:43 -0000 1.2.2.1 --- linux-atm.spec.in 23 Dec 2007 22:33:19 -0000 1.2.2.2 *************** *** 11,15 **** Group: System Environment/Daemons ExclusiveOS: Linux ! BuildRoot: /var/tmp/%{name}-buildroot %define _sourcedir %(pwd) %define _specdir %(pwd)/src/extra --- 11,15 ---- Group: System Environment/Daemons ExclusiveOS: Linux ! BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _sourcedir %(pwd) %define _specdir %(pwd)/src/extra *************** *** 27,94 **** %build ! ./configure make %install rm -rf $RPM_BUILD_ROOT ! mkdir -p $RPM_BUILD_ROOT/usr/local/include ! install -c -m 644 src/include/atm.h $RPM_BUILD_ROOT/usr/local/include ! install -c -m 644 src/include/atmd.h $RPM_BUILD_ROOT/usr/local/include ! install -c -m 644 src/include/atmsap.h $RPM_BUILD_ROOT/usr/local/include ! mkdir -p $RPM_BUILD_ROOT/usr/local/lib ! install -c -m 755 src/lib/.libs/libatm.so.%{lib_current}.%{lib_age}.%{lib_revision} $RPM_BUILD_ROOT/usr/local/lib/libatm.so.%{lib_current}.%{lib_age}.%{lib_revision} ! ln -s libatm.so.%{lib_current}.%{lib_age}.%{lib_revision} $RPM_BUILD_ROOT/usr/local/lib/libatm.so.%{lib_current} ! ln -s libatm.so.%{lib_current}.%{lib_age}.%{lib_revision} $RPM_BUILD_ROOT/usr/local/lib/libatm.so ! install -c -m 755 src/lib/.libs/libatm.lai $RPM_BUILD_ROOT/usr/local/lib/libatm.la ! install -c -m 644 src/lib/.libs/libatm.a $RPM_BUILD_ROOT/usr/local/lib ! ranlib $RPM_BUILD_ROOT/usr/local/lib/libatm.a ! mkdir -p $RPM_BUILD_ROOT/usr/local/bin ! install -c -m 755 src/test/.libs/aread $RPM_BUILD_ROOT/usr/local/bin ! install -c -m 755 src/test/.libs/awrite $RPM_BUILD_ROOT/usr/local/bin ! install -c -m 755 src/test/.libs/ttcp_atm $RPM_BUILD_ROOT/usr/local/bin ! mkdir -p $RPM_BUILD_ROOT/usr/local/sbin ! install -c -m 755 src/sigd/.libs/atmsigd $RPM_BUILD_ROOT/usr/local/sbin ! mkdir -p $RPM_BUILD_ROOT/usr/local/etc ! install -c -m 644 src/sigd/atmsigd.conf $RPM_BUILD_ROOT/usr/local/etc ! mkdir -p $RPM_BUILD_ROOT/usr/local/man/man4 ! install -c -m 644 src/sigd/atmsigd.conf.4 $RPM_BUILD_ROOT/usr/local/man/man4 ! mkdir -p $RPM_BUILD_ROOT/usr/local/man/man8 ! install -c -m 644 src/sigd/atmsigd.8 $RPM_BUILD_ROOT/usr/local/man/man8 ! install -c -m 755 src/maint/.libs/atmdiag $RPM_BUILD_ROOT/usr/local/bin ! install -c -m 755 src/maint/.libs/atmdump $RPM_BUILD_ROOT/usr/local/bin ! install -c -m 755 src/maint/.libs/sonetdiag $RPM_BUILD_ROOT/usr/local/bin ! install -c -m 755 src/maint/.libs/saaldump $RPM_BUILD_ROOT/usr/local/bin ! install -c -m 755 src/maint/.libs/atmaddr $RPM_BUILD_ROOT/usr/local/sbin ! install -c -m 755 src/maint/.libs/esi $RPM_BUILD_ROOT/usr/local/sbin ! install -c -m 755 src/maint/.libs/atmloop $RPM_BUILD_ROOT/usr/local/sbin ! install -c -m 755 src/maint/.libs/atmtcp $RPM_BUILD_ROOT/usr/local/sbin ! install -c -m 755 src/maint/.libs/enitune $RPM_BUILD_ROOT/usr/local/sbin ! install -c -m 755 src/maint/.libs/zntune $RPM_BUILD_ROOT/usr/local/sbin ! install -c -m 644 src/maint/atmaddr.8 $RPM_BUILD_ROOT/usr/local/man/man8 ! install -c -m 644 src/maint/atmdiag.8 $RPM_BUILD_ROOT/usr/local/man/man8 ! install -c -m 644 src/maint/atmdump.8 $RPM_BUILD_ROOT/usr/local/man/man8 ! install -c -m 644 src/maint/atmloop.8 $RPM_BUILD_ROOT/usr/local/man/man8 ! install -c -m 644 src/maint/atmtcp.8 $RPM_BUILD_ROOT/usr/local/man/man8 ! install -c -m 644 src/maint/esi.8 $RPM_BUILD_ROOT/usr/local/man/man8 ! install -c -m 755 src/arpd/.libs/atmarp $RPM_BUILD_ROOT/usr/local/sbin ! install -c -m 755 src/arpd/.libs/atmarpd $RPM_BUILD_ROOT/usr/local/sbin ! install -c -m 644 src/arpd/atmarp.8 $RPM_BUILD_ROOT/usr/local/man/man8 ! install -c -m 644 src/arpd/atmarpd.8 $RPM_BUILD_ROOT/usr/local/man/man8 ! install -c -m 755 src/ilmid/.libs/ilmid $RPM_BUILD_ROOT/usr/local/sbin ! mkdir -p $RPM_BUILD_ROOT/usr/local/man/man7 ! install -c -m 644 src/man/qos.7 $RPM_BUILD_ROOT/usr/local/man/man7 ! install -c -m 644 src/man/sap.7 $RPM_BUILD_ROOT/usr/local/man/man7 ! install -c -m 755 src/led/.libs/zeppelin $RPM_BUILD_ROOT/usr/local/sbin ! install -c -m 644 src/led/zeppelin.8 $RPM_BUILD_ROOT/usr/local/man/man8 ! install -c -m 755 src/lane/.libs/les $RPM_BUILD_ROOT/usr/local/sbin ! install -c -m 644 src/lane/les.8 $RPM_BUILD_ROOT/usr/local/man/man8 ! install -c -m 755 src/lane/.libs/bus $RPM_BUILD_ROOT/usr/local/sbin ! install -c -m 644 src/lane/bus.8 $RPM_BUILD_ROOT/usr/local/man/man8 ! install -c -m 755 src/lane/.libs/lecs $RPM_BUILD_ROOT/usr/local/sbin ! install -c -m 644 src/lane/lecs.8 $RPM_BUILD_ROOT/usr/local/man/man8 ! install -c -m 755 src/mpoad/.libs/mpcd $RPM_BUILD_ROOT/usr/local/sbin ! install -c -m 644 src/mpoad/mpcd.8 $RPM_BUILD_ROOT/usr/local/man/man8 mkdir -p $RPM_BUILD_ROOT/etc install -c -m 644 src/config/hosts.atm $RPM_BUILD_ROOT/etc %clean --- 27,43 ---- %build ! ./configure --prefix=/usr --sysconfdir=%{_sysconfdir} --libdir=%{_libdir} --mandir=%{_mandir} make %install rm -rf $RPM_BUILD_ROOT ! make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc install -c -m 644 src/config/hosts.atm $RPM_BUILD_ROOT/etc + mkdir -p $RPM_BUILD_ROOT/etc/sysconfig + install -c -m 644 src/config/init-redhat/atm-sysconfig $RPM_BUILD_ROOT/etc/sysconfig/atm + mkdir -p $RPM_BUILD_ROOT/etc/init.d + install -c -m 644 src/config/init-redhat/atm $RPM_BUILD_ROOT/etc/init.d/atm + mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/network-scripts %clean *************** *** 96,158 **** %files ! %defattr(-, root, root) %doc AUTHORS BUGS ChangeLog COPYING COPYING.GPL COPYING.LGPL %doc INSTALL NEWS README THANKS ! %doc doc/ src/config/init-redhat/ src/extra/ANS src/extra/drivers ! /usr/local/include/atm.h ! /usr/local/include/atmd.h ! /usr/local/include/atmsap.h ! /usr/local/lib/libatm.so.%{lib_current}.%{lib_age}.%{lib_revision} ! /usr/local/lib/libatm.so.%{lib_current} ! /usr/local/lib/libatm.so ! /usr/local/lib/libatm.la ! /usr/local/lib/libatm.a ! /usr/local/bin/aread ! /usr/local/bin/awrite ! /usr/local/bin/ttcp_atm ! /usr/local/sbin/atmsigd ! %config /usr/local/etc/atmsigd.conf ! /usr/local/man/man4/atmsigd.conf.4 ! /usr/local/man/man8/atmsigd.8 ! /usr/local/bin/atmdiag ! /usr/local/bin/atmdump ! /usr/local/bin/sonetdiag ! /usr/local/bin/saaldump ! /usr/local/sbin/atmaddr ! /usr/local/sbin/esi ! /usr/local/sbin/atmloop ! /usr/local/sbin/atmtcp ! /usr/local/sbin/enitune ! /usr/local/sbin/zntune ! /usr/local/man/man8/atmaddr.8 ! /usr/local/man/man8/atmdiag.8 ! /usr/local/man/man8/atmdump.8 ! /usr/local/man/man8/atmloop.8 ! /usr/local/man/man8/atmtcp.8 ! /usr/local/man/man8/esi.8 ! /usr/local/sbin/atmarp ! /usr/local/sbin/atmarpd ! /usr/local/man/man8/atmarp.8 ! /usr/local/man/man8/atmarpd.8 ! /usr/local/sbin/ilmid ! /usr/local/man/man7/qos.7 ! /usr/local/man/man7/sap.7 ! /usr/local/sbin/zeppelin ! /usr/local/man/man8/zeppelin.8 ! /usr/local/sbin/les ! /usr/local/sbin/bus ! /usr/local/sbin/lecs ! /usr/local/man/man8/les.8 ! /usr/local/man/man8/bus.8 ! /usr/local/man/man8/lecs.8 ! /usr/local/sbin/mpcd ! /usr/local/man/man8/mpcd.8 %config /etc/hosts.atm %post ! ldconfig -n /usr/local/lib %postun ! ldconfig -n /usr/local/lib %changelog --- 45,102 ---- %files ! %defattr(644, root, root, 755) %doc AUTHORS BUGS ChangeLog COPYING COPYING.GPL COPYING.LGPL %doc INSTALL NEWS README THANKS ! %doc doc/ src/config/init-redhat/ src/extra/ANS ! /usr/include/atm.h ! /usr/include/atmd.h ! /usr/include/atmsap.h ! /usr/include/atmarp.h ! /usr/include/atmarpd.h ! %{_libdir}/libatm.so.%{lib_current}.%{lib_age}.%{lib_revision} ! %{_libdir}/libatm.so.%{lib_current} ! %{_libdir}/libatm.so ! %{_libdir}/libatm.la ! %{_libdir}/libatm.a ! /usr/bin/aread ! /usr/bin/awrite ! /usr/bin/svc_send ! /usr/bin/svc_recv ! /usr/bin/atmswitch ! /usr/bin/ttcp_atm ! /usr/sbin/atmsigd ! /usr/bin/atmdiag ! /usr/bin/atmdump ! /usr/bin/sonetdiag ! /usr/bin/saaldump ! /usr/sbin/atmaddr ! /usr/sbin/esi ! /usr/sbin/atmloop ! /usr/sbin/atmtcp ! /usr/sbin/enitune ! /usr/sbin/zntune ! /usr/sbin/hediag ! /usr/sbin/atmarp ! /usr/sbin/atmarpd ! /usr/sbin/br2684ctl ! /usr/sbin/ilmid ! /usr/sbin/ilmidiag ! /usr/sbin/zeppelin ! /usr/sbin/les ! /usr/sbin/bus ! /usr/sbin/lecs ! /usr/sbin/mpcd ! %{_mandir}/man[478]/* %config /etc/hosts.atm + %config /etc/sysconfig/atm + %config /etc/atmsigd.conf + /etc/init.d/atm %post ! /sbin/ldconfig -n %{_libdir} ! /sbin/chkconfig --add atm %postun ! /sbin/ldconfig -n %{_libdir} %changelog *************** *** 160,162 **** - First build of linux-atm RPM. - --- 104,105 ---- |
|
From: chas w. <ch...@us...> - 2007-12-23 22:33:21
|
Update of /cvsroot/linux-atm/linux-atm In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv19237 Modified Files: Tag: V2_5_0 Makefile.am Log Message: update .spec and init scripts/examples Index: Makefile.am =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/Makefile.am,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** Makefile.am 9 Oct 2001 22:33:01 -0000 1.2 --- Makefile.am 23 Dec 2007 22:33:19 -0000 1.2.2.1 *************** *** 6,10 **** -mkdir -p src/extra/RPMS -mkdir -p src/extra/SRPMS ! rpm -ba src/extra/linux-atm.spec rpm: rpms --- 6,10 ---- -mkdir -p src/extra/RPMS -mkdir -p src/extra/SRPMS ! rpmbuild -ba src/extra/linux-atm.spec rpm: rpms |
|
From: chas w. <ch...@us...> - 2007-12-23 22:31:30
|
Update of /cvsroot/linux-atm/linux-atm In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18656 Modified Files: Tag: V2_5_0 configure.in Log Message: prune empty directory Index: configure.in =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/configure.in,v retrieving revision 1.2.2.10 retrieving revision 1.2.2.11 diff -C2 -d -r1.2.2.10 -r1.2.2.11 *** configure.in 25 Nov 2005 16:49:39 -0000 1.2.2.10 --- configure.in 23 Dec 2007 22:31:25 -0000 1.2.2.11 *************** *** 234,239 **** src/extra/Makefile \ src/extra/linux-atm.spec \ ! src/extra/ANS/Makefile \ ! src/extra/drivers/Makefile ) --- 234,238 ---- src/extra/Makefile \ src/extra/linux-atm.spec \ ! src/extra/ANS/Makefile ) |
|
From: chas w. <ch...@us...> - 2007-12-23 22:30:48
|
Update of /cvsroot/linux-atm/linux-atm/src/br2684 In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18185/src/br2684 Modified Files: Tag: V2_5_0 br2684ctl.8 Log Message: document -p (payload) option; not in mainline kernels yet though Index: br2684ctl.8 =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/br2684/Attic/br2684ctl.8,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** br2684ctl.8 4 Sep 2007 17:17:48 -0000 1.1.2.5 --- br2684ctl.8 23 Dec 2007 22:30:45 -0000 1.1.2.6 *************** *** 12,15 **** --- 12,17 ---- .BI \-e\ 0|1 ] [ + .BI \-p\ 0|1 + ] [ .BI \-s\ sndbuf ] [ *************** *** 30,33 **** --- 32,38 ---- Encapsulation method: 0=LLC, 1=VC mux (the default is 0 or LLC) .TP 15 + .BI \-p\ 0|1 + Payload method: 0=Bridged, 1=Routed (the default is 0 or Bridged) + .TP 15 .BI \-s\ sndbuf Send buffer size. Default is 8192. |
|
From: chas w. <ch...@us...> - 2007-12-23 22:30:20
|
Update of /cvsroot/linux-atm/linux-atm/src/extra In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv17918/src/extra Modified Files: Tag: V2_5_0 Makefile.am Log Message: prune empty directory Index: Makefile.am =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/extra/Makefile.am,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** Makefile.am 15 Oct 2001 23:19:43 -0000 1.2.2.1 --- Makefile.am 23 Dec 2007 22:30:17 -0000 1.2.2.2 *************** *** 1,3 **** ! SUBDIRS = ANS drivers EXTRA_DIST = linux-atm.spec.in --- 1,3 ---- ! SUBDIRS = ANS EXTRA_DIST = linux-atm.spec.in |
|
From: chas w. <ch...@us...> - 2007-12-23 14:47:56
|
Update of /cvsroot/linux-atm/linux-atm/src/maint In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16939/src/maint Modified Files: Tag: V2_5_0 Makefile.am Added Files: Tag: V2_5_0 hediag.c Log Message: the he driver is already included in later kernels --- NEW FILE: hediag.c --- #include <stdio.h> #include <sys/ioctl.h> #include <sys/types.h> #include <sys/socket.h> #include <atm.h> #include <linux/atmdev.h> #include <linux/sonet.h> #include <linux/atm_he.h> struct reg_table { unsigned addr; char *name; }; struct reg_table pci_regs[] = { { 0x80000, "reset_cntl" }, { 0x80004, "host_cntl" }, { 0x80008, "lb_swap" }, { 0x8000c, "lb_mem_addr" }, { 0x80010, "lb_mem_data" }, { 0x80014, "lb_mem_access" }, { 0x80018, "sdram_ctl" }, { 0x8001c, "int_fifo" }, { 0x80020, "abort_addr" }, { 0x80080, "irq0_base" }, { 0x80084, "irq0_head" }, { 0x80088, "irq0_cntl" }, { 0x8008c, "irq0_data" }, /* fill in 1-4 later */ { 0x800c0, "grp_10_map" }, { 0x800c4, "grp_32_map" }, { 0x800c8, "grp_54_map" }, { 0x800cc, "grp_76_map" }, { 0x80400, "g0_rbps_s" }, { 0x80404, "g0_rbps_t" }, { 0x80408, "g0_rbps_qi" }, { 0x8040c, "g0_rbps_bs" }, { 0x80410, "g0_rbpl_s" }, { 0x80414, "g0_rbpl_t" }, { 0x80418, "g0_rbpl_qi" }, { 0x8041c, "g0_rbpl_bs" }, /* fill in 1-7 later */ { 0x80580, "g0_inmq_s" }, { 0x80584, "g0_inmq_l" }, { 0x80588, "g1_inmq_s" }, { 0x8058c, "g1_inmq_l" }, { 0x80590, "g2_inmq_s" }, { 0x80594, "g2_inmq_l" }, { 0x80598, "g3_inmq_s" }, { 0x8059c, "g3_inmq_l" }, { 0x805a0, "g4_inmq_s" }, { 0x805a4, "g4_inmq_l" }, { 0x805a8, "g5_inmq_s" }, { 0x805ac, "g5_inmq_l" }, { 0x805b0, "g6_inmq_s" }, { 0x805b4, "g6_inmq_l" }, { 0x805b8, "g7_inmq_s" }, { 0x805bc, "g7_inmq_l" }, { 0x80680, "tpdrq_b_h" }, { 0x80684, "tpdrq_t" }, { 0x80688, "tpdrq_s" }, { 0x8068c, "ubuff_ba" }, { 0x806c0, "rlbf0_h" }, { 0x806c4, "rlbf0_t" }, { 0x806c8, "rlbf1_h" }, { 0x806cc, "rlbf1_t" }, { 0x806d0, "rlbc_h" }, { 0x806d4, "rlbc_t" }, { 0x806d8, "rlbc_h2" }, { 0x806e0, "tlbf_h" }, { 0x806e4, "tlbf_t" }, { 0x806e8, "rlbf0_c" }, { 0x806ec, "rlbf1_c" }, { 0x806f0, "rxthrsh" }, { 0x806f4, "lithrsh" }, { 0x80700, "lbarb" }, { 0x80704, "sdramcon" }, { 0x80708, "lbstat" }, { 0x8070c, "rcc_stat" }, { 0x80740, "tcmconfig" }, { 0x80744, "tsrb_ba" }, { 0x80748, "tsrc_ba" }, { 0x8074c, "tmabr_ba" }, { 0x80750, "tpd_ba" }, { 0x80758, "tsrd_ba" }, { 0x80760, "tx_config" }, { 0x80764, "txaal5_proto" }, { 0x80780, "rcmconfig" }, { 0x80784, "rsrb_ba" }, { 0x80788, "rcmlbm_ba" }, { 0x8078c, "rcmabr_ba" }, { 0x807c0, "rc_config" }, { 0x807c4, "mcc" }, { 0x807c8, "oec" }, { 0x807cc, "dcc" }, { 0x807d0, "cec" }, { 0x807f4, "lb_config" }, { 0x807f0, "hsp_ba" }, { 0x807f8, "con_dat" }, { 0x807fc, "con_ctl" }, { 0x00000, NULL } }; char * reg_name(unsigned addr) { struct reg_table *regp = pci_regs; while ( regp->name != NULL ) { if (regp->addr == addr) return regp->name; regp++; } return NULL; } int main(int argc,char **argv) { int s; struct atmif_sioc sioc; struct he_ioctl_reg req; if (argc < 3) { fprintf(stderr,"usage: hediag itf [cmd]\n"); fprintf(stderr,"\t\treadpci address\n"); fprintf(stderr,"\t\treadrcm address\n"); fprintf(stderr,"\t\treadtcm address\n"); fprintf(stderr,"\t\treadmbox address\n"); exit(1); } if (strcmp(argv[2], "readpci") == 0) { req.addr = strtol(argv[3], NULL, 0); req.type = HE_REGTYPE_PCI; } else if (strcmp(argv[2], "readrcm") == 0) { req.addr = strtol(argv[3], NULL, 0); req.type = HE_REGTYPE_RCM; } else if (strcmp(argv[2], "readtcm") == 0) { req.addr = strtol(argv[3], NULL, 0); req.type = HE_REGTYPE_TCM; } else if (strcmp(argv[2], "readmbox") == 0) { req.addr = strtol(argv[3], NULL, 0); req.type = HE_REGTYPE_MBOX; } if ((s = socket(PF_ATMPVC, SOCK_DGRAM, ATM_AAL5)) < 0) { perror("socket"); exit(1); } sioc.number = atoi(argv[1]); sioc.arg = &req; sioc.length = sizeof(req); if (ioctl(s, HE_GET_REG, &sioc) < 0) { perror("ioctl HE_GET_REG"); exit(1); } if (reg_name(req.addr)) printf("%s = 0x%x\n", reg_name(req.addr), req.val); else printf("0x%x = 0x%x\n", req.addr, req.val); exit(0); } Index: Makefile.am =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/maint/Makefile.am,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** Makefile.am 2 May 2003 13:47:15 -0000 1.2.2.1 --- Makefile.am 23 Dec 2007 14:47:45 -0000 1.2.2.2 *************** *** 1,4 **** BOOTPGMS=atmaddr esi ! SYSPGMS=atmloop atmtcp enitune zntune # nstune USRPGMS=atmdiag atmdump sonetdiag saaldump --- 1,4 ---- BOOTPGMS=atmaddr esi ! SYSPGMS=atmloop atmtcp enitune zntune hediag # nstune USRPGMS=atmdiag atmdump sonetdiag saaldump |
|
From: chas w. <ch...@us...> - 2007-12-23 14:47:56
|
Update of /cvsroot/linux-atm/linux-atm/src/extra/drivers In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16939/src/extra/drivers Removed Files: Tag: V2_5_0 .cvsignore Makefile.am README.he atm_he.h he.c he.h he.patch-2.2 he.patch-2.4 hediag.c Log Message: the he driver is already included in later kernels --- .cvsignore DELETED --- --- Makefile.am DELETED --- --- README.he DELETED --- --- atm_he.h DELETED --- --- he.c DELETED --- --- he.h DELETED --- --- he.patch-2.2 DELETED --- --- he.patch-2.4 DELETED --- --- hediag.c DELETED --- |
|
From: chas w. <ch...@us...> - 2007-12-11 17:46:23
|
Update of /cvsroot/linux-atm/linux-atm/src/mpoad In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2947/src/mpoad Modified Files: Tag: V2_5_0 io.c k_interf.c lecs.c main.c p_factory.c p_recogn.c Log Message: include linux/types.h to fix building on newer kernels that don't automatically include linux/types.h yet Index: io.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/mpoad/io.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** io.c 9 Oct 2001 22:33:07 -0000 1.2 --- io.c 11 Dec 2007 17:46:12 -0000 1.2.2.1 *************** *** 20,23 **** --- 20,24 ---- #endif #include <atm.h> + #include <linux/types.h> #include <linux/atmioc.h> #include <linux/atmmpc.h> Index: k_interf.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/mpoad/k_interf.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** k_interf.c 9 Oct 2001 22:33:07 -0000 1.2 --- k_interf.c 11 Dec 2007 17:46:12 -0000 1.2.2.1 *************** *** 10,13 **** --- 10,14 ---- #include <stdint.h> #include <netinet/in.h> /* for ntohl() */ + #include <linux/types.h> #include <linux/atmmpc.h> #include <atm.h> Index: lecs.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/mpoad/lecs.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** lecs.c 9 Oct 2001 22:33:07 -0000 1.2 --- lecs.c 11 Dec 2007 17:46:12 -0000 1.2.2.1 *************** *** 12,15 **** --- 12,16 ---- #include <atm.h> #include <atmsap.h> + #include <linux/types.h> #include <linux/atmmpc.h> /* for MPOA Device type TLV */ #include "lecs.h" Index: main.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/mpoad/main.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** main.c 9 Oct 2001 22:33:07 -0000 1.2 --- main.c 11 Dec 2007 17:46:12 -0000 1.2.2.1 *************** *** 10,13 **** --- 10,14 ---- #include <sys/ioctl.h> #include <atm.h> + #include <linux/types.h> #include <linux/atmdev.h> #include <linux/atmmpc.h> Index: p_factory.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/mpoad/p_factory.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** p_factory.c 27 Sep 2005 23:16:25 -0000 1.2.2.1 --- p_factory.c 11 Dec 2007 17:46:12 -0000 1.2.2.2 *************** *** 6,9 **** --- 6,10 ---- #include <stdint.h> #include <netinet/in.h> + #include <linux/types.h> #include <linux/atmmpc.h> #include <sys/socket.h> Index: p_recogn.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/mpoad/p_recogn.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** p_recogn.c 9 Oct 2001 22:33:07 -0000 1.2 --- p_recogn.c 11 Dec 2007 17:46:12 -0000 1.2.2.1 *************** *** 8,11 **** --- 8,12 ---- #include <sys/time.h> #include <atm.h> + #include <linux/types.h> #include <linux/atmmpc.h> #include <netinet/in.h> |
|
From: chas w. <ch...@us...> - 2007-10-21 20:08:23
|
Update of /cvsroot/linux-atm/linux-atm/src/br2684 In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv12291/src/br2684 Modified Files: Tag: V2_5_0 br2684ctl.c Log Message: From: "seventh guardian" <sev...@gm...> One of the problems of the current br2684ctl code is that "stuff" is done while parsing the options. This means that if some options are messed up, we end up with a mess (a daemon running for nothing, a dummy interface is created, etc). At the same time, this makes adding the "persist" option too difficult. So here are the changes for now: * there is now one struct br2684_ctl params for the command line parameters. * the "option parsing" switch now just fills this struct (except for one detail, later on that). * there is one new function, named "start_interface" (this name should probably be changed..) that calls "create_br", "assign_vcc". As a bonus, things like "br2684ctl -q 1" don't work anymore :) There is one caveat though: the "start_interface" function is also called on the "c" option to start the previously defined interface (to maintain the multi-interface ability). I'd like to see that "multi-interface" ability removed, as it obviously cripples the code, yet is not that useful. But that's another question. Index: br2684ctl.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/br2684/Attic/br2684ctl.c,v retrieving revision 1.1.2.11 retrieving revision 1.1.2.12 diff -C2 -d -r1.1.2.11 -r1.1.2.12 *** br2684ctl.c 4 Sep 2007 14:16:11 -0000 1.1.2.11 --- br2684ctl.c 21 Oct 2007 20:08:12 -0000 1.1.2.12 *************** *** 29,32 **** --- 29,41 ---- #define LOG_FACILITY LOG_LOCAL2 + struct br2684_params { + int itfnum; + int encap; + int sndbuf; + int payload; + char *astr; /* temporary */ + struct atm_qos reqqos; + }; + int lastsock, lastitf; *************** *** 68,74 **** } ! int create_br(char *nstr, int payload) { ! int num, err; if(lastsock<0) { --- 77,83 ---- } ! int create_br(int itfnum, int payload) { ! int err; if(lastsock<0) { *************** *** 79,84 **** } else { /* create the device with ioctl: */ ! num=atoi(nstr); ! if( num>=0 && num<1234567890){ struct atm_newif_br2684 ni; ni.backend_num = ATM_BACKEND_BR2684; --- 88,92 ---- } else { /* create the device with ioctl: */ ! if( itfnum>=0 && itfnum<1234567890){ struct atm_newif_br2684 ni; ni.backend_num = ATM_BACKEND_BR2684; *************** *** 89,93 **** #endif ni.mtu = 1500; ! sprintf(ni.ifname, "nas%d", num); err=ioctl (lastsock, ATM_NEWBACKENDIF, &ni); --- 97,101 ---- #endif ni.mtu = 1500; ! sprintf(ni.ifname, "nas%d", itfnum); err=ioctl (lastsock, ATM_NEWBACKENDIF, &ni); *************** *** 98,105 **** ni.ifname, strerror(errno)); ! lastitf=num; /* even if we didn't create, because existed, assign_vcc wil want to know it! */ } else { ! syslog(LOG_ERR,"err: strange interface number %d", num ); } } --- 106,113 ---- ni.ifname, strerror(errno)); ! lastitf=itfnum; /* even if we didn't create, because existed, assign_vcc wil want to know it! */ } else { ! syslog(LOG_ERR,"err: strange interface number %d", itfnum ); } } *************** *** 172,175 **** --- 180,194 ---- } + void start_interface(struct br2684_params* params) + { + if (params->astr==NULL) { + syslog(LOG_ERR, "Required ATM parameters not specified."); + exit(1); + } + + create_br(params->itfnum, params->payload); + assign_vcc(params->astr, params->encap, params->payload, params->sndbuf, + params->reqqos); + } *************** *** 186,192 **** int main (int argc, char **argv) { ! int c, background=0, encap=0, sndbuf=8192, payload=1; ! int itfnum = 0; ! struct atm_qos reqqos; lastsock=-1; --- 205,217 ---- int main (int argc, char **argv) { ! int c, background=0; ! ! struct br2684_params params; ! params.itfnum=-1; ! params.encap=0; ! params.sndbuf=8192; ! params.payload=1; ! params.astr=NULL; ! memset(¶ms.reqqos, 0, sizeof(params.reqqos)); lastsock=-1; *************** *** 194,198 **** /* st qos to 0 */ - memset(&reqqos, 0, sizeof(reqqos)); openlog (LOG_NAME,LOG_OPTION,LOG_FACILITY); --- 219,222 ---- *************** *** 202,210 **** case 'q': printf ("optarg : %s",optarg); ! if (text2qos(optarg,&reqqos,0)) ! fprintf(stderr,"QOS parameter invalid"); break; case 'a': ! assign_vcc(optarg, encap, payload, sndbuf, reqqos); break; case 'b': --- 226,234 ---- case 'q': printf ("optarg : %s",optarg); ! if (text2qos(optarg,¶ms.reqqos,0)) ! fprintf(stderr,"QOS parameter invalid\n"); break; case 'a': ! params.astr=optarg; break; case 'b': *************** *** 212,236 **** break; case 'c': ! create_br(optarg, payload); ! itfnum = atoi(optarg); break; case 'e': ! encap=(atoi(optarg)); ! if(encap<0){ syslog (LOG_ERR, "invalid encapsulation: %s:",optarg); ! encap=0; } break; case 's': ! sndbuf=(atoi(optarg)); ! if(sndbuf<0){ syslog(LOG_ERR, "Invalid sndbuf: %s, using size of 8192 instead", optarg); ! sndbuf=8192; } break; case 'p': /* payload type: routed (0) or bridged (1) */ #ifdef BR2684_FLAG_ROUTED ! payload = atoi(optarg); break; #else --- 236,261 ---- break; case 'c': ! /* temporary, to make it work with multiple interfaces: */ ! if (params.itfnum>=0) start_interface(¶ms); ! params.itfnum= atoi(optarg); break; case 'e': ! params.encap=(atoi(optarg)); ! if(params.encap<0){ syslog (LOG_ERR, "invalid encapsulation: %s:",optarg); ! params.encap=0; } break; case 's': ! params.sndbuf=(atoi(optarg)); ! if(params.sndbuf<0){ syslog(LOG_ERR, "Invalid sndbuf: %s, using size of 8192 instead", optarg); ! params.sndbuf=8192; } break; case 'p': /* payload type: routed (0) or bridged (1) */ #ifdef BR2684_FLAG_ROUTED ! params.payload = atoi(optarg); break; #else *************** *** 247,250 **** --- 272,277 ---- if (argc != optind) usage(argv[0]); + start_interface(¶ms); + if(lastsock>=0) close(lastsock); *************** *** 284,288 **** } ! create_pidfile(itfnum); signal(SIGINT, int_signal); signal(SIGTERM, int_signal); --- 311,315 ---- } ! create_pidfile(params.itfnum); signal(SIGINT, int_signal); signal(SIGTERM, int_signal); |
|
From: chas w. <ch...@us...> - 2007-09-04 17:17:51
|
Update of /cvsroot/linux-atm/linux-atm/src/br2684 In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv11662 Modified Files: Tag: V2_5_0 br2684ctl.8 Log Message: This simple patch fixes the alignment of the parameters section on the br2684ctl man page. From: "seventh guardian" <sev...@gm...> Index: br2684ctl.8 =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/br2684/Attic/br2684ctl.8,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** br2684ctl.8 27 Aug 2007 14:24:00 -0000 1.1.2.4 --- br2684ctl.8 4 Sep 2007 17:17:48 -0000 1.1.2.5 *************** *** 20,23 **** --- 20,24 ---- .BI \-a\ [itf].vpi.vci ATM PVC number, VPI and VCI. (Required) + .TP 15 .BI \-b Puts the process in the background. *************** *** 29,33 **** Encapsulation method: 0=LLC, 1=VC mux (the default is 0 or LLC) .TP 15 - .TP 15 .BI \-s\ sndbuf Send buffer size. Default is 8192. --- 30,33 ---- |
|
From: chas w. <ch...@us...> - 2007-09-04 14:16:20
|
Update of /cvsroot/linux-atm/linux-atm/src/br2684 In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2156 Modified Files: Tag: V2_5_0 br2684ctl.c Log Message: The logging functions are currently being called most of the time with a newline character at the end. Unfortunately these characters are useless, and are transformed into underscores at the logs. So attached goes a patch that removes those newline characters from the syslog calls. From: "seventh guardian" <sev...@gm...> Index: br2684ctl.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/br2684/Attic/br2684ctl.c,v retrieving revision 1.1.2.10 retrieving revision 1.1.2.11 diff -C2 -d -r1.1.2.10 -r1.1.2.11 *** br2684ctl.c 4 Sep 2007 13:28:55 -0000 1.1.2.10 --- br2684ctl.c 4 Sep 2007 14:16:11 -0000 1.1.2.11 *************** *** 42,46 **** void exitFunc(void) { ! syslog (LOG_NOTICE,"Daemon terminated\n"); } --- 42,46 ---- void exitFunc(void) { ! syslog (LOG_NOTICE,"Daemon terminated"); } *************** *** 48,52 **** void int_signal(int dummy) { ! syslog (LOG_INFO,"Killed by a signal\n"); exit(0); } --- 48,52 ---- void int_signal(int dummy) { ! syslog (LOG_INFO,"Killed by a signal"); exit(0); } *************** *** 93,102 **** if (err == 0) ! syslog(LOG_NOTICE, "Interface \"%s\" created sucessfully\n",ni.ifname); else ! syslog(LOG_INFO, "Interface \"%s\" could not be created, reason: %s\n", ni.ifname, strerror(errno)); ! lastitf=num; /* even if we didn't create, because existed, assign_vcc wil want to know it! */ } else { syslog(LOG_ERR,"err: strange interface number %d", num ); --- 93,103 ---- if (err == 0) ! syslog(LOG_NOTICE, "Interface \"%s\" created sucessfully",ni.ifname); else ! syslog(LOG_INFO, "Interface \"%s\" could not be created, reason: %s", ni.ifname, strerror(errno)); ! lastitf=num; /* even if we didn't create, because existed, ! assign_vcc wil want to know it! */ } else { syslog(LOG_ERR,"err: strange interface number %d", num ); *************** *** 118,124 **** err=text2atm(astr,(struct sockaddr *)(&addr), sizeof(addr), T2A_PVC); if (err!=0) ! syslog(LOG_ERR,"Could not parse ATM parameters (error=%d)\n",err); ! syslog(LOG_NOTICE,"Communicating over ATM %d.%d.%d, encapsulation: %s\n", addr.sap_addr.itf, addr.sap_addr.vpi, addr.sap_addr.vci, --- 119,126 ---- err=text2atm(astr,(struct sockaddr *)(&addr), sizeof(addr), T2A_PVC); if (err!=0) ! syslog(LOG_ERR,"Could not parse ATM parameters (error=%d)",err); ! syslog(LOG_NOTICE,"Communicating over ATM %d.%d.%d, encapsulation: %s", ! addr.sap_addr.itf, addr.sap_addr.vpi, addr.sap_addr.vci, *************** *** 126,130 **** if ((fd = socket(PF_ATMPVC, SOCK_DGRAM, ATM_AAL5)) < 0) ! syslog(LOG_ERR,"failed to create socket %d, reason: %s", errno,strerror(errno)); if (qos.aal == 0) { --- 128,133 ---- if ((fd = socket(PF_ATMPVC, SOCK_DGRAM, ATM_AAL5)) < 0) ! syslog(LOG_ERR,"failed to create socket %d, reason: %s", ! errno,strerror(errno)); if (qos.aal == 0) { *************** *** 137,141 **** if ( (err=setsockopt(fd,SOL_SOCKET,SO_SNDBUF, &bufsize ,sizeof(bufsize))) ) ! syslog(LOG_ERR,"setsockopt SO_SNDBUF: (%d) %s\n",err, strerror(err)); if (setsockopt(fd, SOL_ATM, SO_ATMQOS, &qos, sizeof(qos)) < 0) --- 140,144 ---- if ( (err=setsockopt(fd,SOL_SOCKET,SO_SNDBUF, &bufsize ,sizeof(bufsize))) ) ! syslog(LOG_ERR,"setsockopt SO_SNDBUF: (%d) %s",err, strerror(err)); if (setsockopt(fd, SOL_ATM, SO_ATMQOS, &qos, sizeof(qos)) < 0) *************** *** 173,177 **** void usage(char *s) { ! printf("usage: %s [-b] [[-c number] [-e 0|1] [-s sndbuf] [-q qos] [-p 0|1] [-a [itf.]vpi.vci]*]*\n", s); printf(" encapsulations: 0=llc, 1=vcmux\n payloads: 0=routed, 1=bridged\n"); exit(1); --- 176,181 ---- void usage(char *s) { ! printf("usage: %s [-b] [[-c number] [-e 0|1] [-s sndbuf] [-q qos] [-p 0|1] " ! "[-a [itf.]vpi.vci]*]*\n", s); printf(" encapsulations: 0=llc, 1=vcmux\n payloads: 0=routed, 1=bridged\n"); exit(1); *************** *** 198,202 **** case 'q': printf ("optarg : %s",optarg); ! if (text2qos(optarg,&reqqos,0)) fprintf(stderr,"QOS parameter invalid\n"); break; case 'a': --- 202,207 ---- case 'q': printf ("optarg : %s",optarg); ! if (text2qos(optarg,&reqqos,0)) ! fprintf(stderr,"QOS parameter invalid"); break; case 'a': *************** *** 213,217 **** encap=(atoi(optarg)); if(encap<0){ ! syslog (LOG_ERR, "invalid encapsulation: %s:\n",optarg); encap=0; } --- 218,222 ---- encap=(atoi(optarg)); if(encap<0){ ! syslog (LOG_ERR, "invalid encapsulation: %s:",optarg); encap=0; } *************** *** 220,224 **** sndbuf=(atoi(optarg)); if(sndbuf<0){ ! syslog(LOG_ERR, "Invalid sndbuf: %s, using size of 8192 instead\n",optarg); sndbuf=8192; } --- 225,230 ---- sndbuf=(atoi(optarg)); if(sndbuf<0){ ! syslog(LOG_ERR, "Invalid sndbuf: %s, using size of 8192 instead", ! optarg); sndbuf=8192; } *************** *** 229,233 **** break; #else ! syslog(LOG_ERR, "payload option not supported.\n"); #endif case '?': --- 235,239 ---- break; #else ! syslog(LOG_ERR, "payload option not supported."); #endif case '?': *************** *** 282,286 **** signal(SIGTERM, int_signal); ! syslog (LOG_INFO, "RFC 1483/2684 bridge daemon started\n"); atexit (exitFunc); --- 288,292 ---- signal(SIGTERM, int_signal); ! syslog (LOG_INFO, "RFC 1483/2684 bridge daemon started"); atexit (exitFunc); |
1 message has been excluded from this view by a project administrator.
