[netfilter-cvslog] r6286 - branches/ulog/ulogd2/output

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-11-29 09:56:09 +0100 (Tue, 29 Nov 2005)
New Revision: 6286

Modified:
   branches/ulog/ulogd2/output/ulogd_output_OPRINT.c
Log:
OPRINT: use pluginstance num_keys instead of plugin num_keys (Christian Hentschel)


Modified: branches/ulog/ulogd2/output/ulogd_output_OPRINT.c
===================================================================
--- branches/ulog/ulogd2/output/ulogd_output_OPRINT.c	2005-11-29 08:43:51 UTC (rev 6285)
+++ branches/ulog/ulogd2/output/ulogd_output_OPRINT.c	2005-11-29 08:56:09 UTC (rev 6286)
@@ -54,9 +54,13 @@
 	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 @@
 			case ULOGD_RET_NONE:
 				fprintf(opi->of, "<none>");
 				break;
+			default: fprintf(opi->of, "default");
 		}
 	}
 	if (upi->config_kset->ces[1].u.value != 0)