[Date Prev] [Date Index] [Date Next] [Thread Prev] [Thread Index] [Thread Next]
Greg A. Woods woods@weird.com
Wed, 24 Apr 2002 18:27:03 -0700 (PDT)
The following patch adds 'n' (in addition to 'p') for "no parity". This
is the traditional de facto standard abbreviation (eg. as in "8N1").
Minor improvements are also made to conserver.cf.man (in addition to
documenting this new parity flag).
(speaking of which, support for an optional stop-bits number following
the parity would probably be nice to have too)
Index: conserver/consent.c
===================================================================
RCS file: /cvs/misc/conserver/conserver/consent.c,v
retrieving revision 1.1.1.3
diff -c -r1.1.1.3 consent.c
*** conserver/consent.c 24 Apr 2002 21:42:00 -0000 1.1.1.3
--- conserver/consent.c 25 Apr 2002 00:47:53 -0000
***************
*** 124,133 ****
, /* even */
{'m', PARENB | CS7 | PARODD | PAREXT, 0}
, /* mark */
{'o', PARENB | CS7 | PARODD, 0}
, /* odd */
{'p', CS8, 0}
! , /* pass 8 bits, no parity */
{'s', PARENB | CS7 | PAREXT, 0}
, /* space */
#else /* ! HAVE_TERMIOS_H */
--- 124,135 ----
, /* even */
{'m', PARENB | CS7 | PARODD | PAREXT, 0}
, /* mark */
+ {'n', CS8, 0}
+ , /* pass 8 bits, no parity */
{'o', PARENB | CS7 | PARODD, 0}
, /* odd */
{'p', CS8, 0}
! , /* pass 8 bits, no parity, old form */
{'s', PARENB | CS7 | PAREXT, 0}
, /* space */
#else /* ! HAVE_TERMIOS_H */
***************
*** 139,144 ****
--- 141,148 ----
, /* odd */
# if defined(PASS8)
{'p', PASS8, EVENP | ODDP}
+ , /* pass 8 bits, no parity, old form */
+ {'n', PASS8, EVENP | ODDP}
, /* pass 8 bits, no parity */
# endif
{'s', 0, EVENP | ODDP} /* space */
Index: conserver.cf/conserver.cf.man
===================================================================
RCS file: /cvs/misc/conserver/conserver.cf/conserver.cf.man,v
retrieving revision 1.1.1.3
diff -c -r1.1.1.3 conserver.cf.man
*** conserver.cf/conserver.cf.man 24 Apr 2002 21:41:59 -0000 1.1.1.3
--- conserver.cf/conserver.cf.man 25 Apr 2002 01:16:20 -0000
***************
*** 4,24 ****
.SH NAME
conserver.cf \- console configuration file for conserver(8)
.SH SYNOPSIS
- .br
.BI \s-1LOGDIR\s0= logdirectory
! .br
.BI \s-1TIMESTAMP\s0= timestamp-spec
! .br
.BI \s-1BREAK\s0\fIn\fP= break-spec
! .br
\fIname\fP:\fIdevice\fP[@\fIconserver\fP]:\fIbaud\fP:\fIlogfile\fP:\fItimestamp-spec\fP:\fIbreak\fP
! .br
\fIname\fP:!\fItermserver\fP[@\fIconserver\fP]:\fIport\fP:\fIlogfile\fP:\fItimestamp-spec\fP:\fIbreak\fP
! .br
\fIname\fP:|\fIcommand\fP[@\fIconserver\fP]::\fIlogfile\fP:\fItimestamp-spec\fP:\fIbreak\fP
! .br
\fB%%\fP
! .br
\fIaccess\fP: \fIhosts\fP
.SH DESCRIPTION
.B Conserver.cf
--- 4,23 ----
.SH NAME
conserver.cf \- console configuration file for conserver(8)
.SH SYNOPSIS
.BI \s-1LOGDIR\s0= logdirectory
! .PP
.BI \s-1TIMESTAMP\s0= timestamp-spec
! .PP
.BI \s-1BREAK\s0\fIn\fP= break-spec
! .PP
\fIname\fP:\fIdevice\fP[@\fIconserver\fP]:\fIbaud\fP:\fIlogfile\fP:\fItimestamp-spec\fP:\fIbreak\fP
! .PP
\fIname\fP:!\fItermserver\fP[@\fIconserver\fP]:\fIport\fP:\fIlogfile\fP:\fItimestamp-spec\fP:\fIbreak\fP
! .PP
\fIname\fP:|\fIcommand\fP[@\fIconserver\fP]::\fIlogfile\fP:\fItimestamp-spec\fP:\fIbreak\fP
! .PP
\fB%%\fP
! .PP
\fIaccess\fP: \fIhosts\fP
.SH DESCRIPTION
.B Conserver.cf
***************
*** 32,53 ****
beginning with whitespace are considered continuations of the
previous line. This allows you to span one logical line over
many physical lines and insert comments wherever appropriate.
.PP
! The first section of the file has logical lines that are separated into
! five colon-separated fields. Leading and trailing white space in each
! field is ignored.
.TP
.I name
the unique name by which this connection is referred to
when using the \fBconsole\fP program.
This is typically the name of the host whose console is being monitored.
.TP
.I device
! the full path name of the device for this line.
! The \fIbaud\fP rate is the speed and parity for this console.
! Speed may be given as an integer,
! parity only requires the first letter of any of: even, odd, mark, space.
! For no parity, use the character `p'.
.TP
.BI ! termserver
the hostname of the terminal server to connect to.
--- 31,53 ----
beginning with whitespace are considered continuations of the
previous line. This allows you to span one logical line over
many physical lines and insert comments wherever appropriate.
+ .SS "Console Specifications"
+ The first section of the file consists of lines either specifying the
+ details for a given console, or giving default setting for the following
+ group of console specifications.
.PP
! Console specification lines are separated into five colon-separated
! fields. Leading and trailing white space in each field is ignored.
.TP
.I name
the unique name by which this connection is referred to
when using the \fBconsole\fP program.
This is typically the name of the host whose console is being monitored.
+ .PP
+ The next field has one of three alternate forms:
.TP
.I device
! the full pathname of the device for this line.
.TP
.BI ! termserver
the hostname of the terminal server to connect to.
***************
*** 56,61 ****
--- 56,76 ----
.BI | command
the command to invoke on the console server.
.PP
+ The interpretation of the third field depends on the form of the second
+ field:
+ .TP
+ .I baud
+ When the second field is a full pathname to a device, the second field
+ is the speed and parity for this device. The speed may be given as an
+ integer in bits per second. The desired parity setting for this device
+ is specified by the first letter of any of: even, odd, mark, space, or
+ none, given immediately after the speed number.
+ .TP
+ .I port
+ When the second field is the hostname of a terminal server (i.e. begins
+ with a `!' character), the second field is the TCP port number to
+ connect to on that host.
+ .PP
\fIdevice\fP, !\fItermserver\fP, and |\fIcommand\fP may be followed by
a remote console server name in the form ``\fB@\fP\fIconserver\fP'',
in which case the conserver daemon will send connections for \fIname\fP
***************
*** 91,104 ****
specifies `lines' and will cause timestamps of the form
`[Mon Jan 25 14:46:56 PST 1999]' to
be placed every \fImark-interval\fP lines (a newline character signifies
! a new line). So, `5h' specifies every five hours and `2l' specifies every
! two lines.
! An `\fBa\fP' can be specified to add logs of
`attached', `detached', and `bumped' actions,
including the user's name and the host from which the
\fBconsole\fP connection was made,
to the logfile.
! A `\fBb\fP' can be specified to add logging of break sequences sent
to the console.
.IP
A default \fItimestamp-spec\fP can be specified by using the
--- 106,118 ----
specifies `lines' and will cause timestamps of the form
`[Mon Jan 25 14:46:56 PST 1999]' to
be placed every \fImark-interval\fP lines (a newline character signifies
! a new line).
! An `\fBa\fP' flag can be specified to add logs of
`attached', `detached', and `bumped' actions,
including the user's name and the host from which the
\fBconsole\fP connection was made,
to the logfile.
! A `\fBb\fP' flag can be specified to add logging of break sequences sent
to the console.
.IP
A default \fItimestamp-spec\fP can be specified by using the
***************
*** 158,164 ****
.PD
.PP
This section is terminated with a `\fB%%\fP' token on a line by itself.
! .PP
The next section of the file contains a list of hosts and addresses
which are allowed to connect to the console server.
.B Conserver
--- 172,178 ----
.PD
.PP
This section is terminated with a `\fB%%\fP' token on a line by itself.
! .SS "Access Specifications"
The next section of the file contains a list of hosts and addresses
which are allowed to connect to the console server.
.B Conserver
--
Greg A. Woods
+1 416 218-0098; <gwoods@acm.org>; <g.a.woods@ieee.org>; <woods@robohack.ca>
Planix, Inc. <woods@planix.com>; VE3TCP; Secrets of the Weird <woods@weird.com>