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...> - 2009-08-03 14:30:22
|
Update of /cvsroot/linux-atm/linux-atm/src/arpd In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29610/src/arpd Modified Files: Tag: V2_5_1 io.c Log Message: pull down updates from the HEAD into 2.5.1 Index: io.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/arpd/io.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.1.2.1 diff -C2 -d -r1.2.2.1 -r1.2.2.1.2.1 *** io.c 11 Jul 2007 15:27:15 -0000 1.2.2.1 --- io.c 3 Aug 2009 14:30:13 -0000 1.2.2.1.2.1 *************** *** 17,21 **** #include <sys/socket.h> #include <sys/ioctl.h> ! #include <net/if.h> #include <netinet/in.h> #include <atm.h> --- 17,21 ---- #include <sys/socket.h> #include <sys/ioctl.h> ! #include <linux/if.h> #include <netinet/in.h> #include <atm.h> |
|
From: chas w. <ch...@us...> - 2009-08-03 14:30:22
|
Update of /cvsroot/linux-atm/linux-atm In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29610 Modified Files: Tag: V2_5_1 ChangeLog Log Message: pull down updates from the HEAD into 2.5.1 Index: ChangeLog =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/ChangeLog,v retrieving revision 1.2.2.7 retrieving revision 1.2.2.7.2.1 diff -C2 -d -r1.2.2.7 -r1.2.2.7.2.1 *** ChangeLog 29 Dec 2007 21:24:03 -0000 1.2.2.7 --- ChangeLog 3 Aug 2009 14:30:13 -0000 1.2.2.7.2.1 *************** *** 43,46 **** --- 43,52 ---- - ia64 build fix for ASN (Chas Williams) + New features + ------------ + + - the driver for the Marconi ForeRunnerHE is in src/extra/drivers (Chas + Williams, Eric Kinzie) + Other changes ------------- |
|
From: chas w. <ch...@us...> - 2009-08-03 14:17:40
|
Update of /cvsroot/linux-atm/linux-atm/src/qgen In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26238 Modified Files: Tag: V2_5_1 msg.fmt Log Message: quiet some warnings from cpp Index: msg.fmt =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/qgen/msg.fmt,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** msg.fmt 9 Oct 2001 22:33:07 -0000 1.2 --- msg.fmt 3 Aug 2009 14:17:27 -0000 1.2.4.1 *************** *** 91,105 **** ITU_STD_HDR { _id "atm_td" <8> = multi { ! TRAFFIC_DESCRIPTOR(_dummy <0> = length {}) ! /* ! * Confused ? ;-) Here, we want no prefix at all, but cpp ! * insists in getting an argument. So we give it that funny ! * construct. This yields something like ! * ... { _dummy <0> = length {}field <24> } ! * with the rather useless "dummy" field. "= length {}" is ! * necessary to avoid the restriction that unnamed fields must ! * have values (which would then get concatenated with the name ! * of the field we're actually interested in). ! */ ATM_TD_TM_OPT { # @@@ should this also go into the TD macro ? #if defined(UNI40) || defined(DYNAMIC_UNI) --- 91,95 ---- ITU_STD_HDR { _id "atm_td" <8> = multi { ! TRAFFIC_DESCRIPTOR() ATM_TD_TM_OPT { # @@@ should this also go into the TD macro ? #if defined(UNI40) || defined(DYNAMIC_UNI) *************** *** 136,141 **** _ext <1@8,more> = 1 hli_type <7@1> = case { ! # Note: cannot use ATM_HL_* here, because those values are incremented by one ! # to keep zero available for ATM_HL_NONE 0 { # ISO iso_hli <-64> --- 126,131 ---- _ext <1@8,more> = 1 hli_type <7@1> = case { ! /* Note: cannot use ATM_HL_* here, because those values are incremented by one ! to keep zero available for ATM_HL_NONE */ 0 { # ISO iso_hli <-64> |
|
From: chas w. <ch...@us...> - 2009-03-03 18:23:35
|
Update of /cvsroot/linux-atm/linux-atm/src/debug In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18737/src/debug Modified Files: svctor.c Log Message: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/linux-atm/files/linux-atm-2.5.0-headers.patch?rev=1.1&view=log Version bump. (Portage version: 2.1.4_rc11) apparently related to: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/linux-atm/files/linux-atm-2.4.1-declarations.patch?rev=1.1&view=log Fix QA warnings. (Portage version: 2.1.2.2) Index: svctor.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/debug/svctor.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** svctor.c 1 Jan 2008 00:14:49 -0000 1.3 --- svctor.c 3 Mar 2009 18:23:26 -0000 1.4 *************** *** 21,24 **** --- 21,25 ---- #include <stdio.h> + #include <stdlib.h> #include <unistd.h> #include <stdlib.h> |
|
From: chas w. <ch...@us...> - 2009-03-03 18:23:31
|
Update of /cvsroot/linux-atm/linux-atm/src/sigd In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18737/src/sigd Modified Files: cfg_y.y Log Message: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/linux-atm/files/linux-atm-2.5.0-headers.patch?rev=1.1&view=log Version bump. (Portage version: 2.1.4_rc11) apparently related to: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/linux-atm/files/linux-atm-2.4.1-declarations.patch?rev=1.1&view=log Fix QA warnings. (Portage version: 2.1.2.2) Index: cfg_y.y =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/sigd/cfg_y.y,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** cfg_y.y 1 Jan 2008 00:14:52 -0000 1.3 --- cfg_y.y 3 Mar 2009 18:23:26 -0000 1.4 *************** *** 8,11 **** --- 8,12 ---- #endif + #include <stdlib.h> #include <string.h> #include <ctype.h> *************** *** 25,28 **** --- 26,32 ---- static SIG_ENTITY *curr_sig = &_entity; + void yyerror(const char *s); + void yywarn(const char *s); + int yylex(void); static int hex2num(char digit) *************** *** 128,132 **** if (atm_equal((struct sockaddr *) &sig->signaling_pvc, (struct sockaddr *) &$2,0,0)) ! yyerror("duplicate PVC address %d.%d.%d",S_PVC(sig)); curr_sig = alloc_t(SIG_ENTITY); *curr_sig = _entity; --- 132,136 ---- if (atm_equal((struct sockaddr *) &sig->signaling_pvc, (struct sockaddr *) &$2,0,0)) ! yyerror("duplicate PVC address"); curr_sig = alloc_t(SIG_ENTITY); *curr_sig = _entity; |
|
From: chas w. <ch...@us...> - 2009-03-03 18:23:31
|
Update of /cvsroot/linux-atm/linux-atm/src/switch In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18737/src/switch Modified Files: cfg_y.y Log Message: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/linux-atm/files/linux-atm-2.5.0-headers.patch?rev=1.1&view=log Version bump. (Portage version: 2.1.4_rc11) apparently related to: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/linux-atm/files/linux-atm-2.4.1-declarations.patch?rev=1.1&view=log Fix QA warnings. (Portage version: 2.1.2.2) Index: cfg_y.y =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/switch/cfg_y.y,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** cfg_y.y 1 Jan 2008 00:14:52 -0000 1.3 --- cfg_y.y 3 Mar 2009 18:23:26 -0000 1.4 *************** *** 8,11 **** --- 8,12 ---- #endif + #include <stdlib.h> #include <string.h> #include <errno.h> *************** *** 23,26 **** --- 24,30 ---- static SIGNALING_ENTITY *sig; + void yyerror(const char *s); + int yylex(void); + %} |
|
From: chas w. <ch...@us...> - 2009-03-03 18:23:31
|
Update of /cvsroot/linux-atm/linux-atm/src/test In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18737/src/test Modified Files: ispl_y.y Log Message: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/linux-atm/files/linux-atm-2.5.0-headers.patch?rev=1.1&view=log Version bump. (Portage version: 2.1.4_rc11) apparently related to: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/linux-atm/files/linux-atm-2.4.1-declarations.patch?rev=1.1&view=log Fix QA warnings. (Portage version: 2.1.2.2) Index: ispl_y.y =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/test/ispl_y.y,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ispl_y.y 9 Oct 2001 22:33:08 -0000 1.2 --- ispl_y.y 3 Mar 2009 18:23:26 -0000 1.3 *************** *** 20,23 **** --- 20,24 ---- static struct atmsvc_msg msg; + int yylex (void); %} |
|
From: chas w. <ch...@us...> - 2009-03-03 18:23:31
|
Update of /cvsroot/linux-atm/linux-atm/src/lane In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18737/src/lane Modified Files: lecs_db.l load_lex.l mem_lecs.c Log Message: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/linux-atm/files/linux-atm-2.5.0-headers.patch?rev=1.1&view=log Version bump. (Portage version: 2.1.4_rc11) apparently related to: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/linux-atm/files/linux-atm-2.4.1-declarations.patch?rev=1.1&view=log Fix QA warnings. (Portage version: 2.1.2.2) Index: lecs_db.l =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/lane/lecs_db.l,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lecs_db.l 9 Oct 2001 22:33:07 -0000 1.2 --- lecs_db.l 3 Mar 2009 18:23:26 -0000 1.3 *************** *** 8,11 **** --- 8,12 ---- #include <stdio.h> #include <stdlib.h> + #include <string.h> /* Local includes */ Index: load_lex.l =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/lane/load_lex.l,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** load_lex.l 9 Oct 2001 22:33:07 -0000 1.2 --- load_lex.l 3 Mar 2009 18:23:26 -0000 1.3 *************** *** 5,8 **** --- 5,9 ---- #endif + #include <string.h> #include <netinet/in.h> #include <arpa/inet.h> Index: mem_lecs.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/lane/mem_lecs.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mem_lecs.c 9 Oct 2001 22:33:07 -0000 1.2 --- mem_lecs.c 3 Mar 2009 18:23:26 -0000 1.3 *************** *** 14,17 **** --- 14,18 ---- #include <stdio.h> #include <stdlib.h> + #include <string.h> #include <sys/types.h> |
|
From: chas w. <ch...@us...> - 2009-03-03 18:23:30
|
Update of /cvsroot/linux-atm/linux-atm/src/maint In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18737/src/maint Modified Files: hediag.c Log Message: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/linux-atm/files/linux-atm-2.5.0-headers.patch?rev=1.1&view=log Version bump. (Portage version: 2.1.4_rc11) apparently related to: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/linux-atm/files/linux-atm-2.4.1-declarations.patch?rev=1.1&view=log Fix QA warnings. (Portage version: 2.1.2.2) Index: hediag.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/maint/hediag.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** hediag.c 1 Jan 2008 00:14:51 -0000 1.2 --- hediag.c 3 Mar 2009 18:23:26 -0000 1.3 *************** *** 1,3 **** --- 1,5 ---- #include <stdio.h> + #include <stdlib.h> + #include <string.h> #include <sys/ioctl.h> #include <sys/types.h> |
|
From: chas w. <ch...@us...> - 2009-03-03 18:23:30
|
Update of /cvsroot/linux-atm/linux-atm/src/qgen In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18737/src/qgen Modified Files: ql_y.y Log Message: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/linux-atm/files/linux-atm-2.5.0-headers.patch?rev=1.1&view=log Version bump. (Portage version: 2.1.4_rc11) apparently related to: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/linux-atm/files/linux-atm-2.4.1-declarations.patch?rev=1.1&view=log Fix QA warnings. (Portage version: 2.1.2.2) Index: ql_y.y =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/qgen/ql_y.y,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ql_y.y 3 Mar 2009 17:56:19 -0000 1.3 --- ql_y.y 3 Mar 2009 18:23:26 -0000 1.4 *************** *** 27,30 **** --- 27,32 ---- static const char *abort_id; /* indicates abort flag */ + void yyerror(const char *s); + int yylex(void); static NAME_LIST *get_name_list(const char *name) |
|
From: chas w. <ch...@us...> - 2009-03-03 18:23:30
|
Update of /cvsroot/linux-atm/linux-atm/src/arpd In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18737/src/arpd Modified Files: io.c Log Message: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/linux-atm/files/linux-atm-2.5.0-headers.patch?rev=1.1&view=log Version bump. (Portage version: 2.1.4_rc11) apparently related to: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/linux-atm/files/linux-atm-2.4.1-declarations.patch?rev=1.1&view=log Fix QA warnings. (Portage version: 2.1.2.2) Index: io.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/arpd/io.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** io.c 1 Jan 2008 00:14:49 -0000 1.3 --- io.c 3 Mar 2009 18:23:25 -0000 1.4 *************** *** 17,21 **** #include <sys/socket.h> #include <sys/ioctl.h> ! #include <net/if.h> #include <netinet/in.h> #include <atm.h> --- 17,21 ---- #include <sys/socket.h> #include <sys/ioctl.h> ! #include <linux/if.h> #include <netinet/in.h> #include <atm.h> |
|
From: chas w. <ch...@us...> - 2009-03-03 18:23:30
|
Update of /cvsroot/linux-atm/linux-atm/src/ilmid In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18737/src/ilmid Modified Files: atmf_uni.c mib.c Log Message: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/linux-atm/files/linux-atm-2.5.0-headers.patch?rev=1.1&view=log Version bump. (Portage version: 2.1.4_rc11) apparently related to: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/linux-atm/files/linux-atm-2.4.1-declarations.patch?rev=1.1&view=log Fix QA warnings. (Portage version: 2.1.2.2) Index: atmf_uni.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/atmf_uni.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** atmf_uni.c 1 Jan 2008 00:14:50 -0000 1.3 --- atmf_uni.c 3 Mar 2009 18:23:26 -0000 1.4 *************** *** 26,29 **** --- 26,30 ---- #endif + #include <stdlib.h> #include "atmf_uni.h" #include "atmd.h" Index: mib.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/mib.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mib.c 1 Jan 2008 00:14:50 -0000 1.3 --- mib.c 3 Mar 2009 18:23:26 -0000 1.4 *************** *** 31,34 **** --- 31,35 ---- #include "util.h" #include "atmd.h" + #include "io.h" #include <unistd.h> /* gethostname() */ |
|
From: chas w. <ch...@us...> - 2009-03-03 18:23:30
|
Update of /cvsroot/linux-atm/linux-atm/src/mpoad In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18737/src/mpoad Modified Files: k_interf.c Log Message: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/linux-atm/files/linux-atm-2.5.0-headers.patch?rev=1.1&view=log Version bump. (Portage version: 2.1.4_rc11) apparently related to: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/linux-atm/files/linux-atm-2.4.1-declarations.patch?rev=1.1&view=log Fix QA warnings. (Portage version: 2.1.2.2) Index: k_interf.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/mpoad/k_interf.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** k_interf.c 1 Jan 2008 00:14:51 -0000 1.3 --- k_interf.c 3 Mar 2009 18:23:26 -0000 1.4 *************** *** 4,7 **** --- 4,8 ---- #include <stdio.h> + #include <stdlib.h> #include <unistd.h> #include <string.h> |
|
From: chas w. <ch...@us...> - 2009-03-03 18:23:30
|
Update of /cvsroot/linux-atm/linux-atm/src/ilmid/asn1 In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18737/src/ilmid/asn1 Modified Files: asn_bits.c asn_list.c asn_octs.c asn_oid.c nibble_alloc.c Log Message: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/linux-atm/files/linux-atm-2.5.0-headers.patch?rev=1.1&view=log Version bump. (Portage version: 2.1.4_rc11) apparently related to: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/linux-atm/files/linux-atm-2.4.1-declarations.patch?rev=1.1&view=log Fix QA warnings. (Portage version: 2.1.2.2) Index: asn_bits.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/asn1/asn_bits.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** asn_bits.c 9 Oct 2001 22:33:06 -0000 1.2 --- asn_bits.c 3 Mar 2009 18:23:26 -0000 1.3 *************** *** 21,24 **** --- 21,26 ---- #include <config.h> #endif + #include <stdlib.h> + #include <string.h> #include "asn_config.h" Index: asn_list.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/asn1/asn_list.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** asn_list.c 9 Oct 2001 22:33:06 -0000 1.2 --- asn_list.c 3 Mar 2009 18:23:26 -0000 1.3 *************** *** 21,24 **** --- 21,25 ---- #endif + #include <stdlib.h> #include "asn_config.h" #include "asn_list.h" Index: asn_octs.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/asn1/asn_octs.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** asn_octs.c 9 Oct 2001 22:33:06 -0000 1.2 --- asn_octs.c 3 Mar 2009 18:23:26 -0000 1.3 *************** *** 21,24 **** --- 21,26 ---- #include <config.h> #endif + #include <stdlib.h> + #include <string.h> #include "asn_config.h" Index: asn_oid.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/asn1/asn_oid.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** asn_oid.c 9 Oct 2001 22:33:06 -0000 1.2 --- asn_oid.c 3 Mar 2009 18:23:26 -0000 1.3 *************** *** 21,24 **** --- 21,26 ---- #include <config.h> #endif + #include <stdlib.h> + #include <string.h> #include "asn_config.h" Index: nibble_alloc.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/asn1/nibble_alloc.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** nibble_alloc.c 1 Jan 2008 00:14:50 -0000 1.3 --- nibble_alloc.c 3 Mar 2009 18:23:26 -0000 1.4 *************** *** 21,24 **** --- 21,25 ---- #endif + #include <stdlib.h> #include <memory.h> #include "asn_config.h" |
|
From: chas w. <ch...@us...> - 2009-03-03 17:57:04
|
Update of /cvsroot/linux-atm/linux-atm/src/led In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13832/src/led Modified Files: main.c Log Message: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/linux-atm/files/linux-atm-2.5.0-glibc28.patch?rev=1.1&view=log Fix broken compiling on glibc-2.8 boxes (#225611). (Portage version: 2.1.4.4) Index: main.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/led/main.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** main.c 1 Jan 2008 00:14:51 -0000 1.3 --- main.c 3 Mar 2009 17:56:59 -0000 1.4 *************** *** 42,45 **** --- 42,46 ---- #include <errno.h> #include <fcntl.h> + #include <limits.h> #include <atm.h> |
|
From: chas w. <ch...@us...> - 2009-03-03 17:56:23
|
Update of /cvsroot/linux-atm/linux-atm/src/qgen In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13429/src/qgen Modified Files: ql_y.y Log Message: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/linux-atm/files/linux-atm-2.5.0-bison24.patch?rev=1.1&view=log Fix bison-2.4 errors (#247981). (Portage version: 2.1.6.4/cvs/Linux 2.6.25-gentoo-r6 x86_64) Index: ql_y.y =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/qgen/ql_y.y,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ql_y.y 9 Oct 2001 22:33:07 -0000 1.2 --- ql_y.y 3 Mar 2009 17:56:19 -0000 1.3 *************** *** 60,65 **** --- 60,67 ---- if (*start == ':') { if (!(searching = strcmp(start+1,name))) + { if (found) yyerror("multiple entries"); else found = 1; + } continue; } *************** *** 307,313 **** --- 309,317 ---- $$->flush = !$3; if ($$->pos == -1) + { if ($$->size & 7) yyerror("position required for small fields"); else $$->pos = 0; + } $$->value = $5; $$->structure = NULL; *************** *** 431,436 **** | TOK_ID opt_id list block { ! $$ = alloc_t(TAG); ! $$->abort_id = abort_id; } tags --- 435,440 ---- | TOK_ID opt_id list block { ! $<tag>$ = alloc_t(TAG); ! $<tag>$->abort_id = abort_id; } tags *************** *** 474,479 **** | TOK_ID opt_id list rep_block { ! $$ = alloc_t(TAG); ! $$->abort_id = abort_id; } rep_tags --- 478,483 ---- | TOK_ID opt_id list rep_block { ! $<tag>$ = alloc_t(TAG); ! $<tag>$->abort_id = abort_id; } rep_tags |
|
From: chas w. <ch...@us...> - 2008-01-10 18:55:57
|
Update of /cvsroot/linux-atm/linux-atm/src/config In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv31430/src/config Modified Files: Tag: V2_5_1 Makefile.am Log Message: dont blindly install hosts.atm http://sourceforge.net/tracker/index.php?func=detail&aid=1860694&group_id=7812&atid=307812 Index: Makefile.am =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/config/Makefile.am,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.1.2.1 diff -C2 -d -r1.2.2.1 -r1.2.2.1.2.1 *** Makefile.am 29 Dec 2007 20:30:43 -0000 1.2.2.1 --- Makefile.am 10 Jan 2008 18:55:51 -0000 1.2.2.1.2.1 *************** *** 2,9 **** init-redhat/ifcfg-atm0 init-redhat/ifcfg-lec0 init-redhat/ifcfg-nas0 ! install-exec-local: ! -cp hosts.atm /etc ! ! uninstall-local: ! -rm /etc/hosts.atm ! --- 2,4 ---- init-redhat/ifcfg-atm0 init-redhat/ifcfg-lec0 init-redhat/ifcfg-nas0 ! sysconf_DATA = hosts.atm |
|
From: chas w. <ch...@us...> - 2008-01-10 18:13:15
|
Update of /cvsroot/linux-atm/linux-atm/src/mpoad In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv14454/src/mpoad Modified Files: Tag: V2_5_1 k_interf.c Log Message: include some headers files to get prototypes from a suggestion by Mike Frysinger http://sourceforge.net/tracker/index.php?func=detail&aid=1860696&group_id=7812&atid=307812 Index: k_interf.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/mpoad/k_interf.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.1.2.1 diff -C2 -d -r1.2.2.1 -r1.2.2.1.2.1 *** k_interf.c 11 Dec 2007 17:46:12 -0000 1.2.2.1 --- k_interf.c 10 Jan 2008 18:13:10 -0000 1.2.2.1.2.1 *************** *** 4,7 **** --- 4,8 ---- #include <stdio.h> + #include <stdlib.h> #include <unistd.h> #include <string.h> |
|
From: chas w. <ch...@us...> - 2008-01-10 18:13:14
|
Update of /cvsroot/linux-atm/linux-atm/src/maint In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv14454/src/maint Modified Files: Tag: V2_5_1 hediag.c Log Message: include some headers files to get prototypes from a suggestion by Mike Frysinger http://sourceforge.net/tracker/index.php?func=detail&aid=1860696&group_id=7812&atid=307812 Index: hediag.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/maint/hediag.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.1.2.1 diff -C2 -d -r1.1.2.1 -r1.1.2.1.2.1 *** hediag.c 23 Dec 2007 14:47:46 -0000 1.1.2.1 --- hediag.c 10 Jan 2008 18:13:10 -0000 1.1.2.1.2.1 *************** *** 1,3 **** --- 1,5 ---- #include <stdio.h> + #include <stdlib.h> + #include <unistd.h> #include <sys/ioctl.h> #include <sys/types.h> |
|
From: chas w. <ch...@us...> - 2008-01-10 18:13:14
|
Update of /cvsroot/linux-atm/linux-atm/src/lane In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv14454/src/lane Modified Files: Tag: V2_5_1 mem_lecs.c Log Message: include some headers files to get prototypes from a suggestion by Mike Frysinger http://sourceforge.net/tracker/index.php?func=detail&aid=1860696&group_id=7812&atid=307812 Index: mem_lecs.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/lane/mem_lecs.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** mem_lecs.c 9 Oct 2001 22:33:07 -0000 1.2 --- mem_lecs.c 10 Jan 2008 18:13:10 -0000 1.2.4.1 *************** *** 14,17 **** --- 14,18 ---- #include <stdio.h> #include <stdlib.h> + #include <string.h> #include <sys/types.h> |
|
From: chas w. <ch...@us...> - 2008-01-01 00:15:29
|
Update of /cvsroot/linux-atm/linux-atm/src/ilmid In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24942/src/ilmid Modified Files: Makefile.am atmf_uni.c atmf_uni.h ilmid.c io.c io.h message.c message.h mib.c mib.h rfc1155_smi.h Added Files: .cvsignore actions.c actions.h ilmid.8 ilmid.h ilmidiag.c states.c states.h wait.c wait.h Log Message: merge 2.5.0 branch into the head Index: Makefile.am =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.am 9 Oct 2001 22:33:06 -0000 1.2 --- Makefile.am 1 Jan 2008 00:14:50 -0000 1.3 *************** *** 1,16 **** SUBDIRS = asn1 ! INCLUDES = -I$(top_builddir)/src/ilmid/asn1 ! sbin_PROGRAMS = ilmid ilmid_SOURCES = rfc1157_snmp.c rfc1157_snmp.h rfc1155_smi.c rfc1155_smi.h \ util.c util.h io.c io.h message.c message.h \ atmf_uni.c atmf_uni.h mib.c mib.h \ ! sysgroup.c sysgroup.h ilmid.c ilmid_LDADD = $(top_builddir)/src/lib/libatm.la \ $(top_builddir)/src/ilmid/asn1/libasn1.a ilmid_DEPENDENCIES = $(ilmid_LDADD) ! EXTRA_DIST = COPYRIGHT --- 1,23 ---- SUBDIRS = asn1 ! INCLUDES = -I$(srcdir)/../ilmid/asn1 ! sbin_PROGRAMS = ilmid ilmidiag ilmid_SOURCES = rfc1157_snmp.c rfc1157_snmp.h rfc1155_smi.c rfc1155_smi.h \ util.c util.h io.c io.h message.c message.h \ atmf_uni.c atmf_uni.h mib.c mib.h \ ! sysgroup.c sysgroup.h ilmid.c ilmid.h \ ! wait.c wait.h states.c states.h actions.c actions.h ilmid_LDADD = $(top_builddir)/src/lib/libatm.la \ $(top_builddir)/src/ilmid/asn1/libasn1.a ilmid_DEPENDENCIES = $(ilmid_LDADD) ! ilmidiag_SOURCES = ilmidiag.c ! ilmidiag_LDADD = $(top_builddir)/src/lib/libatm.la ! ilmidiag_DEPENDENCIES = $(ilmid_LDADD) ! ! man_MANS = ilmid.8 ! ! EXTRA_DIST = COPYRIGHT ilmid.8 Index: atmf_uni.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/atmf_uni.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** atmf_uni.c 9 Oct 2001 22:33:06 -0000 1.2 --- atmf_uni.c 1 Jan 2008 00:14:50 -0000 1.3 *************** *** 38,42 **** --- 38,47 ---- #define INVALID 2 + AsnOid foreQ2931AdminConfigType = + {19, "\53\06\01\04\01\202\106\02\02\02\01\06\02\01\01\01\13\00\00" }; + AsnOid foreQ2931NNIProto = + {19, "\53\06\01\04\01\202\106\02\02\02\01\06\02\01\01\01\102\00\00" }; AsnOid atmfPortIndex = {13, "\53\06\01\04\01\202\141\02\01\01\01\01\00"}; + AsnOid atmfPortMyIfName = {13, "\53\06\01\04\01\202\141\02\01\01\01\07\00"}; AsnOid atmfPortMyIdentifier = {13, "\53\06\01\04\01\202\141\02\01\01\01\10\00"}; AsnOid atmfMyIpNmAddress = {11, "\53\06\01\04\01\202\141\02\01\02\00"}; *************** *** 44,49 **** --- 49,84 ---- AsnOid atmfAtmLayerMaxVpiBits = {13, "\53\06\01\04\01\202\141\02\02\01\01\6\00"}; AsnOid atmfAtmLayerMaxVciBits = {13, "\53\06\01\04\01\202\141\02\02\01\01\7\00"}; + AsnOid atmfAtmLayerUniType = {13, "\53\06\01\04\01\202\141\02\02\01\01\10\00"}; AsnOid atmfAtmLayerUniVersion = {13, "\53\06\01\04\01\202\141\02\02\01\01\11\00"}; + AsnOid atmfAtmLayerDeviceType = {13, "\53\06\01\04\01\202\141\02\02\01\01\12\00"}; + AsnOid atmfAtmLayerIlmiVersion = {13, "\53\06\01\04\01\202\141\02\02\01\01\13\00"}; + AsnOid atmfAtmLayerNniSigVersion = {13, "\53\06\01\04\01\202\141\02\02\01\01\14\00"}; AsnOid atmfNetPrefixStatus = {NETPREFIX_LEN, "\53\06\01\04\01\202\141\02\07\01\01\03"}; + AsnOid atmfSrvcRegATMAddress = + // {26, "\53\06\01\04\01\202\141\02\10\01\01\03\00\12\01\03\06\01\04\01\202\141\01\05\01\01"}; + {25, "\53\06\01\04\01\202\141\02\10\01\01\03\00\12\01\03\06\01\04\01\202\141\01\05\01"}; + + + AsnOid atmfSrvcRegTable = { 10, "\53\06\01\04\01\202\141\02\10\01" }; + AsnOid atmfAddressTable = { 9, "\53\06\01\04\01\202\141\02\06" }; + AsnOid atmfAddressStatus = { 12, "\53\06\01\04\01\202\141\02\06\01\01\03" }; + AsnOid atmfAddressRegistrationAdminStatus = + { 13, "\53\06\01\04\01\202\141\02\13\01\01\02\00" }; + + /* 1 = PublicUNI + 2 = automode + 3 = iisp + 4 = ftPNNI + 5 = privateNNI + 6 = privateUNI + */ + AsnInt foreQ2931AdminConfigTypeValue = 6; /* private uni */ + + /* 1 = none + 2 = ftpnni + 3 = forum-pnni + 4 = iisp + */ + AsnInt foreQ2931NNIProtoValue = 1; /* none */ AsnInt atmfPortIndexValue = 0; *************** *** 55,59 **** AsnInt atmfAtmLayerMaxVpiBitsValue; AsnInt atmfAtmLayerMaxVciBitsValue; ! #if defined(UNI30) || defined(DYNAMIC_UNI) --- 90,97 ---- AsnInt atmfAtmLayerMaxVpiBitsValue; AsnInt atmfAtmLayerMaxVciBitsValue; ! AsnInt atmfAtmLayerUniTypeValue = 2; /* private */ ! AsnInt atmfAtmLayerDeviceTypeValue = 1; /* user (ATM End System) */ ! AsnInt atmfAtmLayerIlmiVersionValue = 2; /* version4point0 */ ! AsnInt atmfAtmLayerNniSigVersionValue = 1; /* unsupported */ #if defined(UNI30) || defined(DYNAMIC_UNI) *************** *** 68,71 **** --- 106,110 ---- static AsnOid atmNetPrefix = {0, NULL}; + static AsnOcts atmLecsAddress = {0, NULL}; typedef struct NetPrefixNode *************** *** 111,114 **** --- 150,154 ---- AsnOid *varBindName; + diag(COMPONENT,DIAG_DEBUG,"getNetPrefix"); varBindName = &varbind->name; if(AsnOidSize(varBindName) != NETPREFIX_LEN + INDEX_LEN || *************** *** 165,168 **** --- 205,209 ---- AsnOid *varBindName; + diag(COMPONENT,DIAG_DEBUG,"setNetPrefix"); varBindName = &varbind->name; if(varbind->value->choiceId != OBJECTSYNTAX_SIMPLE || *************** *** 188,192 **** newPrefix->name->octs = alloc(varBindName->octetLen); AsnOidCopy(newPrefix->name, varBindName); ! Q_INSERT_BEFORE((NetPrefixNode *) var->value, newPrefix, prefix); if(atmNetPrefix.octs == NULL) { --- 229,236 ---- newPrefix->name->octs = alloc(varBindName->octetLen); AsnOidCopy(newPrefix->name, varBindName); ! { ! NetPrefixNode *tmp = (NetPrefixNode *) var->value; ! Q_INSERT_BEFORE(tmp, newPrefix, prefix); ! } if(atmNetPrefix.octs == NULL) { *************** *** 198,204 **** else if (varbind->value->a.simple->a.number == INVALID && cmp == AsnOidEqual) { ! Q_REMOVE((NetPrefixNode *) var->value, prefix); } return NOERROR; } --- 242,281 ---- else if (varbind->value->a.simple->a.number == INVALID && cmp == AsnOidEqual) { ! { ! NetPrefixNode *tmp = (NetPrefixNode *) var->value; ! Q_REMOVE(tmp, prefix); ! } } return NOERROR; } + + AsnInt getLecsAddress(VarBind *varbind, Variable *var) + { + int cmp; + NetPrefixNode *prefix; + AsnOid *varBindName; + + diag(COMPONENT,DIAG_INFO,"getLecsAddress" ); + varBindName = &varbind->name; + if(AsnOidSize(varBindName) != 25 ) return NOSUCHNAME; + + /* + for(prefix = (NetPrefixNode *) var->value, cmp = AsnOidLess; + prefix != NULL && (cmp = AsnOidCompare(varBindName, prefix->name)) < + AsnOidEqual; + prefix = prefix->next); + + if(cmp != AsnOidEqual) + return NOSUCHNAME; + */ + + varbind->value = Asn1Alloc(sizeof(struct ObjectSyntax)); + varbind->value->choiceId = OBJECTSYNTAX_SIMPLE; + varbind->value->a.simple = Asn1Alloc(sizeof(struct SimpleSyntax)); + varbind->value->a.simple->choiceId = SIMPLESYNTAX_NUMBER; + varbind->value->a.simple->a.number = VALID; + + return NOERROR; + } + Index: atmf_uni.h =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/atmf_uni.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** atmf_uni.h 9 Oct 2001 22:33:06 -0000 1.2 --- atmf_uni.h 1 Jan 2008 00:14:50 -0000 1.3 *************** *** 30,34 **** --- 30,37 ---- #include "mib.h" + extern AsnOid foreQ2931NNIProto; + extern AsnOid foreQ2931AdminConfigType; extern AsnOid atmfPortIndex; + extern AsnOid atmfPortMyIfName; extern AsnOid atmfPortMyIdentifier; extern AsnOid atmfMyIpNmAddress; *************** *** 37,42 **** --- 40,56 ---- extern AsnOid atmfAtmLayerMaxVpiBits; extern AsnOid atmfAtmLayerMaxVciBits; + extern AsnOid atmfAtmLayerUniType; extern AsnOid atmfAtmLayerUniVersion; + extern AsnOid atmfAtmLayerDeviceType; + extern AsnOid atmfAtmLayerIlmiVersion; + extern AsnOid atmfAtmLayerNniSigVersion; + extern AsnOid atmfSrvcRegATMAddress; + extern AsnOid atmfSrvcRegTable; + extern AsnOid atmfAddressTable; + extern AsnOid atmfAddressStatus; + extern AsnOid atmfAddressRegistrationAdminStatus; + extern AsnInt foreQ2931NNIProtoValue; + extern AsnInt foreQ2931AdminConfigTypeValue; extern AsnInt atmfPortIndexValue; extern IpAddress atmfMyIpNmAddressValue; *************** *** 44,48 **** --- 58,66 ---- extern AsnInt atmfAtmLayerMaxVpiBitsValue; extern AsnInt atmfAtmLayerMaxVciBitsValue; + extern AsnInt atmfAtmLayerUniTypeValue; extern AsnInt atmfAtmLayerUniVersionValue; + extern AsnInt atmfAtmLayerDeviceTypeValue; + extern AsnInt atmfAtmLayerIlmiVersionValue; + extern AsnInt atmfAtmLayerNniSigVersionValue; AsnOid *accessNetPrefix(void); *************** *** 53,55 **** --- 71,77 ---- AsnInt getMyIp(VarBind *varbind, Variable *var); + AsnOid *accessLecsAddress( void ); + AsnInt setLecsAddress(VarBind *varbind, Variable *var); + AsnInt getLecsAddress(VarBind *varbind, Variable *var); + #endif Index: ilmid.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/ilmid.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ilmid.c 9 Oct 2001 22:33:06 -0000 1.2 --- ilmid.c 1 Jan 2008 00:14:50 -0000 1.3 *************** *** 30,33 **** --- 30,37 ---- */ + /* + * Reference material used: af-ilmi-0065.000 + */ + #if HAVE_CONFIG_H #include <config.h> *************** *** 35,40 **** --- 39,49 ---- #include <unistd.h> + #include <stdlib.h> + #include <stdarg.h> #include <sys/time.h> + #include <sys/types.h> + #include <sys/wait.h> #include <errno.h> + #include <signal.h> #include "asn_incl.h" #include "rfc1155_smi.h" *************** *** 47,141 **** #include "atmf_uni.h" #include "sysgroup.h" #define RESPONSE_TIMEOUT 2 #define POLL_PERIOD 15 #define COMPONENT "ILMI" - typedef enum IlmiState { NO_CHANGE, RESTART, VERIFY, NET_PREFIX, - ADDRESS, POLL, IDLE } IlmiState; - const char *state2text[7] = { "NO_CHANGE", "RESTART", "VERIFY", "NET_PREFIX", - "ADDRESS", "POLL", "IDLE" }; - void usage(char *name); - void ilmi_loop(int fd, int itf); ! void usage(char *name) ! { fprintf(stderr, "usage: %s [-b] [-d] [-v] [-l logfile] [-x] [-q qos]\n" ! "%13s[ -i local_ip ] [ -u uni ] <interface>\n",name,""); fprintf(stderr, "%6s %s -V\n","",name); exit(1); } ! void ilmi_loop(int fd, int itf) ! { ! int no_response; ! long int requestID; ! Message *poll_message, *set_message, *coldstart_message, *in_message; ! AsnOid *set_oid, *netprefix_oid, *esi_oid; VarBind *varbind; ! struct timeval timeout; ! IlmiState state, new_state; ! ! resetUpTime(); ! poll_message = create_poll_message(); ! set_message = create_set_message(); ! set_oid = &((VarBind *) FIRST_LIST_ELMT(set_message->data->a.set_request->variable_bindings))->name; ! esi_oid = get_esi(fd,itf); ! coldstart_message = create_coldstart_message(); ! in_message = alloc_t(Message); ! ! /* Address registration state machine */ ! new_state = RESTART; ! for(;;) ! { ! state = new_state; ! diag(COMPONENT, DIAG_DEBUG, "entering state %s", state2text[state]); ! ! /* Output for the current state */ ! switch(state) ! { ! case RESTART: ! deleteNetPrefix(); ! diag(COMPONENT, DIAG_INFO, "sending cold-start"); ! coldstart_message->data->a.trap->time_stamp = accessUpTime(); ! send_message(fd, coldstart_message); ! no_response = 0; ! ! case VERIFY: ! diag(COMPONENT, DIAG_INFO, "sending get-next"); ! poll_message->data->a.get_next_request->request_id = ++requestID; ! send_message(fd, poll_message); ! break; ! case ADDRESS: ! diag(COMPONENT, DIAG_INFO, "setting the atm address on the switch"); ! set_message->data->a.set_request->request_id = ++requestID; ! send_message(fd, set_message); ! break; ! case POLL: ! diag(COMPONENT, DIAG_INFO, "sending get-next request"); ! poll_message->data->a.get_next_request->request_id = ++requestID; ! send_message(fd, poll_message); ! break; } ! /* Set the time-out period */ ! if(state == IDLE) ! timeout.tv_sec = POLL_PERIOD; ! else ! timeout.tv_sec = RESPONSE_TIMEOUT; ! timeout.tv_usec = 0; - new_state = NO_CHANGE; - /* Input handling loop */ - while(new_state == NO_CHANGE) - { - ResetNibbleMem(); - if(wait_for_message(fd, &timeout) && - !read_message(fd, in_message)) - { - switch(in_message->data->choiceId) - { case PDUS_GET_REQUEST: diag(COMPONENT, DIAG_INFO, "received get request"); --- 56,161 ---- #include "atmf_uni.h" #include "sysgroup.h" + #include "states.h" #define RESPONSE_TIMEOUT 2 #define POLL_PERIOD 15 #define COMPONENT "ILMI" + #ifndef MAX + # define MAX(a,b) ((a) > (b) ? (a) : (b)) + #endif ! /* Globals */ ! /* ! static const char *state_names[STATES] = { ! "Stopped", ! "Link Failing", ! "Establishing", ! "Configuring", ! "Retrieve Network Prefixes", ! "Registering Network Prefixes", ! "Retrieving Addresses", ! "Registering Addresses", ! "Verifying" ! }; ! */ ! ! typedef int (*Func)(int,int,Msgs *); ! static Func state_functions[STATES] = { ! state_stopped, ! state_failing, ! state_establishing, ! state_config, ! state_retrievePrefixes, ! state_registerPrefixes, ! state_retrieveAddresses, ! state_registerAddresses, ! state_verify ! }; ! ! AsnOid *esi_oid = NULL; ! int retries = 0; ! int ilmi_errno = 0; ! int alarm_flag = 0; ! long int requestID = 0; ! State ilmi_state = down; ! ! static int diagfd = -1; ! ! AttPoint _apoint; ! AttPoint *apoint = &_apoint; /* attachment point */ ! Config _config; ! Config *config = &_config; /* Remote IME configuration */ ! SysGroup _remsys; ! SysGroup *remsys = &_remsys; ! AttPoint _newapoint; ! AttPoint *newapoint = &_newapoint; ! ! void usage( char * ); ! void ilmi_loop( int, int ); ! ! void usage( char *name ){ fprintf(stderr, "usage: %s [-b] [-d] [-v] [-l logfile] [-x] [-q qos]\n" ! "%13s[ -i local_ip ] [ -u uni ] <itf>[.<vpi>.<vci>]\n",name,""); fprintf(stderr, "%6s %s -V\n","",name); exit(1); } ! /* returns non-zero if switch set a prefix */ ! int handle_set_request( int fd, int itf, Msgs *msgs, Message *m ){ ! VarBindList *vbl; VarBind *varbind; ! AsnOid *netprefix_oid, *set_oid; ! /* use varbind to compare OIDs of incoming message and that of ! an address status message */ ! varbind = (VarBind *)FIRST_LIST_ELMT( ! m->data->a.get_request->variable_bindings ); ! if( AsnOidCompare( &atmfNetPrefixStatus, &varbind->name ) == AsnOidRoot ){ ! vbl = msgs->set->data->a.set_request->variable_bindings; ! set_oid = &((VarBind *)FIRST_LIST_ELMT( vbl ))->name; ! netprefix_oid = accessNetPrefix(); ! if( netprefix_oid != NULL ){ ! diag( COMPONENT, DIAG_INFO, ! "switch registered a network prefix"); ! set_oid->octetLen = ADDRESS_LEN + 1; ! AsnOidAppend( set_oid, netprefix_oid ); ! AsnOidAppend( set_oid, esi_oid ); ! update_nsap( itf, netprefix_oid, esi_oid ); ! return 1; ! } else{ ! diag( COMPONENT, DIAG_INFO, ! "switch did not register prefix?" ); ! } ! } ! return 0; } ! /* returns E value (ECOLDSTART, . . .) */ ! int handle_request( int fd, int itf, Msgs *msgs, Message *in_message ){ ! int retval = 0; ! switch( in_message->data->choiceId ){ case PDUS_GET_REQUEST: diag(COMPONENT, DIAG_INFO, "received get request"); *************** *** 156,202 **** break; - case PDUS_GET_RESPONSE: - diag(COMPONENT, DIAG_INFO, "received get response"); - if(in_message->data->a.get_response->request_id == requestID) - { - varbind = (VarBind *) FIRST_LIST_ELMT(in_message->data->a.get_response->variable_bindings); - switch(state) - { - case RESTART: - case VERIFY: - if(in_message->data->a.get_response->error_status == NOERROR && - AsnOidCompare(&atmAddressStatus, &varbind->name) == AsnOidRoot) - new_state = RESTART; - else - new_state = NET_PREFIX; - break; - - case ADDRESS: - if(in_message->data->a.get_response->error_status == NOERROR) - { - diag(COMPONENT, DIAG_INFO, "ATM address registered"); - update_nsap(itf, netprefix_oid, esi_oid); - no_response = 0; - new_state = POLL; - } - else - new_state = RESTART; - break; - - case POLL: - if(in_message->data->a.get_response->error_status == NOERROR && - AsnOidCompare(&varbind->name, set_oid) == AsnOidEqual) - { - no_response = 0; - new_state = IDLE; - } - else - new_state = RESTART; - break; - } - } - else diag(COMPONENT, DIAG_ERROR, "received response with invalid request id"); - break; - case PDUS_SET_REQUEST: diag(COMPONENT, DIAG_INFO, "received set request"); --- 176,179 ---- *************** *** 205,277 **** &in_message->data->a.set_request->error_index); in_message->data->choiceId = PDUS_GET_RESPONSE; send_message(fd, in_message); break; case PDUS_TRAP: ! diag(COMPONENT, DIAG_INFO, "received trap"); ! if(in_message->data->a.trap->generic_trap == COLDSTART && ! state != RESTART) ! new_state = RESTART; break; ! default: ! diag(COMPONENT, DIAG_ERROR, "received message with invalid choice"); break; } ! if((state == NET_PREFIX || new_state == NET_PREFIX) && ! (netprefix_oid = accessNetPrefix()) != NULL) ! { ! diag(COMPONENT, DIAG_INFO, "switch registered a network prefix"); ! set_oid->octetLen = ADDRESS_LEN + 1; ! AsnOidAppend(set_oid, netprefix_oid); ! AsnOidAppend(set_oid, esi_oid); ! new_state = ADDRESS; } ! } ! else /* Timeout occurred */ ! { ! switch(state) ! { ! case RESTART: ! case VERIFY: ! diag(COMPONENT, DIAG_INFO, "switch did not respond to get-next -- resending"); ! if(++no_response == 4) ! new_state = RESTART; ! else ! new_state = VERIFY; ! break; ! case NET_PREFIX: ! diag(COMPONENT, DIAG_INFO, "switch did not register a network prefix -- restarting"); ! new_state = RESTART; ! break; ! case ADDRESS: ! diag(COMPONENT, DIAG_INFO, "switch did not respond to set request -- resending"); ! new_state = ADDRESS; ! break; ! case POLL: ! if(++no_response == 4) ! { ! new_state = RESTART; ! diag(COMPONENT, DIAG_INFO, "switch is not responding"); ! } ! else ! new_state = IDLE; ! break; ! case IDLE: ! new_state = POLL; ! break; } } } } } int main(int argc, char *argv[]) { ! int fd, opt, itf = 0, bg = 0; pid_t pid; const char *qos; set_application("ilmid"); set_verbosity(NULL, DIAG_WARN); qos = NULL; while((opt = getopt(argc, argv, "bdhi:l:q:xvu:V")) != EOF) --- 182,381 ---- &in_message->data->a.set_request->error_index); in_message->data->choiceId = PDUS_GET_RESPONSE; + if( handle_set_request( fd, itf, msgs, in_message )) + retval = ESETPREFIX; send_message(fd, in_message); break; case PDUS_TRAP: ! if( in_message->data->a.trap->generic_trap == COLDSTART ){ ! diag( COMPONENT, DIAG_INFO, "received coldstart trap" ); ! retval = ECOLDSTART; ! } else diag( COMPONENT, DIAG_INFO, "received trap" ); break; ! ! case PDUS_GET_RESPONSE: break; } ! return retval; } ! ! /* if a non-null value is returned from this function, the caller must ! free that memory */ ! ! Message *wait_for_response( int fd, int itf, Msgs *msgs, int sec ){ ! Message *in_message; ! static Message m; ! struct timeval timeout; ! int numfds = 0; ! fd_set fdvar; ! ! in_message = (Message *)(&m); ! timeout.tv_sec = sec; ! timeout.tv_usec = 0; ! ! ilmi_errno = 0; ! wait_top: ! waitpid(0, NULL, WNOHANG); ! ResetNibbleMem(); ! FD_ZERO(&fdvar); ! FD_SET(fd, &fdvar); ! FD_SET(diagfd, &fdvar); ! numfds = select(MAX(fd,diagfd)+1, &fdvar, NULL, NULL, &timeout); ! ! if ((numfds > 0) && FD_ISSET(diagfd, &fdvar)) { ! if (fork() == 0) { ! close(fd); ! handle_ilmidiag(diagfd, apoint, config); ! exit(0); } + } + + if(( numfds > 0 ) && FD_ISSET(fd, &fdvar) && + !read_message( fd, in_message )){ + switch( in_message->data->choiceId ){ + case PDUS_GET_REQUEST: + case PDUS_GET_NEXT_REQUEST: + case PDUS_SET_REQUEST: + case PDUS_TRAP: + ilmi_errno = + handle_request( fd, itf, msgs, in_message ); + if( ilmi_errno > 0 ) return NULL; + else goto wait_top; + /* no more evil than "break" */ + case PDUS_GET_RESPONSE: + diag( COMPONENT, DIAG_INFO, + "received get-response" ); + return in_message; + default: + diag( COMPONENT, DIAG_ERROR, + "received message with invalid choice" ); + goto wait_top; + } + } else{ + if( numfds == 0 ) ilmi_errno = ETIMEOUT; + if(( numfds < 0 ) && ( errno == EINTR )) ilmi_errno = EALARM; + return NULL; /* no data read */ + } + } + + Msgs *create_msgs( void ){ + Msgs *m = alloc_t( Msgs ); + if( m == NULL ) return NULL; + + m->coldstart = create_coldstart_message(); + m->addrtable = create_va_getnext_message( 2, + &atmfAddressStatus, + &atmfSrvcRegTable ); + m->poll = create_getnext_message( atmfAddressTable ); + m->set = create_set_message(); + m->config = create_va_get_message( 6, + &atmfAtmLayerUniVersion, + &atmfAtmLayerMaxVpiBits, + &atmfAtmLayerMaxVciBits, + &atmfAtmLayerUniType, + &atmfAtmLayerDeviceType, + &atmfAddressRegistrationAdminStatus ); + m->apointmsg = create_va_get_message( 4, + &atmfPortMyIdentifier, + &atmfPortMyIfName, /* some extra adjacency info */ + &atmfMySystemIdentifier, + &sysUpTime ); + m->sysmsg = create_va_get_message( 7, + &sysDescr, + &sysObjectID, + &sysUpTime, + &sysContact, + &sysName, + &sysLocation, + &sysServices ); + + return m; + } + + void copy_attachment_point( AttPoint *dest, AttPoint *src ){ + dest->sysUpTime = src->sysUpTime; + dest->atmfPortMyIfIdentifier = src->atmfPortMyIfIdentifier; + + dest->atmfMySystemIdentifier.octs = + malloc( src->atmfMySystemIdentifier.octetLen ); + dest->atmfMySystemIdentifier.octetLen = + src->atmfMySystemIdentifier.octetLen; + if( dest->atmfMySystemIdentifier.octs != NULL ){ + memcpy( dest->atmfMySystemIdentifier.octs, + src->atmfMySystemIdentifier.octs, 6 ); + } else diag( COMPONENT, DIAG_FATAL, "malloc() failed" ); + + /* copy the port name */ + dest->atmfPortMyIfName.octs = + malloc( src->atmfPortMyIfName.octetLen + 1 ); + dest->atmfPortMyIfName.octetLen = src->atmfPortMyIfName.octetLen; + if( dest->atmfPortMyIfName.octs != NULL ){ + memcpy( dest->atmfPortMyIfName.octs, + src->atmfPortMyIfName.octs, + src->atmfPortMyIfName.octetLen ); + } else diag( COMPONENT, DIAG_FATAL, "malloc() failed" ); + } + + /* section 8.3.2 */ + int compare_attachment_point( a, b ) + AttPoint *a; /* current a'point */ + AttPoint *b; /* newly aquired a'point info */ + { + if(( a == NULL ) || ( b == NULL )) return -1; + if( a->atmfPortMyIfIdentifier != b->atmfPortMyIfIdentifier ) + return -1; + if( a->atmfMySystemIdentifier.octetLen != + b->atmfMySystemIdentifier.octetLen ) return -1; + if( memcmp( a->atmfMySystemIdentifier.octs, + b->atmfMySystemIdentifier.octs, + b->atmfMySystemIdentifier.octetLen ) != 0 ) return -1; + if( b->sysUpTime < a->sysUpTime ) return -1; + return 0; } + + void handler( int sig ){ + switch( sig ){ + case SIGALRM: + alarm_flag = 1; + diag( COMPONENT, DIAG_INFO, + "received alarm: time to poll for attachment point" ); + break; + case SIGTERM: + case SIGSTOP: + case SIGINT: + case SIGKILL: + ilmi_state = down; + exit( 1 ); } } + + void ilmi_loop( int fd, int itf ){ + int state = S1; + Msgs *msgs = create_msgs(); + struct itimerval setpoint; + esi_oid = get_esi( fd, itf); + // apoint->atmfMySystemIdentifier.octs = &(apoint->sysIdMem[0]); + + setpoint.it_interval.tv_sec = 30; + setpoint.it_interval.tv_usec = 0; + setpoint.it_value.tv_sec = 30; + setpoint.it_value.tv_usec = 0; + signal( SIGALRM, handler ); + setitimer( ITIMER_REAL, &setpoint, NULL ); + + for( ;; ) state = state_functions[state]( fd, itf, msgs ); } int main(int argc, char *argv[]) { ! int opt, bg = 0; ! int fd; pid_t pid; const char *qos; + struct sockaddr_atmpvc ilmipvc; set_application("ilmid"); set_verbosity(NULL, DIAG_WARN); + text2atm("0.0.16", (struct sockaddr *)&ilmipvc, sizeof(ilmipvc), T2A_PVC); qos = NULL; while((opt = getopt(argc, argv, "bdhi:l:q:xvu:V")) != EOF) *************** *** 307,311 **** case 'u': { ! int version; if (!strcmp(optarg,"3.0") || !strcmp(optarg,"30")) --- 411,415 ---- case 'u': { ! int version = 2; if (!strcmp(optarg,"3.0") || !strcmp(optarg,"30")) *************** *** 334,338 **** } if(argc == optind + 1) ! itf = atoi(argv[optind++]); if(argc != optind) --- 438,449 ---- } if(argc == optind + 1) ! if (text2atm(argv[optind++], (struct sockaddr *)&ilmipvc, ! sizeof(ilmipvc), T2A_PVC) < 0) { ! char *endp = NULL; ! int itf = strtoul(argv[optind-1], &endp, 0); ! if (argv[optind-1] == endp || *endp != '\0') ! diag(COMPONENT, DIAG_FATAL, "Invalid pvc or interface number."); ! ilmipvc.sap_addr.itf = itf; ! } if(argc != optind) *************** *** 349,355 **** } ! InitNibbleMem(512, 512); ! fd = open_ilmi(itf,qos); ! ilmi_loop(fd, itf); close(fd); return 0; --- 460,474 ---- } ! InitNibbleMem(1024, 512); ! memset( remsys, 0, sizeof( _remsys )); ! memset( apoint, 0, sizeof( _apoint )); ! memset( newapoint, 0, sizeof( _newapoint )); ! signal( SIGTERM, handler ); ! signal( SIGKILL, handler ); ! signal( SIGINT, handler ); ! signal( SIGSTOP, handler ); ! fd = open_ilmi(&ilmipvc,qos); ! open_ilmidiag(&diagfd, &ilmipvc); ! ilmi_loop(fd, ilmipvc.sap_addr.itf); close(fd); return 0; Index: io.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/io.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** io.c 9 Oct 2001 22:33:06 -0000 1.2 --- io.c 1 Jan 2008 00:14:50 -0000 1.3 *************** *** 26,30 **** --- 26,33 ---- #endif + #include <unistd.h> #include <sys/socket.h> + #include <sys/un.h> + #include <sys/types.h> #include <netinet/in.h> #include <sys/ioctl.h> *************** *** 33,36 **** --- 36,42 ---- #include <atm.h> #include <linux/atmdev.h> + #include <sys/types.h> + #include <sys/stat.h> + #include "ilmid.h" #include "io.h" #include "atmd.h" *************** *** 43,46 **** --- 49,54 ---- registered the "official" address) - HACK */ + extern SysGroup *remsys; + extern State ilmi_state; static short atm_itf = -1; /* bad value */ *************** *** 86,89 **** --- 94,129 ---- } + + void add_lecs(int itf, char *lecs) + { + int fd; + struct atmif_sioc req; + struct sockaddr_atmsvc addr; + + memset(&addr, 0, sizeof(addr)); + addr.sas_family = AF_ATMSVC; + memcpy(&addr.sas_addr.prv, lecs, 20); + + if ((fd = socket(AF_ATMSVC, SOCK_DGRAM, 0)) < 0){ + diag(COMPONENT, DIAG_ERROR, "socket: %s", strerror(errno)); + return; + } + + req.number = itf; + req.arg = &addr; + req.length = sizeof(addr); + + #ifdef ATM_ADDLECSADDR + if (ioctl(fd, ATM_ADDLECSADDR, &req) < 0) + diag(COMPONENT, DIAG_DEBUG, "ioctl ATM_ADDLECSADDR: %s", strerror(errno)); + #else + diag(COMPONENT, DIAG_DEBUG, "missing ATM_ADDLECSADDR support"); + #endif + + close(fd); + return; + } + + void update_nsap(int itf, AsnOid *netprefix, AsnOid *esi) { *************** *** 177,182 **** FD_SET(fd, &fdvar); ! if((numfds = select(fd + 1, &fdvar, 0, 0, timeout)) < 0) diag(COMPONENT, DIAG_FATAL, "select: %s", strerror(errno)); return numfds; --- 217,224 ---- FD_SET(fd, &fdvar); ! if((numfds = select(fd + 1, &fdvar, 0, 0, timeout)) < 0){ ! if( errno != EINTR ) diag(COMPONENT, DIAG_FATAL, "select: %s", strerror(errno)); + } return numfds; *************** *** 251,257 **** ! int open_ilmi(int itf,const char *qos_spec) { - struct sockaddr_atmpvc addr; struct atm_qos qos; int fd; --- 293,298 ---- ! int open_ilmi(struct sockaddr_atmpvc *pvc, const char *qos_spec) { struct atm_qos qos; int fd; *************** *** 260,264 **** diag(COMPONENT, DIAG_FATAL, "socket: %s", strerror(errno)); ! atm_itf = itf; memset(&qos, 0, sizeof(qos)); qos.rxtp.max_sdu = MAX_ILMI_MSG; --- 301,305 ---- diag(COMPONENT, DIAG_FATAL, "socket: %s", strerror(errno)); ! atm_itf = pvc->sap_addr.itf; memset(&qos, 0, sizeof(qos)); qos.rxtp.max_sdu = MAX_ILMI_MSG; *************** *** 271,281 **** diag(COMPONENT,DIAG_FATAL,"setsockopt SO_ATMQOS: %s",strerror(errno)); ! memset(&addr, 0, sizeof(addr)); ! addr.sap_family = AF_ATMPVC; ! addr.sap_addr.itf = itf; ! addr.sap_addr.vpi = 0; ! addr.sap_addr.vci = SNMP_VCI; ! ! if(bind(fd, (struct sockaddr *) &addr, sizeof(addr)) < 0) diag(COMPONENT, DIAG_FATAL, "bind: %s", strerror(errno)); --- 312,316 ---- diag(COMPONENT,DIAG_FATAL,"setsockopt SO_ATMQOS: %s",strerror(errno)); ! if(bind(fd, (struct sockaddr *) pvc, sizeof(*pvc)) < 0) diag(COMPONENT, DIAG_FATAL, "bind: %s", strerror(errno)); *************** *** 300,302 **** --- 335,434 ---- return error; } + return 0; + } + + int open_ilmidiag(int *listenfd, const struct sockaddr_atmpvc *vc) { + int fd = -1; + struct sockaddr_un addr; + struct stat dir; + mode_t oldumask; + + /* check for directory that holds the sockets */ + if ((stat(ILMIDIAG_DIR, &dir) < 0) && (errno == ENOENT)) { + if (mkdir(ILMIDIAG_DIR, 0755) < 0) return -1; + else diag(COMPONENT, DIAG_DEBUG, + "Created directory " ILMIDIAG_DIR); + } + + fd = socket(AF_UNIX, SOCK_STREAM, 0); + if (fd < 0) return -1; + + memset(&addr, 0, sizeof(addr)); + snprintf(addr.sun_path, sizeof(addr.sun_path) - 1, + "%s/%d.%d.%d", + ILMIDIAG_DIR, + vc->sap_addr.itf, + vc->sap_addr.vpi, + vc->sap_addr.vci); + addr.sun_family = AF_UNIX; + unlink(addr.sun_path); + oldumask = umask(0); + if (bind(fd, (struct sockaddr *)&addr, SUN_LEN(&addr)) < 0) { + diag(COMPONENT, DIAG_ERROR, "unable to bind ilmidiag socket: " + "%s", strerror(errno)); + close(fd); + unlink(addr.sun_path); + umask(oldumask); + return -1; + } + umask(oldumask); + + if (listen(fd, ILMIDIAG_BACKLOG) < 0) { + diag(COMPONENT, DIAG_FATAL, "Unable to listen on diag socket:" + " %s", strerror(errno)); + close(fd); + unlink(addr.sun_path); + return -1; + } + *listenfd = fd; + return 0; } + + int handle_ilmidiag(int fd, AttPoint *apoint, Config *config) { + struct sockaddr_un incoming; + socklen_t inlen = sizeof(incoming); + struct atm_cirange cir; + struct ilmi_state ic; + int newfd = accept(fd, (struct sockaddr *)&incoming, &inlen); + + if (newfd < 0) return -1; + /* Since this is a unix socket, there's no need to be portable. */ + + memset( &ic, 0, sizeof( ic )); + ic.ilmi_version = 2; /* version4point0 */ + ic.uni_version = atmfAtmLayerUniVersionValue & 0xff; + + if( get_ci_range( &cir ) < 0 ) + diag( COMPONENT, DIAG_ERROR, "get_ci_range() failed" ); + else{ + if( cir.vpi_bits < config->atmfAtmLayerMaxVpiBits ) + ic.vpi_bits = cir.vpi_bits; + else ic.vpi_bits = config->atmfAtmLayerMaxVpiBits & 0xff; + if( cir.vci_bits < config->atmfAtmLayerMaxVciBits ) + ic.vci_bits = cir.vci_bits; + else ic.vci_bits = config->atmfAtmLayerMaxVciBits & 0xff; + } + + ic.state = ( ilmi_state == down ) ? 0 : 1; + if( remsys->sysName.octs ) strncpy( ic.remote_sysname, + remsys->sysName.octs, + ( remsys->sysName.octetLen < ATM_REMOTE_SYSNAME_LEN ) + ? remsys->sysName.octetLen : ATM_REMOTE_SYSNAME_LEN ); + else strncpy( ic.remote_sysname, "(empty)", 7 ); + if( remsys->sysContact.octs ) strncpy( ic.remote_contact, + remsys->sysContact.octs, + ( remsys->sysContact.octetLen < ATM_REMOTE_CONTACT_LEN ) + ? remsys->sysContact.octetLen : ATM_REMOTE_CONTACT_LEN ); + else strncpy( ic.remote_contact, "(empty)", 7 ); + ic.remote_portid = apoint->atmfPortMyIfIdentifier; + if( apoint->atmfPortMyIfName.octs ) strncpy( + ic.remote_portname, apoint->atmfPortMyIfName.octs, + ( apoint->atmfPortMyIfName.octetLen < ATM_REMOTE_PORTNAME_LEN ) + ? apoint->atmfPortMyIfName.octetLen : ATM_REMOTE_PORTNAME_LEN ); + else strncpy( ic.remote_portname, "(empty)", 7 ); + + write(newfd, &ic, sizeof(ic)); + close(newfd); + exit(0); + } + Index: io.h =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/io.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** io.h 9 Oct 2001 22:33:06 -0000 1.2 --- io.h 1 Jan 2008 00:14:50 -0000 1.3 *************** *** 28,31 **** --- 28,32 ---- #include <atm.h> #include <linux/atmdev.h> + #include "ilmid.h" #include "asn_incl.h" #include "rfc1155_smi.h" *************** *** 39,44 **** int read_message(int fd, Message *message); int send_message(int fd, Message *message); ! int open_ilmi(int itf,const char *qos_spec); int get_ci_range(struct atm_cirange *ci); #endif --- 40,48 ---- int read_message(int fd, Message *message); int send_message(int fd, Message *message); ! int open_ilmi(struct sockaddr_atmpvc *, const char *qos_spec); int get_ci_range(struct atm_cirange *ci); + void add_lecs(int itf, char *lecs); + int open_ilmidiag(int *listenfd, const struct sockaddr_atmpvc *); + int handle_ilmidiag(int fd, AttPoint *apoint, Config *config); #endif Index: message.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/message.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** message.c 9 Oct 2001 22:33:06 -0000 1.2 --- message.c 1 Jan 2008 00:14:50 -0000 1.3 *************** *** 28,39 **** #endif #include "message.h" #include "atmf_uni.h" #include "util.h" int no_var_bindings = 0; ! AsnOid atmAddressStatus = {ADDRESS_LEN, ADDRESS_OID}; Message *create_poll_message(void) { --- 28,129 ---- #endif + #include <unistd.h> + #include <stdarg.h> + #include "message.h" #include "atmf_uni.h" #include "util.h" + #include "sysgroup.h" int no_var_bindings = 0; ! // AsnOid atmAddressStatus = {ADDRESS_LEN, ADDRESS_OID}; ! ! Message *create_va_getnext_message( int n, ... ){ ! Message *m = alloc_t( Message ); ! VarBind *entry; ! AsnOid *what; ! va_list ap; ! int count; + if( m == NULL ) return NULL; + m->version = VERSION_1; + m->community.octs = "ILMI"; + m->community.octetLen = 4; + m->data = alloc_t( PDUs ); + m->data->choiceId = PDUS_GET_NEXT_REQUEST; + m->data->a.get_next_request = alloc_t( GetRequest_PDU ); + m->data->a.get_next_request->error_status = 0; + m->data->a.get_next_request->error_index = 0; + m->data->a.get_next_request->variable_bindings = alloc_t( VarBindList ); + AsnListInit( m->data->a.get_next_request->variable_bindings, + sizeof( VarBind )); + va_start( ap, n ); + count = 0; + while( count < n ){ + what = va_arg( ap, AsnOid* ); + entry = AppendVarBind( + m->data->a.get_next_request->variable_bindings ); + entry->name.octs = alloc( what->octetLen ); + entry->name.octetLen = what->octetLen; + memcpy( entry->name.octs, what->octs, what->octetLen ); + entry->value = alloc_t( ObjectSyntax ); + entry->value->choiceId = OBJECTSYNTAX_SIMPLE; + entry->value->a.simple = alloc_t( SimpleSyntax ); + entry->value->a.simple->choiceId = SIMPLESYNTAX_NUMBER; + count++; + } + va_end(ap); + return m; + } + + Message *create_va_get_message( int n, ... ){ + Message *m = alloc_t( Message ); + VarBind *entry; + AsnOid *what; + va_list ap; + int count; + + if( m == NULL ) return NULL; + m->version = VERSION_1; + m->community.octs = "ILMI"; + m->community.octetLen = 4; + m->data = alloc_t( PDUs ); + m->data->choiceId = PDUS_GET_REQUEST; + m->data->a.get_request = alloc_t( GetRequest_PDU ); + m->data->a.get_request->error_status = 0; + m->data->a.get_request->error_index = 0; + m->data->a.get_request->variable_bindings = alloc_t( VarBindList ); + AsnListInit( m->data->a.get_request->variable_bindings, + sizeof( VarBind )); + va_start( ap, n ); + count = 0; + while( count < n ){ + what = va_arg( ap, AsnOid* ); + entry = AppendVarBind( + m->data->a.get_request->variable_bindings ); + entry->name.octs = alloc( what->octetLen ); + entry->name.octetLen = what->octetLen; + memcpy( entry->name.octs, what->octs, what->octetLen ); + entry->value = alloc_t( ObjectSyntax ); + entry->value->choiceId = OBJECTSYNTAX_SIMPLE; + entry->value->a.simple = alloc_t( SimpleSyntax ); + entry->value->a.simple->choiceId = SIMPLESYNTAX_NUMBER; + count++; + } + va_end(ap); + return m; + } + + + Message *create_get_message( AsnOid what ){ + return create_va_get_message( 1, &what ); + } + + Message *create_getnext_message( AsnOid what ){ + return create_va_getnext_message( 1, &what ); + } + + #ifdef notdef Message *create_poll_message(void) { *************** *** 65,68 **** --- 155,159 ---- return poll_message; } + #endif Message *create_set_message(void) Index: message.h =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/message.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** message.h 9 Oct 2001 22:33:06 -0000 1.2 --- message.h 1 Jan 2008 00:14:50 -0000 1.3 *************** *** 34,42 **** extern int no_var_bindings; ! AsnOid atmAddressStatus; Message *create_poll_message(void); Message *create_set_message(void); Message *create_coldstart_message(void); #endif --- 34,47 ---- extern int no_var_bindings; ! //AsnOid atmAddressStatus; Message *create_poll_message(void); Message *create_set_message(void); Message *create_coldstart_message(void); + Message *create_va_getnext_message( int, ... ); + Message *create_va_get_message( int, ... ); + Message *create_getnext_message( AsnOid ); + Message *create_get_message( AsnOid ); + void free_message( Message *m ); #endif Index: mib.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/mib.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mib.c 9 Oct 2001 22:33:06 -0000 1.2 --- mib.c 1 Jan 2008 00:14:50 -0000 1.3 *************** *** 47,50 **** --- 47,53 ---- { &sysLocation, getString, NULL, NULL, &sysLocationValue }, { &sysServices, getInteger, NULL, NULL, &sysServicesValue }, + { &foreQ2931AdminConfigType, getInteger, NULL, NULL, + &foreQ2931AdminConfigTypeValue }, + { &foreQ2931NNIProto, getInteger, NULL, NULL, &foreQ2931NNIProtoValue }, { &atmfPortIndex, getInteger, NULL, NULL, &atmfPortIndexValue }, { &atmfPortMyIdentifier, getInteger, NULL, NULL, &atmfPortIndexValue }, *************** *** 53,63 **** { &atmfAtmLayerMaxVpiBits, getVpiRange, NULL, NULL, &atmfAtmLayerMaxVpiBitsValue }, { &atmfAtmLayerMaxVciBits, getVciRange, NULL, NULL, &atmfAtmLayerMaxVciBitsValue }, { &atmfAtmLayerUniVersion, getInteger, NULL, NULL, &atmfAtmLayerUniVersionValue }, { &atmfNetPrefixStatus, getNetPrefix, getnextNetPrefix, setNetPrefix, NULL }, { NULL } }; ! void MIBget(VarBindList *list, PDUInt *status, AsnInt *index) { VarBind *varbind; --- 56,75 ---- { &atmfAtmLayerMaxVpiBits, getVpiRange, NULL, NULL, &atmfAtmLayerMaxVpiBitsValue }, { &atmfAtmLayerMaxVciBits, getVciRange, NULL, NULL, &atmfAtmLayerMaxVciBitsValue }, + { &atmfAtmLayerUniType, getInteger, NULL, NULL, &atmfAtmLayerUniTypeValue}, { &atmfAtmLayerUniVersion, getInteger, NULL, NULL, &atmfAtmLayerUniVersionValue }, + { &atmfAtmLayerDeviceType, getInteger, NULL, NULL, + &atmfAtmLayerDeviceTypeValue}, + { &atmfAtmLayerIlmiVersion, getInteger, NULL, NULL, + &atmfAtmLayerIlmiVersionValue}, + { &atmfAtmLayerNniSigVersion, getInteger, NULL, NULL, + &atmfAtmLayerNniSigVersionValue}, { &atmfNetPrefixStatus, getNetPrefix, getnextNetPrefix, setNetPrefix, NULL }, { NULL } }; ! ! ! void MIBget(VarBindList *list, PDUInt *status, AsnInt *offset) { VarBind *varbind; *************** *** 65,69 **** AsnOidResult result; ! *index = 1; FOR_EACH_LIST_ELMT(varbind, list) { --- 77,81 ---- AsnOidResult result; ! *offset = 1; FOR_EACH_LIST_ELMT(varbind, list) { *************** *** 92,103 **** return; ! (*index)++; } ! *index = 0; return; } ! void MIBgetnext(VarBindList *list, PDUInt *status, AsnInt *index) { VarBind *varbind; --- 104,115 ---- return; ! (*offset)++; } ! *offset = 0; return; } ! void MIBgetnext(VarBindList *list, PDUInt *status, AsnInt *offset) { VarBind *varbind; *************** *** 105,109 **** AsnOidResult result; ! *index = 1; FOR_EACH_LIST_ELMT(varbind, list) { --- 117,121 ---- AsnOidResult result; ! *offset = 1; FOR_EACH_LIST_ELMT(varbind, list) { *************** *** 140,150 **** return; ! (*index)++; } ! *index = 0; return; } ! void MIBset(VarBindList *list, PDUInt *status, AsnInt *index) { VarBind *varbind; --- 152,162 ---- return; ! (*offset)++; } ! *offset = 0; return; } ! void MIBset(VarBindList *list, PDUInt *status, AsnInt *offset) { VarBind *varbind; *************** *** 152,156 **** AsnOidResult result; ! *index = 1; FOR_EACH_LIST_ELMT(varbind, list) { --- 164,168 ---- AsnOidResult result; ! *offset = 1; FOR_EACH_LIST_ELMT(varbind, list) { *************** *** 183,189 **** return; ! (*index)++; } ! *index = 0; return; } --- 195,201 ---- return; ! (*offset)++; } ! *offset = 0; return; } *************** *** 246,250 **** } - #include <stdint.h> #include <string.h> --- 258,261 ---- Index: mib.h =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/mib.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mib.h 9 Oct 2001 22:33:06 -0000 1.2 --- mib.h 1 Jan 2008 00:14:50 -0000 1.3 *************** *** 40,46 **** } Variable; ! void MIBget(VarBindList *list, PDUInt *status, AsnInt *index); ! void MIBgetnext(VarBindList *list, PDUInt *status, AsnInt *index); ! void MIBset(VarBindList *list, PDUInt *status, AsnInt *index); void *MIBdelete(AsnOid *oid); --- 40,46 ---- } Variable; ! void MIBget(VarBindList *list, PDUInt *status, AsnInt *offset); ! void MIBgetnext(VarBindList *list, PDUInt *status, AsnInt *offset); ! void MIBset(VarBindList *list, PDUInt *status, AsnInt *offset); void *MIBdelete(AsnOid *oid); Index: rfc1155_smi.h =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/rfc1155_smi.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** rfc1155_smi.h 9 Oct 2001 22:33:06 -0000 1.2 --- rfc1155_smi.h 1 Jan 2008 00:14:50 -0000 1.3 *************** *** 62,72 **** ! typedef AsnInt TimeTicks; /* [APPLICATION 3] IMPLICIT INTEGER (0..2147483647) */ ! #define BEncTimeTicksContent BEncAsnIntContent ! #define BDecTimeTicksContent BDecAsnIntContent ! #define PrintTimeTicks PrintAsnInt --- 62,72 ---- ! typedef UAsnInt TimeTicks; /* [APPLICATION 3] IMPLICIT INTEGER (0..2147483647) */ ! #define BEncTimeTicksContent BEncUAsnIntContent ! #define BDecTimeTicksContent BDecUAsnIntContent ! #define PrintTimeTicks PrintUAsnInt |
|
From: chas w. <ch...@us...> - 2008-01-01 00:15:26
|
Update of /cvsroot/linux-atm/linux-atm/src/extra In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24942/src/extra Modified Files: Makefile.am linux-atm.spec.in Added Files: .cvsignore oam.patch Log Message: merge 2.5.0 branch into the head Index: Makefile.am =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/extra/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.am 15 Oct 2001 21:15:00 -0000 1.3 --- Makefile.am 1 Jan 2008 00:14:49 -0000 1.4 *************** *** 1,4 **** ! SUBDIRS = ANS drivers ! ! 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 Index: linux-atm.spec.in =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/extra/linux-atm.spec.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** linux-atm.spec.in 15 Oct 2001 21:15:00 -0000 1.3 --- linux-atm.spec.in 1 Jan 2008 00:14:49 -0000 1.4 *************** *** 7,15 **** 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 ExclusiveOS: Linux ! BuildRoot: /var/tmp/%{name}-buildroot %define _sourcedir %(pwd) %define _specdir %(pwd)/src/extra --- 7,15 ---- 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 ExclusiveOS: Linux ! BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _sourcedir %(pwd) %define _specdir %(pwd)/src/extra *************** *** 18,21 **** --- 18,22 ---- Source: linux-atm-%{linux_atm_version}.tar.gz + %define multipoint 1 %description *************** *** 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 --- 28,45 ---- %build ! ./configure --prefix=/usr --sysconfdir=%{_sysconfdir} --libdir=%{_libdir} --mandir=%{_mandir} \ ! %{?multipoint:--enable-multipoint} 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 755 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 --- 47,107 ---- %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 ! /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 ! %if multipoint ! /usr/bin/pmp_send ! %endif ! /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 %post ! /sbin/ldconfig -n %{_libdir} ! /sbin/chkconfig --add atm %postun ! /sbin/ldconfig -n %{_libdir} %changelog *************** *** 160,162 **** - First build of linux-atm RPM. - --- 109,110 ---- |
|
From: chas w. <ch...@us...> - 2008-01-01 00:15:26
|
Update of /cvsroot/linux-atm/linux-atm/src/ilmid/asn1 In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24942/src/ilmid/asn1 Modified Files: asn_config.h nibble_alloc.c nibble_alloc.h Added Files: .cvsignore Log Message: merge 2.5.0 branch into the head Index: asn_config.h =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/asn1/asn_config.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** asn_config.h 9 Oct 2001 22:33:06 -0000 1.2 --- asn_config.h 1 Jan 2008 00:14:50 -0000 1.3 *************** *** 24,27 **** --- 24,29 ---- #include <ctype.h> /* for isprint() in asn_octs.c */ #include <setjmp.h> /* for jmp_buf type, setjmp and longjmp */ + #include <string.h> /* memcpy, etc */ + #include <stdlib.h> /* for free */ /* for pow() used in asn_real.c - must include to avoid casting err on pow */ Index: nibble_alloc.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/asn1/nibble_alloc.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** nibble_alloc.c 9 Oct 2001 22:33:06 -0000 1.2 --- nibble_alloc.c 1 Jan 2008 00:14:50 -0000 1.3 *************** *** 153,156 **** --- 153,158 ---- tmp = nextTmp; } + nm->firstNibbleBuf->next = NULL; + nm->currNibbleBuf = nm->firstNibbleBuf; } /* ResetNibbleMem */ Index: nibble_alloc.h =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/asn1/nibble_alloc.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** nibble_alloc.h 9 Oct 2001 22:33:06 -0000 1.2 --- nibble_alloc.h 1 Jan 2008 00:14:50 -0000 1.3 *************** *** 40,44 **** unsigned long int incrementSize)); ! void ShutdownNibbleMem(); void ServiceNibbleFault PROTO((unsigned long int size)); --- 40,44 ---- unsigned long int incrementSize)); ! void ShutdownNibbleMem(void); void ServiceNibbleFault PROTO((unsigned long int size)); *************** *** 46,50 **** void* NibbleAlloc PROTO((unsigned long int size)); ! void ResetNibbleMem(); --- 46,50 ---- void* NibbleAlloc PROTO((unsigned long int size)); ! void ResetNibbleMem(void); |
|
From: chas w. <ch...@us...> - 2008-01-01 00:15:26
|
Update of /cvsroot/linux-atm/linux-atm/src/include In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24942/src/include Modified Files: Makefile.am atm.h atmd.h atmsap.h Added Files: .cvsignore Removed Files: stdint.h Log Message: merge 2.5.0 branch into the head Index: Makefile.am =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/include/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.am 9 Oct 2001 22:33:06 -0000 1.2 --- Makefile.am 1 Jan 2008 00:14:50 -0000 1.3 *************** *** 1,3 **** include_HEADERS = atm.h atmd.h atmsap.h - noinst_HEADERS = stdint.h - --- 1 ---- Index: atm.h =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/include/atm.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** atm.h 9 Oct 2001 22:33:06 -0000 1.2 --- atm.h 1 Jan 2008 00:14:50 -0000 1.3 *************** *** 11,14 **** --- 11,17 ---- #include <linux/atm.h> + #ifdef __cplusplus + extern "C" { + #endif /* *************** *** 106,108 **** --- 109,115 ---- int __atmlib_fetch(const char **pos,...); /* internal use only */ + #ifdef __cplusplus + }; + #endif + #endif Index: atmd.h =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/include/atmd.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** atmd.h 9 Oct 2001 22:33:06 -0000 1.2 --- atmd.h 1 Jan 2008 00:14:50 -0000 1.3 *************** *** 14,17 **** --- 14,21 ---- #include <sys/time.h> + #ifdef __cplusplus + extern "C" { + #endif + /* doubly linked list primitives */ *************** *** 199,201 **** --- 203,209 ---- */ + #ifdef __cplusplus + }; + #endif + #endif Index: atmsap.h =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/include/atmsap.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** atmsap.h 9 Oct 2001 22:33:06 -0000 1.2 --- atmsap.h 1 Jan 2008 00:14:50 -0000 1.3 *************** *** 10,13 **** --- 10,16 ---- #include <linux/atmsap.h> + #ifdef __cplusplus + extern "C" { + #endif /* *************** *** 43,45 **** --- 46,52 ---- void atm_tcpip_port_mapping(char *vs_id,uint8_t protocol,uint16_t port); + #ifdef __cplusplus + }; + #endif + #endif --- stdint.h DELETED --- |
|
From: chas w. <ch...@us...> - 2008-01-01 00:15:26
|
Update of /cvsroot/linux-atm/linux-atm/src/extra/ANS In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24942/src/extra/ANS Added Files: .cvsignore Removed Files: Makefile.am Log Message: merge 2.5.0 branch into the head --- Makefile.am DELETED --- |
1 message has been excluded from this view by a project administrator.
