~mdw
/
secnet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
comm: Formalise interface to udp sockets
[secnet]
/
slip.c
diff --git
a/slip.c
b/slip.c
index
891b268
..
badbc5d
100644
(file)
--- a/
slip.c
+++ b/
slip.c
@@
-170,13
+170,13
@@
static int userv_beforepoll(void *sst, struct pollfd *fds, int *nfds_io,
struct userv *st=sst;
if (st->rxfd!=-1) {
struct userv *st=sst;
if (st->rxfd!=-1) {
-
*nfds_io=2
;
+
BEFOREPOLL_WANT_FDS(2)
;
fds[0].fd=st->txfd;
fds[0].events=0; /* Might want to pick up POLLOUT sometime */
fds[1].fd=st->rxfd;
fds[1].events=POLLIN;
} else {
fds[0].fd=st->txfd;
fds[0].events=0; /* Might want to pick up POLLOUT sometime */
fds[1].fd=st->rxfd;
fds[1].events=POLLIN;
} else {
-
*nfds_io=0
;
+
BEFOREPOLL_WANT_FDS(0)
;
}
return 0;
}
}
return 0;
}
@@
-313,7
+313,6
@@
static void userv_invoke_userv(struct userv *st)
s=subnet_to_string(snets->list[i]);
strcat(nets,s);
strcat(nets,",");
s=subnet_to_string(snets->list[i]);
strcat(nets,s);
strcat(nets,",");
- free(s);
}
nets[strlen(nets)-1]=0;
subnet_list_free(snets);
}
nets[strlen(nets)-1]=0;
subnet_list_free(snets);
@@
-392,7
+391,7
@@
static void userv_phase_hook(void *sst, uint32_t newphase)
if (newphase==PHASE_RUN) {
userv_invoke_userv(st);
/* Register for poll() */
if (newphase==PHASE_RUN) {
userv_invoke_userv(st);
/* Register for poll() */
- register_for_poll(st, userv_beforepoll, userv_afterpoll,
2,
+ register_for_poll(st, userv_beforepoll, userv_afterpoll,
st->slip.nl.name);
}
if (newphase==PHASE_SHUTDOWN) {
st->slip.nl.name);
}
if (newphase==PHASE_SHUTDOWN) {