X-Git-Url: https://git.distorted.org.uk/~mdw/userv-utils/blobdiff_plain/22fd0ebe07ae9f634cd5ab01dbc2e6506bc99b65..66b873f0277e8822c6479946353eef4ff06e56c1:/ipif/service.c?ds=sidebyside

diff --git a/ipif/service.c b/ipif/service.c
index 0a29f06..87dac8e 100644
--- 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");
   }
@@ -720,11 +719,13 @@ static void setnonblock(int fd) {
 }
 
 static void rx_packet(const uint8_t *packet, int len) {
+  if (!len)
+    return;
   for (;;) {
     int r= write(tunfd, packet, len);
     if (r<0) {
       if (errno==EINTR) continue;
-      if (errno==EAGAIN) return; /* oh well */
+      if (errno==EAGAIN || errno==ENOMEM) return; /* oh well */
       sysfatal("error writing packet to tun (transmitting)");
     }
     assert(r==len);
@@ -791,6 +792,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 +820,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);
@@ -855,7 +863,7 @@ static void copydata(void) {
       r= read(0, input_buf + input_waiting, want);
       if (r>0) {
 	input_waiting += r;
-	assert(r < sizeof(input_buf));
+	assert(input_waiting <= sizeof(input_buf));
 	more_rx_data(input_buf, rx_packet_buf);
       } else if (r==0) {
 	terminate(0);