X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fsys-str.c;h=780b27f95d643403798c57e64f33a8a21add2979;hp=b7c2c5ad36791100dbc82e59a107066373b31e0e;hb=55d1aee00ea64ce0abaa0accd5bfab65d39a1f7d;hpb=a199a8fc6621d7e1ca23fdc65091cc605c5feb28 diff --git a/pppd/sys-str.c b/pppd/sys-str.c index b7c2c5a..780b27f 100644 --- a/pppd/sys-str.c +++ b/pppd/sys-str.c @@ -28,8 +28,8 @@ #include #include #include -#include #include +#include #include #include #include @@ -44,7 +44,6 @@ #include "pppd.h" #include "ppp.h" -#include #include #ifndef ifr_mtu @@ -57,9 +56,12 @@ 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; +extern int hungup; /* has the physical layer been disconnected? */ +extern int kdebugflag; +extern int default_device; +extern int restore_term; #define PAI_FLAGS_B7_0 0x100 #define PAI_FLAGS_B7_1 0x200 @@ -67,6 +69,31 @@ extern int kdebugflag; #define PAI_FLAGS_PAR_ODD 0x800 #define PAI_FLAGS_HIBITS 0xF00 +/* + * 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; +} + + /* * ppp_available - check if this kernel supports PPP. */ @@ -105,6 +132,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 +143,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 +161,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 != s) + close(i); + closed_stdio = 1; + } } /* @@ -155,6 +187,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; } @@ -191,8 +224,9 @@ disestablish_ppp() 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); + if (errno != ENXIO) + 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)); @@ -219,13 +253,30 @@ 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(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,13 +284,16 @@ 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.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) { return -1; @@ -249,6 +303,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)); @@ -342,6 +399,38 @@ 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"); +} + /* * sifvjcomp - config tcp header compression */ @@ -364,6 +453,7 @@ sifvjcomp(u, vjcomp, cidcomp, maxcid) */ int sifup(u) + int u; { struct ifreq ifr; @@ -385,6 +475,7 @@ sifup(u) */ int sifdown(u) + int u; { struct ifreq ifr; strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); @@ -412,6 +503,8 @@ sifdown(u) */ int sifaddr(u, o, h, m) + int u; + u_long o, h, m; { int ret; struct ifreq ifr; @@ -446,6 +539,8 @@ sifaddr(u, o, h, m) */ int cifaddr(u, o, h) + int u; + u_long o, h; { struct rtentry rt; @@ -466,6 +561,8 @@ cifaddr(u, o, h) */ int sifdefaultroute(u, g) + int u; + u_long g; { struct rtentry rt; @@ -485,6 +582,8 @@ sifdefaultroute(u, g) */ int cifdefaultroute(u, g) + int u; + u_long g; { struct rtentry rt; @@ -601,7 +700,7 @@ cifproxyarp(unit, hisaddr) static struct nlist nl[] = { #define N_IFNET 0 { "_ifnet" }, - 0 + { 0 } }; static void kread();