return 0;
}
-static void dump_ppml(struct polypath *st, const char *orgl)
-{
-#ifdef POLYPATH_DEBUG
- struct interf *interf;
- if (orgl)
- lg_perror(LG,M_DEBUG,0, "polypath monitor line `%s'",orgl);
- LIST_FOREACH(interf, &st->interfs, entry) {
- lg_perror(LG,M_DEBUG,0, " polypath interface `%s', nsocks=%d",
- interf->name, interf->socks.n_socks);
- int i;
- for (i=0; i<interf->socks.n_socks; i++) {
- struct udpsock *us=&interf->socks.socks[i];
- lg_perror(LG,M_DEBUG,0, " polypath sock fd=%d addr=%s",
- us->fd, iaddr_to_string(&us->addr));
- }
- }
-#endif
-}
-
-static void bad(struct polypath *st, char *l, char *undospace,
- const char *m, int ev)
-{
- if (undospace)
- *undospace=' ';
- lg_perror(LG,M_WARNING,ev,
- "error processing polypath state change: %s"
- " (while processing `%s')",
- m,l);
-}
-
static inline bool_t matches32(uint32_t word, uint32_t prefix, int prefixlen)
{
assert(prefixlen>0);
return (word & mask) == prefix;
}
-static void polypath_process_monitor_line(struct polypath *st, char *orgl)
+/* These macros expect
+ * bad_fn_type *const bad;
+ * void *badctx;
+ * and
+ * out:
+ */
+#define BAD(m) do{ bad(st,badctx,m,0); goto out; }while(0)
+#define BADE(m,ev) do{ bad(st,badctx,m,ev); goto out; }while(0)
+typedef void bad_fn_type(struct polypath *st, void *badctx,
+ const char* m, int ev);
+
+typedef void polypath_ppml_callback_type(struct polypath *st,
+ bad_fn_type *bad, void *badctx,
+ bool_t add, const char *ifname, const char *ifaddr,
+ const union iaddr *ia, int fd /* -1 if none yet */);
+
+struct ppml_bad_ctx {
+ const char *orgl;
+ char *undospace;
+};
+
+static void ppml_bad(struct polypath *st, void *badctx, const char *m, int ev)
+{
+ struct ppml_bad_ctx *bc=badctx;
+ if (bc->undospace)
+ *(bc->undospace)=' ';
+ lg_perror(LG,M_WARNING,ev,
+ "error processing polypath state change: %s"
+ " (while processing `%s')",
+ m,bc->orgl);
+}
+
+static void polypath_process_monitor_line(struct polypath *st, char *orgl,
+ polypath_ppml_callback_type *callback)
+ /* always calls callback with fd==-1 */
{
- struct interf *interf=0;
struct udpcommon *uc=&st->uc;
- char *undospace=0;
char *l=orgl;
- struct udpsock *us=0;
-
- dump_ppml(st,orgl);
-
-#define BAD(m) do{ bad(st,orgl,undospace,m,0); goto out; }while(0)
-#define BADE(m,ev) do{ bad(st,orgl,undospace,m,ev); goto out; }while(0)
+ bad_fn_type (*const bad)=ppml_bad;
+ struct ppml_bad_ctx badctx[1]={{
+ .orgl=orgl,
+ .undospace=0
+ }};
bool_t add;
int c=*l++;
if (!space) BAD("no second space");
const char *ifaddr=space+1;
*space=0;
- undospace=space;
+ badctx->undospace=space;
union iaddr ia;
FILLZERO(ia);
abort();
}
+#undef DONT
+
/* OK, process it */
+ callback(st, bad,badctx, add,ifname,ifaddr,&ia,-1);
+
+ out:;
+}
+
+static void dump_pria(struct polypath *st, const char *ifname)
+{
+#ifdef POLYPATH_DEBUG
+ struct interf *interf;
+ if (ifname)
+ lg_perror(LG,M_DEBUG,0, "polypath record ifaddr `%s'",ifname);
+ LIST_FOREACH(interf, &st->interfs, entry) {
+ lg_perror(LG,M_DEBUG,0, " polypath interface `%s', nsocks=%d",
+ interf->name, interf->socks.n_socks);
+ int i;
+ for (i=0; i<interf->socks.n_socks; i++) {
+ struct udpsock *us=&interf->socks.socks[i];
+ lg_perror(LG,M_DEBUG,0, " polypath sock fd=%d addr=%s",
+ us->fd, iaddr_to_string(&us->addr));
+ }
+ }
+#endif
+}
+
+static bool_t polypath_make_socket(struct polypath *st,
+ bad_fn_type *bad, void *badctx,
+ struct udpsock *us, const char *ifname)
+ /* on error exit has called bad; might leave us->fd as -1 */
+{
+ assert(us->fd==-1);
+
+ bool_t ok=udp_make_socket(&st->uc,us,M_WARNING);
+ if (!ok) BAD("unable to set up socket");
+ int r=setsockopt(us->fd,SOL_SOCKET,SO_BINDTODEVICE,
+ ifname,strlen(ifname)+1);
+ if (r) BADE("setsockopt(,,SO_BINDTODEVICE,)",errno);
+ return True;
+
+ out:
+ return False;
+}
+
+static void polypath_record_ifaddr(struct polypath *st,
+ bad_fn_type *bad, void *badctx,
+ bool_t add, const char *ifname,
+ const char *ifaddr,
+ const union iaddr *ia, int fd)
+{
+ struct udpcommon *uc=&st->uc;
+ struct interf *interf=0;
+ struct udpsock *us=0;
+
+ dump_pria(st,ifname);
+
int n_ifs=0;
LIST_FOREACH(interf,&st->interfs,entry) {
if (!strcmp(interf->name,ifname))
BAD("too many addresses on this interface");
struct udpsock *us=&interf->socks.socks[interf->socks.n_socks];
us->fd=-1;
- COPY_OBJ(us->addr,ia);
- bool_t ok=udp_make_socket(&st->uc,us,M_WARNING);
- if (!ok) BAD("unable to set up socket");
- r=setsockopt(us->fd,SOL_SOCKET,SO_BINDTODEVICE,
- ifname,strlen(ifname)+1);
- if (r) BADE("setsockopt(,,SO_BINDTODEVICE,)",errno);
+ COPY_OBJ(us->addr,*ia);
+ if (fd<0) {
+ bool_t ok=polypath_make_socket(st,bad,badctx, us,ifname);
+ if (!ok) goto out;
+ } else {
+ FILLZERO(us->experienced);
+ us->fd=fd;
+ fd=-1;
+ }
interf->socks.n_socks++;
us=0; /* do not destroy this socket during `out' */
lg_perror(LG,M_INFO,0,"using %s %s",ifname,ifaddr);
} else {
int i;
for (i=0; i<interf->socks.n_socks; i++)
- if (!memcmp(&interf->socks.socks[i].addr,&ia,sizeof(ia)))
+ if (!memcmp(&interf->socks.socks[i].addr,ia,sizeof(*ia)))
goto address_remove_found;
BAD("address to remove not found");
address_remove_found:
out:
if (us)
udp_destroy_socket(uc,us);
+ if (fd>=0)
+ close(fd);
if (interf && !interf->socks.n_socks) {
udp_socks_deregister(&st->uc,&interf->socks);
LIST_REMOVE(interf,entry);
free(interf);
}
- dump_ppml(st,0);
-
-#undef BAD
-#undef BADE
-#undef DONT
+ dump_pria(st,0);
}
-static void polypath_afterpoll(void *state, struct pollfd *fds, int nfds)
+static void subproc_problem(struct polypath *st,
+ enum async_linebuf_result alr, const char *emsg)
{
- struct polypath *st=state;
- enum async_linebuf_result alr;
- const char *emsg;
int status;
-
- if (nfds<1) return;
-
- while ((alr=async_linebuf_read(fds,&st->lbuf,&emsg)) == async_linebuf_ok)
- polypath_process_monitor_line(st,st->lbuf.base);
-
- if (alr==async_linebuf_nothing)
- return;
-
assert(st->monitor_pid);
pid_t gotpid=waitpid(st->monitor_pid,&status,WNOHANG);
lg_perror(LG,M_FATAL,0,"unexpected EOF from interface monitor");
else
lg_perror(LG,M_FATAL,0,"bad output from interface monitor: %s",emsg);
-
assert(!"not reached");
}
+static void afterpoll_monitor(struct polypath *st, struct pollfd *fd,
+ polypath_ppml_callback_type *callback)
+{
+ enum async_linebuf_result alr;
+ const char *emsg;
+
+ while ((alr=async_linebuf_read(fd,&st->lbuf,&emsg)) == async_linebuf_ok)
+ polypath_process_monitor_line(st,st->lbuf.base,callback);
+
+ if (alr==async_linebuf_nothing)
+ return;
+
+ subproc_problem(st,alr,emsg);
+}
+
+static void polypath_afterpoll_monitor(void *state, struct pollfd *fds,
+ int nfds)
+{
+ struct polypath *st=state;
+ if (nfds<1) return;
+ afterpoll_monitor(st,fds,polypath_record_ifaddr);
+}
+
/* Actual udp packet sending work */
static bool_t polypath_sendmsg(void *commst, struct buffer_if *buf,
const struct comm_addr *dest)
return allreasonable;
}
-static void polypath_phase_startmonitor(void *sst, uint32_t newphase)
+static void child_monitor(struct polypath *st, int childfd)
+{
+ dup2(childfd,1);
+ execvp(st->monitor_command[0],(char**)st->monitor_command);
+ fprintf(stderr,"secnet: cannot execute %s: %s\n",
+ st->monitor_command[0], strerror(errno));
+ exit(-1);
+}
+
+static void start_subproc(struct polypath *st, void (*make_fdpair)(int[2]),
+ void (*child)(struct polypath *st, int childfd),
+ const char *desc)
{
- struct polypath *st=sst;
int pfds[2];
assert(!st->monitor_pid);
assert(st->monitor_fd<0);
- pipe_cloexec(pfds);
+ make_fdpair(pfds);
pid_t pid=fork();
if (!pid) {
afterfork();
- dup2(pfds[1],1);
- execvp(st->monitor_command[0],(char**)st->monitor_command);
- fprintf(stderr,"secnet: cannot execute %s: %s\n",
- st->monitor_command[0], strerror(errno));
- exit(-1);
+ close(pfds[0]);
+ child(st,pfds[1]);
+ abort();
}
if (pid<0)
- fatal_perror("%s: failed to fork for interface monitor",
+ fatal_perror("%s: failed to fork for interface monitoring",
st->uc.cc.cl.description);
close(pfds[1]);
st->monitor_fd=pfds[0];
setnonblock(st->monitor_fd);
- register_for_poll(st,polypath_beforepoll,polypath_afterpoll,"polypath");
+ lg_perror(LG,M_NOTICE,0, "%s: spawning %s [pid %ld]",
+ st->uc.cc.cl.description, desc, (long)st->monitor_pid);
+}
+
+static void polypath_phase_startmonitor(void *sst, uint32_t newphase)
+{
+ struct polypath *st=sst;
+ start_subproc(st,pipe_cloexec,child_monitor,"interface monitor");
+ register_for_poll(st,polypath_beforepoll,
+ polypath_afterpoll_monitor,"polypath");
}
static void polypath_phase_shutdown(void *sst, uint32_t newphase)
}
}
+static void polypath_phase_childpersist(void *sst, uint32_t newphase)
+{
+ struct polypath *st=sst;
+ struct interf *interf;
+
+ LIST_FOREACH(interf,&st->interfs,entry)
+ udp_socks_childpersist(&st->uc,&interf->socks);
+}
+
+#undef BAD
+#undef BADE
+
static list_t *polypath_apply(closure_t *self, struct cloc loc,
dict_t *context, list_t *args)
{
add_hook(PHASE_RUN, polypath_phase_startmonitor,st);
add_hook(PHASE_SHUTDOWN, polypath_phase_shutdown, st);
+ add_hook(PHASE_CHILDPERSIST,polypath_phase_childpersist,st);
return new_closure(&cc->cl);
}
~ian / secnet.git / blobdiff