OPRINT: use pluginstance num_keys instead of plugin num_keys (Christian Hentschel)

diff --git a/output/ulogd_output_OPRINT.c b/output/ulogd_output_OPRINT.c
index 53638ce7264e0d942968a6cfc744026b2fd4dfe5..532dd6155fe5169bc08d9c40833ccc9f01916509 100644 (file)
--- a/output/ulogd_output_OPRINT.c
+++ b/output/ulogd_output_OPRINT.c
@@ -54,9 +54,13 @@ static int oprint_interp(struct ulogd_pluginstance *upi)
        unsigned int i;
        
        fprintf(opi->of, "===>PACKET BOUNDARY\n");
-       for (i = 0; i < upi->plugin->input.num_keys; i++) {
+       for (i = 0; i < upi->input.num_keys; i++) {
                struct ulogd_key *ret = upi->input.keys[i].u.source;
 
+               if (!ret)
+                       ulogd_log(ULOGD_NOTICE, "no result for %s ?!?\n",
+                                 upi->input.keys[i].name);
+               
                if (!IS_VALID(*ret))
                        continue;
 
@@ -84,6 +88,7 @@ static int oprint_interp(struct ulogd_pluginstance *upi)
                        case ULOGD_RET_NONE:
                                fprintf(opi->of, "<none>");
                                break;
+                       default: fprintf(opi->of, "default");
                }
        }
        if (upi->config_kset->ces[1].u.value != 0)