*/
#ifndef lint
-static char rcsid[] = "$Id: sys-sunos4.c,v 1.13 1999/03/12 06:07:23 paulus Exp $";
+static char rcsid[] = "$Id: sys-sunos4.c,v 1.15 1999/03/16 22:53:48 paulus Exp $";
#endif
#include <stdio.h>
#include <sys/sockio.h>
#include <sys/stream.h>
#include <sys/stropts.h>
-#include <sys/syslog.h>
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/poll.h>
extern u_char inpacket_buf[]; /* borrowed from main.c */
+#define MAX_POLLFDS 32
+static struct pollfd pollfds[MAX_POLLFDS];
+static int n_pollfds;
+
static int link_mtu, link_mru;
#define NMODULES 32
int x;
/* 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);
- }
+ if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
+ fatal("Couldn't create IP socket: %m");
/*
* We may want to send a SIGHUP to the session leader associated
* Open the ppp device.
*/
pppfd = open("/dev/ppp", O_RDWR | O_NONBLOCK, 0);
- if (pppfd < 0) {
- syslog(LOG_ERR, "Can't open /dev/ppp: %m");
- die(1);
- }
+ if (pppfd < 0)
+ fatal("Can't open /dev/ppp: %m");
if (kdebugflag) {
x = PPPDBG_LOG + PPPDBG_DRIVER;
strioctl(pppfd, PPPIO_DEBUG, &x, sizeof(int), 0);
}
/* Assign a new PPA and get its unit number. */
- if (strioctl(pppfd, PPPIO_NEWPPA, &ifunit, 0, sizeof(int)) < 0) {
- syslog(LOG_ERR, "Can't create new PPP interface: %m");
- die(1);
- }
+ if (strioctl(pppfd, PPPIO_NEWPPA, &ifunit, 0, sizeof(int)) < 0)
+ fatal("Can't create new PPP interface: %m");
/*
* Open the ppp device again and push the if_ppp module on it.
*/
iffd = open("/dev/ppp", O_RDWR, 0);
- if (iffd < 0) {
- syslog(LOG_ERR, "Can't open /dev/ppp (2): %m");
- die(1);
- }
+ if (iffd < 0)
+ fatal("Can't open /dev/ppp (2): %m");
if (kdebugflag) {
x = PPPDBG_LOG + PPPDBG_DRIVER;
strioctl(iffd, PPPIO_DEBUG, &x, sizeof(int), 0);
}
- if (strioctl(iffd, PPPIO_ATTACH, &ifunit, sizeof(int), 0) < 0) {
- syslog(LOG_ERR, "Couldn't attach ppp interface to device: %m");
- die(1);
- }
- if (ioctl(iffd, I_PUSH, "if_ppp") < 0) {
- syslog(LOG_ERR, "Can't push ppp interface module: %m");
- die(1);
- }
+ if (strioctl(iffd, PPPIO_ATTACH, &ifunit, sizeof(int), 0) < 0)
+ fatal("Couldn't attach ppp interface to device: %m");
+ if (ioctl(iffd, I_PUSH, "if_ppp") < 0)
+ fatal("Can't push ppp interface module: %m");
if (kdebugflag) {
x = PPPDBG_LOG + PPPDBG_IF;
strioctl(iffd, PPPIO_DEBUG, &x, sizeof(int), 0);
}
- if (strioctl(iffd, PPPIO_NEWPPA, &ifunit, sizeof(int), 0) < 0) {
- syslog(LOG_ERR, "Couldn't create ppp interface unit: %m");
- die(1);
- }
+ if (strioctl(iffd, PPPIO_NEWPPA, &ifunit, sizeof(int), 0) < 0)
+ fatal("Couldn't create ppp interface unit: %m");
x = PPP_IP;
- if (strioctl(iffd, PPPIO_BIND, &x, sizeof(int), 0) < 0) {
- syslog(LOG_ERR, "Couldn't bind ppp interface to IP SAP: %m");
- die(1);
- }
+ if (strioctl(iffd, PPPIO_BIND, &x, sizeof(int), 0) < 0)
+ fatal("Couldn't bind ppp interface to IP SAP: %m");
+
+ n_pollfds = 0;
}
/*
/*
* establish_ppp - Turn the serial port into a ppp interface.
*/
-void
+int
establish_ppp(fd)
int fd;
{
tty_nmodules = i;
/* Push the async hdlc module and the compressor module. */
- if (ioctl(fd, I_PUSH, "ppp_ahdl") < 0) {
- syslog(LOG_ERR, "Couldn't push PPP Async HDLC module: %m");
- die(1);
- }
- if (ioctl(fd, I_PUSH, "ppp_comp") < 0) {
- syslog(LOG_ERR, "Couldn't push PPP compression module: %m");
-/* die(1); */
- }
+ if (ioctl(fd, I_PUSH, "ppp_ahdl") < 0)
+ fatal("Couldn't push PPP Async HDLC module: %m");
+ if (ioctl(fd, I_PUSH, "ppp_comp") < 0)
+ error("Couldn't push PPP compression module: %m");
/* Link the serial port under the PPP multiplexor. */
- if ((fdmuxid = ioctl(pppfd, I_LINK, fd)) < 0) {
- syslog(LOG_ERR, "Can't link tty to PPP mux: %m");
- die(1);
- }
+ if ((fdmuxid = ioctl(pppfd, I_LINK, fd)) < 0)
+ fatal("Can't link tty to PPP mux: %m");
+
+ return pppfd;
}
/*
if (fdmuxid >= 0) {
if (ioctl(pppfd, I_UNLINK, fdmuxid) < 0) {
if (!hungup)
- syslog(LOG_ERR, "Can't unlink tty from PPP mux: %m");
+ error("Can't unlink tty from PPP mux: %m");
}
fdmuxid = -1;
;
for (i = tty_nmodules - 1; i >= 0; --i)
if (ioctl(fd, I_PUSH, tty_modules[i]) < 0)
- syslog(LOG_ERR, "Couldn't restore tty module %s: %m",
+ error("Couldn't restore tty module %s: %m",
tty_modules[i]);
}
if (hungup && default_device && parent_pid > 0) {
break;
}
if (s != NULL) {
- syslog(LOG_WARNING, "Serial link is not 8-bit clean:");
- syslog(LOG_WARNING, "All received characters had %s", s);
+ warn("Serial link is not 8-bit clean:");
+ warn("All received characters had %s", s);
}
}
for (speedp = speeds; speedp->speed_int; speedp++)
if (bps == speedp->speed_int)
return speedp->speed_val;
- syslog(LOG_WARNING, "speed %d not supported", bps);
+ warn("speed %d not supported", bps);
return 0;
}
int speed;
struct termios tios;
- if (tcgetattr(fd, &tios) < 0) {
- syslog(LOG_ERR, "tcgetattr: %m");
- die(1);
- }
+ if (tcgetattr(fd, &tios) < 0)
+ fatal("tcgetattr: %m");
if (!restore_term) {
inittermios = tios;
* We can't proceed if the serial port speed is 0,
* 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 (speed == B0)
+ fatal("Baud rate for %s is 0; need explicit baud rate", devnam);
}
- if (tcsetattr(fd, TCSAFLUSH, &tios) < 0) {
- syslog(LOG_ERR, "tcsetattr: %m");
- die(1);
- }
+ if (tcsetattr(fd, TCSAFLUSH, &tios) < 0)
+ fatal("tcsetattr: %m");
baud_rate = inspeed = baud_rate_of(speed);
restore_term = 1;
}
if (tcsetattr(fd, TCSAFLUSH, &inittermios) < 0)
if (!hungup && errno != ENXIO)
- syslog(LOG_WARNING, "tcsetattr: %m");
+ warn("tcsetattr: %m");
ioctl(fd, TIOCSWINSZ, &wsinfo);
restore_term = 0;
}
/*
* open_loopback - open the device we use for getting packets
- * in demand mode. Under Solaris 2, we use our existing fd
+ * in demand mode. Under SunOS, we use our existing fd
* to the ppp driver.
*/
-void
+int
open_ppp_loopback()
{
+ return pppfd;
}
/*
struct pollfd pfd;
if (debug)
- log_packet(p, len, "sent ", LOG_DEBUG);
+ dbglog("sent %P", p, len);
data.len = len;
data.buf = (caddr_t) p;
while (putmsg(pppfd, NULL, &data, 0) < 0) {
if (--retries < 0 || (errno != EWOULDBLOCK && errno != EAGAIN)) {
if (errno != ENXIO)
- syslog(LOG_ERR, "Couldn't send packet: %m");
+ error("Couldn't send packet: %m");
break;
}
pfd.fd = pppfd;
/*
- * wait_input - wait until there is data available on fd,
+ * wait_input - wait until there is data available,
* for the length of time specified by *timo (indefinite
* if timo is NULL).
*/
struct timeval *timo;
{
int t;
- struct pollfd pfd;
t = timo == NULL? -1: timo->tv_sec * 1000 + timo->tv_usec / 1000;
- pfd.fd = pppfd;
- pfd.events = POLLIN | POLLPRI | POLLHUP;
- if (poll(&pfd, 1, t) < 0 && errno != EINTR) {
- syslog(LOG_ERR, "poll: %m");
- die(1);
- }
+ if (poll(pollfds, n_pollfds, t) < 0 && errno != EINTR)
+ fatal("poll: %m");
}
/*
int n;
n = select(0, NULL, NULL, NULL, timo);
- if (n < 0 && errno != EINTR) {
- syslog(LOG_ERR, "select: %m");
- die(1);
- }
+ if (n < 0 && errno != EINTR)
+ fatal("select: %m");
}
if (len < 0) {
if (errno = EAGAIN || errno == EINTR)
return -1;
- syslog(LOG_ERR, "Error reading packet: %m");
- die(1);
+ fatal("Error reading packet: %m");
}
if (ctrl.len <= 0)
* Got a M_PROTO or M_PCPROTO message. Huh?
*/
if (debug)
- syslog(LOG_DEBUG, "got ctrl msg len=%d", ctrl.len);
+ dbglog("got ctrl msg len=%d", ctrl.len);
}
}
if (strioctl(pppfd, PPPIO_MTU, &mtu, sizeof(mtu), 0) < 0) {
if (hungup && errno == ENXIO)
return;
- syslog(LOG_ERR, "Couldn't set MTU: %m");
+ error("Couldn't set MTU: %m");
}
if (strioctl(pppfd, PPPIO_XACCM, &asyncmap, sizeof(asyncmap), 0) < 0) {
- syslog(LOG_ERR, "Couldn't set transmit ACCM: %m");
+ error("Couldn't set transmit ACCM: %m");
}
cf[0] = (pcomp? COMP_PROT: 0) + (accomp? COMP_AC: 0);
cf[1] = COMP_PROT | COMP_AC;
if (strioctl(pppfd, PPPIO_CFLAGS, cf, sizeof(cf), sizeof(int)) < 0) {
- syslog(LOG_ERR, "Couldn't set prot/AC compression: %m");
+ error("Couldn't set prot/AC compression: %m");
}
/* set mtu for ip as well */
strlcpy(ifr.ifr_name, sizeof(ifr.ifr_name), ifname);
ifr.ifr_metric = link_mtu;
if (ioctl(sockfd, SIOCSIFMTU, &ifr) < 0) {
- syslog(LOG_ERR, "Couldn't set IP MTU: %m");
+ error("Couldn't set IP MTU: %m");
}
}
{
if (strioctl(pppfd, PPPIO_XACCM, accm, sizeof(ext_accm), 0) < 0) {
if (!hungup || errno != ENXIO)
- syslog(LOG_WARNING, "Couldn't set extended ACCM: %m");
+ warn("Couldn't set extended ACCM: %m");
}
}
if (strioctl(pppfd, PPPIO_MRU, &mru, sizeof(mru), 0) < 0) {
if (hungup && errno == ENXIO)
return;
- syslog(LOG_ERR, "Couldn't set MRU: %m");
+ error("Couldn't set MRU: %m");
}
if (strioctl(pppfd, PPPIO_RACCM, &asyncmap, sizeof(asyncmap), 0) < 0) {
- syslog(LOG_ERR, "Couldn't set receive ACCM: %m");
+ error("Couldn't set receive ACCM: %m");
}
cf[0] = (pcomp? DECOMP_PROT: 0) + (accomp? DECOMP_AC: 0);
cf[1] = DECOMP_PROT | DECOMP_AC;
if (strioctl(pppfd, PPPIO_CFLAGS, cf, sizeof(cf), sizeof(int)) < 0) {
- syslog(LOG_ERR, "Couldn't set prot/AC decompression: %m");
+ error("Couldn't set prot/AC decompression: %m");
}
}
cf[1] = CCP_ISOPEN | CCP_ISUP | CCP_ERROR | CCP_FATALERROR;
if (strioctl(pppfd, PPPIO_CFLAGS, cf, sizeof(cf), sizeof(int)) < 0) {
if (!hungup || errno != ENXIO)
- syslog(LOG_ERR, "Couldn't set kernel CCP state: %m");
+ error("Couldn't set kernel CCP state: %m");
}
}
cf[0] = cf[1] = 0;
if (strioctl(pppfd, PPPIO_CFLAGS, cf, sizeof(cf), sizeof(int)) < 0) {
if (errno != ENXIO && errno != EINVAL)
- syslog(LOG_ERR, "Couldn't get compression flags: %m");
+ error("Couldn't get compression flags: %m");
return 0;
}
return cf[0] & CCP_FATALERROR;
maxcid[0] = xcidcomp;
maxcid[1] = 15; /* XXX should be rmaxcid */
if (strioctl(pppfd, PPPIO_VJINIT, maxcid, sizeof(maxcid), 0) < 0) {
- syslog(LOG_ERR, "Couldn't initialize VJ compression: %m");
+ error("Couldn't initialize VJ compression: %m");
}
}
cf[1] = COMP_VJC + DECOMP_VJC + COMP_VJCCID + DECOMP_VJCCID;
if (strioctl(pppfd, PPPIO_CFLAGS, cf, sizeof(cf), sizeof(int)) < 0) {
if (vjcomp)
- syslog(LOG_ERR, "Couldn't enable VJ compression: %m");
+ error("Couldn't enable VJ compression: %m");
}
return 1;
strlcpy(ifr.ifr_name, sizeof(ifr.ifr_name), ifname);
if (ioctl(sockfd, SIOCGIFFLAGS, &ifr) < 0) {
- syslog(LOG_ERR, "Couldn't mark interface up (get): %m");
+ error("Couldn't mark interface up (get): %m");
return 0;
}
ifr.ifr_flags |= IFF_UP;
if (ioctl(sockfd, SIOCSIFFLAGS, &ifr) < 0) {
- syslog(LOG_ERR, "Couldn't mark interface up (set): %m");
+ error("Couldn't mark interface up (set): %m");
return 0;
}
if_is_up = 1;
strlcpy(ifr.ifr_name, sizeof(ifr.ifr_name), ifname);
if (ioctl(sockfd, SIOCGIFFLAGS, &ifr) < 0) {
- syslog(LOG_ERR, "Couldn't mark interface down (get): %m");
+ error("Couldn't mark interface down (get): %m");
return 0;
}
if ((ifr.ifr_flags & IFF_UP) != 0) {
ifr.ifr_flags &= ~IFF_UP;
if (ioctl(sockfd, SIOCSIFFLAGS, &ifr) < 0) {
- syslog(LOG_ERR, "Couldn't mark interface down (set): %m");
+ error("Couldn't mark interface down (set): %m");
return 0;
}
}
npi[0] = proto;
npi[1] = (int) mode;
if (strioctl(pppfd, PPPIO_NPMODE, npi, 2 * sizeof(int), 0) < 0) {
- syslog(LOG_ERR, "ioctl(set NP %d mode to %d): %m", proto, mode);
+ error("ioctl(set NP %d mode to %d): %m", proto, mode);
return 0;
}
return 1;
ifr.ifr_addr.sa_family = AF_INET;
INET_ADDR(ifr.ifr_addr) = m;
if (ioctl(sockfd, SIOCSIFNETMASK, &ifr) < 0) {
- syslog(LOG_ERR, "Couldn't set IP netmask: %m");
+ error("Couldn't set IP netmask: %m");
}
ifr.ifr_addr.sa_family = AF_INET;
INET_ADDR(ifr.ifr_addr) = o;
if (ioctl(sockfd, SIOCSIFADDR, &ifr) < 0) {
- syslog(LOG_ERR, "Couldn't set local IP address: %m");
+ error("Couldn't set local IP address: %m");
}
ifr.ifr_dstaddr.sa_family = AF_INET;
INET_ADDR(ifr.ifr_dstaddr) = h;
if (ioctl(sockfd, SIOCSIFDSTADDR, &ifr) < 0) {
- syslog(LOG_ERR, "Couldn't set remote IP address: %m");
+ error("Couldn't set remote IP address: %m");
}
#if 0 /* now done in ppp_send_config */
ifr.ifr_metric = link_mtu;
if (ioctl(sockfd, SIOCSIFMTU, &ifr) < 0) {
- syslog(LOG_ERR, "Couldn't set IP MTU: %m");
+ error("Couldn't set IP MTU: %m");
}
#endif
ifaddrs[0] = o;
INET_ADDR(rt.rt_gateway) = o;
rt.rt_flags = RTF_HOST;
if (ioctl(sockfd, SIOCDELRT, &rt) < 0)
- syslog(LOG_ERR, "Couldn't delete route through interface: %m");
+ error("Couldn't delete route through interface: %m");
ifaddrs[0] = 0;
return 1;
}
rt.rt_flags = RTF_GATEWAY;
if (ioctl(sockfd, SIOCADDRT, &rt) < 0) {
- syslog(LOG_ERR, "Can't add default route: %m");
+ error("Can't add default route: %m");
return 0;
}
rt.rt_flags = RTF_GATEWAY;
if (ioctl(sockfd, SIOCDELRT, &rt) < 0) {
- syslog(LOG_ERR, "Can't delete default route: %m");
+ error("Can't delete default route: %m");
return 0;
}
INET_ADDR(arpreq.arp_pa) = hisaddr;
arpreq.arp_flags = ATF_PERM | ATF_PUBL;
if (ioctl(sockfd, SIOCSARP, (caddr_t) &arpreq) < 0) {
- syslog(LOG_ERR, "Couldn't set proxy ARP entry: %m");
+ error("Couldn't set proxy ARP entry: %m");
return 0;
}
arpreq.arp_pa.sa_family = AF_INET;
INET_ADDR(arpreq.arp_pa) = hisaddr;
if (ioctl(sockfd, SIOCDARP, (caddr_t)&arpreq) < 0) {
- syslog(LOG_ERR, "Couldn't delete proxy ARP entry: %m");
+ error("Couldn't delete proxy ARP entry: %m");
return 0;
}
ifc.ifc_len = sizeof(ifs);
ifc.ifc_req = ifs;
if (ioctl(sockfd, SIOCGIFCONF, &ifc) < 0) {
- syslog(LOG_ERR, "ioctl(SIOCGIFCONF): %m");
+ error("ioctl(SIOCGIFCONF): %m");
return 0;
}
if (ifr >= ifend)
return 0;
- syslog(LOG_INFO, "found interface %s for proxy arp", ifr->ifr_name);
+ info("found interface %s for proxy arp", ifr->ifr_name);
/*
* Grab the physical address for this interface.
*/
if ((nit_fd = open("/dev/nit", O_RDONLY)) < 0) {
- syslog(LOG_ERR, "Couldn't open /dev/nit: %m");
+ error("Couldn't open /dev/nit: %m");
return 0;
}
strlcpy(ifreq.ifr_name, sizeof(ifreq.ifr_name), ifr->ifr_name);
if (ioctl(nit_fd, NIOCBIND, &ifreq) < 0
|| ioctl(nit_fd, SIOCGIFADDR, &ifreq) < 0) {
- syslog(LOG_ERR, "Couldn't get hardware address for %s: %m",
+ error("Couldn't get hardware address for %s: %m",
ifreq.ifr_name);
close(nit_fd);
return 0;
if (ifc.ifc_req == 0)
return mask;
if (ioctl(sockfd, SIOCGIFCONF, &ifc) < 0) {
- syslog(LOG_WARNING, "Couldn't get system interface list: %m");
+ warn("Couldn't get system interface list: %m");
return mask;
}
ifend = (struct ifreq *) (ifc.ifc_buf + ifc.ifc_len);
if (ioctl(fd, I_STR, &str) == -1)
return -1;
if (str.ic_len != olen)
- syslog(LOG_DEBUG, "strioctl: expected %d bytes, got %d for cmd %x\n",
+ dbglog("strioctl: expected %d bytes, got %d for cmd %x\n",
olen, str.ic_len, cmd);
return 0;
}
n = read(fd, &pid, sizeof(pid));
#endif
if (n <= 0) {
- syslog(LOG_ERR, "Can't read pid from lock file %s", lock_file);
+ error("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)",
+ notice("Removed stale lock on %s (pid %d)",
dev, pid);
continue;
} else
- syslog(LOG_WARNING, "Couldn't remove stale lock on %s",
+ warn("Couldn't remove stale lock on %s",
dev);
} else
- syslog(LOG_NOTICE, "Device %s is locked by pid %d",
+ 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);
+ error("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());
+ slprintf(hdb_lock_buffer, sizeof(hdb_lock_buffer), "%10d\n", getpid());
write(fd, hdb_lock_buffer, 11);
#else
pid = getpid();
if (n > 0 && n < sys_nerr)
return sys_errlist[n];
- sprintf(unknown, "Error %d", n);
+ slprintf(unknown, sizeof(unknown), "Error %d", n);
return unknown;
}
projects / ppp.git / blobdiff