max_start_pad: calculate globally, not via client graph

[secnet.git] / slip.c

diff --git a/slip.c b/slip.c
index a4529262bd1b913de9ec6d40d317cf3583d9d703..5eb8dbdb1239e72698eb52d0f53d108af2e2f607 100644 (file)
--- a/slip.c
+++ b/slip.c
@@ -7,6 +7,7 @@
 #include "util.h"
 #include "netlink.h"
 #include "process.h"
+#include "unaligned.h"
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
@@ -114,7 +115,7 @@ static void slip_unstuff(struct slip *st, uint8_t *buf, uint32_t l)
        if (st->ignoring_packet) {
            if (outputchr == OUTPUT_END) {
                st->ignoring_packet=False;
-               buffer_init(st->buff,st->nl.max_start_pad);
+               buffer_init(st->buff,calculate_max_start_pad());
            }
        } else {
            if (outputchr == OUTPUT_END) {
@@ -122,10 +123,10 @@ static void slip_unstuff(struct slip *st, uint8_t *buf, uint32_t l)
                    st->netlink_to_tunnel(&st->nl,st->buff);
                    BUF_ALLOC(st->buff,"userv_afterpoll");
                }
-               buffer_init(st->buff,st->nl.max_start_pad);
+               buffer_init(st->buff,calculate_max_start_pad());
            } else if (outputchr != OUTPUT_NOTHING) {
                if (st->buff->size < st->buff->len) {
-                   *(uint8_t *)buf_append(st->buff,1)=outputchr;
+                   buf_append_uint8(st->buff,outputchr);
                } else {
                    Message(M_WARNING, "userv_afterpoll: dropping overlong"
                            " SLIP packet\n");
@@ -229,7 +230,8 @@ static void userv_userv_callback(void *sst, pid_t pid, int status)
            fatal("%s: userv exited unexpectedly: uncaught signal %d",
                  st->slip.nl.name,WTERMSIG(status));
        } else {
-           fatal("%s: userv stopped unexpectedly");
+           fatal("%s: userv stopped unexpectedly",
+                 st->slip.nl.name);
        }
     }
     Message(M_WARNING,"%s: userv subprocess died with status %d\n",