ipif: abolish use of slip: fixes from testing

diff --git a/debian/changelog b/debian/changelog
index d72047fc3e8bccb43497af46e621de44faac777f..72b0964745bddc5128b31a2157f60eb031afbe99 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ userv-utils (0.4~beta2) unstable; urgency=low
   * Now uses tun, not slip.  All modern Linux kernels have tun support,
     and we weren't portable to non-Linux anyway.  slattach has sometimes
     been implicated in kernel problems.  Interfaces are now called
-    "userv%d" (ie, userv0, userv1, etc.).
+    "userv%d" (ie, userv0, userv1, etc.).  Only "slip" is now supported.
 
  --
 

diff --git a/ipif/service.c b/ipif/service.c
index 0a29f0695d4dfb21850c1ce943b2b7153c56a638..670b44706be087221e882eb69b9c61cf5e02ecef 100644 (file)
--- a/ipif/service.c
+++ b/ipif/service.c
@@ -143,7 +143,7 @@
 #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;
@@ -635,7 +635,7 @@ static int task(const char *desc) {
   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");
@@ -643,17 +643,16 @@ static int task(const char *desc) {
   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;
@@ -696,7 +695,7 @@ static void netconfigure(void) {
     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");
   }
@@ -791,6 +790,9 @@ static void tx_packet(uint8_t *output_buf, const uint8_t *ip, int inlen) {
     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;
 }
 
@@ -816,6 +818,10 @@ static void copydata(void) {
    * 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);