X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fsys-str.c;h=689bb8701b648aed7672cd2f34b604c6c3475617;hp=b7c2c5ad36791100dbc82e59a107066373b31e0e;hb=38946351eee506e06c35286c53f1ee24874d0e0c;hpb=a199a8fc6621d7e1ca23fdc65091cc605c5feb28 diff --git a/pppd/sys-str.c b/pppd/sys-str.c index b7c2c5a..689bb87 100644 --- a/pppd/sys-str.c +++ b/pppd/sys-str.c @@ -18,34 +18,40 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static char rcsid[] = "$Id: sys-str.c,v 1.17 1995/04/24 05:36:14 paulus Exp $"; +#endif + /* * TODO: */ #include +#include #include #include +#include #include #include #include -#include #include -#include +#include #include #include +#include #include #include #include +#include #include +#include +#include #include #include #include #include "pppd.h" -#include "ppp.h" -#include -#include #ifndef ifr_mtu #define ifr_mtu ifr_metric @@ -57,15 +63,70 @@ static struct modlist { } str_modules[MAXMODULES]; static int str_module_count = 0; static int pushed_ppp; +static int closed_stdio; -extern int hungup; /* has the physical layer been disconnected? */ -extern int kdebugflag; +static int restore_term; /* 1 => we've munged the terminal */ +static struct termios inittermios; /* Initial TTY termios */ + +int sockfd; /* socket for doing interface ioctls */ +static char *lock_file; /* lock file created for serial port */ + +/* + * sys_init - System-dependent initialization. + */ +void +sys_init() +{ + openlog("pppd", LOG_PID | LOG_NDELAY, LOG_PPP); + setlogmask(LOG_UPTO(LOG_INFO)); + if (debug) + setlogmask(LOG_UPTO(LOG_DEBUG)); + + /* Get an internet socket for doing socket ioctl's on. */ + if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { + syslog(LOG_ERR, "Couldn't create IP socket: %m"); + die(1); + } +} + +/* + * note_debug_level - note a change in the debug level. + */ +void +note_debug_level() +{ + if (debug) { + syslog(LOG_INFO, "Debug turned ON, Level %d", debug); + setlogmask(LOG_UPTO(LOG_DEBUG)); + } else { + setlogmask(LOG_UPTO(LOG_WARNING)); + } +} + +/* + * daemon - Detach us from the terminal session. + */ +int +daemon(nochdir, noclose) + int nochdir, noclose; +{ + int pid; + + if ((pid = fork()) < 0) + return -1; + if (pid != 0) + exit(0); /* parent dies */ + setsid(); + if (!nochdir) + chdir("/"); + if (!noclose) { + fclose(stdin); /* don't need stdin, stdout, stderr */ + fclose(stdout); + fclose(stderr); + } + return 0; +} -#define PAI_FLAGS_B7_0 0x100 -#define PAI_FLAGS_B7_1 0x200 -#define PAI_FLAGS_PAR_EVEN 0x400 -#define PAI_FLAGS_PAR_ODD 0x800 -#define PAI_FLAGS_HIBITS 0xF00 /* * ppp_available - check if this kernel supports PPP. @@ -105,6 +166,10 @@ establish_ppp() syslog(LOG_ERR, "ioctl(I_PUSH, ppp_async): %m"); die(1); } + /* push the compress module */ + if (ioctl(fd, I_PUSH, "pppcomp") < 0) { + syslog(LOG_WARNING, "ioctl(I_PUSH, ppp_comp): %m"); + } /* finally, push the ppp_if module that actually handles the */ /* network interface */ if (ioctl(fd, I_PUSH, "pppif") < 0) { @@ -112,20 +177,11 @@ establish_ppp() die(1); } pushed_ppp = 1; - if (ioctl(fd, I_SETSIG, S_INPUT) < 0) { - syslog(LOG_ERR, "ioctl(I_SETSIG, S_INPUT): %m"); - die(1); - } /* read mode, message non-discard mode */ if (ioctl(fd, I_SRDOPT, RMSGN) < 0) { syslog(LOG_ERR, "ioctl(I_SRDOPT, RMSGN): %m"); die(1); } - /* Flush any waiting messages, or we'll never get SIGPOLL */ - if (ioctl(fd, I_FLUSH, FLUSHRW) < 0) { - syslog(LOG_ERR, "ioctl(I_FLUSH, FLUSHRW): %m"); - die(1); - } /* * Find out which interface we were given. * (ppp_if handles this ioctl) @@ -139,6 +195,16 @@ establish_ppp() if (ioctl(fd, SIOCSIFDEBUG, &kdebugflag) < 0) { syslog(LOG_ERR, "ioctl(SIOCSIFDEBUG): %m"); } + + /* close stdin, stdout, stderr if they might refer to the device */ + if (default_device && !closed_stdio) { + int i; + + for (i = 0; i <= 2; ++i) + if (i != fd && i != sockfd) + close(i); + closed_stdio = 1; + } } /* @@ -155,6 +221,7 @@ disestablish_ppp() if (hungup) { /* we can't push or pop modules after the stream has hung up */ str_module_count = 0; + restore_term = 0; /* nor can we fix up terminal settings */ return; } @@ -183,21 +250,225 @@ disestablish_ppp() syslog(LOG_WARNING, "All received characters had %s", s); } } - } - while (ioctl(fd, I_POP, 0) == 0) /* pop any we pushed */ - ; - pushed_ppp = 0; + while (ioctl(fd, I_POP, 0) == 0) /* pop any we pushed */ + ; - for (; str_module_count > 0; str_module_count--) { - if (ioctl(fd, I_PUSH, str_modules[str_module_count-1].modname)) { - syslog(LOG_WARNING, "str_restore: couldn't push module %s: %m", - str_modules[str_module_count-1].modname); - } else { - MAINDEBUG((LOG_INFO, "str_restore: pushed module %s", - str_modules[str_module_count-1].modname)); + for (; str_module_count > 0; str_module_count--) { + if (ioctl(fd, I_PUSH, str_modules[str_module_count-1].modname)) { + if (errno != ENXIO) + syslog(LOG_WARNING, "Couldn't restore module %s: %m", + str_modules[str_module_count-1].modname); + } else { + MAINDEBUG((LOG_INFO, "str_restore: pushed module %s", + str_modules[str_module_count-1].modname)); + } + } + pushed_ppp = 0; + } +} + + +/* + * List of valid speeds. + */ +struct speed { + int speed_int, speed_val; +} speeds[] = { +#ifdef B50 + { 50, B50 }, +#endif +#ifdef B75 + { 75, B75 }, +#endif +#ifdef B110 + { 110, B110 }, +#endif +#ifdef B134 + { 134, B134 }, +#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 B19200 + { 19200, B19200 }, +#endif +#ifdef B38400 + { 38400, B38400 }, +#endif +#ifdef EXTA + { 19200, EXTA }, +#endif +#ifdef EXTB + { 38400, EXTB }, +#endif +#ifdef B57600 + { 57600, B57600 }, +#endif +#ifdef B115200 + { 115200, B115200 }, +#endif + { 0, 0 } +}; + +/* + * Translate from bits/second to a speed_t. + */ +int +translate_speed(bps) + int bps; +{ + struct speed *speedp; + + if (bps == 0) + return 0; + for (speedp = speeds; speedp->speed_int; speedp++) + if (bps == speedp->speed_int) + return speedp->speed_val; + syslog(LOG_WARNING, "speed %d not supported", bps); + return 0; +} + +/* + * Translate from a speed_t to bits/second. + */ +int +baud_rate_of(speed) + int speed; +{ + struct speed *speedp; + + if (speed == 0) + return 0; + for (speedp = speeds; speedp->speed_int; speedp++) + if (speed == speedp->speed_val) + return speedp->speed_int; + return 0; +} + +/* + * set_up_tty: Set up the serial port on `fd' for 8 bits, no parity, + * at the requested speed, etc. If `local' is true, set CLOCAL + * regardless of whether the modem option was specified. + */ +set_up_tty(fd, local) + int fd, local; +{ + int speed; + struct termios tios; + + if (tcgetattr(fd, &tios) < 0) { + syslog(LOG_ERR, "tcgetattr: %m"); + die(1); + } + + if (!restore_term) + inittermios = tios; + + tios.c_cflag &= ~(CSIZE | CSTOPB | PARENB | CLOCAL); + if (crtscts > 0) + tios.c_cflag |= CRTSCTS; + else if (crtscts < 0) + tios.c_cflag &= ~CRTSCTS; + + tios.c_cflag |= CS8 | CREAD | HUPCL; + if (local || !modem) + tios.c_cflag |= CLOCAL; + tios.c_iflag = IGNBRK | IGNPAR; + tios.c_oflag = 0; + tios.c_lflag = 0; + tios.c_cc[VMIN] = 1; + tios.c_cc[VTIME] = 0; + + if (crtscts == 2) { + tios.c_iflag |= IXOFF; + tios.c_cc[VSTOP] = 0x13; /* DC3 = XOFF = ^S */ + tios.c_cc[VSTART] = 0x11; /* DC1 = XON = ^Q */ + } + + speed = translate_speed(inspeed); + if (speed) { + cfsetospeed(&tios, speed); + cfsetispeed(&tios, speed); + } else { + speed = cfgetospeed(&tios); + /* + * We can't proceed if the serial port speed is B0, + * since that implies that the serial port is disabled. + */ + if (speed == B0) { + syslog(LOG_ERR, "Baud rate for %s is 0; need explicit baud rate", + devnam); + die(1); } } + + if (tcsetattr(fd, TCSAFLUSH, &tios) < 0) { + syslog(LOG_ERR, "tcsetattr: %m"); + die(1); + } + + baud_rate = inspeed = baud_rate_of(speed); + restore_term = 1; +} + +/* + * restore_tty - restore the terminal to the saved settings. + */ +void +restore_tty() +{ + if (restore_term) { + if (tcsetattr(fd, TCSAFLUSH, &inittermios) < 0) + if (errno != ENXIO) + syslog(LOG_WARNING, "tcsetattr: %m"); + restore_term = 0; + } +} + +/* + * setdtr - control the DTR line on the serial port. + * This is called from die(), so it shouldn't call die(). + */ +setdtr(fd, on) +int fd, on; +{ + int modembits = TIOCM_DTR; + + ioctl(fd, (on? TIOCMBIS: TIOCMBIC), &modembits); } @@ -219,12 +490,31 @@ output(unit, p, len) str.len = len; str.buf = (caddr_t) p; - if(putmsg(fd, NULL, &str, 0) < 0) { - syslog(LOG_ERR, "putmsg: %m"); - die(1); + if (putmsg(fd, NULL, &str, 0) < 0) { + if (errno != ENXIO) { + syslog(LOG_ERR, "putmsg: %m"); + die(1); + } } } +/* + * wait_input - wait for input, for a length of time specified in *timo. + */ +wait_input(timo) + struct timeval *timo; +{ + int t; + struct pollfd pfd; + + t = timo == NULL? -1: timo->tv_sec * 1000 + timo->tv_usec / 1000; + pfd.fd = fd; + pfd.events = POLLIN | POLLPRI | POLLHUP; + if (poll(&pfd, 1, t) < 0 && errno != EINTR) { + syslog(LOG_ERR, "poll: %m"); + die(1); + } +} /* * read_packet - get a PPP packet from the serial device. @@ -233,15 +523,18 @@ int read_packet(buf) u_char *buf; { - struct strbuf str; + struct strbuf str, ctl; int len, i; + unsigned char ctlbuf[16]; - str.maxlen = MTU+DLLHEADERLEN; + str.maxlen = PPP_MTU + PPP_HDRLEN; str.buf = (caddr_t) buf; + ctl.maxlen = sizeof(ctlbuf); + ctl.buf = (caddr_t) ctlbuf; i = 0; - len = getmsg(fd, NULL, &str, &i); + len = getmsg(fd, &ctl, &str, &i); if (len < 0) { - if (errno == EAGAIN || errno == EWOULDBLOCK) { + if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) { return -1; } syslog(LOG_ERR, "getmsg(fd) %m"); @@ -249,6 +542,9 @@ read_packet(buf) } if (len) MAINDEBUG((LOG_DEBUG, "getmsg returned 0x%x",len)); + if (ctl.len > 0) + syslog(LOG_NOTICE, "got ctrl msg len %d %x %x\n", ctl.len, + ctlbuf[0], ctlbuf[1]); if (str.len < 0) { MAINDEBUG((LOG_DEBUG, "getmsg short return length %d", str.len)); @@ -266,7 +562,7 @@ read_packet(buf) void ppp_send_config(unit, mtu, asyncmap, pcomp, accomp) int unit, mtu; - u_long asyncmap; + u_int32_t asyncmap; int pcomp, accomp; { char c; @@ -274,7 +570,7 @@ ppp_send_config(unit, mtu, asyncmap, pcomp, accomp) strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); ifr.ifr_mtu = mtu; - if (ioctl(s, SIOCSIFMTU, (caddr_t) &ifr) < 0) { + if (ioctl(sockfd, SIOCSIFMTU, (caddr_t) &ifr) < 0) { syslog(LOG_ERR, "ioctl(SIOCSIFMTU): %m"); quit(); } @@ -318,7 +614,7 @@ ppp_set_xaccm(unit, accm) void ppp_recv_config(unit, mru, asyncmap, pcomp, accomp) int unit, mru; - u_long asyncmap; + u_int32_t asyncmap; int pcomp, accomp; { char c; @@ -342,6 +638,56 @@ ppp_recv_config(unit, mru, asyncmap, pcomp, accomp) } } +/* + * ccp_test - ask kernel whether a given compression method + * is acceptable for use. + */ +ccp_test(unit, opt_ptr, opt_len, for_transmit) + int unit, opt_len, for_transmit; + u_char *opt_ptr; +{ + struct ppp_option_data data; + + if ((unsigned) opt_len > MAX_PPP_OPTION) + opt_len = MAX_PPP_OPTION; + data.length = opt_len; + data.transmit = for_transmit; + BCOPY(opt_ptr, data.opt_data, opt_len); + return ioctl(fd, SIOCSCOMPRESS, (caddr_t) &data) >= 0; +} + +/* + * ccp_flags_set - inform kernel about the current state of CCP. + */ +void +ccp_flags_set(unit, isopen, isup) + int unit, isopen, isup; +{ + int x; + + x = (isopen? 1: 0) + (isup? 2: 0); + if (ioctl(fd, SIOCSIFCOMP, (caddr_t) &x) < 0 && errno != ENOTTY) + syslog(LOG_ERR, "ioctl (SIOCSIFCOMP): %m"); +} + +/* + * ccp_fatal_error - returns 1 if decompression was disabled as a + * result of an error detected after decompression of a packet, + * 0 otherwise. This is necessary because of patent nonsense. + */ +int +ccp_fatal_error(unit) + int unit; +{ + int x; + + if (ioctl(fd, SIOCGIFCOMP, (caddr_t) &x) < 0) { + syslog(LOG_ERR, "ioctl(SIOCGIFCOMP): %m"); + return 0; + } + return x & CCP_FATALERROR; +} + /* * sifvjcomp - config tcp header compression */ @@ -360,23 +706,33 @@ sifvjcomp(u, vjcomp, cidcomp, maxcid) } /* - * sifup - Config the interface up. + * sifup - Config the interface up and enable IP packets to pass. */ int sifup(u) + int u; { struct ifreq ifr; + struct npioctl npi; strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); - if (ioctl(s, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) { + if (ioctl(sockfd, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) { syslog(LOG_ERR, "ioctl (SIOCGIFFLAGS): %m"); return 0; } ifr.ifr_flags |= IFF_UP; - if (ioctl(s, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) { + if (ioctl(sockfd, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) { syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m"); return 0; } + npi.protocol = PPP_IP; + npi.mode = NPMODE_PASS; + if (ioctl(fd, SIOCSETNPMODE, &npi) < 0) { + if (errno != ENOTTY) { + syslog(LOG_ERR, "ioctl(SIOCSETNPMODE): %m"); + return 0; + } + } return 1; } @@ -385,19 +741,34 @@ sifup(u) */ int sifdown(u) + int u; { struct ifreq ifr; + int rv; + struct npioctl npi; + + rv = 1; + npi.protocol = PPP_IP; + npi.mode = NPMODE_ERROR; + if (ioctl(fd, SIOCSETNPMODE, (caddr_t) &npi) < 0) { + if (errno != ENOTTY) { + syslog(LOG_ERR, "ioctl(SIOCSETNPMODE): %m"); + rv = 0; + } + } + strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); - if (ioctl(s, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) { + if (ioctl(sockfd, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) { syslog(LOG_ERR, "ioctl (SIOCGIFFLAGS): %m"); - return 0; - } - ifr.ifr_flags &= ~IFF_UP; - if (ioctl(s, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) { - syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m"); - return 0; + rv = 0; + } else { + ifr.ifr_flags &= ~IFF_UP; + if (ioctl(sockfd, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) { + syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m"); + rv = 0; + } } - return 1; + return rv; } /* @@ -412,6 +783,8 @@ sifdown(u) */ int sifaddr(u, o, h, m) + int u; + u_int32_t o, h, m; { int ret; struct ifreq ifr; @@ -420,19 +793,19 @@ sifaddr(u, o, h, m) strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); SET_SA_FAMILY(ifr.ifr_addr, AF_INET); ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr.s_addr = o; - if (ioctl(s, SIOCSIFADDR, (caddr_t) &ifr) < 0) { + if (ioctl(sockfd, SIOCSIFADDR, (caddr_t) &ifr) < 0) { syslog(LOG_ERR, "ioctl(SIOCSIFADDR): %m"); ret = 0; } ((struct sockaddr_in *) &ifr.ifr_dstaddr)->sin_addr.s_addr = h; - if (ioctl(s, SIOCSIFDSTADDR, (caddr_t) &ifr) < 0) { + if (ioctl(sockfd, SIOCSIFDSTADDR, (caddr_t) &ifr) < 0) { syslog(LOG_ERR, "ioctl(SIOCSIFDSTADDR): %m"); ret = 0; } if (m != 0) { ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr.s_addr = m; syslog(LOG_INFO, "Setting interface mask to %s\n", ip_ntoa(m)); - if (ioctl(s, SIOCSIFNETMASK, (caddr_t) &ifr) < 0) { + if (ioctl(sockfd, SIOCSIFNETMASK, (caddr_t) &ifr) < 0) { syslog(LOG_ERR, "ioctl(SIOCSIFNETMASK): %m"); ret = 0; } @@ -446,6 +819,8 @@ sifaddr(u, o, h, m) */ int cifaddr(u, o, h) + int u; + u_int32_t o, h; { struct rtentry rt; @@ -454,7 +829,7 @@ cifaddr(u, o, h) SET_SA_FAMILY(rt.rt_gateway, AF_INET); ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = o; rt.rt_flags = RTF_HOST; - if (ioctl(s, SIOCDELRT, (caddr_t) &rt) < 0) { + if (ioctl(sockfd, SIOCDELRT, (caddr_t) &rt) < 0) { syslog(LOG_ERR, "ioctl(SIOCDELRT): %m"); return 0; } @@ -466,6 +841,8 @@ cifaddr(u, o, h) */ int sifdefaultroute(u, g) + int u; + u_int32_t g; { struct rtentry rt; @@ -473,7 +850,7 @@ sifdefaultroute(u, g) SET_SA_FAMILY(rt.rt_gateway, AF_INET); ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = g; rt.rt_flags = RTF_GATEWAY; - if (ioctl(s, SIOCADDRT, &rt) < 0) { + if (ioctl(sockfd, SIOCADDRT, &rt) < 0) { syslog(LOG_ERR, "default route ioctl(SIOCADDRT): %m"); return 0; } @@ -485,6 +862,8 @@ sifdefaultroute(u, g) */ int cifdefaultroute(u, g) + int u; + u_int32_t g; { struct rtentry rt; @@ -492,7 +871,7 @@ cifdefaultroute(u, g) SET_SA_FAMILY(rt.rt_gateway, AF_INET); ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = g; rt.rt_flags = RTF_GATEWAY; - if (ioctl(s, SIOCDELRT, &rt) < 0) { + if (ioctl(sockfd, SIOCDELRT, &rt) < 0) { syslog(LOG_ERR, "default route ioctl(SIOCDELRT): %m"); return 0; } @@ -505,7 +884,7 @@ cifdefaultroute(u, g) int sifproxyarp(unit, hisaddr) int unit; - u_long hisaddr; + u_int32_t hisaddr; { struct arpreq arpreq; @@ -523,7 +902,7 @@ sifproxyarp(unit, hisaddr) SET_SA_FAMILY(arpreq.arp_pa, AF_INET); ((struct sockaddr_in *) &arpreq.arp_pa)->sin_addr.s_addr = hisaddr; arpreq.arp_flags = ATF_PERM | ATF_PUBL; - if (ioctl(s, SIOCSARP, (caddr_t)&arpreq) < 0) { + if (ioctl(sockfd, SIOCSARP, (caddr_t)&arpreq) < 0) { syslog(LOG_ERR, "ioctl(SIOCSARP): %m"); return 0; } @@ -537,14 +916,14 @@ sifproxyarp(unit, hisaddr) int cifproxyarp(unit, hisaddr) int unit; - u_long hisaddr; + u_int32_t hisaddr; { struct arpreq arpreq; BZERO(&arpreq, sizeof(arpreq)); SET_SA_FAMILY(arpreq.arp_pa, AF_INET); ((struct sockaddr_in *) &arpreq.arp_pa)->sin_addr.s_addr = hisaddr; - if (ioctl(s, SIOCDARP, (caddr_t)&arpreq) < 0) { + if (ioctl(sockfd, SIOCDARP, (caddr_t)&arpreq) < 0) { syslog(LOG_ERR, "ioctl(SIOCDARP): %m"); return 0; } @@ -580,7 +959,6 @@ cifproxyarp(unit, hisaddr) #include #include #include -#include /* XXX SunOS 4.1 defines this and 3.5 doesn't... */ #ifdef _nlist_h @@ -601,14 +979,14 @@ cifproxyarp(unit, hisaddr) static struct nlist nl[] = { #define N_IFNET 0 { "_ifnet" }, - 0 + { 0 } }; static void kread(); int get_ether_addr(ipaddr, hwaddr) - u_long ipaddr; + u_int32_t ipaddr; struct sockaddr *hwaddr; { register kvm_t *kd; @@ -624,7 +1002,7 @@ get_ether_addr(ipaddr, hwaddr) struct in_ifaddr in; } ifaddr; #endif - u_long addr, mask; + u_int32_t addr, mask; /* Open kernel memory for reading */ kd = kvm_open(0, 0, 0, O_RDONLY, NULL); @@ -651,7 +1029,7 @@ get_ether_addr(ipaddr, hwaddr) syslog(LOG_ERR, "error reading ifnet addr"); return 0; } - for ( ; addr; addr = (u_long)ifp->if_next) { + for ( ; addr; addr = (u_int32_t)ifp->if_next) { if (kvm_read(kd, addr, (char *)ac, sizeof(*ac)) != sizeof(*ac)) { syslog(LOG_ERR, "error reading ifnet"); return 0; @@ -668,7 +1046,7 @@ get_ether_addr(ipaddr, hwaddr) /* Get interface ip address */ #ifdef SUNOS4 - if (kvm_read(kd, (u_long)ifp->if_addrlist, (char *)&ifaddr, + if (kvm_read(kd, (u_int32_t)ifp->if_addrlist, (char *)&ifaddr, sizeof(ifaddr)) != sizeof(ifaddr)) { syslog(LOG_ERR, "error reading ifaddr"); return 0; @@ -720,3 +1098,103 @@ logwtmp(line, name, host) } close(fd); } + +/* + * Code for locking/unlocking the serial device. + * This code is derived from chat.c. + */ + +#if defined(SUNOS) && SUNOS >= 41 && !defined(HDB) +#define HDB 1 +#endif + +#ifndef LOCK_DIR +# ifdef HDB +# define PIDSTRING +# define LOCK_PREFIX "/usr/spool/locks/LCK.." +# else /* HDB */ +# define LOCK_PREFIX "/usr/spool/uucp/LCK.." +# endif /* HDB */ +#endif /* LOCK_DIR */ + +/* + * lock - create a lock file for the named device. + */ +int +lock(dev) + char *dev; +{ + char hdb_lock_buffer[12]; + int fd, pid, n; + char *p; + + if ((p = strrchr(dev, '/')) != NULL) + dev = p + 1; + lock_file = malloc(strlen(LOCK_PREFIX) + strlen(dev) + 1); + if (lock_file == NULL) + novm("lock file name"); + strcat(strcpy(lock_file, LOCK_PREFIX), dev); + + while ((fd = open(lock_file, O_EXCL | O_CREAT | O_RDWR, 0644)) < 0) { + if (errno == EEXIST + && (fd = open(lock_file, O_RDONLY, 0)) >= 0) { + /* Read the lock file to find out who has the device locked */ +#ifdef PIDSTRING + n = read(fd, hdb_lock_buffer, 11); + if (n > 0) { + hdb_lock_buffer[n] = 0; + pid = atoi(hdb_lock_buffer); + } +#else + n = read(fd, &pid, sizeof(pid)); +#endif + if (n <= 0) { + syslog(LOG_ERR, "Can't read pid from lock file %s", lock_file); + close(fd); + } else { + if (kill(pid, 0) == -1 && errno == ESRCH) { + /* pid no longer exists - remove the lock file */ + if (unlink(lock_file) == 0) { + close(fd); + syslog(LOG_NOTICE, "Removed stale lock on %s (pid %d)", + dev, pid); + continue; + } else + syslog(LOG_WARNING, "Couldn't remove stale lock on %s", + dev); + } else + syslog(LOG_NOTICE, "Device %s is locked by pid %d", + dev, pid); + } + close(fd); + } else + syslog(LOG_ERR, "Can't create lock file %s: %m", lock_file); + free(lock_file); + lock_file = NULL; + return -1; + } + +#ifdef PIDSTRING + sprintf(hdb_lock_buffer, "%10d\n", getpid()); + write(fd, hdb_lock_buffer, 11); +#else + pid = getpid(); + write(fd, &pid, sizeof pid); +#endif + + close(fd); + return 0; +} + +/* + * unlock - remove our lockfile + */ +void +unlock() +{ + if (lock_file) { + unlink(lock_file); + free(lock_file); + lock_file = NULL; + } +}