X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fsys-bsd.c;h=05533b34da983daba536338706659ab90e8d5b23;hp=1a1810de2bfc4e674681c38d8de908a0b6b3fe0b;hb=de4afebf8fa879fec442d7b6c456b571b004b2b4;hpb=e8be982dbc5c6c50dfc9f66737867570c8ed4973 diff --git a/pppd/sys-bsd.c b/pppd/sys-bsd.c index 1a1810d..05533b3 100644 --- a/pppd/sys-bsd.c +++ b/pppd/sys-bsd.c @@ -20,10 +20,8 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -static char rcsid[] = "$Id: sys-bsd.c,v 1.43 1999/04/12 06:24:49 paulus Exp $"; +#define RCSID "$Id: sys-bsd.c,v 1.47 2000/04/13 12:04:23 paulus Exp $" /* $NetBSD: sys-bsd.c,v 1.1.1.3 1997/09/26 18:53:04 christos Exp $ */ -#endif /* * TODO: @@ -74,6 +72,8 @@ static char rcsid[] = "$Id: sys-bsd.c,v 1.43 1999/04/12 06:24:49 paulus Exp $"; #include "fsm.h" #include "ipcp.h" +static const char rcsid[] = RCSID; + static int initdisc = -1; /* Initial TTY discipline for ppp_fd */ static int initfdflags = -1; /* Initial file descriptor flags for ppp_fd */ static int ppp_fd = -1; /* fd which is set to PPP discipline */ @@ -227,13 +227,13 @@ establish_ppp(fd) /* * Find out which interface we were given. */ - if (ioctl(fd, PPPIOCGUNIT, &ifunit) < 0) { + if (ioctl(fd, PPPIOCGUNIT, &ifunit) < 0) fatal("ioctl(PPPIOCGUNIT): %m"); } else { /* * Check that we got the same unit again. */ - if (ioctl(fd, PPPIOCGUNIT, &x) < 0) { + if (ioctl(fd, PPPIOCGUNIT, &x) < 0) fatal("ioctl(PPPIOCGUNIT): %m"); if (x != ifunit) fatal("transfer_ppp failed: wanted unit %d, got %d", ifunit, x); @@ -712,6 +712,7 @@ ppp_send_config(unit, mtu, asyncmap, pcomp, accomp) fatal("ioctl (PPPIOCGFLAGS): %m"); x = pcomp? x | SC_COMP_PROT: x &~ SC_COMP_PROT; x = accomp? x | SC_COMP_AC: x &~ SC_COMP_AC; + x = sync_serial ? x | SC_SYNC : x & ~SC_SYNC; if (ioctl(ppp_fd, PPPIOCSFLAGS, (caddr_t) &x) < 0) fatal("ioctl(PPPIOCSFLAGS): %m"); } @@ -833,7 +834,7 @@ get_ppp_stats(u, stats) struct ifpppstatsreq req; memset (&req, 0, sizeof (req)); - strlcpy(req.ifr_name, interface, sizeof(req.ifr_name)); + strlcpy(req.ifr_name, ifname, sizeof(req.ifr_name)); if (ioctl(sockfd, SIOCGPPPSTATS, &req) < 0) { error("Couldn't get PPP statistics: %m"); return 0;