#include "util.h"
#include "netlink.h"
#include "process.h"
+#include "unaligned.h"
#include <stdio.h>
#include <string.h>
#include <unistd.h>
int outputchr;
enum { OUTPUT_END = 256, OUTPUT_NOTHING = 257 };
+ if (!st->buff->size)
+ buffer_init(st->buff,calculate_max_start_pad());
+
if (st->pending_esc) {
st->pending_esc=False;
switch(buf[i]) {
if (st->ignoring_packet) {
if (outputchr == OUTPUT_END) {
st->ignoring_packet=False;
- buffer_init(st->buff,st->nl.max_start_pad);
+ st->buff->size=0;
}
} else {
if (outputchr == OUTPUT_END) {
st->netlink_to_tunnel(&st->nl,st->buff);
BUF_ALLOC(st->buff,"userv_afterpoll");
}
- buffer_init(st->buff,st->nl.max_start_pad);
+ st->buff->size=0;
} 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");
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",