linux-decnet-commit Mailing List for DECnet for Linux (Page 8)
Brought to you by:
chrissie_c,
ph3-der-loewe
Menu
▾
▴
linux-decnet-commit — CVS commits to the DECnet project
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(15) |
Nov
(16) |
Dec
(6) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(20) |
Feb
(27) |
Mar
(25) |
Apr
(12) |
May
(2) |
Jun
(6) |
Jul
(36) |
Aug
(12) |
Sep
(12) |
Oct
(16) |
Nov
(5) |
Dec
(5) |
| 2003 |
Jan
(8) |
Feb
(9) |
Mar
(25) |
Apr
(18) |
May
(29) |
Jun
(4) |
Jul
(1) |
Aug
|
Sep
(10) |
Oct
(5) |
Nov
(3) |
Dec
(9) |
| 2004 |
Jan
(17) |
Feb
|
Mar
(9) |
Apr
|
May
(4) |
Jun
(1) |
Jul
(2) |
Aug
(21) |
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2005 |
Jan
(5) |
Feb
|
Mar
(13) |
Apr
|
May
(3) |
Jun
(1) |
Jul
|
Aug
|
Sep
(13) |
Oct
(83) |
Nov
(2) |
Dec
|
| 2006 |
Jan
(21) |
Feb
(1) |
Mar
(32) |
Apr
(31) |
May
(3) |
Jun
(1) |
Jul
|
Aug
(7) |
Sep
|
Oct
(1) |
Nov
(3) |
Dec
(13) |
| 2007 |
Jan
(1) |
Feb
(7) |
Mar
|
Apr
(2) |
May
|
Jun
(1) |
Jul
(2) |
Aug
(20) |
Sep
|
Oct
|
Nov
|
Dec
(7) |
| 2008 |
Jan
(4) |
Feb
(13) |
Mar
(24) |
Apr
(18) |
May
(10) |
Jun
|
Jul
|
Aug
(40) |
Sep
(72) |
Oct
(61) |
Nov
(9) |
Dec
(2) |
| 2009 |
Jan
(6) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
(7) |
Jul
|
Aug
|
Sep
|
Oct
(8) |
Nov
|
Dec
(3) |
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
(5) |
May
|
Jun
|
Jul
(41) |
Aug
(28) |
Sep
(2) |
Oct
(5) |
Nov
(4) |
Dec
|
| 2011 |
Jan
(7) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <chr...@us...> - 2008-10-04 11:15:40
|
Update of /cvsroot/linux-decnet/dnprogs/libdap In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14849/libdap Modified Files: connection.cc Log Message: I've changed my mind, the default connect timeout is now 60 seconds Index: connection.cc =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/libdap/connection.cc,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** connection.cc 3 Oct 2008 09:09:00 -0000 1.12 --- connection.cc 4 Oct 2008 11:15:32 -0000 1.13 *************** *** 91,95 **** errstring[0]= '\0'; closed = false; ! connect_timeout = 20; #ifdef NO_BLOCKING --- 91,95 ---- errstring[0]= '\0'; closed = false; ! connect_timeout = 60; #ifdef NO_BLOCKING |
|
From: <chr...@us...> - 2008-10-04 11:15:39
|
Update of /cvsroot/linux-decnet/dnprogs/dndir In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14849/dndir Modified Files: dndir.cc Log Message: I've changed my mind, the default connect timeout is now 60 seconds Index: dndir.cc =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dndir/dndir.cc,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** dndir.cc 3 Oct 2008 09:18:58 -0000 1.10 --- dndir.cc 4 Oct 2008 11:15:32 -0000 1.11 *************** *** 75,79 **** fprintf(f, " -c Force single-column output on ttys (default for files)\n"); fprintf(f, " -t Show total bytes/blocks\n"); ! fprintf(f, " -T <secs> Set connection timeout (default 20 seconds)\n"); fprintf(f, " -w <size> width of multi-column output\n"); fprintf(f, " -f <size> maximum width of filename field\n"); --- 75,79 ---- fprintf(f, " -c Force single-column output on ttys (default for files)\n"); fprintf(f, " -t Show total bytes/blocks\n"); ! fprintf(f, " -T <secs> Set connection timeout (default 60 seconds)\n"); fprintf(f, " -w <size> width of multi-column output\n"); fprintf(f, " -f <size> maximum width of filename field\n"); *************** *** 108,112 **** int just_shown_header = 0; int verbosity = 0; ! int connect_timeout = 20; unsigned long total = 0; unsigned int filename_width = 18; --- 108,112 ---- int just_shown_header = 0; int verbosity = 0; ! int connect_timeout = 60; unsigned long total = 0; unsigned int filename_width = 18; |
|
From: <chr...@us...> - 2008-10-04 11:15:39
|
Update of /cvsroot/linux-decnet/dnprogs/dndel In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14849/dndel Modified Files: dndel.cc Log Message: I've changed my mind, the default connect timeout is now 60 seconds Index: dndel.cc =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dndel/dndel.cc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** dndel.cc 4 Oct 2008 10:26:12 -0000 1.5 --- dndel.cc 4 Oct 2008 11:15:32 -0000 1.6 *************** *** 40,44 **** printf(" -i interactive - prompt before deleting\n"); printf(" -v verbose - display files that have been deleted\n"); ! printf(" -T <secs> connect timeout (default 20)\n"); printf(" -? -h display this help message\n"); printf(" -V show version number\n"); --- 40,44 ---- printf(" -i interactive - prompt before deleting\n"); printf(" -v verbose - display files that have been deleted\n"); ! printf(" -T <secs> connect timeout (default 60)\n"); printf(" -? -h display this help message\n"); printf(" -V show version number\n"); *************** *** 224,228 **** int verbose = 0; int two_links = 0; ! int connect_timeout = 20; if (argc < 2) --- 224,228 ---- int verbose = 0; int two_links = 0; ! int connect_timeout = 60; if (argc < 2) |
|
From: <chr...@us...> - 2008-10-04 10:33:06
|
Update of /cvsroot/linux-decnet/dnprogs/debian In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11954/debian Modified Files: changelog Log Message: Starting 2.48 Index: changelog =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/debian/changelog,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -r1.70 -r1.71 *** changelog 3 Oct 2008 09:09:00 -0000 1.70 --- changelog 4 Oct 2008 10:32:57 -0000 1.71 *************** *** 15,19 **** * dnroute now honours SYSCONF_PREFIX for dnroute.conf * dnetinfo no longer shows the local area as under manual control ! * Add connect timeout to libdap and dnlogin dnprogs (2.47) unstable; urgency=low --- 15,19 ---- * dnroute now honours SYSCONF_PREFIX for dnroute.conf * dnetinfo no longer shows the local area as under manual control ! * Add connect timeout to most programs dnprogs (2.47) unstable; urgency=low |
|
From: <chr...@us...> - 2008-10-04 10:33:06
|
Update of /cvsroot/linux-decnet/dnprogs In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11954 Modified Files: Makefile.common Log Message: Starting 2.48 Index: Makefile.common =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/Makefile.common,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -r1.51 -r1.52 *** Makefile.common 26 Sep 2008 12:26:00 -0000 1.51 --- Makefile.common 4 Oct 2008 10:32:57 -0000 1.52 *************** *** 59,63 **** #Package version MAJOR_VERSION=2 ! MINOR_VERSION=47 VERSION=$(MAJOR_VERSION).$(MINOR_VERSION) --- 59,63 ---- #Package version MAJOR_VERSION=2 ! MINOR_VERSION=48 VERSION=$(MAJOR_VERSION).$(MINOR_VERSION) |
|
From: <chr...@us...> - 2008-10-04 10:32:03
|
Update of /cvsroot/linux-decnet/dnprogs/phone In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11915 Modified Files: backend.c Log Message: Add timeout Index: backend.c =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/phone/backend.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** backend.c 24 Aug 2008 09:31:28 -0000 1.5 --- backend.c 4 Oct 2008 10:32:00 -0000 1.6 *************** *** 658,661 **** --- 658,662 ---- struct nodeent *np; struct sockaddr_dn sockaddr; + struct timeval timeout = {60, 0}; colons = strstr(remuser, "::"); *************** *** 697,700 **** --- 698,703 ---- memcpy(sockaddr.sdn_add.a_addr, np->n_addr,2); + setsockopt(sockfd, SOL_SOCKET, SO_SNDTIMEO, &timeout, sizeof(timeout)); + if (connect(sockfd, (struct sockaddr *)&sockaddr, sizeof(sockaddr)) < 0) *************** *** 853,856 **** --- 856,860 ---- struct nodeent *np; struct sockaddr_dn sockaddr; + struct timeval timeout = {60, 0}; // colons are optional but we don't want them *************** *** 878,881 **** --- 882,887 ---- memcpy(sockaddr.sdn_add.a_addr, np->n_addr,2); + setsockopt(sockfd, SOL_SOCKET, SO_SNDTIMEO, &timeout, sizeof(timeout)); + if (connect(sockfd, (struct sockaddr *)&sockaddr, sizeof(sockaddr)) < 0) |
|
From: <chr...@us...> - 2008-10-04 10:28:17
|
Update of /cvsroot/linux-decnet/dnprogs/dnsubmit In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11781/dnsubmit Modified Files: dnsubmit.cc Log Message: Add timeout Index: dnsubmit.cc =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dnsubmit/dnsubmit.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** dnsubmit.cc 20 Aug 2008 12:43:58 -0000 1.3 --- dnsubmit.cc 4 Oct 2008 10:28:04 -0000 1.4 *************** *** 1,5 **** /****************************************************************************** ! (c) 1998-1999 Christine Caulfield chr...@go... ! This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by --- 1,5 ---- /****************************************************************************** ! (c) 1998-2008 Christine Caulfield chr...@go... ! This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by *************** *** 48,54 **** fprintf(f,"\nOptions:\n"); fprintf(f," -? -h display this help message\n"); fprintf(f," -v increase verbosity\n"); fprintf(f," -V show version number\n"); ! fprintf(f,"\nExample:\n\n"); if (dnprint) --- 48,55 ---- fprintf(f,"\nOptions:\n"); fprintf(f," -? -h display this help message\n"); + fprintf(f," -T <secs> Connect timeout (Default 20)\n"); fprintf(f," -v increase verbosity\n"); fprintf(f," -V show version number\n"); ! fprintf(f,"\nExample:\n\n"); if (dnprint) *************** *** 125,128 **** --- 126,130 ---- int verbose = 0; bool dnprint = false; + int connect_timeout = 20; // Work out the command name *************** *** 131,135 **** dnprint = true; } ! if (argc < 2) { --- 133,137 ---- dnprint = true; } ! if (argc < 2) { *************** *** 141,152 **** opterr = 0; optind = 0; ! while ((opt=getopt(argc,argv,"?hvV")) != EOF) { switch(opt) { ! case 'h': usage(stdout, dnprint); exit(1); ! case '?': usage(stderr, dnprint); --- 143,154 ---- opterr = 0; optind = 0; ! while ((opt=getopt(argc,argv,"?hvVT:")) != EOF) { switch(opt) { ! case 'h': usage(stdout, dnprint); exit(1); ! case '?': usage(stderr, dnprint); *************** *** 157,160 **** --- 159,166 ---- break; + case 'T': + connect_timeout = atoi(optarg); + break; + case 'V': printf("\ndnsubmit from dnprogs version %s\n\n", VERSION); *************** *** 166,175 **** { usage(stderr, dnprint); ! exit(2); } init_logging("dnsubmit", 'e', false); ! dap_connection conn(verbose); char dirname[256] = {'\0'}; if (!conn.connect(argv[optind], dap_connection::FAL_OBJECT, dirname)) --- 172,183 ---- { usage(stderr, dnprint); ! exit(2); } init_logging("dnsubmit", 'e', false); ! dap_connection conn(verbose); + conn.set_connect_timeout(connect_timeout); + char dirname[256] = {'\0'}; if (!conn.connect(argv[optind], dap_connection::FAL_OBJECT, dirname)) *************** *** 206,210 **** retval = read_reply(conn); } ! conn.close(); return 0; --- 214,218 ---- retval = read_reply(conn); } ! conn.close(); return 0; |
|
From: <chr...@us...> - 2008-10-04 10:26:21
|
Update of /cvsroot/linux-decnet/dnprogs/dndel In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11715 Modified Files: dndel.cc Log Message: Add Timeout Index: dndel.cc =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dndel/dndel.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** dndel.cc 20 Aug 2008 12:43:58 -0000 1.4 --- dndel.cc 4 Oct 2008 10:26:12 -0000 1.5 *************** *** 1,4 **** /****************************************************************************** ! (c) 1998-1999 Christine Caulfield chr...@go... This program is free software; you can redistribute it and/or modify --- 1,4 ---- /****************************************************************************** ! (c) 1998-2008 Christine Caulfield chr...@go... This program is free software; you can redistribute it and/or modify *************** *** 40,43 **** --- 40,44 ---- printf(" -i interactive - prompt before deleting\n"); printf(" -v verbose - display files that have been deleted\n"); + printf(" -T <secs> connect timeout (default 20)\n"); printf(" -? -h display this help message\n"); printf(" -V show version number\n"); *************** *** 223,227 **** int verbose = 0; int two_links = 0; ! if (argc < 2) --- 224,228 ---- int verbose = 0; int two_links = 0; ! int connect_timeout = 20; if (argc < 2) *************** *** 234,238 **** opterr = 0; optind = 0; ! while ((opt=getopt(argc,argv,"?hvVi")) != EOF) { switch(opt) --- 235,239 ---- opterr = 0; optind = 0; ! while ((opt=getopt(argc,argv,"?hvViT:")) != EOF) { switch(opt) *************** *** 248,251 **** --- 249,256 ---- break; + case 'T': + connect_timeout = atoi(optarg); + break; + case 'v': verbose++; *************** *** 264,267 **** --- 269,275 ---- dap_connection del_conn(verbose); + dir_conn.set_connect_timeout(connect_timeout); + del_conn.set_connect_timeout(connect_timeout); + /* We open one link to get the file names and (if interactive or verbose) another to do the actual deletion. |
|
From: <chr...@us...> - 2008-10-04 10:22:37
|
Update of /cvsroot/linux-decnet/dnprogs/dntask In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11566 Modified Files: dntask.c Log Message: Add timeout Index: dntask.c =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dntask/dntask.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** dntask.c 20 Aug 2008 12:43:58 -0000 1.8 --- dntask.c 4 Oct 2008 10:22:29 -0000 1.9 *************** *** 1,5 **** /****************************************************************************** ! (c) 1998 Christine Caulfield chr...@go... ! K. Humborg ke...@av... This program is free software; you can redistribute it and/or modify --- 1,5 ---- /****************************************************************************** ! (c) 1998,2008 Christine Caulfield chr...@go... ! K. Humborg ke...@av... This program is free software; you can redistribute it and/or modify *************** *** 33,36 **** --- 33,37 ---- static int sockfd; static int timeout = 60; + static int connect_timeout = 20; struct sockaddr_dn sockaddr; *************** *** 160,163 **** --- 161,166 ---- int setup_link(void) { + struct timeval timeout = {connect_timeout,0}; + if ( (np=getnodebyname(node)) == NULL) { *************** *** 185,188 **** --- 188,194 ---- } + if (setsockopt(sockfd, SOL_SOCKET, SO_SNDTIMEO, &timeout, sizeof(timeout))) + perror("Error setting snd timeout"); + // Provide access control and proxy information if (setsockopt(sockfd,DNPROTO_NSP,SO_CONACCESS,&accessdata, *************** *** 235,239 **** opterr = 0; optind = 0; ! while ((opt=getopt(argc,argv,"?hVibt:")) != EOF) { switch(opt) --- 241,245 ---- opterr = 0; optind = 0; ! while ((opt=getopt(argc,argv,"?hVibt:T:")) != EOF) { switch(opt) *************** *** 255,258 **** --- 261,268 ---- break; + case 'T': + connect_timeout = atoi(optarg); + break; + case 'V': printf("\ndntask from dntools version %s\n\n", VERSION); *************** *** 477,480 **** --- 487,491 ---- fprintf(f, " -i Interact with the command procedure\n"); fprintf(f, " -t Timeout (in seconds) for interactive command procedure input\n"); + fprintf(f, " -T Connect timeout (in seconds)\n"); fprintf(f, " -b Treat received data as binary data\n"); fprintf(f, " -? -h display this help message\n"); *************** *** 495,499 **** char *msg; ! if (getsockopt(sockfd, DNPROTO_NSP, DSO_DISDATA, &optdata, &len) == -1) { --- 506,510 ---- char *msg; ! if (errno == ETIMEDOUT || getsockopt(sockfd, DNPROTO_NSP, DSO_DISDATA, &optdata, &len) == -1) { |
|
From: <chr...@us...> - 2008-10-04 10:18:35
|
Update of /cvsroot/linux-decnet/dnprogs/dncopy In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11355 Modified Files: dncopy.cc dnetfile.cc dnetfile.h file.h unixfile.cc unixfile.h Log Message: Add -T timeout switch Index: dncopy.cc =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dncopy/dncopy.cc,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** dncopy.cc 20 Aug 2008 12:43:58 -0000 1.13 --- dncopy.cc 4 Oct 2008 10:18:28 -0000 1.14 *************** *** 1,4 **** /****************************************************************************** ! (c) 1998-2005 Christine Caulfield chr...@go... This program is free software; you can redistribute it and/or modify --- 1,4 ---- /****************************************************************************** ! (c) 1998-2008 Christine Caulfield chr...@go... This program is free software; you can redistribute it and/or modify *************** *** 39,44 **** int &rfm, int &rat, int &org, int &interactive, int &keep_version, int &user_bufsize, ! int &remove_cr, int &show_stats, int &verbose, ! int &flags, char *protection); // Start here: --- 39,44 ---- int &rfm, int &rat, int &org, int &interactive, int &keep_version, int &user_bufsize, ! int &remove_cr, int &show_stats, int &verbose, ! int &flags, char *protection, int &connect_timeout); // Start here: *************** *** 63,66 **** --- 63,67 ---- int printfile = 0; int flags = 0; + int connect_timeout = 20; char opt; char protection[255]={'\0'}; *************** *** 88,92 **** rfm, rat,org, interactive, keep_version, user_bufsize, ! remove_cr, show_stats, verbose, flags, protection); --- 89,93 ---- rfm, rat,org, interactive, keep_version, user_bufsize, ! remove_cr, show_stats, verbose, flags, protection, connect_timeout); *************** *** 95,99 **** rfm, rat,org, interactive, keep_version, user_bufsize, ! remove_cr, show_stats, verbose, flags, protection); // Work out the buffer size. The default for block transfers is 512 --- 96,100 ---- rfm, rat,org, interactive, keep_version, user_bufsize, ! remove_cr, show_stats, verbose, flags, protection, connect_timeout); // Work out the buffer size. The default for block transfers is 512 *************** *** 156,160 **** // Set up the network links if necessary ! if (out->setup_link(bufsize, rfm, rat, org, flags)) { out->perror("Error setting up output link"); --- 157,161 ---- // Set up the network links if necessary ! if (out->setup_link(bufsize, rfm, rat, org, flags, connect_timeout)) { out->perror("Error setting up output link"); *************** *** 181,185 **** } ! if (in->setup_link(bufsize, rfm, rat, org, flags)) { in->perror("Error setting up input link"); --- 182,186 ---- } ! if (in->setup_link(bufsize, rfm, rat, org, flags, connect_timeout)) { in->perror("Error setting up input link"); *************** *** 365,368 **** --- 366,370 ---- fprintf(f, " -P (s)print file to SYS$PRINT\n"); fprintf(f, " -D (s)delete file on close. Only really useful with -P\n"); + fprintf(f, " -T <secs> connect timeout in seconds (default 20)\n"); fprintf(f, " -V show version number\n"); fprintf(f, "\n"); *************** *** 445,455 **** int &rfm, int &rat, int &org, int &interactive, int &keep_version, int &user_bufsize, ! int &remove_cr, int &show_stats, int &verbose, ! int &flags, char *protection) { int opt; opterr = 0; optind = 0; ! while ((opt=getopt(argc,argv,"?Vvhdr:a:b:kislm:p:PDE")) != EOF) { switch(opt) { --- 447,457 ---- int &rfm, int &rat, int &org, int &interactive, int &keep_version, int &user_bufsize, ! int &remove_cr, int &show_stats, int &verbose, ! int &flags, char *protection, int &connect_timeout) { int opt; opterr = 0; optind = 0; ! while ((opt=getopt(argc,argv,"?Vvhdr:a:b:kislm:p:PDET:")) != EOF) { switch(opt) { *************** *** 474,477 **** --- 476,483 ---- break; + case 'T': + connect_timeout = atoi(optarg); + break; + case 'r': if (tolower(optarg[0]) == 'f') rfm = file::RFM_FIX; Index: dnetfile.cc =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dncopy/dnetfile.cc,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** dnetfile.cc 20 Aug 2008 12:43:58 -0000 1.10 --- dnetfile.cc 4 Oct 2008 10:18:28 -0000 1.11 *************** *** 1,4 **** /****************************************************************************** ! (c) 1998-2002 Christine Caulfield chr...@go... This program is free software; you can redistribute it and/or modify --- 1,4 ---- /****************************************************************************** ! (c) 1998-2008 Christine Caulfield chr...@go... This program is free software; you can redistribute it and/or modify *************** *** 69,73 **** } ! int dnetfile::setup_link(unsigned int bufsize, int rfm, int rat, int xfer_mode, int flags) { // If there was a parse error in the file name then fail here --- 69,73 ---- } ! int dnetfile::setup_link(unsigned int bufsize, int rfm, int rat, int xfer_mode, int flags, int timeout) { // If there was a parse error in the file name then fail here *************** *** 92,95 **** --- 92,96 ---- } + conn.set_connect_timeout(timeout); strcpy(user, (char *)accessdata.acc_user); Index: dnetfile.h =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dncopy/dnetfile.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** dnetfile.h 7 Dec 2007 11:05:02 -0000 1.6 --- dnetfile.h 4 Oct 2008 10:18:28 -0000 1.7 *************** *** 13,17 **** // Stuff overriden from file. ! virtual int setup_link(unsigned int bufsize, int rfm, int rat, int xfer_mode, int flags); virtual int open(const char *mode); virtual int open(const char *basename, const char *mode); --- 13,17 ---- // Stuff overriden from file. ! virtual int setup_link(unsigned int bufsize, int rfm, int rat, int xfer_mode, int flags, int timeout); virtual int open(const char *mode); virtual int open(const char *basename, const char *mode); Index: file.h =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dncopy/file.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** file.h 4 Sep 2008 15:43:09 -0000 1.6 --- file.h 4 Oct 2008 10:18:28 -0000 1.7 *************** *** 18,22 **** virtual ~file() {}; ! virtual int setup_link(unsigned int bufsize, int rfm, int rat, int xfer_mode, int flags) = 0; virtual int open(const char *mode) = 0; virtual int open(const char *basename, const char *mode) = 0; --- 18,22 ---- virtual ~file() {}; ! virtual int setup_link(unsigned int bufsize, int rfm, int rat, int xfer_mode, int flags, int timeout) = 0; virtual int open(const char *mode) = 0; virtual int open(const char *basename, const char *mode) = 0; Index: unixfile.cc =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dncopy/unixfile.cc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** unixfile.cc 20 Aug 2008 12:43:58 -0000 1.6 --- unixfile.cc 4 Oct 2008 10:18:28 -0000 1.7 *************** *** 1,4 **** /****************************************************************************** ! (c) 1998-2003 Christine Caulfield chr...@go... This program is free software; you can redistribute it and/or modify --- 1,4 ---- /****************************************************************************** ! (c) 1998-2008 Christine Caulfield chr...@go... This program is free software; you can redistribute it and/or modify *************** *** 172,176 **** } ! int unixfile::setup_link(unsigned int bufsize, int rfm, int rat, int xfer_mode, int flags) { // Save these for later --- 172,176 ---- } ! int unixfile::setup_link(unsigned int bufsize, int rfm, int rat, int xfer_mode, int flags, int timeout) { // Save these for later Index: unixfile.h =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/dncopy/unixfile.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** unixfile.h 7 Dec 2007 11:05:03 -0000 1.3 --- unixfile.h 4 Oct 2008 10:18:28 -0000 1.4 *************** *** 7,12 **** ~unixfile(); ! virtual int setup_link(unsigned int bufsize, int rfm, int rat, int xfer_mode, int flags); ! virtual int open(const char *mode); virtual int open(const char *basename, const char *mode); --- 7,12 ---- ~unixfile(); ! virtual int setup_link(unsigned int bufsize, int rfm, int rat, int xfer_mode, int flags, int timeout); ! virtual int open(const char *mode); virtual int open(const char *basename, const char *mode); *************** *** 25,29 **** virtual bool isdirectory(); virtual bool iswildcard(); ! virtual int max_buffersize(int biggest); protected: --- 25,29 ---- virtual bool isdirectory(); virtual bool iswildcard(); ! virtual int max_buffersize(int biggest); protected: |
|
From: <chr...@us...> - 2008-10-04 09:55:01
|
Update of /cvsroot/linux-decnet/latd In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10067 Modified Files: aclocal.m4 Log Message: Update aclocal.m4 & changelog Index: aclocal.m4 =================================================================== RCS file: /cvsroot/linux-decnet/latd/aclocal.m4,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** aclocal.m4 24 Aug 2008 13:18:16 -0000 1.5 --- aclocal.m4 4 Oct 2008 09:54:57 -0000 1.6 *************** *** 1,4393 **** ! # generated automatically by aclocal 1.7.9 -*- Autoconf -*- ! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 ! # Free Software Foundation, Inc. ! # This file is free software; the Free Software Foundation ! # gives unlimited permission to copy and/or distribute it, ! # with or without modifications, as long as this notice is preserved. ! ! # This program is distributed in the hope that it will be useful, ! # but WITHOUT ANY WARRANTY, to the extent permitted by law; without [...5323 lines suppressed...] + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar <conftest.tar]) + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break + fi + done + rm -rf conftest.dir + + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) + AC_SUBST([am__untar]) + ]) # _AM_PROG_TAR + + m4_include([acinclude.m4]) |
|
From: <chr...@us...> - 2008-10-04 09:55:01
|
Update of /cvsroot/linux-decnet/latd/debian In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10067/debian Modified Files: changelog Log Message: Update aclocal.m4 & changelog Index: changelog =================================================================== RCS file: /cvsroot/linux-decnet/latd/debian/changelog,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -r1.26 -r1.27 *** changelog 24 Aug 2008 13:18:16 -0000 1.26 --- changelog 4 Oct 2008 09:54:58 -0000 1.27 *************** *** 1,2 **** --- 1,9 ---- + latd (1.28) unstable; urgency=low + + * Fix a typing delay bug. + * Get rid of some compile-time warnings. + * Fix a missing header with newer compilers + + latd (1.27) unstable; urgency=low |
|
From: <chr...@us...> - 2008-10-03 15:50:00
|
Update of /cvsroot/linux-decnet/latd In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv30074 Modified Files: clientsession.cc connection.cc connection.h interfaces-linux.cc latcp.cc lat_messages.cc lat_messages.h llogin.cc lloginsession.cc localport.cc server.h Log Message: Fix some warnings. Index: clientsession.cc =================================================================== RCS file: /cvsroot/linux-decnet/latd/clientsession.cc,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -r1.30 -r1.31 *** clientsession.cc 20 Aug 2008 13:10:23 -0000 1.30 --- clientsession.cc 3 Oct 2008 15:49:53 -0000 1.31 *************** *** 1,4 **** /****************************************************************************** ! (c) 2001 Christine Caulfield chr...@go... This program is free software; you can redistribute it and/or modify --- 1,4 ---- /****************************************************************************** ! (c) 2001-2008 Christine Caulfield chr...@go... This program is free software; you can redistribute it and/or modify *************** *** 81,85 **** if (reason > 1) { ! char *msg = lat_messages::session_disconnect_msg(reason); write(master_fd, msg, strlen(msg)); write(master_fd, "\n", 1); --- 81,85 ---- if (reason > 1) { ! const char *msg = lat_messages::session_disconnect_msg(reason); write(master_fd, msg, strlen(msg)); write(master_fd, "\n", 1); Index: connection.cc =================================================================== RCS file: /cvsroot/linux-decnet/latd/connection.cc,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -r1.75 -r1.76 *** connection.cc 3 Oct 2008 15:25:44 -0000 1.75 --- connection.cc 3 Oct 2008 15:49:53 -0000 1.76 *************** *** 332,336 **** newsessionnum, (*master_conn)->eightbitclean); ! if (newsession->new_session(remnode, "","", credits) == -1) { --- 332,336 ---- newsessionnum, (*master_conn)->eightbitclean); ! if (newsession->new_session(remnode, (char*)"", (char*)"", credits) == -1) { *************** *** 393,397 **** slotcmd->remote_session, newsessionnum, false); ! if (newsession->new_session(remnode, "", (char *)portname, credits) == -1) { --- 393,397 ---- slotcmd->remote_session, newsessionnum, false); ! if (newsession->new_session(remnode, (char*)"", (char *)portname, credits) == -1) { *************** *** 1198,1202 **** } ! // TODO: mark this session (connection?) as waiting for connect so // that, if the user quits, we can tell the server. (TODODO: what message ??) } --- 1198,1202 ---- } ! // TODO: mark this session (connection?) as waiting for connect so // that, if the user quits, we can tell the server. (TODODO: what message ??) } *************** *** 1383,1393 **** } ! int LATConnection::num_clients() { unsigned int i; ! int num = 0; for (i=1; i<=highest_session; i++) ! if (sessions[i]) num++; return num; --- 1383,1394 ---- } ! unsigned int LATConnection::num_clients() { unsigned int i; ! unsigned int num = 0; for (i=1; i<=highest_session; i++) ! if (sessions[i]) ! num++; return num; Index: connection.h =================================================================== RCS file: /cvsroot/linux-decnet/latd/connection.h,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -r1.32 -r1.33 *** connection.h 20 Aug 2008 13:10:23 -0000 1.32 --- connection.h 3 Oct 2008 15:49:53 -0000 1.33 *************** *** 57,61 **** void got_status(unsigned char *node, LAT_StatusEntry *entry); bool node_is(const char *node) { return strcmp(node, (char *)remnode)==0;} ! int num_clients(); const char *get_servicename() { return (const char *)servicename; } --- 57,61 ---- void got_status(unsigned char *node, LAT_StatusEntry *entry); bool node_is(const char *node) { return strcmp(node, (char *)remnode)==0;} ! unsigned int num_clients(); const char *get_servicename() { return (const char *)servicename; } Index: interfaces-linux.cc =================================================================== RCS file: /cvsroot/linux-decnet/latd/interfaces-linux.cc,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** interfaces-linux.cc 20 Aug 2008 13:10:23 -0000 1.12 --- interfaces-linux.cc 3 Oct 2008 15:49:53 -0000 1.13 *************** *** 1,4 **** /****************************************************************************** ! (c) 2002-2004 Christine Caulfield chr...@go... This program is free software; you can redistribute it and/or modify --- 1,4 ---- /****************************************************************************** ! (c) 2002-2008 Christine Caulfield chr...@go... This program is free software; you can redistribute it and/or modify *************** *** 153,157 **** // Default "1st" interface ! if (!name) name = "eth0"; ifr.ifr_ifindex = iindex; --- 153,158 ---- // Default "1st" interface ! if (!name) ! name = (char *)"eth0"; ifr.ifr_ifindex = iindex; Index: latcp.cc =================================================================== RCS file: /cvsroot/linux-decnet/latd/latcp.cc,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -r1.45 -r1.46 *** latcp.cc 20 Aug 2008 13:10:23 -0000 1.45 --- latcp.cc 3 Oct 2008 15:49:53 -0000 1.46 *************** *** 1,4 **** /****************************************************************************** ! (c) 2000-2004 Christine Caulfield chr...@go... (c) 2003 Dmitri Popov --- 1,4 ---- /****************************************************************************** ! (c) 2000-2008 Christine Caulfield chr...@go... (c) 2003 Dmitri Popov *************** *** 794,804 **** else if (!stat("/usr/sbin/latd", &st)) { ! latd_bin = "/usr/sbin/latd"; ! latd_path = "/usr/sbin"; } else if (!stat("/usr/local/sbin/latd", &st)) { ! latd_bin = "/usr/local/sbin/latd"; ! latd_path = "/usr/local/sbin"; } --- 794,804 ---- else if (!stat("/usr/sbin/latd", &st)) { ! latd_bin = (char *)"/usr/sbin/latd"; ! latd_path = (char *)"/usr/sbin"; } else if (!stat("/usr/local/sbin/latd", &st)) { ! latd_bin = (char *)"/usr/local/sbin/latd"; ! latd_path = (char *)"/usr/local/sbin"; } *************** *** 806,810 **** if (latd_bin) { ! char *newargv[argc+1]; char *newenv[4]; int i; --- 806,810 ---- if (latd_bin) { ! char *newargv[argc+1]; char *newenv[4]; int i; *************** *** 830,835 **** newargv[0] = latd_bin; newargv[1] = NULL; ! newenv[0] = "PATH=/bin:/usr/bin:/sbin:/usr/sbin"; ! newenv[1] = "LATCP_STARTED=true"; // Tell latd it was started by us. newenv[2] = latcp_env; newenv[3] = NULL; --- 830,835 ---- newargv[0] = latd_bin; newargv[1] = NULL; ! newenv[0] = (char *)"PATH=/bin:/usr/bin:/sbin:/usr/sbin"; ! newenv[1] = (char*)"LATCP_STARTED=true"; // Tell latd it was started by us. newenv[2] = latcp_env; newenv[3] = NULL; *************** *** 873,878 **** { case 0: // Child ! newargv[0] = "/bin/sh"; ! newargv[1] = "/etc/latd.conf"; newargv[2] = NULL; execve("/bin/sh", newargv, newenv); --- 873,878 ---- { case 0: // Child ! newargv[0] = (char *)"/bin/sh"; ! newargv[1] = (char *)"/etc/latd.conf"; newargv[2] = NULL; execve("/bin/sh", newargv, newenv); *************** *** 973,977 **** // Send our version ! send_msg(latcp_socket, LATCP_VERSION, VERSION, strlen(VERSION)+1); if (!read_reply(latcp_socket, cmd, result, len)) // Read version number back --- 973,977 ---- // Send our version ! send_msg(latcp_socket, LATCP_VERSION, (char*)VERSION, strlen(VERSION)+1); if (!read_reply(latcp_socket, cmd, result, len)) // Read version number back Index: lat_messages.cc =================================================================== RCS file: /cvsroot/linux-decnet/latd/lat_messages.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** lat_messages.cc 20 Aug 2008 13:10:23 -0000 1.3 --- lat_messages.cc 3 Oct 2008 15:49:53 -0000 1.4 *************** *** 1,4 **** /****************************************************************************** ! (c) 2000 Christine Caulfield chr...@go... This program is free software; you can redistribute it and/or modify --- 1,4 ---- /****************************************************************************** ! (c) 2000-2008 Christine Caulfield chr...@go... This program is free software; you can redistribute it and/or modify *************** *** 15,19 **** #include "lat_messages.h" ! char *lat_messages::session_disconnect_msg(int code) { switch (code) --- 15,19 ---- #include "lat_messages.h" ! const char *lat_messages::session_disconnect_msg(int code) { switch (code) *************** *** 24,28 **** case 0x1: return "User requested disconnect"; break; ! case 0x2: return "System shutdown in progress"; break; case 0x3: return "Invalid slot received"; --- 24,28 ---- case 0x1: return "User requested disconnect"; break; ! case 0x2: return "System shutdown in progress"; break; case 0x3: return "Invalid slot received"; *************** *** 55,59 **** } ! char *lat_messages::connection_disconnect_msg(int code) { switch(code) --- 55,59 ---- } ! const char *lat_messages::connection_disconnect_msg(int code) { switch(code) Index: lat_messages.h =================================================================== RCS file: /cvsroot/linux-decnet/latd/lat_messages.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** lat_messages.h 20 Aug 2008 13:10:23 -0000 1.3 --- lat_messages.h 3 Oct 2008 15:49:53 -0000 1.4 *************** *** 1,4 **** /****************************************************************************** ! (c) 2000 Christine Caulfield chr...@go... This program is free software; you can redistribute it and/or modify --- 1,4 ---- /****************************************************************************** ! (c) 2000-2008 Christine Caulfield chr...@go... This program is free software; you can redistribute it and/or modify *************** *** 19,23 **** public: ! static char *session_disconnect_msg(int); ! static char *connection_disconnect_msg(int); }; --- 19,23 ---- public: ! static const char *session_disconnect_msg(int); ! static const char *connection_disconnect_msg(int); }; Index: llogin.cc =================================================================== RCS file: /cvsroot/linux-decnet/latd/llogin.cc,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -r1.26 -r1.27 *** llogin.cc 20 Aug 2008 13:10:23 -0000 1.26 --- llogin.cc 3 Oct 2008 15:49:53 -0000 1.27 *************** *** 1,4 **** /****************************************************************************** ! (c) 2001-2006 Christine Caulfield chr...@go... This program is free software; you can redistribute it and/or modify --- 1,4 ---- /****************************************************************************** ! (c) 2001-2008 Christine Caulfield chr...@go... This program is free software; you can redistribute it and/or modify *************** *** 335,339 **** // Send our version ! send_msg(latcp_socket, LATCP_VERSION, VERSION, strlen(VERSION)+1); read_reply(latcp_socket, cmd, result, len); // Read version number back --- 335,339 ---- // Send our version ! send_msg(latcp_socket, LATCP_VERSION, (char *)VERSION, strlen(VERSION)+1); read_reply(latcp_socket, cmd, result, len); // Read version number back Index: lloginsession.cc =================================================================== RCS file: /cvsroot/linux-decnet/latd/lloginsession.cc,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** lloginsession.cc 20 Aug 2008 13:10:23 -0000 1.15 --- lloginsession.cc 3 Oct 2008 15:49:53 -0000 1.16 *************** *** 1,4 **** /****************************************************************************** ! (c) 2001-2002 Christine Caulfield chr...@go... This program is free software; you can redistribute it and/or modify --- 1,4 ---- /****************************************************************************** ! (c) 2001-2008 Christine Caulfield chr...@go... This program is free software; you can redistribute it and/or modify *************** *** 157,161 **** if (reason > 1) { ! char *msg = lat_messages::session_disconnect_msg(reason); write(master_fd, msg, strlen(msg)); write(master_fd, "\n", 1); --- 157,161 ---- if (reason > 1) { ! const char *msg = lat_messages::session_disconnect_msg(reason); write(master_fd, msg, strlen(msg)); write(master_fd, "\n", 1); Index: localport.cc =================================================================== RCS file: /cvsroot/linux-decnet/latd/localport.cc,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** localport.cc 24 Aug 2008 13:18:16 -0000 1.18 --- localport.cc 3 Oct 2008 15:49:53 -0000 1.19 *************** *** 1,4 **** /****************************************************************************** ! (c) 2001-2004 Christine Caulfield chr...@go... This program is free software; you can redistribute it and/or modify --- 1,4 ---- /****************************************************************************** ! (c) 2001-2008 Christine Caulfield chr...@go... This program is free software; you can redistribute it and/or modify *************** *** 184,188 **** if (reason >= 1) { ! char *msg = lat_messages::session_disconnect_msg(reason); write(master_fd, msg, strlen(msg)); write(master_fd, "\n", 1); --- 184,188 ---- if (reason >= 1) { ! const char *msg = lat_messages::session_disconnect_msg(reason); write(master_fd, msg, strlen(msg)); write(master_fd, "\n", 1); Index: server.h =================================================================== RCS file: /cvsroot/linux-decnet/latd/server.h,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -r1.48 -r1.49 *** server.h 24 Aug 2008 13:18:16 -0000 1.48 --- server.h 3 Oct 2008 15:49:53 -0000 1.49 *************** *** 1,4 **** /****************************************************************************** ! (c) 2000-2002 Christine Caulfield chr...@go... This program is free software; you can redistribute it and/or modify --- 1,4 ---- /****************************************************************************** ! (c) 2000-2008 Christine Caulfield chr...@go... This program is free software; you can redistribute it and/or modify *************** *** 204,209 **** { public: ! serviceinfo(std::string n, int r, bool s, std::string i = std::string(""), int mc=0, char* comm="", ! uid_t uid=0, gid_t gid=0): name(n), id(i), --- 204,209 ---- { public: ! serviceinfo(std::string n, int r, bool s, std::string i = std::string((char*)""), int mc=0, char* comm="", ! uid_t uid=0, gid_t gid=0): name(n), id(i), *************** *** 235,242 **** void dec_connections() {cur_connections--;} ! const bool operator==(serviceinfo &si) { return (si == name);} ! const bool operator==(const std::string &nm) { return (nm == name);} ! const bool operator!=(serviceinfo &si) { return (si != name);} ! const bool operator!=(const std::string &nm) { return (nm != name);} private: --- 235,242 ---- void dec_connections() {cur_connections--;} ! bool operator==(serviceinfo &si) { return (si == name);} ! bool operator==(const std::string &nm) { return (nm == name);} ! bool operator!=(serviceinfo &si) { return (si != name);} ! bool operator!=(const std::string &nm) { return (nm != name);} private: |
|
From: <chr...@us...> - 2008-10-03 15:25:59
|
Update of /cvsroot/linux-decnet/latd In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv27749 Modified Files: connection.cc Log Message: Fix off-by-one error that can cause typing delays Index: connection.cc =================================================================== RCS file: /cvsroot/linux-decnet/latd/connection.cc,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -r1.74 -r1.75 *** connection.cc 24 Aug 2008 13:18:16 -0000 1.74 --- connection.cc 3 Oct 2008 15:25:44 -0000 1.75 *************** *** 1,4 **** /****************************************************************************** ! (c) 2000-2005 Christine Caulfield chr...@go... This program is free software; you can redistribute it and/or modify --- 1,4 ---- /****************************************************************************** ! (c) 2000-2008 Christine Caulfield chr...@go... This program is free software; you can redistribute it and/or modify *************** *** 853,857 **** // Send a pending data message (if we can) ! if (!pending_data.empty() && window_size < max_window_size) { // Send the top message --- 853,857 ---- // Send a pending data message (if we can) ! if (!pending_data.empty() && window_size <= max_window_size) { // Send the top message |
|
From: ph3-der-loewe <ph3...@us...> - 2008-09-29 14:10:38
|
Update of /cvsroot/linux-decnet/dnprogs/contrib/ph3-der-loewe In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28663 Modified Files: Tag: 1.23 dnetstat.c Log Message: updating dnetstat to use new getobjectbynumber() call (dntools r1.23) --- NEW FILE: dnetstat.c --- //dnetstat.c: /* copyright 2008 Philipp 'ph3-der-loewe' Schafft <li...@li...> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or version 3. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. */ #include <stdio.h> #include <string.h> #include <errno.h> #include <unistd.h> #include <stdlib.h> #include <sys/types.h> #include <sys/stat.h> #include <sys/socket.h> #include <fcntl.h> #include <netdnet/dn.h> #include <netdnet/dnetdb.h> #include <netdb.h> #define DNNS_FILE "/proc/net/decnet" struct dn_nse { char node[8]; char object[32]; }; char * progname = NULL; int numeric = 0; void usage (void) { fprintf(stderr, "Usage: %s [OPTIONS]\n", progname); fprintf(stderr, "\n"); fprintf(stderr, "Options:\n"); fprintf(stderr, " -h --help this help\n" " -n numerical mode (do not show node names but addresses)\n" ); } char * object_name(char *number) { int objnum = atoi(number); static char name[16]; if (numeric) return number; if ( objnum ) if ( getobjectbynumber(objnum, name, 16) != -1 ) return name; return number; } int prep_addr (char * buf, char * object) { struct nodeent * ne; *index(buf, '/') = 0; if ( strcmp(buf, "0.0") == 0 && ! numeric ) { strcpy(buf, "*"); } else if ( !numeric ) { if ( (ne = getnodebyname(buf)) != NULL ) { if ( (ne = getnodebyaddr((const char *)ne->n_addr, ne->n_length, ne->n_addrtype)) != NULL ) { strcpy(buf, ne->n_name); } } } strcat(buf, "::"); if ( strcmp(object, "0") == 0 && ! numeric ) { strcat(buf, "*"); } else { strcat(buf, object_name(object)); } return 0; } char * state_ktou (char * state, char ** dir) { if ( strcmp(state, "OPEN") == 0 ) { *dir = "IN"; return "LISTEN"; } else if ( strcmp(state, "RUN") == 0 ) { return "ESTABLISHED"; } else if ( strcmp(state, "RJ") == 0 ) { *dir = "OUT"; return "REJECTED"; } else if ( strcmp(state, "DN") == 0 ) { return "DISCNOTIFY"; } else if ( strcmp(state, "DIC") == 0 ) { return "DISCONNECTED"; } else if ( strcmp(state, "DI") == 0 ) { return "DISCONNECTING"; } else if ( strcmp(state, "DR") == 0 ) { return "DISCONREJECT"; } else if ( strcmp(state, "DRC") == 0 ) { return "DISCONREJCOMP"; } else if ( strcmp(state, "CL") == 0 ) { return "CLOSED"; } else if ( strcmp(state, "CN") == 0 ) { return "CLOSEDNOTIFY"; } else if ( strcmp(state, "CI") == 0 ) { *dir = "OUT"; return "CONNECTING"; } else if ( strcmp(state, "NR") == 0 ) { return "NORES"; } else if ( strcmp(state, "NC") == 0 ) { return "NOCOM"; } else if ( strcmp(state, "CC") == 0 ) { return "CONCONFIRM"; } else if ( strcmp(state, "CD") == 0 ) { return "CONDELIVERY"; } else if ( strcmp(state, "CR") == 0 ) { return "CONNECTRECV"; } return state; } int proc_file (FILE * fh) { struct dn_nse local, remote; char state[32], immed[32]; char buf[1024]; char out[1024] = {0}, * outdir = out+57; char conid[8] = {0,0,0,0,0,0,0,0}, *lid, *rid; char * lbuf = buf, * rbuf = buf + 512; char * dir = ""; // max be "UNI" or "BI", "IN", "OUT" int unused; if ( fgets(buf, 1024, fh) == NULL ) { fprintf(stderr, "Error: can not read banner from file\n"); return -1; } if ( strcmp(buf, "Local Remote\n") != 0 ) { fprintf(stderr, "Error: invalid file format\n"); return -1; } while (fscanf(fh, "%s %04d:%04d %04d:%04d %01d %16s" "%s %04d:%04d %04d:%04d %01d %16s" "%4s %s\n", lbuf, &unused, &unused, &unused, &unused, &unused, local.object, rbuf, &unused, &unused, &unused, &unused, &unused, remote.object, state, immed ) == 16) { lid = index(lbuf, '/') + 1; rid = index(rbuf, '/') + 1; if ( memcmp(lid, conid+4, 4) == 0 && memcmp(rid, conid, 4) == 0 && strcmp(state, "OPEN") != 0 ) { if ( *out ) { memcpy(outdir, "LOC", 3); puts(out); *out = 0; continue; } } if ( *out ) puts(out); memcpy(conid, lid, 4); memcpy(conid+4, rid, 4); prep_addr(lbuf, local.object); prep_addr(rbuf, remote.object); dir = ""; if ( strcmp(state, "OPEN") != 0 ) { immed[0] = 0; } sprintf(out, "decnet %-24s %-24s %-3s %-13s %s", lbuf, rbuf, dir, state_ktou(state, &dir), immed); } puts(out); return 0; } int main (int argc, char * argv[]) { FILE * fh = NULL; int i; char * k; char * file = DNNS_FILE; progname = argv[0]; for (i = 1; i < argc; i++) { k = argv[i]; if ( strcmp(k, "-n") == 0 ) { numeric = 1; } else if ( strcmp(k, "-h") == 0 || strcmp(k, "--help") == 0 ) { usage(); return 0; } else { fprintf(stderr, "Error: unknown parameter %s\n", k); usage(); return 1; } } if ( (fh = fopen(file, "r")) == NULL ) { fprintf(stderr, "Error: can not open DECnet netstat file: %s: %s\n", file, strerror(errno)); return 2; } // |Proto Recv-Q Send-Q Local Address Foreign Address State PID/Program name // |decnet *::29 *::0 LISTEN IMMED printf("Active DECnet sockets (servers and established)\n"); printf("Proto Local Address Foreign Address Dir State Accept mode\n"); proc_file(fh); fclose(fh); return 0; } //ll |
|
From: ph3-der-loewe <ph3...@us...> - 2008-09-29 14:08:50
|
Update of /cvsroot/linux-decnet/dnprogs/libdnet In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27826/libdnet Modified Files: Makefile Added Files: getobjectbyX.c Log Message: added libdnet/getobjectbyX.c: object name resolv using NIS and a static lookup table --- NEW FILE: getobjectbyX.c --- //getobjectbyX.c: /* copyright 2008 Philipp 'ph3-der-loewe' Schafft <li...@li...> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or version 3. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. */ #include <string.h> #include <errno.h> #include <stdlib.h> #include <netdb.h> #include <netdnet/dn.h> #include <netdnet/dnetdb.h> static char * _dnet_objhinum_string = NULL; static int _dnet_objhinum_handling = DNOBJHINUM_ERROR; struct { int num; char * name; } _dnet_objdb[] = { { 17, "FAL" }, { 19, "NML" }, { 19, "NICE" }, // alias! { 23, "DTERM" }, { 25, "MIRROR"}, { 26, "EVR" }, { 27, "MAIL" }, { 27, "MAIL11"}, // alias! { 29, "PHONE" }, { 42, "CTERM" }, { 63, "DTR" }, { -1, NULL} // END OF LIST }; int dnet_checkobjectnumber (int num) { if ( _dnet_objhinum_string == NULL ) { if ( (_dnet_objhinum_string = getenv(DNOBJ_HINUM_ENV)) == NULL ) _dnet_objhinum_string = DNOBJ_HINUM_DEF; if ( !*_dnet_objhinum_string ) _dnet_objhinum_string = DNOBJ_HINUM_DEF; if ( !strcasecmp(_dnet_objhinum_string, "error") ) { _dnet_objhinum_handling = DNOBJHINUM_ERROR; // error case } else if ( !strcasecmp(_dnet_objhinum_string, "zero") ) { _dnet_objhinum_handling = DNOBJHINUM_ZERO; // return as object number 0 } else if ( !strcasecmp(_dnet_objhinum_string, "return") ) { _dnet_objhinum_handling = DNOBJHINUM_RETURN; // return as object number unchanged } else if ( !strcasecmp(_dnet_objhinum_string, "alwayszero") ) { _dnet_objhinum_handling = DNOBJHINUM_ALWAYSZERO; // specal case to prevent app from using numbered objects } } if ( _dnet_objhinum_handling == DNOBJHINUM_ALWAYSZERO && num != -1 ) return 0; if ( num < 256 ) return num; switch (_dnet_objhinum_handling) { case DNOBJHINUM_ERROR: errno = EINVAL; return -1; case DNOBJHINUM_ZERO: return 0; case DNOBJHINUM_RETURN: return num; default: errno = ENOSYS; return -1; } } int getobjectbyname_nis(char * name) { char * cur, *next; char proto[16]; struct servent * se; static char * search_order = NULL; if ( search_order == NULL ) { if ( (search_order = getenv(DNOBJ_SEARCH_ENV)) == NULL ) search_order = DNOBJ_SEARCH_DEF; if ( !*search_order ) search_order = DNOBJ_SEARCH_DEF; } cur = search_order; while (cur && *cur) { if ( (next = strstr(cur, " ")) == NULL ) { strncpy(proto, cur, 16); } else { strncpy(proto, cur, next-cur); proto[next-cur] = 0; next++; } cur = next; if ( (se = getservbyname(name, proto)) != NULL ) { return ntohs(se->s_port); } } errno = ENOENT; return -1; } char * getobjectbynumber_nis(int num) { char * cur, *next; char proto[16]; struct servent * se; static char * search_order = NULL; if ( search_order == NULL ) { if ( (search_order = getenv(DNOBJ_SEARCH_ENV)) == NULL ) search_order = DNOBJ_SEARCH_DEF; if ( !*search_order ) search_order = DNOBJ_SEARCH_DEF; } cur = search_order; num = htons(num); while (cur && *cur) { if ( (next = strstr(cur, " ")) == NULL ) { strncpy(proto, cur, 16); } else { strncpy(proto, cur, next-cur); proto[next-cur] = 0; next++; } cur = next; if ( (se = getservbyport(num, proto)) != NULL ) { return se->s_name; } } errno = ENOENT; return NULL; } int getobjectbyname_static(char * name) { int i; for (i = 0; _dnet_objdb[i].num != -1; i++) { if ( !strcasecmp(name, _dnet_objdb[i].name) ) return _dnet_objdb[i].num; } errno = ENOENT; return -1; } char * getobjectbynumber_static(int num) { int i; for (i = 0; _dnet_objdb[i].num != -1; i++) { if ( _dnet_objdb[i].num == num ) return _dnet_objdb[i].name; } errno = ENOENT; return NULL; } int getobjectbyname(char * name) { int num; int old_errno = errno; if ( (num = getobjectbyname_nis(name)) == -1 ) num = getobjectbyname_static(name); if ( num != -1 ) errno = old_errno; return dnet_checkobjectnumber(num); } int getobjectbynumber(int number, char * name, size_t name_len) { int num; char * rname = NULL; int old_errno = errno; if ( (num = dnet_checkobjectnumber(number)) == -1 ) { // errno is set correctly after this call return -1; } if ( name_len < 2 ) { errno = EINVAL; return -1; } if ( (rname = getobjectbynumber_nis(number)) == NULL ) rname = getobjectbynumber_static(number); if ( rname == NULL ) { errno = ENOENT; return -1; } errno = old_errno; strncpy(name, rname, name_len-1); name[name_len-1] = 0; return num; } //ll Index: Makefile =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/libdnet/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** Makefile 24 Sep 2008 16:00:43 -0000 1.10 --- Makefile 29 Sep 2008 14:08:23 -0000 1.11 *************** *** 13,21 **** getnodebyname.o getnodebyaddr.o setnodeent.o getexecdev.o \ getnodename.o setnodename.o dnet_getnode.o dnet_pton.o dnet_ntop.o \ ! dnet_recv.o dnet_eof.o PICOBJS:=dnet_htoa.po dnet_ntoa.po dnet_addr.po dnet_conn.po getnodeadd.po \ getnodebyname.po getnodebyaddr.po setnodeent.po getexecdev.po \ getnodename.po setnodename.po dnet_getnode.po dnet_pton.po dnet_ntop.po\ ! dnet_recv.po dnet_eof.po LIBNAME=libdnet --- 13,21 ---- getnodebyname.o getnodebyaddr.o setnodeent.o getexecdev.o \ getnodename.o setnodename.o dnet_getnode.o dnet_pton.o dnet_ntop.o \ ! dnet_recv.o dnet_eof.o getobjectbyX.o PICOBJS:=dnet_htoa.po dnet_ntoa.po dnet_addr.po dnet_conn.po getnodeadd.po \ getnodebyname.po getnodebyaddr.po setnodeent.po getexecdev.po \ getnodename.po setnodename.po dnet_getnode.po dnet_pton.po dnet_ntop.po\ ! dnet_recv.po dnet_eof.po getobjectbyX.po LIBNAME=libdnet |
|
From: ph3-der-loewe <ph3...@us...> - 2008-09-29 14:08:40
|
Update of /cvsroot/linux-decnet/dnprogs/include/netdnet In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27826/include/netdnet Modified Files: dnetdb.h Log Message: added libdnet/getobjectbyX.c: object name resolv using NIS and a static lookup table Index: dnetdb.h =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/include/netdnet/dnetdb.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** dnetdb.h 22 Dec 2000 09:00:43 -0000 1.5 --- dnetdb.h 29 Sep 2008 14:08:23 -0000 1.6 *************** *** 28,31 **** --- 28,35 ---- extern struct nodeent *getnodebyname(const char *name); + extern int getobjectbyname(char * name); + extern int getobjectbynumber(int number, char * name, size_t name_len); + extern int dnet_checkobjectnumber(int num); + extern char *getexecdev(void); extern void setnodeent(int); *************** *** 67,70 **** --- 71,86 ---- #define DNOBJECT_DTR 63 /* DECnet test receiver */ + /* Config for dnet_checkobjectnumber()/getobjectbyname()/getobjectbynumber() */ + #define DNOBJ_SEARCH_ENV "DECNET_OBJPROTO" + #define DNOBJ_SEARCH_DEF "decnet" + + #define DNOBJ_HINUM_ENV "DECNET_OBJHINUM" + #define DNOBJ_HINUM_DEF "error" + + #define DNOBJHINUM_ERROR -1 + #define DNOBJHINUM_ZERO 0 + #define DNOBJHINUM_RETURN 1 + #define DNOBJHINUM_ALWAYSZERO 2 + /* Connect/Reject codes. These are my symbolic names, not DEC's */ #define DNSTAT_REJECTED 0 /* Rejected by object */ |
|
From: Christine C. <chr...@us...> - 2008-09-27 09:28:50
|
Update of /cvsroot/linux-decnet/dnprogs/libdnet In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28442/libdnet Modified Files: dnet_addr.c getexecdev.c getnodename.c Log Message: Return some errno values Index: dnet_addr.c =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/libdnet/dnet_addr.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** dnet_addr.c 6 Dec 2000 19:55:28 -0000 1.2 --- dnet_addr.c 27 Sep 2008 09:28:39 -0000 1.3 *************** *** 20,23 **** --- 20,24 ---- #include <sys/socket.h> #include <sys/types.h> + #include <sys/errno.h> #include <string.h> #include <stdlib.h> *************** *** 38,51 **** long area,node; ! if ((dnhosts = fopen(SYSCONF_PREFIX "/etc/decnet.conf","r")) == NULL) { printf("dnet_addr: Can not open " SYSCONF_PREFIX "/etc/decnet.conf\n"); ! return 0; } while (fgets(nodeln,80,dnhosts) != NULL) { sscanf(nodeln,"%s%s%s%s\n",nodetag,nodeadr,nametag,nodename); ! if (strncmp(nodetag,"#",1) != 0) { if (((strcmp(nodetag,"executor") != 0) && --- 39,53 ---- long area,node; ! if ((dnhosts = fopen(SYSCONF_PREFIX "/etc/decnet.conf","r")) == NULL) { printf("dnet_addr: Can not open " SYSCONF_PREFIX "/etc/decnet.conf\n"); ! errno = ENOENT; ! return NULL; } while (fgets(nodeln,80,dnhosts) != NULL) { sscanf(nodeln,"%s%s%s%s\n",nodetag,nodeadr,nametag,nodename); ! if (strncmp(nodetag,"#",1) != 0) { if (((strcmp(nodetag,"executor") != 0) && *************** *** 54,60 **** { printf("dnet_addr: Invalid decnet.conf syntax\n"); return 0; } ! if (strcmp(nodename,name) == 0) { aux=nodeadr; --- 56,63 ---- { printf("dnet_addr: Invalid decnet.conf syntax\n"); + errno = ENOENT; return 0; } ! if (strcmp(nodename,name) == 0) { aux=nodeadr; *************** *** 62,66 **** area=strtol(nodeadr,endptr,0); node=strtol(*endptr+1,endptr,0); ! if ((area < 0) || (area > 63) || (node < 0) || (node > 1023)) { --- 65,69 ---- area=strtol(nodeadr,endptr,0); node=strtol(*endptr+1,endptr,0); ! if ((area < 0) || (area > 63) || (node < 0) || (node > 1023)) { *************** *** 71,75 **** } binadr.a_addr[0] = node & 0xFF; ! binadr.a_addr[1] = (area << 2) | ((node & 0x300) >> 8); fclose(dnhosts); return &binadr; --- 74,78 ---- } binadr.a_addr[0] = node & 0xFF; ! binadr.a_addr[1] = (area << 2) | ((node & 0x300) >> 8); fclose(dnhosts); return &binadr; *************** *** 78,81 **** --- 81,85 ---- } fclose(dnhosts); + errno = ENOENT; return 0; } Index: getexecdev.c =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/libdnet/getexecdev.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** getexecdev.c 26 Apr 2000 08:22:03 -0000 1.1.1.1 --- getexecdev.c 27 Sep 2008 09:28:39 -0000 1.2 *************** *** 20,27 **** --- 20,29 ---- #include <sys/socket.h> #include <sys/types.h> + #include <sys/errno.h> #include <string.h> #include <stdlib.h> #include <netdnet/dn.h> #include <netdnet/dnetdb.h> + static char nodetag[80],nametag[80],nodeadr[80],nodename[80]; static char linetag[80],devicename[80]; *************** *** 35,39 **** { printf("getnodebyname: Can not open " SYSCONF_PREFIX "/etc/decnet.conf\n"); ! exit(-1); } while (fgets(nodeln,80,dnhosts) != NULL) --- 37,42 ---- { printf("getnodebyname: Can not open " SYSCONF_PREFIX "/etc/decnet.conf\n"); ! errno = ENOENT; ! return NULL; } while (fgets(nodeln,80,dnhosts) != NULL) *************** *** 41,45 **** sscanf(nodeln,"%s%s%s%s%s%s\n",nodetag,nodeadr,nametag, nodename,linetag,devicename); ! if (strncmp(nodetag,"#",1) != 0) { if (((strcmp(nodetag,"executor") != 0) && --- 44,48 ---- sscanf(nodeln,"%s%s%s%s%s%s\n",nodetag,nodeadr,nametag, nodename,linetag,devicename); ! if (strncmp(nodetag,"#",1) != 0) { if (((strcmp(nodetag,"executor") != 0) && *************** *** 48,58 **** { printf("getnodebyname: Invalid decnet.conf syntax\n"); ! exit(-1); } ! if (strcmp(linetag,"line") == 0) { fclose(dnhosts); return devicename; ! } } } --- 51,62 ---- { printf("getnodebyname: Invalid decnet.conf syntax\n"); ! errno = ENOENT; ! return NULL; } ! if (strcmp(linetag,"line") == 0) { fclose(dnhosts); return devicename; ! } } } Index: getnodename.c =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/libdnet/getnodename.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** getnodename.c 26 Sep 2008 13:18:45 -0000 1.4 --- getnodename.c 27 Sep 2008 09:28:39 -0000 1.5 *************** *** 21,24 **** --- 21,25 ---- #include <stdio.h> #include <string.h> + #include <sys/errno.h> #include <unistd.h> *************** *** 56,64 **** return 0; } ! else return -1; } } fclose(dnhosts); return -1; } --- 57,70 ---- return 0; } ! else ! { ! errno = ENOENT; ! return -1; ! } } } fclose(dnhosts); + errno = ENOENT; return -1; } |
|
From: Christine C. <chr...@us...> - 2008-09-27 09:21:19
|
Update of /cvsroot/linux-decnet/dnprogs/Documentation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25130 Modified Files: dnroute.README Log Message: Test commit Index: dnroute.README =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/Documentation/dnroute.README,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** dnroute.README 2 Sep 2008 16:13:31 -0000 1.1 --- dnroute.README 27 Sep 2008 09:21:06 -0000 1.2 *************** *** 1,13 **** This is dnroute - the DECnet routing daemon ! What it will do is to send out level 1 routing messages containing the local neighbour information for this node. If you enable routing for your kernel then this daemon will make it look as though it can route DECnet packets to other DECnet nodes. It will also, optionally, ! send level2 routing messages showing which other areas can be seen. It also sets up area routes to remote areas that are seen via these messages ! and adjusts those routes according to the relative cost of each route. The ! router priority is NOT currrently taken into account cos it's not currently ! available to userspace, but the cost bit seems to work pretty well. Use the ip command to show the routes set up by the daemon and report any --- 1,11 ---- This is dnroute - the DECnet routing daemon ! What it will do is to send out level 1 or 2 routing messages containing the local neighbour information for this node. If you enable routing for your kernel then this daemon will make it look as though it can route DECnet packets to other DECnet nodes. It will also, optionally, ! send level 2 routing messages showing which other areas can be seen. It also sets up area routes to remote areas that are seen via these messages ! and adjusts those routes according to the relative cost of each route. Use the ip command to show the routes set up by the daemon and report any |
|
From: Christine C. <chr...@go...> - 2008-09-24 08:41:07
|
is this list working? -- Chrissie |
|
From: Christine C. <chr...@us...> - 2008-09-18 01:01:18
|
Update of /cvsroot/linux-decnet/dnprogs/nml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv938 Modified Files: dnetnml.8 Log Message: Update man page Index: dnetnml.8 =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/nml/dnetnml.8,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** dnetnml.8 5 Sep 2008 09:05:55 -0000 1.2 --- dnetnml.8 18 Sep 2008 08:01:15 -0000 1.3 *************** *** 29,33 **** SHOW EXEC CHAR .br ! .SH OPTIONS .TP --- 29,41 ---- SHOW EXEC CHAR .br ! SHOW KNOWN OBJECTS ! .br ! SHOW KNOWN LINKS ! .br ! .br ! Note that for SHOW KNOWN OBJECTS to work, /etc/dnetd.conf needs to be readable by ! the daemon user (usually 'nobody') or it will return a Privilege Violation. There is no ! sensitive data in this file so it's quite OK to set the permissions to 0644. Though ! this is not the default. .SH OPTIONS .TP *************** *** 45,50 **** .I \-V Show the version of dnetnml. ! ! .SH SEE ALSO .BR dnetd "(8), " dnetd.conf "(5)" --- 53,60 ---- .I \-V Show the version of dnetnml. ! .SH BUGS ! Probably lots, particularly as some of the functions are undocumented and I've had to reverse-engineer them. ! SHOW KNOWN LINKS doesn't show quite the same information as VMS does. dnetnml relies on the information it ! can get from /proc/net/decnet so it can't show load PIDs or processes unfortunately. .SH SEE ALSO .BR dnetd "(8), " dnetd.conf "(5)" |
|
From: Christine C. <chr...@us...> - 2008-09-18 00:50:28
|
Update of /cvsroot/linux-decnet/dnprogs/nml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28987 Modified Files: nml.c Log Message: Comments Index: nml.c =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/nml/nml.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** nml.c 18 Sep 2008 07:38:24 -0000 1.12 --- nml.c 18 Sep 2008 07:50:25 -0000 1.13 *************** *** 628,633 **** if (load_dnetd_conf()) { buf[0] = -3; // Privilege violation ! buf[1] = 0; // Privilege violation ! buf[2] = 0; // Privilege violation write(sock, buf, 3); return -1; --- 628,633 ---- if (load_dnetd_conf()) { buf[0] = -3; // Privilege violation ! buf[1] = 0; ! buf[2] = 0; write(sock, buf, 3); return -1; *************** *** 651,655 **** ptr+=strlen(obj->name); ! buf[ptr++] = 0x01; buf[ptr++] = 0x02; buf[ptr++] = 0x01; --- 651,655 ---- ptr+=strlen(obj->name); ! buf[ptr++] = 0x01; // 513 Object number (not in NETMAN40.txt) buf[ptr++] = 0x02; buf[ptr++] = 0x01; *************** *** 657,663 **** if (obj->daemon) { ! buf[ptr++] = 0x12; buf[ptr++] = 0x02; ! buf[ptr++] = 0x40; buf[ptr++] = strlen(obj->daemon); strcpy(&buf[ptr], obj->daemon); --- 657,663 ---- if (obj->daemon) { ! buf[ptr++] = 0x12; // 530 FILE (not in NETMAN40.txt) buf[ptr++] = 0x02; ! buf[ptr++] = 0x40; // ASCII text buf[ptr++] = strlen(obj->daemon); strcpy(&buf[ptr], obj->daemon); *************** *** 666,672 **** if (!obj->proxy) { ! buf[ptr++] = 0x26; buf[ptr++] = 0x02; ! buf[ptr++] = 0x40; buf[ptr++] = strlen(obj->user); strcpy(&buf[ptr], obj->user); --- 666,672 ---- if (!obj->proxy) { ! buf[ptr++] = 0x26; // 550 username (not in NETMAN40.txt) buf[ptr++] = 0x02; ! buf[ptr++] = 0x40; // ASCII Text buf[ptr++] = strlen(obj->user); strcpy(&buf[ptr], obj->user); |
|
From: Christine C. <chr...@us...> - 2008-09-18 00:38:28
|
Update of /cvsroot/linux-decnet/dnprogs/nml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23911 Modified Files: nml.c Log Message: Fix error sent when dnetd.conf is not readable. Don't show router of 0.0 Index: nml.c =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/nml/nml.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** nml.c 17 Sep 2008 15:25:44 -0000 1.11 --- nml.c 18 Sep 2008 07:38:24 -0000 1.12 *************** *** 267,287 **** } ! buf[ptr++] = 0x3e; // 830=NEXT NODE ! buf[ptr++] = 0x03; ! ! buf[ptr++] = 0xc2; // What's this !? ! buf[ptr++] = 0x02; // Data type ! buf[ptr++] = rn->n_addr[0]; ! buf[ptr++] = rn->n_addr[1]; ! ! buf[ptr++] = 0x40; // ASCII text ! if (rn && rn->n_name) { ! makeupper(rn->n_name); ! buf[ptr++] = strlen(rn->n_name); ! strcpy(&buf[ptr], rn->n_name); ! ptr += strlen(rn->n_name); ! } ! else { ! buf[ptr++] = 0;// No Name } --- 267,290 ---- } ! /* We might not know the router yet */ ! if (rn->n_addr[0] && rn->n_addr[1]) { ! buf[ptr++] = 0x3e; // 830=NEXT NODE ! buf[ptr++] = 0x03; ! ! buf[ptr++] = 0xc2; // What's this !? ! buf[ptr++] = 0x02; // Data type ! buf[ptr++] = rn->n_addr[0]; ! buf[ptr++] = rn->n_addr[1]; ! ! buf[ptr++] = 0x40; // ASCII text ! if (rn && rn->n_name) { ! makeupper(rn->n_name); ! buf[ptr++] = strlen(rn->n_name); ! strcpy(&buf[ptr], rn->n_name); ! ptr += strlen(rn->n_name); ! } ! else { ! buf[ptr++] = 0;// No Name ! } } *************** *** 625,629 **** if (load_dnetd_conf()) { buf[0] = -3; // Privilege violation ! write(sock, &response, 1); return -1; } --- 628,634 ---- if (load_dnetd_conf()) { buf[0] = -3; // Privilege violation ! buf[1] = 0; // Privilege violation ! buf[2] = 0; // Privilege violation ! write(sock, buf, 3); return -1; } |
|
From: Christine C. <chr...@us...> - 2008-09-17 08:33:40
|
Update of /cvsroot/linux-decnet/dnprogs/libdaemon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20268/libdaemon Modified Files: Makefile Log Message: Bump minor version because there is a bugfix Index: Makefile =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/libdaemon/Makefile,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** Makefile 1 May 2008 07:56:36 -0000 1.11 --- Makefile 17 Sep 2008 15:33:36 -0000 1.12 *************** *** 6,10 **** LIBNAME=libdnet_daemon ! LIB_MINOR_VERSION=43.0 LIB_VERSION=$(MAJOR_VERSION).$(LIB_MINOR_VERSION) --- 6,10 ---- LIBNAME=libdnet_daemon ! LIB_MINOR_VERSION=43.1 LIB_VERSION=$(MAJOR_VERSION).$(LIB_MINOR_VERSION) |
|
From: Christine C. <chr...@us...> - 2008-09-17 08:25:53
|
Update of /cvsroot/linux-decnet/dnprogs/nml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16984 Modified Files: nml.c Log Message: Tidy comments Index: nml.c =================================================================== RCS file: /cvsroot/linux-decnet/dnprogs/nml/nml.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** nml.c 17 Sep 2008 15:00:17 -0000 1.10 --- nml.c 17 Sep 2008 15:25:44 -0000 1.11 *************** *** 41,44 **** --- 41,47 ---- #define IDENT_STRING "DECnet for Linux" + #define PROC_DECNET "/proc/net/decnet" + #define PROC_DECNET_DEV "/proc/net/decnet_dev" + #define NODESTATE_UNKNOWN -1 #define NODESTATE_ON 0 *************** *** 87,90 **** --- 90,94 ---- static struct object *object_db = NULL; + static void makeupper(char *s) { *************** *** 165,169 **** char var11[32]; unsigned short router = 0; ! FILE *procfile = fopen("/proc/net/decnet_dev", "r"); if (!procfile) --- 169,173 ---- char var11[32]; unsigned short router = 0; ! FILE *procfile = fopen(PROC_DECNET_DEV, "r"); if (!procfile) *************** *** 187,190 **** --- 191,195 ---- } + /* This assumes that count_links() has already ben called */ static int get_link_count(unsigned char addr1, unsigned char addr2) { *************** *** 202,205 **** --- 207,211 ---- } + /* Send a single node */ static int send_node(int sock, struct nodeent *n, int exec, char *device, int state) { *************** *** 312,316 **** } ! static int send_exec(int sock) { --- 318,322 ---- } ! /* Get the bits for SHOW EXECUTOR */ static int send_exec(int sock) { *************** *** 464,468 **** char var11[32]; int i; ! FILE *procfile = fopen("/proc/net/decnet", "r"); if (!procfile) --- 470,474 ---- char var11[32]; int i; ! FILE *procfile = fopen(PROC_DECNET, "r"); if (!procfile) *************** *** 478,484 **** struct link_node *lnode = NULL; - /* In case we ever do "SHOW KNOWN LINKS: - * var10 is remote user, var5 is local user - */ sscanf(var6, "%d.%d\n", &area, &node); --- 484,487 ---- *************** *** 612,615 **** --- 615,619 ---- } + /* SHOW KNOWN OBJECTS */ static int send_objects(int sock) { *************** *** 674,678 **** } ! static int send_links(int sock) { --- 678,682 ---- } ! /* SHOW KNOWN LINKS */ static int send_links(int sock) { *************** *** 693,697 **** char response; int ptr = 0; ! FILE *procfile = fopen("/proc/net/decnet", "r"); if (!procfile) --- 697,701 ---- char response; int ptr = 0; ! FILE *procfile = fopen(PROC_DECNET, "r"); if (!procfile) *************** *** 714,720 **** struct nodeent *nent; ! /* In case we ever do "SHOW KNOWN LINKS: ! * var10 is remote user, var5 is local user ! */ sscanf(var1, "%d.%d/%x\n", &area, &node, &llink); sscanf(var6, "%d.%d/%x\n", &area, &node, &rlink); --- 718,723 ---- struct nodeent *nent; ! /* We're only interested in the remote node addre here, but want both ! link numbers */ sscanf(var1, "%d.%d/%x\n", &area, &node, &llink); sscanf(var6, "%d.%d/%x\n", &area, &node, &rlink); *************** *** 792,795 **** --- 795,799 ---- } + /* SHOW NODE Lists */ static int read_information(int sock, unsigned char *buf, int length) { |
