make 'num_keys' an attribute of pluginstance instead of plugin

4 files changed, 10 insertions, 10 deletions

diff --git a/output/pcap/ulogd_output_PCAP.c b/output/pcap/ulogd_output_PCAP.c
index fa2b955..90f7e0a 100644
--- a/output/pcap/ulogd_output_PCAP.c
+++ b/output/pcap/ulogd_output_PCAP.c
@@ -132,7 +132,7 @@ static struct ulogd_key pcap_keys[INTR_IDS] = {
 static int interp_pcap(struct ulogd_pluginstance *upi)
 {
 	struct pcap_instance *pi = (struct pcap_instance *) &upi->private;
-	struct ulogd_key *res = upi->input;
+	struct ulogd_key *res = upi->input.keys;
 	struct pcap_sf_pkthdr pchdr;
 
 	pchdr.caplen = GET_VALUE(res, 1).ui32;
@@ -208,7 +208,7 @@ static int append_create_outfile(struct ulogd_pluginstance *upi)
 				  strerror(errno));
 			return -EPERM;
 		}
-		if (!write_pcap_header(upi)) {
+		if (!write_pcap_header(pi)) {
 			ulogd_log(ULOGD_ERROR, "can't write pcap header: %s\n",
 				  strerror(errno));
 			return -ENOSPC;
diff --git a/output/ulogd_output_LOGEMU.c b/output/ulogd_output_LOGEMU.c
index e46a19c..4be4807 100644
--- a/output/ulogd_output_LOGEMU.c
+++ b/output/ulogd_output_LOGEMU.c
@@ -66,7 +66,7 @@ struct logemu_instance {
 static int _output_logemu(struct ulogd_pluginstance *upi)
 {
 	struct logemu_instance *li = (struct logemu_instance *) &upi->private;
-	struct ulogd_key *res = upi->input;
+	struct ulogd_key *res = upi->input.keys;
 	static char buf[4096];
 
 	printpkt_print(res, buf, 1);
diff --git a/output/ulogd_output_OPRINT.c b/output/ulogd_output_OPRINT.c
index a35634a..89a8095 100644
--- a/output/ulogd_output_OPRINT.c
+++ b/output/ulogd_output_OPRINT.c
@@ -55,7 +55,7 @@ static int oprint_interp(struct ulogd_pluginstance *upi)
 	
 	fprintf(opi->of, "===>PACKET BOUNDARY\n");
 	for (i = 0; i < upi->plugin->input.num_keys; i++) {
-		struct ulogd_key *ret = upi->input[i].u.source;
+		struct ulogd_key *ret = upi->input.keys[i].u.source;
 
 		if (!IS_VALID(*ret))
 			continue;
@@ -152,8 +152,8 @@ static int oprint_configure(struct ulogd_pluginstance *upi,
 	}
 
 	ulogd_log(ULOGD_DEBUG, "allocating %u input keys\n", num_keys);
-	upi->input = malloc(sizeof(struct ulogd_key) * num_keys);
-	if (!upi->input)
+	upi->input.keys = malloc(sizeof(struct ulogd_key) * num_keys);
+	if (!upi->input.keys)
 		return -ENOMEM;
 
 	/* second pass: copy key names */
@@ -162,13 +162,13 @@ static int oprint_configure(struct ulogd_pluginstance *upi,
 		int i;
 
 		for (i = 0; i < pi_cur->plugin->output.num_keys; i++)
-			upi->input[index++] = pi_cur->output[i];
+			upi->input.keys[index++] = pi_cur->output.keys[i];
 	}
 
 	config_parse_file(upi->id, upi->config_kset);
 
-	/* FIXME: the count needs to be per-instance */
-	upi->plugin->input.num_keys = num_keys;
+	/* the count needs to be per-instance */
+	upi->input.num_keys = num_keys;
 
 	return 0;
 }
diff --git a/output/ulogd_output_SYSLOG.c b/output/ulogd_output_SYSLOG.c
index 2ee1ae0..66a140e 100644
--- a/output/ulogd_output_SYSLOG.c
+++ b/output/ulogd_output_SYSLOG.c
@@ -66,7 +66,7 @@ struct syslog_instance {
 static int _output_syslog(struct ulogd_pluginstance *upi)
 {
 	struct syslog_instance *li = (struct syslog_instance *) &upi->private;
-	struct ulogd_key *res = upi->input;
+	struct ulogd_key *res = upi->input.keys;
 	static char buf[4096];
 	
 	printpkt_print(res, buf, 0);