X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/userv-utils/blobdiff_plain/84f87e82eb7ab4fb0bb39d5d9800b740d528e6c9..aaa9ab3ad43917293ff70ee9cd3654906118fc08:/ipif/forwarder.c

diff --git a/ipif/forwarder.c b/ipif/forwarder.c
index ae32786..9b7e51e 100644
--- a/ipif/forwarder.c
+++ b/ipif/forwarder.c
@@ -41,13 +41,10 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include "mech.h"
+#include "forwarder.h"
 
 #define MAXMECHS 10
-#define PROGRAM "udptunnel-forwarder"
-char programid[SYS_NMLN+sizeof(PROGRAM)+3];
 
-static const char *const *argv;
 static size_t buffer_size;
 
 static int public_local_fd, private_in_fd, private_out_fd;
@@ -68,74 +65,15 @@ static size_t accum_used, accum_avail;
 static time_t nextsendka;
 
 
-void arg_assert_fail(const char *msg) {
-  fprintf(stderr, PROGRAM ": argument error: %s\n",msg);
-  exit(12);
-}
-
-void sysfail(const char *msg) {
-  fprintf(stderr, "%s: fatal system error: %s: %s\n", programid, msg, strerror(errno));
-  exit(8);
-}
-
-void fail(const char *msg) {
-  fprintf(stderr, "%s: fatal error: %s\n", programid, msg);
-  exit(4);
-}
-
-void sysdiag(const char *msg) {
-  fprintf(stderr, "%s: system/network error: %s: %s\n", programid, msg, strerror(errno));
-}
-
-void diag(const char *msg) {
-  fprintf(stderr, "%s: %s\n", programid, msg);
-}
-
-time_t now(void) {
-  time_t r;
-  if (time(&r) == (time_t)-1) sysfail("get time of day");
-  return r;
-}
-
-void *xmalloc(size_t sz) {
-  void *r;
-  r= malloc(sz);
-  if (!r) sysfail("allocate memory");
-  return r;
-}
-
-void get_random(void *ptr, size_t sz) {
-  static FILE *randfile;
-
-  size_t r;
-
-  if (!randfile) {
-    randfile= fopen("/dev/urandom","rb");
-    if (!randfile && errno==ENOENT) randfile= fopen("/dev/random","rb");
-    if (!randfile) sysfail("open random number generator");
+void random_key(void *ptr, size_t sz) {
+  if (encdec_keys_write) {
+    get_random(ptr,sz);
+    write_must(encdec_keys_fd,ptr,sz,"write keys datastream");
+  } else {
+    read_must(encdec_keys_fd,ptr,sz,"read keys datastream");
   }
-
-  r= fread(ptr,1,sz,randfile);
-  if (r == sz) return;
-  (ferror(randfile) ? sysfail : fail)("cannot read random number generator");
 }
 
-const char *getarg_string(void) {
-  const char *arg;
-  
-  arg= *++argv;
-  arg_assert(arg);
-  return arg;
-}
-
-unsigned long getarg_ulong(void) {
-  char *ep;
-  unsigned long ul;
-  
-  ul= strtoul(getarg_string(),&ep,0);
-  arg_assert(!*ep);
-  return ul;
-}
 
 static void setnonblock(int fd, int nonblock) {
   int r;
@@ -169,8 +107,6 @@ static void inbound(void) {
   int r, i, different, this_saddrlen;
   const char *emsg;
 
-  alarm(timeout);
-
   setnonblock(public_local_fd,1);
   this_saddrlen= sizeof(this_saddr);
   r= recvfrom(public_local_fd, buf_in.base, buffer_size-1, 0,
@@ -178,7 +114,7 @@ static void inbound(void) {
   if (!r) { diag("empty ciphertext"); return; }
 
   if (r<0) {
-    if (errno != EAGAIN && errno != EINTR) sysdiag("receive");
+    if (errno != EAGAIN && errno != EINTR) { sysdiag("receive"); sleep(1); }
     return;
   }
   if (this_saddr.sin_family != AF_INET) {
@@ -198,6 +134,8 @@ static void inbound(void) {
     }
   }
 
+  alarm(timeout);
+
   different= !public_remote_specd ||
     memcmp(&this_saddr,&public_remote,sizeof(this_saddr));
 
@@ -230,16 +168,7 @@ static void inbound(void) {
   buf_in.size+= 2;
 
   setnonblock(private_in_fd,0);
-  while (buf_in.size) {
-    r= write(private_in_fd, buf_in.start, buf_in.size);
-    assert(r && r <= buf_in.size);
-    if (r<0) {
-      if (errno == EINTR) continue;
-      sysfail("write down");
-    }
-    buf_in.start += r;
-    buf_in.size -= r;
-  }
+  write_must(private_in_fd, buf_in.start, buf_in.size, "write down");
 }
 
 static void sendpacket(const unsigned char *message, size_t size) {
@@ -310,11 +239,11 @@ int main(int argc, const char *const *const argv_in) {
   sprintf(programid, PROGRAM ": %.*s", SYS_NMLN, uname_result.nodename);
   
   public_local_fd= getarg_ulong();
+  private_in_fd= getarg_ulong();
+  private_out_fd= getarg_ulong();
   mtu2= getarg_ulong() * 2;
   keepalive= getarg_ulong();
   timeout= getarg_ulong();
-  private_in_fd= getarg_ulong();
-  private_out_fd= getarg_ulong();
   
   arg= getarg_string();
   if (*arg) {