]> git.ipfire.org Git - thirdparty/iptables.git/commitdiff
libxtables: Debug: Slightly improve extension ordering debugging
authorPhil Sutter <phil@nwl.cc>
Fri, 26 Jul 2024 12:45:33 +0000 (14:45 +0200)
committerPhil Sutter <phil@nwl.cc>
Wed, 31 Jul 2024 21:13:55 +0000 (23:13 +0200)
Print the extension's real name (if present) and prefix the extension
list by a position number for clarity.

Signed-off-by: Phil Sutter <phil@nwl.cc>
libxtables/xtables.c

index 7b370d486f88837e41ff73c3234cd6b0c0ab3e67..7d54540b73b73757f1b047120ff707c0e2a1eab8 100644 (file)
@@ -1171,11 +1171,21 @@ void xtables_register_match(struct xtables_match *me)
        me->next = *pos;
        *pos = me;
 #ifdef DEBUG
-       printf("%s: inserted match %s (family %d, revision %d):\n",
-                       __func__, me->name, me->family, me->revision);
-       for (pos = &xtables_pending_matches; *pos; pos = &(*pos)->next) {
-               printf("%s:\tmatch %s (family %d, revision %d)\n", __func__,
-                      (*pos)->name, (*pos)->family, (*pos)->revision);
+#define printmatch(m, sfx)                                             \
+       printf("match %s (", (m)->name);                                \
+       if ((m)->real_name)                                             \
+               printf("alias %s, ", (m)->real_name);                   \
+       printf("family %d, revision %d)%s", (m)->family, (m)->revision, sfx);
+
+       {
+               int i = 1;
+
+               printf("%s: inserted ", __func__);
+               printmatch(me, ":\n");
+               for (pos = &xtables_pending_matches; *pos; pos = &(*pos)->next) {
+                       printf("pos %d:\t", i++);
+                       printmatch(*pos, "\n");
+               }
        }
 #endif
 }