polypath: Make message class an argument to bad() callbacks

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/polypath.c b/polypath.c
index 273849a141d1cd3280b5639b71a4a17596a17726..5ae5b04d22cd34b5f3f661f90a614d936cc9c13c 100644 (file)
--- a/polypath.c
+++ b/polypath.c
@@ -127,10 +127,10 @@ static inline bool_t matches32(uint32_t word, uint32_t prefix, int prefixlen)
  * and
  *   out:
  */
  * 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)
+#define BAD(m)     do{ bad(st,badctx,M_WARNING,m,0);  goto out; }while(0)
+#define BADE(m,ev) do{ bad(st,badctx,M_WARNING,m,ev); goto out; }while(0)

 typedef void bad_fn_type(struct polypath *st, void *badctx,
 typedef void bad_fn_type(struct polypath *st, void *badctx,

-                        const char* m, int ev);
+                        int mclass, const char* m, int ev);

 
 typedef void polypath_ppml_callback_type(struct polypath *st,
           bad_fn_type *bad, void *badctx,
 
 typedef void polypath_ppml_callback_type(struct polypath *st,
           bad_fn_type *bad, void *badctx,


@@ -142,12 +142,13 @@ struct ppml_bad_ctx {
     char *undospace;
 };
 
     char *undospace;
 };
 

-static void ppml_bad(struct polypath *st, void *badctx, const char *m, int ev)
+static void ppml_bad(struct polypath *st, void *badctx,
+                    int mclass, const char *m, int ev)

 {
     struct ppml_bad_ctx *bc=badctx;
     if (bc->undospace)
        *(bc->undospace)=' ';
 {
     struct ppml_bad_ctx *bc=badctx;
     if (bc->undospace)
        *(bc->undospace)=' ';

-    lg_perror(LG,M_WARNING,ev,
+    lg_perror(LG,mclass,ev,

              "error processing polypath state change: %s"
              " (while processing `%s')",
              m,bc->orgl);
              "error processing polypath state change: %s"
              " (while processing `%s')",
              m,bc->orgl);


@@ -546,12 +547,13 @@ struct privsep_mdata {
     union iaddr ia;
 };
 
     union iaddr ia;
 };
 

-static void papp_bad(struct polypath *st, void *badctx, const char *m, int ev)
+static void papp_bad(struct polypath *st, void *badctx,
+                    int mclass, const char *m, int ev)

 {
     const struct privsep_mdata *mdata=(const void*)st->lbuf.start;
     const char *addr_str=badctx;
 
 {
     const struct privsep_mdata *mdata=(const void*)st->lbuf.start;
     const char *addr_str=badctx;
 

-    lg_perror(LG,M_WARNING,ev,
+    lg_perror(LG,mclass,ev,

              "error processing polypath address change %s %s [%s]: %s",
              mdata->add ? "+" : "-",
              mdata->ifname, addr_str, m);
              "error processing polypath address change %s %s [%s]: %s",
              mdata->add ? "+" : "-",
              mdata->ifname, addr_str, m);