diff options
| -rw-r--r-- | sbin/slattach/Makefile | 5 | ||||
| -rw-r--r-- | sbin/slattach/slattach.8 | 123 | ||||
| -rw-r--r-- | sbin/slattach/slattach.c | 503 |
3 files changed, 511 insertions, 120 deletions
diff --git a/sbin/slattach/Makefile b/sbin/slattach/Makefile index 4951f7e..285c494 100644 --- a/sbin/slattach/Makefile +++ b/sbin/slattach/Makefile @@ -1,7 +1,10 @@ -# @(#)Makefile 8.1 (Berkeley) 6/5/93 +# from: @(#)Makefile 5.4 (Berkeley) 5/11/90 +# $Id: Makefile,v 1.6 1993/10/13 07:16:38 rgrimes Exp $ PROG= slattach MAN8= slattach.8 MLINKS= slattach.8 slip.8 +LDADD= -lutil +DPADD= ${LIBUTIL} .include <bsd.prog.mk> diff --git a/sbin/slattach/slattach.8 b/sbin/slattach/slattach.8 index 217c481..e45ba3c 100644 --- a/sbin/slattach/slattach.8 +++ b/sbin/slattach/slattach.8 @@ -1,5 +1,5 @@ -.\" Copyright (c) 1986, 1991, 1993 -.\" The Regents of the University of California. All rights reserved. +.\" Copyright (c) 1986, 1991 The Regents of the University of California. +.\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -29,17 +29,30 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)slattach.8 8.2 (Berkeley) 4/1/94 +.\" from: @(#)slattach.8 6.4 (Berkeley) 3/16/91 .\" -.Dd April 1, 1994 +.\" $Id: slattach.8,v 1.7 1993/10/13 07:16:39 rgrimes Exp $ +.\" +.Dd April 4, 1993 .Dt SLATTACH 8 .Os BSD 4.3 .Sh NAME .Nm slattach .Nd attach serial lines as network interfaces -.Sh SYNOPSIS +.Sh SYOPNSIS .Nm Slattach -.Ar ttyname Op Ar baudrate +.Op \-a +.Op \-c +.Op \-e exit-command +.Op \-f +.Op \-h +.Op \-l +.Op \-n +.Op \-r redial-command +.Op \-s baudrate +.Op \-u unit-command +.Op \-z +.Ar ttyname .Sh DESCRIPTION .Nm Slattach is used to assign a tty line to a network interface, @@ -47,16 +60,53 @@ and to define the network source and destination addresses. The following operands are supported by .Nm slattach : .Bl -tag -width Ar +.It Ar \-a +Autoenable the VJ header compression option, if the other end of the link +is capable of VJ header compression then it will be used otherwise normal +headers will be used. +.It Ar \-c +Enables the VJ header compression option. Note that both ends of the link +must be able to use VJ header compression for this to work. +.It Ar \-e exit-command +Specifies a command to be invoked within a shell (sh -c exit-command) +before slattach exits. +.It Ar \-f +Disables the invocation of daemon() to run slattach in the background. +.It Ar \-h +Turn on cts/rts style flow control on the slip port, by default no flow +control is done. +.It Ar \-l +disable modem control (CLOCAL) and ignore carrier detect on the slip +port. By default the redial-command is invoked upon carrier drop and +slattach aborts if no redial-command is specified. +.It Ar \-n +Throw away ICMP packets. The slip interface will ignore ICMP packets +to prevent slow lines being saturated by ICMP responses. +.It Ar \-r redial-command +Specifies a command to be invoked within a shell (sh -c +redial-command) whenever carrier is lost on the line. +.It Ar \-s baudrate +Specifies the speed of the connection. If not specified, the +default of 9600 is used. +.It Ar \-u unit-command +When the line is switched to slip discipline, run +.Ql sh \-c unit-command <last> <current> +where <last> and <current> are the slip unit numbers when the line was +last opened and the unit number of the current slip connection +respecitvely. The unit number can change after redialing if you are +using more than one slip line. Slattach will abort if the unit number +changes and +.Ql \-u unit-command +was not specified. +.It Ar \-z +forces redial +redial-cmd upon startup irrespective of carrier. .It Ar ttyname Specifies the name of the tty device. .Ar Ttyname -should be a string of the form -.Ql ttyXX , -or -.Ql /dev/ttyXX . -.It Ar baudrate -Specifies the speed of the connection. If not specified, the -default of 9600 is used. +should be a string of the form +.Ql ttyXX or +.Ql /dev/ttyXX. .El .Pp Only the super-user may attach a network interface. @@ -65,19 +115,58 @@ To detach the interface, use .Dq Li ifconfig interface-name down after killing off the .Nm slattach -process. +process using +.Ql kill -INT . .Ar Interface-name is the name that is shown by .Xr netstat 1 +.Pp +To setup slattach to redial the phone when carrier is lost, use the +.Ql \-r redial-cmd +option to specify a script or executable that will reconnect the +serial line to the slip server. For example, the script could redial +the server and log in, etc. +.Pp +To reconfigure the network interface in case the slip unit number +changes, use the +.Ql \-u unit-cmd +option to specify a script or executable that will be invoked as +.Ql sh \-c unit-cmd old new, +where old and new are the slip unit numbers before and after +reconnecting the line. The unit number can change if you have more +than one line disconnect at the same time. The first to succeed in +reconnecting will get the lowest unit number. +.Pp +To kill slattach use +.Ql kill -INT +(SIGINT) which causes it to close the tty and exit. +.Pp +To force a redial, use +.Ql kill -HUP +(SIGHUP) which causes slattach to think carrier was lost and thus invoke +.Ql sh -c redial-command +to reconnect to the server. +.Pp +If you use a hard-wired connection rather than a modem, invoke +slattach with the +.Ql \-l +option in order to ignore carrier on the slip line. .Sh EXAMPLES .Bd -literal -offset indent -compact slattach ttyh8 -slattach /dev/tty01 4800 +slattach \-s 4800 /dev/tty01 +slattach \-c \-s 38400 /dev/sio01 +slattach \-r 'kermit -y dial.script >kermit.log 2>&1' .Ed .Sh DIAGNOSTICS +Look for error messages in /var/log/messages (slattach is a daemon). Messages indicating the specified interface does not exit, the -requested address is unknown, the user is not privileged and -tried to alter an interface's configuration. +requested address is unknown, the user is not privileged and tried to +alter an interface's configuration are logged there. Slattach also +logs failure to set the controlling terminal or failure to install +signal handlers. Upon connection and redial the ttyname and baud rate +are logged and on shutdown the ttyname is logged. +.Pp .Sh SEE ALSO .Xr netstat 1 , .Xr netintro 4 , diff --git a/sbin/slattach/slattach.c b/sbin/slattach/slattach.c index ac81d33..8d429f0 100644 --- a/sbin/slattach/slattach.c +++ b/sbin/slattach/slattach.c @@ -1,6 +1,6 @@ /* - * Copyright (c) 1988, 1993 - * The Regents of the University of California. All rights reserved. + * Copyright (c) 1988 Regents of the University of California. + * All rights reserved. * * This code is derived from software contributed to Berkeley by * Rick Adams. @@ -34,140 +34,439 @@ * SUCH DAMAGE. */ +/* + * Hacks to support "-a|c|n" flags on the command line which enable VJ + * header compresion and disable ICMP. + * If this is good all rights go to B & L Jolitz, otherwise send your + * comments to Reagan (/dev/null). + * + * nerd@percival.rain.com (Michael Galassi) 92.09.03 + * + * Hacked to change from sgtty to POSIX termio style serial line control + * and added flag to enable cts/rts style flow control. + * + * blymn@awadi.com.au (Brett Lymn) 93.04.04 + * + * Put slattach in it's own process group so it can't be killed + * accidentally. Close the connection on SIGHUP and SIGINT. Write a + * syslog entry upon opening and closing the connection. Rich Murphey + * and Brad Huntting. + * + * Add '-r command' option: runs 'command' upon recieving SIGHUP + * resulting from loss of carrier. Log any errors after forking. + * Rich 8/13/93 + * + * This version of slattach includes many changes by David Greenman, Brian + * Smith, Chris Bradley, and me (Michael Galassi). None of them are + * represented as functional anywhere outside of RAINet though they do work + * for us. Documentation is limited to the usage message for now. If you + * make improovments please pass them back. + * + * Added '-u UCMD' which runs 'UCMD <old> <new>' whenever the slip + * unit number changes where <old> and <new> are the old and new unit + * numbers, respectively. Also added the '-z' option which forces + * invocation of the redial command (-r CMD) upon startup regardless + * of whether the com driver claims (sometimes mistakenly) that + * carrier is present. Also added '-e ECMD' which runs ECMD before + * exiting. + * + * marc@escargot.rain.com (Marc Frajola) 93/09/10 + * + * Minor fixes to allow passive SLIP links to work (connections with + * modem control that do not have an associated dial command). Added + * code to re-check for carrier after dial command has been executed. + * Added SIGTERM handler to properly handle normal kill signals. Fixed + * bug in logic that caused message about no -u command to be logged + * even when -u was specified and the sl number changes. Tried to get + * rid of redundant syslog()'s to minimize console log output. Improved + * logging of improper command line options or number of command + * arguments. Removed spurious newline characters from syslog() calls. + * + * gjung@gjbsd.franken.de + * + * sighup_handler changed to set CLOCAL before running redial_cmd. + * added flag exiting, so exit_handler is not run twice. + * + */ + #ifndef lint -static char copyright[] = -"@(#) Copyright (c) 1988, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; +char copyright[] = +"@(#) Copyright (c) 1988 Regents of the University of California.\n\ + All rights reserved.\n"; #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)slattach.c 8.2 (Berkeley) 1/7/94"; +/*static char sccsid[] = "from: @(#)slattach.c 4.6 (Berkeley) 6/1/90";*/ +static char rcsid[] = "$Id"; #endif /* not lint */ #include <sys/param.h> -#include <sgtty.h> +#include <sys/ioctl.h> +#include <termios.h> #include <sys/socket.h> #include <netinet/in.h> #include <net/if.h> +#include <net/if_slvar.h> #include <netdb.h> #include <fcntl.h> +#include <stdlib.h> #include <stdio.h> +#include <unistd.h> #include <paths.h> +#include <syslog.h> +#include <signal.h> +#include <strings.h> + +extern int errno; +extern char *sys_errlist[]; #define DEFAULT_BAUD 9600 + +void sighup_handler(); /* SIGHUP handler */ +void sigint_handler(); /* SIGINT handler */ +void sigterm_handler(); /* SIGTERM handler */ +void exit_handler(int ret); /* run exit_cmd iff specified upon exit. */ +void setup_line(); /* configure slip line */ +void attach_line(); /* switch to slip line discipline */ + +int fd = -1; +char *dev = (char *)0; int slipdisc = SLIPDISC; +int ttydisc = TTYDISC; +int flow_control = 0; /* non-zero to enable hardware flow control. */ +int modem_control = 0; /* non-zero iff we watch carrier. */ +int comstate; /* TIOCMGET current state of serial driver */ +int redial_on_startup = 0; /* iff non-zero execute redial_cmd on startup */ +int speed = DEFAULT_BAUD; +int slflags = 0; /* compression flags */ +int unit = -1; /* slip device unit number */ +int foreground = 0; +int exiting = 0; /* allready running exit_handler */ +FILE *console; + +struct termios tty; +struct termios tty_orig; /* For saving original tty state */ char devname[32]; char hostname[MAXHOSTNAMELEN]; +char *redial_cmd = 0; /* command to exec upon shutdown. */ +char *config_cmd = 0; /* command to exec if slip unit changes. */ +char *exit_cmd = 0; /* command to exec before exiting. */ +char string[100]; + +static char usage_str[] = "\ +usage: %s [-acfhlnz] [-e command] [-r command] [-s speed] [-u command] device\n\ + -a -- autoenable VJ compression\n\ + -c -- enable VJ compression\n\ + -e ECMD -- run ECMD before exiting\n\ + -f -- run in foreground (don't detach from controlling tty)\n\ + -h -- turn on cts/rts style flow control\n\ + -l -- disable modem control (CLOCAL) and ignore carrier detect\n\ + -n -- throw out ICMP packets\n\ + -r RCMD -- run RCMD upon loss of carrier\n\ + -s # -- set baud rate (default 9600)\n\ + -u UCMD -- run 'UCMD <old sl#> <new sl#>' before switch to slip discipline\n\ + -z -- run RCMD upon startup irrespective of carrier\n"; -main(argc, argv) - int argc; - char *argv[]; +int main(int argc, char **argv) { - register int fd; - register char *dev = argv[1]; - struct sgttyb sgtty; - int speed; - - if (argc < 2 || argc > 3) { - fprintf(stderr, "usage: %s ttyname [baudrate]\n", argv[0]); - exit(1); + int option; + char name[32]; + extern char *optarg; + extern int optind; + + while ((option = getopt(argc, argv, "ace:fhlnr:s:u:z")) != EOF) { + switch (option) { + case 'a': + slflags |= SC_AUTOCOMP; + slflags &= ~SC_COMPRESS; + break; + case 'c': + slflags |= SC_COMPRESS; + slflags &= ~SC_AUTOCOMP; + break; + case 'e': + exit_cmd = (char*) strdup (optarg); + break; + case 'f': + foreground = 1; + break; + case 'h': + flow_control |= CRTSCTS; + break; + case 'l': + modem_control |= CLOCAL; + break; + case 'n': + slflags |= SC_NOICMP; + break; + case 'r': + redial_cmd = (char*) strdup (optarg); + break; + case 's': + speed = atoi(optarg); + break; + case 'u': + config_cmd = (char*) strdup (optarg); + break; + case 'z': + redial_on_startup = 1; + break; + default: + fprintf(stderr, "%s: Invalid option -- '%c'\n", + option); + case '?': + fprintf(stderr, usage_str, argv[0]); + exit_handler(1); + } } - speed = argc == 3 ? findspeed(atoi(argv[2])) : findspeed(DEFAULT_BAUD); - if (speed == 0) { - fprintf(stderr, "unknown speed %s", argv[2]); - exit(1); + + if (optind == argc - 1) + dev = argv[optind]; + + if (optind < (argc - 1)) { + fprintf(stderr, "%s: Too many args, first='%s'\n", + argv[0], argv[optind]); + } + if (optind > (argc - 1)) { + fprintf(stderr, "%s: Not enough args\n", argv[0]); + } + if (dev == (char *)0) { + fprintf(stderr, usage_str, argv[0]); + exit_handler(2); } if (strncmp(_PATH_DEV, dev, sizeof(_PATH_DEV) - 1)) { - (void)snprintf(devname, sizeof(devname), - "%s%s", _PATH_DEV, dev); + strcpy(devname, _PATH_DEV); + strcat(devname, "/"); + strncat(devname, dev, 10); dev = devname; } - if ((fd = open(dev, O_RDWR | O_NDELAY)) < 0) { - perror(dev); - exit(1); + + if (!foreground) + daemon(0,0); /* fork, setsid, chdir /, and close std*. */ + + /* Note: daemon() closes stderr, so log errors from here on. */ + (void)sprintf(name,"slattach[%d]", getpid()); + openlog(name,LOG_CONS,LOG_DAEMON); + + if ((fd = open(dev, O_RDWR | O_NONBLOCK)) < 0) { + syslog(LOG_ERR, "open(%s): %m", dev); + exit_handler(1); + } + /* acquire the serial line as a controling terminal. */ + if (ioctl(fd, TIOCSCTTY, 0) < 0) + syslog(LOG_NOTICE,"ioctl(TIOCSCTTY) failed: %s: %m"); + /* Make us the foreground process group associated with the + slip line which is our controlling terminal. */ + if (tcsetpgrp(fd, getpid()) < 0) + syslog(LOG_NOTICE,"tcsetpgrp failed: %s: %m"); + /* upon INT log a timestamp and exit. */ + if ((int)signal(SIGINT,sigint_handler) < 0) + syslog(LOG_NOTICE,"cannot install SIGINT handler: %s: %m"); + /* upon TERM log a timestamp and exit. */ + if ((int)signal(SIGTERM,sigterm_handler) < 0) + syslog(LOG_NOTICE,"cannot install SIGTERM handler: %s: %m"); + /* upon HUP redial and reconnect. */ + if ((int)signal(SIGHUP,sighup_handler) < 0) + syslog(LOG_NOTICE,"cannot install SIGHUP handler: %s: %m"); + /* Keep track of our original terminal values for redialing */ + if (tcgetattr(fd, &tty_orig) < 0) { + syslog(LOG_ERR, "tcgetattr: %m"); + exit_handler(1); + } + + + setup_line(); + + if (redial_on_startup) + sighup_handler(); + else + attach_line(); + if (!(modem_control & CLOCAL)) { + ioctl(fd, TIOCMGET, &comstate); + if (!(comstate & TIOCM_CD)) { /* check for carrier */ + /* force a redial if no carrier */ + kill (getpid(), SIGHUP); + } + } + for (;;) { + sigset_t mask = 0; + sigsuspend(&mask); } - sgtty.sg_flags = RAW | ANYP; - sgtty.sg_ispeed = sgtty.sg_ospeed = speed; - if (ioctl(fd, TIOCSETP, &sgtty) < 0) { - perror("ioctl(TIOCSETP)"); - exit(1); +} + +void setup_line() +{ + tty.c_lflag = tty.c_iflag = tty.c_oflag = 0; + tty.c_cflag = CREAD | CS8 | flow_control | modem_control; + tty.c_ispeed = tty.c_ospeed = speed; + /* set the line speed and flow control */ + if (tcsetattr(fd, TCSAFLUSH, &tty) < 0) { + syslog(LOG_ERR, "tcsetattr(TCSAFLUSH): %m"); + exit_handler(1); } + /* set data terminal ready */ + if (ioctl(fd, TIOCSDTR) < 0) { + syslog(LOG_ERR, "ioctl(TIOCSDTR): %m"); + exit_handler(1); + } + /* Switch to slip line discipline. */ if (ioctl(fd, TIOCSETD, &slipdisc) < 0) { - perror("ioctl(TIOCSETD)"); - exit(1); + syslog(LOG_ERR, "ioctl(TIOCSETD): %m"); + exit_handler(1); } + /* Assert any compression or no-icmp flags. */ + if (ioctl(fd, SLIOCSFLAGS, &slflags) < 0) { + syslog(LOG_ERR, "ioctl(SLIOCSFLAGS): %m"); + exit_handler(1); + } +} - if (fork() > 0) - exit(0); - for (;;) - sigpause(0L); +/* switch to slip line discipline and configure the network. */ +void attach_line() +{ + int new_unit; + + /* find out what unit number we were assigned */ + if (ioctl(fd, SLIOCGUNIT, (caddr_t)&new_unit) < 0) { + syslog(LOG_ERR, "ioctl(SLIOCGUNIT): %m"); + exit_handler(1); + } + /* don't compare unit numbers if this is the first time to attach. */ + if (unit < 0) + unit = new_unit; + /* iff the unit number changes either invoke config_cmd or punt. */ + if (config_cmd) { + char *s; + s = (char*) malloc(strlen(config_cmd) + 32); + sprintf (s, "%s %d %d", config_cmd, unit, new_unit); + syslog(LOG_NOTICE, "Configuring %s (sl%d):", dev, unit); + syslog(LOG_NOTICE, " '%s'", s); + system(s); + free (s); + unit = new_unit; + } else { + if (new_unit != unit) { + syslog(LOG_ERR, "slip unit changed from sl%d to sl%d, but no -u CMD was specified!"); + exit_handler(1); + } + syslog(LOG_NOTICE,"sl%d connected to %s at %d baud",unit,dev,speed); + } } -struct sg_spds { - int sp_val, sp_name; -} spds[] = { -#ifdef B50 - { 50, B50 }, -#endif -#ifdef B75 - { 75, B75 }, -#endif -#ifdef B110 - { 110, B110 }, -#endif -#ifdef B150 - { 150, B150 }, -#endif -#ifdef B200 - { 200, B200 }, -#endif -#ifdef B300 - { 300, B300 }, -#endif -#ifdef B600 - { 600, B600 }, -#endif -#ifdef B1200 - { 1200, B1200 }, -#endif -#ifdef B1800 - { 1800, B1800 }, -#endif -#ifdef B2000 - { 2000, B2000 }, -#endif -#ifdef B2400 - { 2400, B2400 }, -#endif -#ifdef B3600 - { 3600, B3600 }, -#endif -#ifdef B4800 - { 4800, B4800 }, -#endif -#ifdef B7200 - { 7200, B7200 }, -#endif -#ifdef B9600 - { 9600, B9600 }, -#endif -#ifdef EXTA - { 19200, EXTA }, -#endif -#ifdef EXTB - { 38400, EXTB }, -#endif - { 0, 0 } -}; - -findspeed(speed) - register int speed; +/* Signal handler for SIGHUP when carrier is dropped. */ +void sighup_handler() { - register struct sg_spds *sp; + if(exiting) return; +again: + /* reset discipline */ + if (ioctl(fd, TIOCSETD, &ttydisc) < 0) { + syslog(LOG_ERR, "ioctl(TIOCSETD): %m"); + exit_handler(1); + } + /* invoke a shell for redial_cmd or punt. */ + if (redial_cmd) { + syslog(LOG_NOTICE,"SIGHUP on %s (sl%d); running %s", + dev,unit,redial_cmd); + if (!(modem_control & CLOCAL)) { + tty_orig.c_cflag |= CLOCAL; + if (tcsetattr(fd, TCSAFLUSH, &tty_orig) < 0) { + syslog(LOG_ERR, "tcsetattr(TCSAFLUSH): %m"); + exit_handler(1); + } + } + system(redial_cmd); + /* Now check again for carrier (dial command is done): */ + if (!(modem_control & CLOCAL)) { + tty.c_cflag &= ~CLOCAL; + if (tcsetattr(fd, TCSAFLUSH, &tty) < 0) { + syslog(LOG_ERR, "tcsetattr(TCSAFLUSH): %m"); + exit_handler(1); + } + ioctl(fd, TIOCMGET, &comstate); + if (!(comstate & TIOCM_CD)) { /* check for carrier */ + /* force a redial if no carrier */ + goto again; + } + } + } else { + /* + * No redial command. + * + * If modem control, just wait for carrier before + * falling through to setup_line() and attach_line(). + * If no modem control, just fall through immediately. + */ + if (!(modem_control & CLOCAL)) { + int carrier = 0; + + syslog(LOG_NOTICE, "Waiting for carrier on %s (sl%d)", + dev, unit); + + /* Now wait for carrier before attaching line: */ + while (! carrier) { + /* + * Don't burn the CPU checking for carrier; + * carrier must be polled since there is no + * way to have a signal sent when carrier + * goes high (SIGHUP can only be sent when + * carrier is dropped); so add space between + * checks for carrier: + */ + sleep(2); + + /* Check for carrier present on tty port: */ + ioctl(fd, TIOCMGET, &comstate); + if (comstate & TIOCM_CD) { + carrier = 1; + } + } - sp = spds; - while (sp->sp_val && sp->sp_val != speed) - sp++; - return (sp->sp_name); + syslog(LOG_NOTICE, "Carrier now present on %s (sl%d)", + dev, unit); + } + } + setup_line(); + attach_line(); +} +/* Signal handler for SIGINT. We just log and exit. */ +void sigint_handler() +{ + if(exiting) return; + syslog(LOG_NOTICE,"sl%d on %s caught SIGINT, exiting.",unit,dev); + exit_handler(0); } +/* Signal handler for SIGTERM. We just log and exit. */ +void sigterm_handler() +{ + if(exiting) return; + syslog(LOG_NOTICE,"SIGTERM on %s (sl%d); exiting",dev,unit); + exit_handler(0); +} +/* Run config_cmd if specified before exiting. */ +void exit_handler(int ret) +{ + if(exiting) return; + exiting = 1; + /* + * First close the slip line in case exit_cmd wants it (like to hang + * up a modem or something). + */ + if (fd != -1) + close(fd); + /* invoke a shell for exit_cmd. */ + if (exit_cmd) { + syslog(LOG_NOTICE,"exiting after running %s", exit_cmd); + system(exit_cmd); + } + exit(ret); +} + +/* local variables: */ +/* c-indent-level: 8 */ +/* c-argdecl-indent: 0 */ +/* c-label-offset: -8 */ +/* c-continued-statement-offset: 8 */ +/* c-brace-offset: 0 */ +/* comment-column: 32 */ +/* end: */ |
