added example config file

bugfixes in conffile.c
ulogd_log still prints obsolete \n
cosmetic fixes

2 files changed, 17 insertions, 14 deletions

diff --git a/ulogd/extensions/ulogd_BASE.c b/ulogd/extensions/ulogd_BASE.c
index e0b1e1f..290ad0b 100644
--- a/ulogd/extensions/ulogd_BASE.c
+++ b/ulogd/extensions/ulogd_BASE.c
@@ -1,11 +1,11 @@
-/* ulogd_MAC.c, Version $Revision: 1.2 $
+/* ulogd_MAC.c, Version $Revision: 1.3 $
  *
  * ulogd logging interpreter for MAC addresses, TIME, etc.
  *
  * (C) 2000 by Harald Welte <laforge@sunbeam.franken.de>
  * This software is released under the terms of GNU GPL
  *
- * $Id: ulogd_BASE.c,v 1.2 2000/08/02 12:15:44 laforge Exp $
+ * $Id: ulogd_BASE.c,v 1.3 2000/08/14 08:28:24 laforge Exp $
  *
  */
 
@@ -25,8 +25,7 @@ ulog_iret_t *_interp_mac(ulog_packet_msg_t *pkt)
 	char *buf;
 	ulog_iret_t *ret;
 	
-	if (pkt->mac_len)
-	{
+	if (pkt->mac_len) {
 		buf = (char *) malloc(3 * pkt->mac_len + 1);
 		*buf = 0;
 
diff --git a/ulogd/extensions/ulogd_OPRINT.c b/ulogd/extensions/ulogd_OPRINT.c
index 19fbd7b..2d8e608 100644
--- a/ulogd/extensions/ulogd_OPRINT.c
+++ b/ulogd/extensions/ulogd_OPRINT.c
@@ -1,18 +1,19 @@
-/* ulogd_MAC.c, Version $Revision: 1.1 $
+/* ulogd_MAC.c, Version $Revision: 1.2 $
  *
  * ulogd output target for logging to a file 
  *
  * (C) 2000 by Harald Welte <laforge@sunbeam.franken.de>
  * This software is released under the terms of GNU GPL
  *
- * $Id: ulogd_OPRINT.c,v 1.1 2000/08/02 12:16:00 laforge Exp $
+ * $Id: ulogd_OPRINT.c,v 1.2 2000/08/14 08:28:24 laforge Exp $
  *
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ulogd.h>
+#include "ulogd.h"
+#include "conffile.h"
 
 #define NIPQUAD(addr) \
 	((unsigned char *)&addr)[0], \
@@ -26,8 +27,6 @@
         ((unsigned char *)&addr)[1], \
         ((unsigned char *)&addr)[0]
 
-#define ULOGD_OPRINT_FILE	"/var/log/ulogd.pktlog"
-
 static FILE *of = NULL;
 
 int _output_print(ulog_iret_t *res)
@@ -35,8 +34,7 @@ int _output_print(ulog_iret_t *res)
 	ulog_iret_t *ret;
 	
 	fprintf(of, "===>PACKET BOUNDARY\n");
-	for (ret = res; ret; ret = ret->next)
-	{
+	for (ret = res; ret; ret = ret->next) {
 		fprintf(of,"%s=", ret->key);
 		switch (ret->type) {
 			case ULOGD_RET_STRING:
@@ -74,12 +72,12 @@ int _output_print(ulog_iret_t *res)
 }
 
 static ulog_output_t base_op[] = {
-	{ NULL, "print.console", &_output_print },
+	{ NULL, "print", &_output_print },
 	{ NULL, "", NULL },
 };
 
 
-void _base_reg_op(void)
+static void _base_reg_op(void)
 {
 	ulog_output_t *op = base_op;
 	ulog_output_t *p;
@@ -88,12 +86,18 @@ void _base_reg_op(void)
 		register_output(p);
 }
 
+static config_entry_t outf_ce = { NULL, "dumpfile", CONFIG_TYPE_STRING, 
+				  CONFIG_OPT_NONE, 0,
+				  { string: "/var/log/ulogd.pktlog" } };
 void _init(void)
 {
 #ifdef DEBUG
 	of = stdout;
 #else
-	of = fopen(ULOGD_OPRINT_FILE, "a");
+	config_register_key(&outf_ce);
+	config_parse_file(0);
+
+	of = fopen(outf_ce.u.string, "a");
 	if (!of) {
 		ulogd_error("ulogd_OPRINT: can't open PKTLOG: %s\n", strerror(errno));
 		exit(2);