X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/786989941b7b4504f0234c4a318f929802e981ad..91a97a964d4b8793b7304b8851c0ae76bf35da36:/pkstream/pkstream.c

diff --git a/pkstream/pkstream.c b/pkstream/pkstream.c
index e291a9bd..4a1ccf50 100644
--- a/pkstream/pkstream.c
+++ b/pkstream/pkstream.c
@@ -1,13 +1,11 @@
 /* -*-c-*-
- *
- * $Id: pkstream.c,v 1.3 2004/04/08 01:36:17 mdw Exp $
  *
  * Forwarding UDP packets over a stream
  *
  * (c) 2003 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Trivial IP Encryption (TrIPE).
  *
@@ -15,12 +13,12 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * TrIPE is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with TrIPE; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -56,6 +54,8 @@
 #include <mLib/sel.h>
 #include <mLib/selpk.h>
 
+#include "util.h"
+
 /*----- Data structures ---------------------------------------------------*/
 
 typedef struct pk {
@@ -89,14 +89,10 @@ static size_t pk_nmax = 128, pk_szmax = 1024 * 1024;
 /*----- Main code ---------------------------------------------------------*/
 
 static int nonblockify(int fd)
-{
-  return (fdflags(fd, O_NONBLOCK, O_NONBLOCK, 0, 0));
-}
+  { return (fdflags(fd, O_NONBLOCK, O_NONBLOCK, 0, 0)); }
 
 static int cloexec(int fd)
-{
-  return (fdflags(fd, 0, 0, FD_CLOEXEC, FD_CLOEXEC));
-}
+  { return (fdflags(fd, 0, 0, FD_CLOEXEC, FD_CLOEXEC)); }
 
 static void dolisten(void);
 
@@ -133,7 +129,7 @@ static void rdtcp(octet *b, size_t sz, pkbuf *pk, size_t *k, void *vp)
   }
   pksz = LOAD16(b);
   if (pksz + 2 == sz) {
-    write(fd_udp, b + 2, pksz);
+    DISCARD(write(fd_udp, b + 2, pksz));
     selpk_want(&p->p, 2);
   } else {
     selpk_want(&p->p, pksz + 2);
@@ -318,9 +314,7 @@ static void usage(FILE *fp)
 }
 
 static void version(FILE *fp)
-{
-  pquis(fp, "$, tripe version " VERSION "\n");
-}
+  { pquis(fp, "$, tripe version " VERSION "\n"); }
 
 static void help(FILE *fp)
 {
@@ -400,6 +394,7 @@ int main(int argc, char *argv[])
 	break;
       case 'b':
 	parseaddr(optarg, &bindaddr.sin_addr, 0);
+	cw.me.sin_addr = bindaddr.sin_addr;
 	break;
       case 'c':
 	parseaddr(optarg, &connaddr.sin_addr, &pt);
@@ -417,7 +412,7 @@ int main(int argc, char *argv[])
 
   udp_me.sin_family = udp_peer.sin_family = AF_INET;
   parseaddr(argv[optind], &udp_me.sin_addr, &pt);
-  udp_me.sin_port = pt; 
+  udp_me.sin_port = pt;
   parseaddr(argv[optind + 1], &udp_peer.sin_addr, &pt);
   udp_peer.sin_port = pt;