BUF_ASSERT_USED(buf);
- /* XXX crunchy bytestuff code */
+ /* There's probably a much more efficient way of implementing this */
txbuf[j++]=SLIP_END;
for (i=buf->start; i<(buf->start+buf->size); i++) {
switch (*i) {
{
uint32_t i;
- /* XXX really crude unstuff code */
- /* XXX check for buffer overflow */
BUF_ASSERT_USED(st->buff);
for (i=0; i<l; i++) {
if (st->pending_esc) {
*(uint8_t *)buf_append(st->buff,1)=SLIP_ESC;
break;
default:
- fatal("userv_afterpoll: bad SLIP escape character\n");
+ fatal("userv_afterpoll: bad SLIP escape character");
}
} else {
switch (buf[i]) {
fatal_perror("%s: userv_afterpoll: read(rxfd)",
st->slip.nl.name);
} else if (l==0) {
- fatal("%s: userv_afterpoll: read(rxfd)=0; userv gone away?\n",
+ fatal("%s: userv_afterpoll: read(rxfd)=0; userv gone away?",
st->slip.nl.name);
} else slip_unstuff(&st->slip,rxbuf,l);
}
}
if (!st->expecting_userv_exit) {
if (WIFEXITED(status)) {
- fatal("%s: userv exited unexpectedly with status %d\n",
+ fatal("%s: userv exited unexpectedly with status %d",
st->slip.nl.name,WEXITSTATUS(status));
} else if (WIFSIGNALED(status)) {
- fatal("%s: userv exited unexpectedly: uncaught signal %d\n",
+ fatal("%s: userv exited unexpectedly: uncaught signal %d",
st->slip.nl.name,WTERMSIG(status));
} else {
- fatal("%s: userv stopped unexpectedly\n");
+ fatal("%s: userv stopped unexpectedly");
}
}
Message(M_WARNING,"%s: userv subprocess died with status %d\n",
string_t addrs;
string_t nets;
string_t s;
- struct netlink_route *r;
- struct ipset *isnets;
+ struct netlink_client *r;
+ struct ipset *allnets;
struct subnet_list *snets;
- int i;
+ int i, nread;
uint8_t confirm;
if (st->pid) {
- fatal("userv_invoke_userv: already running\n");
+ fatal("userv_invoke_userv: already running");
}
/* This is where we actually invoke userv - all the networks we'll
ipaddr_to_string(st->slip.local_address),
ipaddr_to_string(st->slip.nl.secnet_address),st->slip.nl.mtu);
- r=st->slip.nl.routes;
- isnets=ipset_new();
- for (i=0; i<st->slip.nl.n_routes; i++) {
- if (r[i].up) {
- struct ipset *sn,*nis;
- r[i].kup=True;
- sn=ipset_from_subnet(r[i].net);
- nis=ipset_union(isnets,sn);
- ipset_free(sn);
- ipset_free(isnets);
- isnets=nis;
+ allnets=ipset_new();
+ for (r=st->slip.nl.clients; r; r=r->next) {
+ if (r->up) {
+ struct ipset *nan;
+ r->kup=True;
+ nan=ipset_union(allnets,r->networks);
+ ipset_free(allnets);
+ allnets=nan;
}
}
- snets=ipset_to_subnet_list(isnets);
- ipset_free(isnets);
+ snets=ipset_to_subnet_list(allnets);
+ ipset_free(allnets);
nets=safe_malloc(20*snets->entries,"userv_invoke_userv:nets");
*nets=0;
for (i=0; i<snets->entries; i++) {
Message(M_INFO,"%s: userv-ipif pid is %d\n",st->slip.nl.name,st->pid);
/* Read a single character from the pipe to confirm userv-ipif is
running. If we get a SIGCHLD at this point then we'll get EINTR. */
- if (read(st->rxfd,&confirm,1)!=1) {
+ if ((nread=read(st->rxfd,&confirm,1))!=1) {
if (errno==EINTR) {
Message(M_WARNING,"%s: read of confirmation byte was "
"interrupted\n",st->slip.nl.name);
} else {
- fatal_perror("%s: read() of confirmation byte",st->slip.nl.name);
+ if (nread<0) {
+ fatal_perror("%s: error reading confirmation byte",
+ st->slip.nl.name);
+ } else {
+ fatal("%s: unexpected EOF instead of confirmation byte"
+ " - userv ipif failed?", st->slip.nl.name);
+ }
}
} else {
if (confirm!=SLIP_END) {
- fatal("%s: bad confirmation byte %d from userv-ipif\n",
+ fatal("%s: bad confirmation byte %d from userv-ipif",
st->slip.nl.name,confirm);
}
}
- /* Mark rxfd non-blocking */
- if (fcntl(st->rxfd, F_SETFL, fcntl(st->rxfd, F_GETFL)|O_NONBLOCK)==-1) {
- fatal_perror("%s: fcntl(O_NONBLOCK)",st->slip.nl.name);
- }
}
static void userv_kill_userv(struct userv *st)
void slip_module(dict_t *dict)
{
add_closure(dict,"userv-ipif",userv_apply);
-#if 0
- /* TODO */
- add_closure(dict,"pty-slip",ptyslip_apply);
- add_closure(dict,"slipd",slipd_apply);
-#endif /* 0 */
}