Upgrade licence to GPLv3+.

[tripe] / pkstream / pkstream.c

diff --git a/pkstream/pkstream.c b/pkstream/pkstream.c
index 6e36adc2a945f883b9348e4296cde8231771e02f..f03d0ffedeb8f8d7c8a7c010166e7d634e534a5a 100644 (file)
--- a/pkstream/pkstream.c
+++ b/pkstream/pkstream.c
@@ -1,29 +1,26 @@
 /* -*-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).
  *
- * TrIPE is free software; you can redistribute it and/or modify
- * 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.
- * 
+ * TrIPE is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 3 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.
+ * along with TrIPE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /*----- Header files ------------------------------------------------------*/
@@ -56,6 +53,8 @@
 #include <mLib/sel.h>
 #include <mLib/selpk.h>
 
+#include "util.h"
+
 /*----- Data structures ---------------------------------------------------*/
 
 typedef struct pk {
@@ -129,7 +128,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);
@@ -394,6 +393,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);
@@ -411,7 +411,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;