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-08-31 14:50:36
|
Update of /cvsroot/linux-atm/linux-atm/src/lib In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv22955/src/lib Added Files: Tag: V2_5_0 .cvsignore Log Message: Add .cvsignore entries From: "Renato Caldas" <sev...@gm...> --- NEW FILE: .cvsignore --- Makefile Makefile.in .deps .libs ans.lo atm2text.lo atmequal.lo common.lo diag.lo kptr.lo libatm.la misc.lo qos2text.lo qosequal.lo sap2text.lo sapequal.lo sdu2cell.lo text2atm.lo text2ip.lo text2qos.lo text2sap.lo timer.lo unix.lo |
|
From: chas w. <ch...@us...> - 2007-08-31 14:50:35
|
Update of /cvsroot/linux-atm/linux-atm/doc In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv22955/doc Added Files: Tag: V2_5_0 .cvsignore Log Message: Add .cvsignore entries From: "Renato Caldas" <sev...@gm...> --- NEW FILE: .cvsignore --- Makefile Makefile.in |
|
From: chas w. <ch...@us...> - 2007-08-31 14:50:35
|
Update of /cvsroot/linux-atm/linux-atm/src/arpd In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv22955/src/arpd Added Files: Tag: V2_5_0 .cvsignore Log Message: Add .cvsignore entries From: "Renato Caldas" <sev...@gm...> --- NEW FILE: .cvsignore --- Makefile Makefile.in .deps .libs atmarp atmarpd |
|
From: chas w. <ch...@us...> - 2007-08-31 14:50:34
|
Update of /cvsroot/linux-atm/linux-atm/src/br2684 In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv22955/src/br2684 Added Files: Tag: V2_5_0 .cvsignore Log Message: Add .cvsignore entries From: "Renato Caldas" <sev...@gm...> --- NEW FILE: .cvsignore --- Makefile Makefile.in .deps .libs br2684ctl |
|
From: chas w. <ch...@us...> - 2007-08-31 14:50:34
|
Update of /cvsroot/linux-atm/linux-atm/m4 In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv22955/m4 Added Files: Tag: V2_5_0 .cvsignore Log Message: Add .cvsignore entries From: "Renato Caldas" <sev...@gm...> --- NEW FILE: .cvsignore --- Makefile Makefile.in |
|
From: chas w. <ch...@us...> - 2007-08-31 14:50:34
|
Update of /cvsroot/linux-atm/linux-atm In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv22955 Added Files: Tag: V2_5_0 .cvsignore Log Message: Add .cvsignore entries From: "Renato Caldas" <sev...@gm...> --- NEW FILE: .cvsignore --- Makefile Makefile.in aclocal.m4 autom4te.cache config.guess config.h config.h.in config.log config.status config.sub configure libtool ltmain.sh stamp-h* |
|
From: chas w. <ch...@us...> - 2007-08-27 16:54:31
|
Update of /cvsroot/linux-atm/linux-atm/src/ilmid In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv23017/src/ilmid Added Files: Tag: V2_5_0 ilmidiag.c Log Message: oops; missed including this when ilmid switching to named sockets --- NEW FILE: ilmidiag.c --- #include <atm.h> #include <linux/atmdev.h> #include <sys/socket.h> #include <sys/types.h> #include <sys/un.h> #include <netinet/in.h> #include <sys/ioctl.h> #include <stdio.h> #include <string.h> #include <errno.h> #include <unistd.h> #include "ilmid.h" static const char *ilmiver[4] = { "", "unsupported", "4.0", "undefined" }; static const char *univer[6] = { "", "", "3.0", "3.1", "4.0", "undefined" }; const char *struni(int ver){ switch(ver){ case 2: return univer[2]; case 3: return univer[3]; case 4: return univer[4]; } return univer[5]; } const char *strilmi(int ver){ switch(ver){ case 1: return ilmiver[1]; case 2: return ilmiver[2]; } return ilmiver[3]; } int main(int argc, char **argv){ int fd; struct ilmi_state ic; struct sockaddr_un addr; struct sockaddr_atmpvc vc; if(argc > 2){ fprintf(stderr, "usage: %s [<pvc>]\n", argv[0]); fprintf(stderr, " Default pvc is 0.0.16\n"); return 1; } if (argc == 1) text2atm("0.0.16", (struct sockaddr *)&vc, sizeof(vc), T2A_PVC); else if (text2atm(argv[1], (struct sockaddr *)&vc, sizeof(vc), T2A_PVC) < 0) { fprintf(stderr, "invalid pvc\n"); return 1; } fd = socket(AF_UNIX, SOCK_STREAM, 0); if(fd < 0){ fprintf(stderr, "Could not open socket.\n"); 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; if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { fprintf(stderr, "unable to connect (ilmid running?)\n"); return 1; } if (read(fd, &ic, sizeof(ic)) < sizeof(ic)) { fprintf(stderr, "read failed\n"); return 1; } printf("\n"); printf("%-15.15s%-15.15s%-15.15s%-15.15s%-15.15s\n", "Ilmi", "Uni", "VPI", "VCI", "Ilmi"); printf("%-15.15s%-15.15s%-15.15s%-15.15s%-15.15s\n", "Version", "Version", "Bits", "Bits", "State"); printf("---------------------------------------" "------------------------------------\n"); printf("%-15s%-15s%-15d%-15d%-15s\n", strilmi(ic.ilmi_version), struni(ic.uni_version), ic.vpi_bits, ic.vci_bits, (ic.state == 1) ? "Up" : "Down"); printf("\n"); printf("%-15.15s%-15.15s%-15.15s%-15.15s\n", "Remote", "Remote", "Remote", "Remote"); printf("%-15.15s%-15.15s%-15.15s%-15.15s\n", "Port Id", "Port Name", "Sysname", "Contact"); printf("---------------------------------------" "------------------------------------\n"); printf("%-15d%-15.15s%-15.15s%-30.30s\n", ic.remote_portid, ic.remote_portname, ic.remote_sysname, ic.remote_contact); printf("\n"); return 0; } |
|
From: chas w. <ch...@us...> - 2007-08-27 14:24:12
|
Update of /cvsroot/linux-atm/linux-atm/src/br2684 In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv12801 Modified Files: Tag: V2_5_0 br2684ctl.8 br2684ctl.c Log Message: On 8/24/07, seventh guardian <sev...@gm...> wrote: > Hello, (...) > One of the changes to the logging support was to make br2684ctl log to > LOG_LOCAL2 instead of LOG_LOCAL0. I left the logging on LOCAL0, but I > leave to you the decision on leaving it that way or changing it to > LOCAL2 (I have no idea on why this was changed, and I'm still waiting > for Marco's feedback). I've just received feedback from Marco: He changed the log facility to LOG_LOCAL2 because that's the same facility as pppd. This allows them to be logged together, which seems useful to me. From: "Renato Caldas" <sev...@gm...> Index: br2684ctl.8 =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/br2684/Attic/br2684ctl.8,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** br2684ctl.8 27 Aug 2007 14:22:02 -0000 1.1.2.3 --- br2684ctl.8 27 Aug 2007 14:24:00 -0000 1.1.2.4 *************** *** 70,74 **** % ifconfig nas0 192.168.2.1 netmask 255.255.255.0 ! Messages are logged to the LOCAL0 syslog facility. .SH FILES /var/run/br2684ctl-<iface>.pid --- 70,74 ---- % ifconfig nas0 192.168.2.1 netmask 255.255.255.0 ! Messages are logged to the LOCAL2 syslog facility. .SH FILES /var/run/br2684ctl-<iface>.pid Index: br2684ctl.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/br2684/Attic/br2684ctl.c,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -C2 -d -r1.1.2.8 -r1.1.2.9 *** br2684ctl.c 27 Aug 2007 14:22:02 -0000 1.1.2.8 --- br2684ctl.c 27 Aug 2007 14:24:00 -0000 1.1.2.9 *************** *** 27,31 **** #define LOG_NAME "br2684ctl" #define LOG_OPTION LOG_PERROR|LOG_PID ! #define LOG_FACILITY LOG_LOCAL0 --- 27,31 ---- #define LOG_NAME "br2684ctl" #define LOG_OPTION LOG_PERROR|LOG_PID ! #define LOG_FACILITY LOG_LOCAL2 |
|
From: chas w. <ch...@us...> - 2007-08-27 14:22:07
|
Update of /cvsroot/linux-atm/linux-atm/src/br2684 In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv11979 Modified Files: Tag: V2_5_0 br2684ctl.8 br2684ctl.c Log Message: In annex goes a patch that changes the pid file location from /var/run/nas%d.pid to /var/run/br2684ctl-nas%d.pid. I believe this is a more descriptive name. The patch also adds its documentation to the man page. From: "Renato Caldas" <sev...@gm...> Index: br2684ctl.8 =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/br2684/Attic/br2684ctl.8,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** br2684ctl.8 25 Aug 2007 16:56:40 -0000 1.1.2.2 --- br2684ctl.8 27 Aug 2007 14:22:02 -0000 1.1.2.3 *************** *** 71,74 **** --- 71,76 ---- Messages are logged to the LOCAL0 syslog facility. + .SH FILES + /var/run/br2684ctl-<iface>.pid .SH NOTES This man page is based on a tutorial by by Joonbum Byun <jb...@me...> Index: br2684ctl.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/br2684/Attic/br2684ctl.c,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -C2 -d -r1.1.2.7 -r1.1.2.8 *** br2684ctl.c 25 Aug 2007 16:57:43 -0000 1.1.2.7 --- br2684ctl.c 27 Aug 2007 14:22:02 -0000 1.1.2.8 *************** *** 59,63 **** if (num < 0) return -1; ! snprintf(name, 20, "/var/run/nas%d.pid", num); pidfile = fopen(name, "w"); if (pidfile == NULL) return -1; --- 59,63 ---- if (num < 0) return -1; ! snprintf(name, 20, "/var/run/br2684ctl-nas%d.pid", num); pidfile = fopen(name, "w"); if (pidfile == NULL) return -1; |
|
From: chas w. <ch...@us...> - 2007-08-26 11:59:53
|
Update of /cvsroot/linux-atm/linux-atm/src/br2684 In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv27040 Modified Files: Tag: V2_5_0 br2684ctl.c Log Message: Debian patch from Marco d'Itri extracted by "seventh guardian" <sev...@gm...> add signal handling. Index: br2684ctl.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/br2684/Attic/br2684ctl.c,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.c 25 Aug 2007 16:53:34 -0000 1.1.2.6 --- br2684ctl.c 25 Aug 2007 16:57:43 -0000 1.1.2.7 *************** *** 4,7 **** --- 4,9 ---- #include <errno.h> #include <sys/ioctl.h> + #include <sys/types.h> + #include <signal.h> #include <string.h> #include <syslog.h> *************** *** 44,47 **** --- 46,55 ---- + void int_signal(int dummy) + { + syslog (LOG_INFO,"Killed by a signal\n"); + exit(0); + } + int create_pidfile(int num) { *************** *** 271,279 **** create_pidfile(itfnum); syslog (LOG_INFO, "RFC 1483/2684 bridge daemon started\n"); atexit (exitFunc); ! while (1) sleep(30); /* to keep the sockets... */ return 0; } --- 279,289 ---- create_pidfile(itfnum); + signal(SIGINT, int_signal); + signal(SIGTERM, int_signal); syslog (LOG_INFO, "RFC 1483/2684 bridge daemon started\n"); atexit (exitFunc); ! while (1) pause(); /* to keep the sockets... */ return 0; } |
|
From: chas w. <ch...@us...> - 2007-08-26 11:59:53
|
Update of /cvsroot/linux-atm/linux-atm/src/br2684 In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv26639 Modified Files: Tag: V2_5_0 br2684ctl.8 Log Message: Debian patch from Marco d'Itri extracted by "seventh guardian" <sev...@gm...> Corrects some things on the man page (most notably, it is marked as being on section 1). Index: br2684ctl.8 =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/br2684/Attic/br2684ctl.8,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** br2684ctl.8 19 Jul 2003 22:03:28 -0000 1.1.2.1 --- br2684ctl.8 25 Aug 2007 16:56:40 -0000 1.1.2.2 *************** *** 1,4 **** .\" ! .TH br2684ctl 1 "7 Jul 2003" .SH NAME br2684ctl \- RFC1483/2684 Bridge Daemon --- 1,4 ---- .\" ! .TH br2684ctl 8 "7 Jul 2003" .SH NAME br2684ctl \- RFC1483/2684 Bridge Daemon *************** *** 69,72 **** --- 69,74 ---- % ifconfig nas0 192.168.2.1 netmask 255.255.255.0 + + Messages are logged to the LOCAL0 syslog facility. .SH NOTES This man page is based on a tutorial by by Joonbum Byun <jb...@me...> |
|
From: chas w. <ch...@us...> - 2007-08-26 11:59:53
|
Update of /cvsroot/linux-atm/linux-atm/src/br2684 In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv25031 Modified Files: Tag: V2_5_0 br2684ctl.c Log Message: Debian patch from Marco d'Itri extracted by "seventh guardian" <sev...@gm...> changes to logging Index: br2684ctl.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/br2684/Attic/br2684ctl.c,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.c 11 Jul 2007 15:42:20 -0000 1.1.2.5 --- br2684ctl.c 25 Aug 2007 16:53:34 -0000 1.1.2.6 *************** *** 23,28 **** ! #define LOG_NAME "RFC1483/2684 bridge" ! #define LOG_OPTION LOG_PERROR #define LOG_FACILITY LOG_LOCAL0 --- 23,28 ---- ! #define LOG_NAME "br2684ctl" ! #define LOG_OPTION LOG_PERROR|LOG_PID #define LOG_FACILITY LOG_LOCAL0 *************** *** 40,44 **** void exitFunc(void) { ! syslog (LOG_PID,"Daemon terminated\n"); } --- 40,44 ---- void exitFunc(void) { ! syslog (LOG_NOTICE,"Daemon terminated\n"); } *************** *** 85,89 **** if (err == 0) ! syslog(LOG_INFO, "Interface \"%s\" created sucessfully\n",ni.ifname); else syslog(LOG_INFO, "Interface \"%s\" could not be created, reason: %s\n", --- 85,89 ---- 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", *************** *** 112,116 **** syslog(LOG_ERR,"Could not parse ATM parameters (error=%d)\n",err); ! syslog(LOG_INFO,"Communicating over ATM %d.%d.%d, encapsulation: %s\n", addr.sap_addr.itf, addr.sap_addr.vpi, addr.sap_addr.vci, --- 112,116 ---- 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, |
|
From: chas w. <ch...@us...> - 2007-07-11 16:32:55
|
Update of /cvsroot/linux-atm/linux-atm/src/ilmid In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv4106/src/ilmid Modified Files: Tag: V2_5_0 Makefile.am ilmid.c ilmid.h io.c io.h Log Message: add ilmidiag support from ek...@cm... Index: Makefile.am =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/Makefile.am,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -d -r1.2.2.3 -r1.2.2.4 *** Makefile.am 20 Apr 2005 17:05:47 -0000 1.2.2.3 --- Makefile.am 11 Jul 2007 16:07:57 -0000 1.2.2.4 *************** *** 3,7 **** INCLUDES = -I$(srcdir)/../ilmid/asn1 ! sbin_PROGRAMS = ilmid ilmid_SOURCES = rfc1157_snmp.c rfc1157_snmp.h rfc1155_smi.c rfc1155_smi.h \ --- 3,7 ---- INCLUDES = -I$(srcdir)/../ilmid/asn1 ! sbin_PROGRAMS = ilmid ilmidiag ilmid_SOURCES = rfc1157_snmp.c rfc1157_snmp.h rfc1155_smi.c rfc1155_smi.h \ *************** *** 14,17 **** --- 14,21 ---- ilmid_DEPENDENCIES = $(ilmid_LDADD) + ilmidiag_SOURCES = ilmidiag.c + ilmidiag_LDADD = $(top_builddir)/src/lib/libatm.la + ilmidiag_DEPENDENCIES = $(ilmid_LDADD) + man_MANS = ilmid.8 Index: ilmid.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/ilmid.c,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -C2 -d -r1.2.2.2 -r1.2.2.3 *** ilmid.c 14 Apr 2007 15:50:58 -0000 1.2.2.2 --- ilmid.c 11 Jul 2007 16:07:57 -0000 1.2.2.3 *************** *** 43,46 **** --- 43,47 ---- #include <sys/time.h> #include <sys/types.h> + #include <sys/wait.h> #include <errno.h> #include <signal.h> *************** *** 60,63 **** --- 61,68 ---- #define POLL_PERIOD 15 #define COMPONENT "ILMI" + #ifndef MAX + # define MAX(a,b) ((a) > (b) ? (a) : (b)) + #endif + /* Globals */ *************** *** 96,99 **** --- 101,106 ---- State ilmi_state = down; + static int diagfd = -1; + AttPoint _apoint; AttPoint *apoint = &_apoint; /* attachment point */ *************** *** 110,114 **** 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); --- 117,121 ---- 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); *************** *** 201,204 **** --- 208,212 ---- struct timeval timeout; int numfds = 0; + fd_set fdvar; in_message = (Message *)(&m); *************** *** 208,214 **** ilmi_errno = 0; wait_top: ResetNibbleMem(); ! numfds = wait_for_message( fd, &timeout ); ! if(( numfds > 0 ) && !read_message( fd, in_message )){ switch( in_message->data->choiceId ){ case PDUS_GET_REQUEST: --- 216,236 ---- 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: *************** *** 234,239 **** if(( numfds < 0 ) && ( errno == EINTR )) ilmi_errno = EALARM; return NULL; /* no data read */ ! } ! } Msgs *create_msgs( void ){ --- 256,261 ---- if(( numfds < 0 ) && ( errno == EINTR )) ilmi_errno = EALARM; return NULL; /* no data read */ ! } ! } Msgs *create_msgs( void ){ *************** *** 348,357 **** { int opt, bg = 0; pid_t pid; const char *qos; ! int fd, itf = 0; set_application("ilmid"); set_verbosity(NULL, DIAG_WARN); qos = NULL; while((opt = getopt(argc, argv, "bdhi:l:q:xvu:V")) != EOF) --- 370,381 ---- { 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) *************** *** 414,418 **** } 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) *************** *** 437,442 **** signal( SIGINT, handler ); signal( SIGSTOP, handler ); ! fd = open_ilmi(itf,qos); ! ilmi_loop(fd, itf); close(fd); return 0; --- 468,474 ---- 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: ilmid.h =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/Attic/ilmid.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** ilmid.h 19 Jul 2003 21:07:19 -0000 1.1.2.1 --- ilmid.h 11 Jul 2007 16:07:57 -0000 1.1.2.2 *************** *** 49,52 **** --- 49,69 ---- typedef enum _State { up, down } State; + #define ATM_REMOTE_SYSNAME_LEN 15 + #define ATM_REMOTE_CONTACT_LEN 30 + #define ATM_REMOTE_PORTNAME_LEN 10 + #define ILMIDIAG_DIR "/tmp/.ilmi" + #define ILMIDIAG_BACKLOG 1 + struct ilmi_state { + unsigned char ilmi_version; /* ilmi version */ + unsigned char uni_version; /* negotiated signalling version */ + unsigned char vpi_bits; /* negotiated vpi bits */ + unsigned char vci_bits; /* negotiated vci bits */ + unsigned char state; /* up/down */ + unsigned int remote_portid; /* id of switch port we're using */ + char remote_sysname[ATM_REMOTE_SYSNAME_LEN]; + char remote_contact[ATM_REMOTE_CONTACT_LEN]; + char remote_portname[ATM_REMOTE_PORTNAME_LEN]; + }; + #endif Index: io.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/io.c,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -C2 -d -r1.2.2.2 -r1.2.2.3 *** io.c 6 Oct 2005 15:39:58 -0000 1.2.2.2 --- io.c 11 Jul 2007 16:07:57 -0000 1.2.2.3 *************** *** 28,31 **** --- 28,33 ---- #include <unistd.h> #include <sys/socket.h> + #include <sys/un.h> + #include <sys/types.h> #include <netinet/in.h> #include <sys/ioctl.h> *************** *** 34,37 **** --- 36,41 ---- #include <atm.h> #include <linux/atmdev.h> + #include <sys/types.h> + #include <sys/stat.h> #include "ilmid.h" #include "io.h" *************** *** 289,295 **** ! 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; *************** *** 298,302 **** 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; *************** *** 309,319 **** 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)); *************** *** 340,341 **** --- 337,434 ---- 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.2.2 retrieving revision 1.2.2.3 diff -C2 -d -r1.2.2.2 -r1.2.2.3 *** io.h 6 Oct 2005 15:39:58 -0000 1.2.2.2 --- io.h 11 Jul 2007 16:07:57 -0000 1.2.2.3 *************** *** 40,46 **** 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); void add_lecs(int itf, char *lecs); #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 |
|
From: chas w. <ch...@us...> - 2007-07-11 15:52:12
|
Update of /cvsroot/linux-atm/linux-atm/src/br2684 In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv26467/src/br2684 Modified Files: Tag: V2_5_0 br2684ctl.c Log Message: add payload option to br2684ctl (note that this also requires kernel support as well) Index: br2684ctl.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/br2684/Attic/br2684ctl.c,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.c 26 Feb 2007 18:26:27 -0000 1.1.2.4 --- br2684ctl.c 11 Jul 2007 15:42:20 -0000 1.1.2.5 *************** *** 60,64 **** } ! int create_br(char *nstr) { int num, err; --- 60,64 ---- } ! int create_br(char *nstr, int payload) { int num, err; *************** *** 76,79 **** --- 76,83 ---- ni.backend_num = ATM_BACKEND_BR2684; ni.media = BR2684_MEDIA_ETHERNET; + #ifdef BR2684_FLAG_ROUTED + if (payload == 0) + ni.media |= BR2684_FLAG_ROUTED; + #endif ni.mtu = 1500; sprintf(ni.ifname, "nas%d", num); *************** *** 95,99 **** ! int assign_vcc(char *astr, int encap, int bufsize, struct atm_qos qos) { int err; --- 99,104 ---- ! int assign_vcc(char *astr, int encap, int payload, ! int bufsize, struct atm_qos qos) { int err; *************** *** 107,116 **** syslog(LOG_ERR,"Could not parse ATM parameters (error=%d)\n",err); - #if 0 - addr.sap_family = AF_ATMPVC; - addr.sap_addr.itf = itf; - addr.sap_addr.vpi = 0; - addr.sap_addr.vci = vci; - #endif syslog(LOG_INFO,"Communicating over ATM %d.%d.%d, encapsulation: %s\n", addr.sap_addr.itf, addr.sap_addr.vpi, --- 112,115 ---- *************** *** 163,169 **** void usage(char *s) { ! printf("usage: %s [-b] [[-c number] [-e 0|1] [-s sndbuf] [-q qos] [-a [itf.]vpi.vci]*]*\n", s); exit(1); } --- 162,170 ---- + 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); } *************** *** 173,179 **** int main (int argc, char **argv) { ! int c, background=0, encap=0, sndbuf=8192; struct atm_qos reqqos; ! int itfnum; lastsock=-1; lastitf=0; --- 174,181 ---- 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; lastitf=0; *************** *** 184,188 **** openlog (LOG_NAME,LOG_OPTION,LOG_FACILITY); if (argc>1) ! while ((c = getopt(argc, argv,"q:a:bc:e:s:?h")) !=EOF) switch (c) { case 'q': --- 186,190 ---- openlog (LOG_NAME,LOG_OPTION,LOG_FACILITY); if (argc>1) ! while ((c = getopt(argc, argv,"q:a:bc:e:s:p:?h")) !=EOF) switch (c) { case 'q': *************** *** 191,195 **** break; case 'a': ! assign_vcc(optarg, encap, sndbuf, reqqos); break; case 'b': --- 193,197 ---- break; case 'a': ! assign_vcc(optarg, encap, payload, sndbuf, reqqos); break; case 'b': *************** *** 197,201 **** break; case 'c': ! create_br(optarg); itfnum = atoi(optarg); break; --- 199,203 ---- break; case 'c': ! create_br(optarg, payload); itfnum = atoi(optarg); break; *************** *** 214,217 **** --- 216,226 ---- } break; + case 'p': /* payload type: routed (0) or bridged (1) */ + #ifdef BR2684_FLAG_ROUTED + payload = atoi(optarg); + break; + #else + syslog(LOG_ERR, "payload option not supported.\n"); + #endif case '?': case 'h': |
|
From: chas w. <ch...@us...> - 2007-07-11 15:27:20
|
Update of /cvsroot/linux-atm/linux-atm/src/arpd In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv21989/src/arpd Modified Files: Tag: V2_5_0 arp.c io.c itf.c Log Message: some intermediate kernel versions didnt get the include dependencies correct. Index: arp.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/arpd/arp.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** arp.c 9 Oct 2001 22:33:06 -0000 1.2 --- arp.c 11 Jul 2007 15:27:15 -0000 1.2.2.1 *************** *** 17,20 **** --- 17,21 ---- #include <netinet/in.h> /* for ntohs, etc. */ #define _LINUX_NETDEVICE_H /* very crude hack for glibc2 */ + #include <linux/types.h> #include <linux/if_arp.h> #include <linux/if_ether.h> Index: io.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/arpd/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:06 -0000 1.2 --- io.c 11 Jul 2007 15:27:15 -0000 1.2.2.1 *************** *** 23,26 **** --- 23,27 ---- #include <linux/atmarp.h> #define _LINUX_NETDEVICE_H /* glibc2 */ + #include <linux/types.h> #include <linux/if_arp.h> Index: itf.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/arpd/itf.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** itf.c 9 Oct 2001 22:33:06 -0000 1.2 --- itf.c 11 Jul 2007 15:27:15 -0000 1.2.2.1 *************** *** 14,17 **** --- 14,18 ---- #include <sys/socket.h> #define _LINUX_NETDEVICE_H /* glibc2 */ + #include <linux/types.h> #include <linux/if_arp.h> |
|
From: chas w. <ch...@us...> - 2007-07-11 15:27:20
|
Update of /cvsroot/linux-atm/linux-atm/src/oamd In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv21989/src/oamd Modified Files: Tag: V2_5_0 io.c Log Message: some intermediate kernel versions didnt get the include dependencies correct. Index: io.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/oamd/Attic/io.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** io.c 21 Feb 2004 15:31:40 -0000 1.1.2.1 --- io.c 11 Jul 2007 15:27:15 -0000 1.1.2.2 *************** *** 22,25 **** --- 22,26 ---- #include <atm.h> #define _LINUX_NETDEVICE_H /* glibc2 */ + #include <linux/types.h> #include <linux/if_arp.h> |
|
From: chas w. <ch...@us...> - 2007-07-11 15:26:23
|
Update of /cvsroot/linux-atm/linux-atm In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv21578 Modified Files: Tag: V2_5_0 autotools Log Message: fix up some automake bits... Index: autotools =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/autotools,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** autotools 26 Feb 2004 01:10:37 -0000 1.2.2.1 --- autotools 11 Jul 2007 15:26:17 -0000 1.2.2.2 *************** *** 8,12 **** echo "Running libtoolize..." ! libtoolize --force echo "Running aclocal..." aclocal $VERBOSE --- 8,12 ---- echo "Running libtoolize..." ! libtoolize --force --copy echo "Running aclocal..." aclocal $VERBOSE *************** *** 16,20 **** autoheader echo "Running automake..." ! automake --add-missing $VERBOSE echo "Finished... Now run './configure' and 'make'..." --- 16,20 ---- autoheader echo "Running automake..." ! automake --force-missing --add-missing --copy $VERBOSE echo "Finished... Now run './configure' and 'make'..." |
|
From: chas w. <ch...@us...> - 2007-07-11 15:26:23
|
Update of /cvsroot/linux-atm/linux-atm/src/lib In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv21578/src/lib Modified Files: Tag: V2_5_0 Makefile.am Log Message: fix up some automake bits... Index: Makefile.am =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/lib/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 22 Nov 2005 20:55:55 -0000 1.2.2.1 --- Makefile.am 11 Jul 2007 15:26:17 -0000 1.2.2.2 *************** *** 3,7 **** # ATMLIBS_VERSION comes from configure.in in the toplevel directory ! LDFLAGS = -version-info @LIBVER_CURRENT@:@LIBVER_REVISION@:@LIBVER_AGE@ --- 3,7 ---- # ATMLIBS_VERSION comes from configure.in in the toplevel directory ! AM_LDFLAGS = -version-info @LIBVER_CURRENT@:@LIBVER_REVISION@:@LIBVER_AGE@ |
|
From: chas w. <ch...@us...> - 2007-04-14 15:51:01
|
Update of /cvsroot/linux-atm/linux-atm/src/ilmid In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv5935/src/ilmid Modified Files: Tag: V2_5_0 ilmid.c Log Message: create_va_get_message() has 4 arguments from ek...@cm... Index: ilmid.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/ilmid.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 *** ilmid.c 19 Jul 2003 21:07:19 -0000 1.2.2.1 --- ilmid.c 14 Apr 2007 15:50:58 -0000 1.2.2.2 *************** *** 254,258 **** &atmfAtmLayerDeviceType, &atmfAddressRegistrationAdminStatus ); ! m->apointmsg = create_va_get_message( 3, &atmfPortMyIdentifier, &atmfPortMyIfName, /* some extra adjacency info */ --- 254,258 ---- &atmfAtmLayerDeviceType, &atmfAddressRegistrationAdminStatus ); ! m->apointmsg = create_va_get_message( 4, &atmfPortMyIdentifier, &atmfPortMyIfName, /* some extra adjacency info */ |
|
From: chas w. <ch...@us...> - 2007-04-14 15:48:24
|
Update of /cvsroot/linux-atm/linux-atm/src/ilmid/asn1 In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv5220/src/ilmid/asn1 Modified Files: Tag: V2_5_0 nibble_alloc.c Log Message: correction to ResetNibbleMem() from ek...@cm... 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.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** nibble_alloc.c 9 Oct 2001 22:33:06 -0000 1.2 --- nibble_alloc.c 14 Apr 2007 15:48:20 -0000 1.2.2.1 *************** *** 153,156 **** --- 153,158 ---- tmp = nextTmp; } + nm->firstNibbleBuf->next = NULL; + nm->currNibbleBuf = nm->firstNibbleBuf; } /* ResetNibbleMem */ |
|
From: chas w. <ch...@us...> - 2007-02-26 19:37:33
|
Update of /cvsroot/linux-atm/linux-atm/src/qgen In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv31262/src/qgen Modified Files: Tag: V2_5_0 Makefile.am Log Message: support cross copmiling better. reported by "Russell McGuire" <rmc...@vi...>. Index: Makefile.am =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/qgen/Makefile.am,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -d -r1.2.2.3 -r1.2.2.4 *** Makefile.am 22 Nov 2005 22:11:05 -0000 1.2.2.3 --- Makefile.am 26 Feb 2007 19:37:13 -0000 1.2.2.4 *************** *** 17,20 **** --- 17,21 ---- q_test_DEPENDENCIES = q.test.c + TARGET_CC = @CC@ CC = @CC_FOR_BUILD@ *************** *** 50,54 **** q.out.o: q.out.c q.out.h qlib.c qlib.h ! $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(CFLAGS) -c q.out.c #q40.out.o: q40.out.c q40.out.h qlib.c qlib.h --- 51,55 ---- q.out.o: q.out.c q.out.h qlib.c qlib.h ! $(TARGET_CC) $(DEFS) $(DEFAULT_INCLUDES) $(CFLAGS) -c q.out.c #q40.out.o: q40.out.c q40.out.h qlib.c qlib.h *************** *** 56,60 **** qd.dump.o: qd.dump.c qd.out.c qlib.c qlib.h ! $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(CFLAGS) -c qd.dump.c qd.dump.standalone.o: qd.dump.c qd.out.c qlib.c qlib.h --- 57,61 ---- qd.dump.o: qd.dump.c qd.out.c qlib.c qlib.h ! $(TARGET_CC) $(DEFS) $(DEFAULT_INCLUDES) $(CFLAGS) -c qd.dump.c qd.dump.standalone.o: qd.dump.c qd.out.c qlib.c qlib.h |
|
From: chas w. <ch...@us...> - 2007-02-26 18:26:39
|
Update of /cvsroot/linux-atm/linux-atm/src/br2684 In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28842/src/br2684 Modified Files: Tag: V2_5_0 br2684ctl.c Log Message: use (and log) the actual error for fatal(). mentioned by Aurelio Arroyo <lis...@ya...>. Index: br2684ctl.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/br2684/Attic/br2684ctl.c,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** br2684ctl.c 26 Feb 2004 00:59:04 -0000 1.1.2.3 --- br2684ctl.c 26 Feb 2007 18:26:27 -0000 1.1.2.4 *************** *** 31,37 **** ! void fatal(const char *str, int i) { ! syslog (LOG_ERR,"Fatal: %s",str); exit(-2); }; --- 31,37 ---- ! void fatal(const char *str, int err) { ! syslog (LOG_ERR,"Fatal: %s; %s", str, strerror(err)); exit(-2); }; *************** *** 138,142 **** if (err < 0) ! fatal("failed to connect on socket", err); /* attach the vcc to device: */ --- 138,142 ---- if (err < 0) ! fatal("failed to connect on socket", errno); /* attach the vcc to device: */ |
|
From: chas w. <ch...@us...> - 2007-02-25 22:51:08
|
Update of /cvsroot/linux-atm/linux-atm/src/include In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv8804/src/include Modified Files: Tag: V2_5_0 atm.h atmd.h atmsap.h Log Message: add extern "C" linkage declaration to header files suggested by "Russell McGuire" <rmc...@vi...> Index: atm.h =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/include/atm.h,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** atm.h 9 Oct 2001 22:33:06 -0000 1.2 --- atm.h 25 Feb 2007 22:51:04 -0000 1.2.2.1 *************** *** 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.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** atmd.h 9 Oct 2001 22:33:06 -0000 1.2 --- atmd.h 25 Feb 2007 22:51:04 -0000 1.2.2.1 *************** *** 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.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** atmsap.h 9 Oct 2001 22:33:06 -0000 1.2 --- atmsap.h 25 Feb 2007 22:51:04 -0000 1.2.2.1 *************** *** 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 |
|
From: chas w. <ch...@us...> - 2005-11-25 16:49:46
|
Update of /cvsroot/linux-atm/linux-atm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19090 Modified Files: Tag: V2_5_0 configure.in Log Message: fix multipoint and oamd compile tests Index: configure.in =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/configure.in,v retrieving revision 1.2.2.9 retrieving revision 1.2.2.10 diff -C2 -d -r1.2.2.9 -r1.2.2.10 *** configure.in 22 Nov 2005 22:11:05 -0000 1.2.2.9 --- configure.in 25 Nov 2005 16:49:39 -0000 1.2.2.10 *************** *** 169,204 **** fi pmp_send="" AC_SUBST(pmp_send) AC_ARG_ENABLE(multipoint, ! [ --enable-multipoint Enable point to multipoint signalling], ! [AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT ! #include <sys/ioctl.h> #include <linux/atmdev.h> ], ! [[ int fd; struct atm_iobuf buf; ioctl(fd, ATM_ADDPARTY, &buf); ]])], ! [AC_DEFINE(MULTIPOINT, [], [Point to multipoint signalling support for atmsigd.]) ! pmp_send="pmp_send"], ! [AC_MSG_WARN([*** Multipoint signalling was not enabled. Missing kernel support?])], ! [AC_MSG_WARN([*** Multipoint signalling was not enabled. Can't test when cross-compiling.])]) ! ]) atmoamd="" AC_SUBST(atmoamd) ! AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT ! #include <sys/ioctl.h> #include <linux/atmoam.h> ], ! [[ int fd; ! ioctl(kernel, ATMOAMD_CTRL, 0); ]])], [atmoamd="atmoamd"], ! [AC_MSG_WARN([*** atmoamd will not be built. Missing kernel support?])], ! [AC_MSG_WARN([*** atmoamd will not be built. Can't test when cross-compiling.])]) dnl Xsed="sed -e s/^X//" --- 169,203 ---- fi + dnl AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[],[]) pmp_send="" AC_SUBST(pmp_send) AC_ARG_ENABLE(multipoint, ! [ --enable-multipoint Enable point to multipoint signalling], ! [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT ! #include <stdint.h> #include <linux/atmdev.h> ], ! [[ int fd; struct atm_iobuf buf; ioctl(fd, ATM_ADDPARTY, &buf); ]])], ! [AC_DEFINE(MULTIPOINT, [], [Point to multipoint signalling support for atmsigd.]) ! pmp_send="pmp_send"], ! [AC_MSG_WARN([*** Multipoint signalling was not enabled. Missing kernel support?])])] ! ) atmoamd="" AC_SUBST(atmoamd) ! AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT ! #include <stdint.h> #include <linux/atmoam.h> ], ! [[ int fd; ! ioctl(fd, ATMOAMD_CTRL, 0); ]])], [atmoamd="atmoamd"], ! [AC_MSG_WARN([*** atmoamd will not be built. Missing kernel support?])]) dnl Xsed="sed -e s/^X//" |
|
From: chas w. <ch...@us...> - 2005-11-22 22:11:20
|
Update of /cvsroot/linux-atm/linux-atm/src/qgen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15409/src/qgen Modified Files: Tag: V2_5_0 Makefile.am Log Message: prelimnary support for cross compiling (qgen needs built with the host compiler) Index: Makefile.am =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/qgen/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 26 Feb 2004 15:04:42 -0000 1.2.2.2 --- Makefile.am 22 Nov 2005 22:11:05 -0000 1.2.2.3 *************** *** 17,20 **** --- 17,22 ---- q_test_DEPENDENCIES = q.test.c + CC = @CC_FOR_BUILD@ + #TESTS = $(check_PROGRAMS) |
1 message has been excluded from this view by a project administrator.
