*/
#ifndef lint
-static char rcsid[] = "$Id: sys-bsd.c,v 1.3 1994/04/11 07:16:50 paulus Exp $";
+static char rcsid[] = "$Id: sys-bsd.c,v 1.4 1994/04/18 04:09:27 paulus Exp $";
#endif
/*
#include <sys/socket.h>
#include <sys/time.h>
#include <sys/errno.h>
-#include <sys/wait.h>
#include <net/if.h>
#include <net/if_ppp.h>
#include "pppd.h"
#include "ppp.h"
-static int initdisc; /* Initial TTY discipline */
+static int initdisc = -1; /* Initial TTY discipline */
/*
establish_ppp()
{
int pppdisc = PPPDISC;
+ int x;
if (ioctl(fd, TIOCGETD, &initdisc) < 0) {
syslog(LOG_ERR, "ioctl(TIOCGETD): %m");
syslog(LOG_ERR, "ioctl(PPPIOCGUNIT): %m");
die(1);
}
+
+ /*
+ * Enable debug in the driver if requested.
+ */
+ if (kdebugflag) {
+ if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &x) < 0) {
+ syslog(LOG_WARNING, "ioctl (PPPIOCGFLAGS): %m");
+ } else {
+ x |= (kdebugflag & 0xFF) * SC_DEBUG;
+ if (ioctl(fd, PPPIOCSFLAGS, (caddr_t) &x) < 0)
+ syslog(LOG_WARNING, "ioctl(PPPIOCSFLAGS): %m");
+ }
+ }
}
void
disestablish_ppp()
{
- if (ioctl(fd, TIOCSETD, &initdisc) < 0)
- syslog(LOG_ERR, "ioctl(TIOCSETD): %m");
+ int x;
+ char *s;
+
+ if (initdisc >= 0) {
+ /*
+ * Check whether the link seems not to be 8-bit clean.
+ */
+ if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &x) == 0) {
+ s = NULL;
+ switch (~x & (SC_RCV_B7_0|SC_RCV_B7_1|SC_RCV_EVNP|SC_RCV_ODDP)) {
+ case SC_RCV_B7_0:
+ s = "bit 7 set to 1";
+ break;
+ case SC_RCV_B7_1:
+ s = "bit 7 set to 0";
+ break;
+ case SC_RCV_EVNP:
+ s = "odd parity";
+ break;
+ case SC_RCV_ODDP:
+ s = "even parity";
+ break;
+ }
+ if (s != NULL) {
+ syslog(LOG_WARNING, "Serial link is not 8-bit clean:");
+ syslog(LOG_WARNING, "All received characters had %s", s);
+ }
+ }
+ if (ioctl(fd, TIOCSETD, &initdisc) < 0)
+ syslog(LOG_ERR, "ioctl(TIOCSETD): %m");
+ }
}
}
}
+
+/*
+ * ppp_set_xaccm - set the extended transmit ACCM for the interface.
+ */
+void
+ppp_set_xaccm(unit, accm)
+ int unit;
+ ext_accm accm;
+{
+ if (ioctl(fd, PPPIOCSXASYNCMAP, accm) < 0 && errno != ENOTTY)
+ syslog(LOG_WARNING, "ioctl(set extended ACCM): %m");
+}
+
+
/*
* ppp_recv_config - configure the receive-side characteristics of
- * the ppp interface. At present this does nothing.
+ * the ppp interface.
*/
void
ppp_recv_config(unit, mru, asyncmap, pcomp, accomp)
}
/*
- * sifup - Config the interface up.
+ * sifup - Config the interface up and enable IP packets to pass.
*/
int
sifup(u)
{
struct ifreq ifr;
+ u_int x;
+
strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
if (ioctl(s, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) {
syslog(LOG_ERR, "ioctl (SIOCGIFFLAGS): %m");
syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m");
return 0;
}
+ if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &x) < 0) {
+ syslog(LOG_ERR, "ioctl (PPPIOCGFLAGS): %m");
+ return 0;
+ }
+ x |= SC_ENABLE_IP;
+ if (ioctl(fd, PPPIOCSFLAGS, (caddr_t) &x) < 0) {
+ syslog(LOG_ERR, "ioctl(PPPIOCSFLAGS): %m");
+ return 0;
+ }
return 1;
}
/*
- * sifdown - Config the interface down.
+ * sifdown - Config the interface down and disable IP.
*/
int
sifdown(u)
{
struct ifreq ifr;
+ u_int x;
+ int rv;
+
+ rv = 1;
+ if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &x) < 0) {
+ syslog(LOG_ERR, "ioctl (PPPIOCGFLAGS): %m");
+ rv = 0;
+ } else {
+ x &= ~SC_ENABLE_IP;
+ if (ioctl(fd, PPPIOCSFLAGS, (caddr_t) &x) < 0) {
+ syslog(LOG_ERR, "ioctl(PPPIOCSFLAGS): %m");
+ rv = 0;
+ }
+ }
strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
if (ioctl(s, 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(s, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) {
+ syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m");
+ rv = 0;
+ }
}
- return 1;
+ return rv;
}
/*
return 0;
}
+
/*
* ppp_available - check whether the system has any ppp interfaces
* (in fact we check whether we can do an ioctl on ppp0).
*/
-
int
ppp_available()
{
return ok;
}
-
-/*
- * run-program - execute a program with given arguments.
- * Returns the exit status, or -1 if an error occurred.
- * If the program can't be executed, logs an error unless
- * must_exist is 0 and the program file doesn't exist.
- */
-
-int
-run_program(prog, args, must_exist)
- char *prog;
- char **args;
- int must_exist;
-{
- pid_t pid;
- int status;
-
- pid = fork();
- if (pid == -1) {
- syslog(LOG_ERR, "can't fork to run %s: %m", prog);
- return -1;
- }
- if (pid == 0) {
- execv(prog, args);
- if (must_exist || errno != ENOENT)
- syslog(LOG_WARNING, "can't execute %s: %m", prog);
- _exit(-1);
- }
- if (waitpid(pid, &status, 0) == -1) {
- syslog(LOG_ERR, "waitpid: %m");
- return -1;
- }
- if (WIFSIGNALED(status)) {
- syslog(LOG_INFO, "%s terminated with signal %d", prog,
- WTERMSIG(status));
- return -1;
- }
- return WEXITSTATUS(status);
-}
#include <sys/time.h>
#include <sys/stream.h>
#include <sys/stropts.h>
-#include <sys/wait.h>
#include <net/if.h>
#include <net/route.h>
#include "pppd.h"
#include "ppp.h"
+#include <net/if_ppp.h>
#include <net/ppp_str.h>
#ifndef ifr_mtu
char modname[FMNAMESZ+1];
} str_modules[MAXMODULES];
static int str_module_count = 0;
+static int pushed_ppp;
extern int hungup; /* has the physical layer been disconnected? */
+extern int kdebugflag;
+
+#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.
str_module_count++;
}
- MAINDEBUG((LOG_INFO, "about to push modules..."));
-
/* now push the async/fcs module */
if (ioctl(fd, I_PUSH, "pppasync") < 0) {
syslog(LOG_ERR, "ioctl(I_PUSH, ppp_async): %m");
syslog(LOG_ERR, "ioctl(I_PUSH, ppp_if): %m");
die(1);
}
+ pushed_ppp = 1;
if (ioctl(fd, I_SETSIG, S_INPUT) < 0) {
syslog(LOG_ERR, "ioctl(I_SETSIG, S_INPUT): %m");
die(1);
die(1);
}
- /* if debug, set debug flags in driver */
- {
- int flags = debug ? 0x3 : 0;
- if (ioctl(fd, SIOCSIFDEBUG, &flags) < 0) {
- syslog(LOG_ERR, "ioctl(SIOCSIFDEBUG): %m");
- }
+ /* Set debug flags in driver */
+ if (ioctl(fd, SIOCSIFDEBUG, &kdebugflag) < 0) {
+ syslog(LOG_ERR, "ioctl(SIOCSIFDEBUG): %m");
}
-
- MAINDEBUG((LOG_INFO, "done pushing modules, ifunit %d", ifunit));
}
/*
void
disestablish_ppp()
{
- /*EMPTY*/
+ int flags;
+ char *s;
if (hungup) {
/* we can't push or pop modules after the stream has hung up */
return;
}
+ if (pushed_ppp) {
+ /*
+ * Check whether the link seems not to be 8-bit clean.
+ */
+ if (ioctl(fd, SIOCGIFDEBUG, (caddr_t) &flags) == 0) {
+ s = NULL;
+ switch (~flags & PAI_FLAGS_HIBITS) {
+ case PAI_FLAGS_B7_0:
+ s = "bit 7 set to 1";
+ break;
+ case PAI_FLAGS_B7_1:
+ s = "bit 7 set to 0";
+ break;
+ case PAI_FLAGS_PAR_EVEN:
+ s = "odd parity";
+ break;
+ case PAI_FLAGS_PAR_ODD:
+ s = "even parity";
+ break;
+ }
+ if (s != NULL) {
+ syslog(LOG_WARNING, "Serial link is not 8-bit clean:");
+ syslog(LOG_WARNING, "All received characters had %s", s);
+ }
+ }
+ }
+
while (ioctl(fd, I_POP, 0) == 0) /* pop any we pushed */
;
+ pushed_ppp = 0;
for (; str_module_count > 0; str_module_count--) {
if (ioctl(fd, I_PUSH, str_modules[str_module_count-1].modname)) {
- syslog(LOG_ERR, "str_restore: couldn't push module %s: %m",
+ 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",
quit();
}
- c = pcomp;
+ c = (pcomp? 1: 0);
if(ioctl(fd, SIOCSIFCOMPPROT, &c) < 0) {
syslog(LOG_ERR, "ioctl(SIOCSIFCOMPPROT): %m");
quit();
}
- c = accomp;
+ c = (accomp? 1: 0);
if(ioctl(fd, SIOCSIFCOMPAC, &c) < 0) {
syslog(LOG_ERR, "ioctl(SIOCSIFCOMPAC): %m");
quit();
}
}
+
+/*
+ * ppp_set_xaccm - set the extended transmit ACCM for the interface.
+ */
+void
+ppp_set_xaccm(unit, accm)
+ int unit;
+ ext_accm accm;
+{
+ if (ioctl(fd, SIOCSIFXASYNCMAP, accm) < 0 && errno != ENOTTY)
+ syslog(LOG_WARNING, "ioctl(set extended ACCM): %m");
+}
+
+
/*
* ppp_recv_config - configure the receive-side characteristics of
- * the ppp interface. At present this just sets the MRU.
+ * the ppp interface.
*/
void
ppp_recv_config(unit, mru, asyncmap, pcomp, accomp)
syslog(LOG_ERR, "ioctl(SIOCSIFMRU): %m");
}
-#ifdef notyet
- if(ioctl(fd, SIOCSIFRASYNCMAP, (caddr_t) &asyncmap) < 0) {
+ if (ioctl(fd, SIOCSIFRASYNCMAP, (caddr_t) &asyncmap) < 0) {
syslog(LOG_ERR, "ioctl(SIOCSIFRASYNCMAP): %m");
}
- c = accomp;
- if(ioctl(fd, SIOCSIFRCOMPAC, &c) < 0) {
- syslog(LOG_ERR, "ioctl(SIOCSIFRCOMPAC): %m");
- quit();
+ c = 2 + (pcomp? 1: 0);
+ if(ioctl(fd, SIOCSIFCOMPPROT, &c) < 0) {
+ syslog(LOG_ERR, "ioctl(SIOCSIFCOMPPROT): %m");
+ }
+
+ c = 2 + (accomp? 1: 0);
+ if (ioctl(fd, SIOCSIFCOMPAC, &c) < 0) {
+ syslog(LOG_ERR, "ioctl(SIOCSIFCOMPAC): %m");
}
-#endif /* notyet */
}
/*
sifvjcomp(u, vjcomp, cidcomp, maxcid)
int u, vjcomp, cidcomp, maxcid;
{
- char x = vjcomp;
+ char x;
- if(ioctl(fd, SIOCSIFVJCOMP, (caddr_t) &x) < 0) {
+ x = (vjcomp? 1: 0) + (cidcomp? 0: 2) + (maxcid << 4);
+ if (ioctl(fd, SIOCSIFVJCOMP, (caddr_t) &x) < 0) {
syslog(LOG_ERR, "ioctl(SIOCSIFVJCOMP): %m");
return 0;
}
* as our local address.
*/
if (!get_ether_addr(hisaddr, &arpreq.arp_ha)) {
- syslog(LOG_ERR, "Cannot determine ethernet address for proxy ARP");
+ syslog(LOG_WARNING, "Cannot determine ethernet address for proxy ARP");
return 0;
}
/* couldn't find one */
return 0;
}
-
-
-/*
- * run-program - execute a program with given arguments,
- * but don't wait for it.
- * If the program can't be executed, logs an error unless
- * must_exist is 0 and the program file doesn't exist.
- */
-static int n_children;
-
-int
-run_program(prog, args, must_exist)
- char *prog;
- char **args;
- int must_exist;
-{
- int pid;
-
- pid = fork();
- if (pid == -1) {
- syslog(LOG_ERR, "can't fork to run %s: %m", prog);
- return -1;
- }
- if (pid == 0) {
- execv(prog, args);
- if (must_exist || errno != ENOENT)
- syslog(LOG_WARNING, "can't execute %s: %m", prog);
- _exit(-1);
- }
- MAINDEBUG(("Script %s started; pid = %d", prog, pid));
- ++n_children;
- return 0;
-}
-
-
-/*
- * reap_kids - get status from any dead child processes,
- * and log a message for abnormal terminations.
- */
-void
-reap_kids()
-{
- int pid, status;
-
- if (n_children == 0)
- return;
- if ((pid = waitpid(-1, &status, WNOHANG)) == -1) {
- if (errno != ECHILD)
- syslog(LOG_ERR, "waitpid: %m");
- return;
- }
- --n_children;
- if (WIFSIGNALED(status)) {
- syslog(LOG_WARNING, "child process %d terminated with signal %d",
- pid, WTERMSIG(status));
- }
-}
projects / ppp.git / commitdiff