fixup! polypath: Plumb ifname_wanted

[secnet] / polypath.c

diff --git a/polypath.c b/polypath.c
index 1d73a0a..a8b2759 100644 (file)
--- a/polypath.c
+++ b/polypath.c
@@ -98,7 +98,7 @@ static bool_t ifname_search_pats(struct polypath *st, struct cloc loc,
     const char *const *pati;
     for (pati=pats; *pati; pati++) {
        const char *pat=*pati;
-       if (*pat=='!' || *pat=='+') { *want_io=*pat; pat++; }
+       if (*pat=='!' || *pat=='+' || *pat=='@') { *want_io=*pat; pat++; }
        else if (*pat=='*' || isalnum((unsigned char)*pat)) { *want_io='+'; }
        else cfgfatal(loc,"polypath","invalid interface name pattern `%s'",pat);
        int match=fnmatch(pat,ifname,0);
@@ -351,7 +351,7 @@ static void polypath_record_ifaddr(struct polypath *st,
 
     struct interf_list *interfs;
     switch (want) {
-    case '+':  interfs=&st->interfs_general;    max_interfs=st->max_interfs;
+    case '+': interfs=&st->interfs_general; max_interfs=st->max_interfs; break;
     case '@':  interfs=&st->interfs_dedicated;  max_interfs=INT_MAX;
     default:   fatal("polypath: got bad want (%#x, %s)", want, ifname);
     }