*
* <local-addr>,<peer-addr>,<mtu>,<proto>
*
- * As for slattach. Supported protocols are slip, cslip, and
- * adaptive. Alternatively, set to `debug' to print debugging info
- * and exit. <local-addr> is address of the interface to be created
+ * As for slattach. The only supported protocol is slip.
+ * Alternatively, set to `debug' to print debugging info and
+ * exit. <local-addr> is address of the interface to be created
* on the local system; <peer-addr> is the address of the
* point-to-point peer. They must be actual addresses (not
* hostnames).
* not supported). If no additional routes are to be set up, use `-'
* or supply an empty argument.
*
- * Each <config> item - whether a line file such as
- * /etc/userv/ipif-networks, or supplied on the service program
- * command line - is one of:
+ * Each <config> item - whether a line in a file such as
+ * /etc/userv/ipif-networks, or the single trusted argument supplied
+ * on the service program command line - is one of:
*
* /<config-file-name>
* ./<config-file-name>
#define ATXTLEN 16
static const unsigned long gidmaxval= (unsigned long)((gid_t)-2);
-static const char *const protos_ok[]= { "slip", "cslip", "adaptive", 0 };
+static const char *const protos_ok[]= { "slip", 0 };
static const int signals[]= { SIGHUP, SIGINT, SIGTERM, 0 };
static const char *configstr, *proto;
if (!pid) return 1;
for (;;) {
- pidr= waitpid(pid,&status,WNOHANG);
+ pidr= waitpid(pid,&status,0);
if (pidr!=(pid_t)-1) break;
if (errno==EINTR) continue;
sysfatal("waitpid for task");
assert(pidr==pid);
if (WIFEXITED(status)) {
- fprintf(stderr,
- "userv-ipif service: %s unexpectedly exited with exit status %d\n",
+ if (WEXITSTATUS(status))
+ fatal("userv-ipif service: %s exited with error exit status %d\n",
desc, WEXITSTATUS(status));
} else if (WIFSIGNALED(status)) {
- fprintf(stderr,
- "userv-ipif service: %s unexpectedly killed by signal %s%s\n",
- desc, strsignal(WTERMSIG(status)),
- WCOREDUMP(status) ? " (core dumped)" : "");
+ fatal("userv-ipif service: %s died due to signal %s%s\n",
+ desc, strsignal(WTERMSIG(status)),
+ WCOREDUMP(status) ? " (core dumped)" : "");
} else {
- fprintf(stderr, "userv-ipif service: %s unexpectedly terminated"
- " with unknown status code %d\n", desc, status);
+ fatal("userv-ipif service: %s unexpectedly terminated"
+ " with unknown status code %d\n", desc, status);
}
return 0;
sprintf(mtutxt,"%lu",mtu);
execlp("ifconfig", "ifconfig", ifname, localtxt,
- "netmask","255.255.255.255", "-broadcast", "pointopoint",peertxt,
+ "netmask","255.255.255.255", "pointopoint",peertxt, "-broadcast",
"mtu",mtutxt, "up", (char*)0);
sysfatal("cannot exec ifconfig");
}
else if (c==SLIP_ESC) { *op++= SLIP_ESC; *op++= SLIP_ESC_ESC; }
else *op++= c;
}
+ *op++= SLIP_END;
+ assert(op <= output_buf + mtu*2+2);
+
output_waiting= op - output_buf;
}
* Output packets we buffer, so we poll only as appropriate for those.
*/
+ /* Start by transmitting one END byte to say we're ready. */
+ output_buf[0]= SLIP_END;
+ output_waiting= 1;
+
for (;;) {
if (output_waiting) {
r= write(1, output_buf, output_waiting);