Upgrade licence to GPLv3+.

[tripe] / server / tun-slip.c

diff --git a/server/tun-slip.c b/server/tun-slip.c
index e807662a7532b23fe80fd15702b5e1c3169bb3bc..1c452955e753c307faea0889a2c5563c04ad1c17 100644 (file)
--- a/server/tun-slip.c
+++ b/server/tun-slip.c
@@ -9,19 +9,18 @@
  *
  * 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 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.
+ * 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 ------------------------------------------------------*/
@@ -121,9 +120,10 @@ static void t_read(int fd, unsigned mode, void *v)
       case SL_END:
        if (st & ST_BAD)
          ;
-       else if (st & ST_ESC)
+       else if (st & ST_ESC) {
          a_warn("TUN", "%s", p_ifname(t->p), "slip", "escape-end", A_END);
-       else if (q == t->buf) {
+         st |= ST_BAD;
+       } else if (q == t->buf) {
          T( trace(T_TUNNEL, "tun-slip: empty packet"); )
        } else {
          IF_TRACING(T_TUNNEL, {
@@ -289,7 +289,7 @@ static tunnel *t_create(peer *p, int fd, char **ifn)
   dstr d = DSTR_INIT;
   unsigned char ch;
   tunnel *t;
-  static const char end[] = { SL_END, SL_END };
+  static const octet end[] = { SL_END, SL_END };
 
   /* --- Try to find a spare static interface --- */