]> git.ipfire.org Git - thirdparty/ulogd2.git/commitdiff
add 'real' syslog target (untested)
authorlaforge <laforge>
Fri, 10 Oct 2003 15:56:37 +0000 (15:56 +0000)
committerlaforge <laforge>
Fri, 10 Oct 2003 15:56:37 +0000 (15:56 +0000)
Changes
Rules.make.in
extensions/Makefile.in
extensions/printpkt.c [new file with mode: 0644]
extensions/printpkt.h [new file with mode: 0644]
extensions/ulogd_LOGEMU.c
extensions/ulogd_SYSLOG.c [new file with mode: 0644]

diff --git a/Changes b/Changes
index 1cff25c61de83832aedc37c70bbc01b5bdf72e40..886f86e276a02e88a205c8b6e5261cfd9ab40db8 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,9 +1,12 @@
-Version 1.10 (2003-Sep-XX)
+Version 1.10 (2003-Oct-xx)
 - Change format of configuration file.  Now every plugin has it's own section
   in the config file, making the whole parsing procedure easier - and
   eliminating multiple loading of .so plugins. (Magnus Boden)
 - Make the config file format completely syntax compatible with .ini style files
--
+- Add a new 'SYSLOG' plugin for real syslogging
+
+Version 1.02 (2003-Oct-08)
+- fix printout of time information in ulogd_LOGEMU.c
 
 Version 1.01 (2003-Aug-23)
 - use $(LD) macro in order to provide cross-compiling/linking support
index 1092a6cd566d4c62e1a108a4a59242671e4b7d77..e1d1730e24170f2be162b77939e3b042056d51a5 100644 (file)
@@ -30,7 +30,7 @@ LIBS=@LIBS@
 
 
 # Names of the plugins to be compiled
-ULOGD_SL:=BASE OPRINT PWSNIFF LOGEMU LOCAL
+ULOGD_SL:=BASE OPRINT PWSNIFF LOGEMU LOCAL SYSLOG
 
 # mysql output support
 #ULOGD_SL+=MYSQL
index 4c41930aa22dd59ca0ab286b8ebb815eb93e4110..589bf7b270fc06b8013ebe6f16729a7fa8b17a38 100644 (file)
@@ -14,9 +14,15 @@ all: $(SHARED_LIBS)
 
 distrib:
 
+printpkt.o: printpkt.c
+       $(CC) $(SH_CFLAGS) -o $@ -c $<
+
 $(SHARED_LIBS): %.so: %_sh.o
        $(LD) -shared -o $@ $< -lc
 
+ulogd_SYSLOG.so: printpkt.o ulogd_SYSLOG_sh.o 
+       $(LD) -shared -o $@ $^ -lc
+
 %_sh.o: %.c
        $(CC) $(SH_CFLAGS) -o $@ -c $<
 
diff --git a/extensions/printpkt.c b/extensions/printpkt.c
new file mode 100644 (file)
index 0000000..91f6e2b
--- /dev/null
@@ -0,0 +1,267 @@
+/* printpkt.c
+ *
+ * build something looking like a iptables LOG message
+ *
+ * (C) 2000-2003 by Harald Welte <laforge@gnumonks.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 
+ *  as published by the Free Software Foundation
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * $Id: ulogd_LOGEMU.c,v 1.15 2003/09/28 15:19:26 laforge Exp $
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
+#include <netinet/ip.h>
+#include <netinet/ip_icmp.h>
+#include <ulogd/ulogd.h>
+#include <ulogd/conffile.h>
+
+#ifndef HOST_NAME_MAX
+#warning this libc does not define HOST_NAME_MAX
+#define HOST_NAME_MAX  (255+1)
+#endif
+
+#define NIPQUAD(addr) \
+       ((unsigned char *)&addr)[0], \
+       ((unsigned char *)&addr)[1], \
+        ((unsigned char *)&addr)[2], \
+        ((unsigned char *)&addr)[3]
+
+struct intr_id {
+       char* name;
+       unsigned int id;                
+};
+
+static char hostname[HOST_NAME_MAX+1];
+
+#define INTR_IDS       35
+static struct intr_id intr_ids[INTR_IDS] = {
+       { "oob.time.sec", 0 },
+       { "oob.prefix", 0 },
+       { "oob.in", 0 },
+       { "oob.out", 0 },
+       { "raw.mac", 0 },
+       { "ip.saddr", 0 },
+       { "ip.daddr", 0 },
+       { "ip.totlen", 0 },
+       { "ip.tos", 0 },
+       { "ip.ttl", 0 },
+       { "ip.id", 0 },
+       { "ip.fragoff", 0 },
+       { "ip.protocol", 0 },
+       { "tcp.sport", 0 },
+       { "tcp.dport", 0 },
+       { "tcp.seq", 0 },
+       { "tcp.ackseq", 0 },
+       { "tcp.window", 0 },
+       { "tcp.urg", 0 },
+       { "tcp.ack", 0 },
+       { "tcp.psh", 0 },
+       { "tcp.rst", 0 },
+       { "tcp.syn", 0 },
+       { "tcp.fin", 0 },
+       { "tcp.urgp", 0 },
+       { "udp.sport", 0 },
+       { "udp.dport", 0 },
+       { "udp.len", 0 },
+       { "icmp.type", 0 },
+       { "icmp.code", 0 },
+       { "icmp.echoid", 0 },
+       { "icmp.echoseq", 0 },
+       { "icmp.gateway", 0 },
+       { "icmp.fragmtu", 0 },
+       { "ahesp.spi", 0 },
+};
+
+#define GET_VALUE(x)   ulogd_keyh[intr_ids[x].id].interp->result[ulogd_keyh[intr_ids[x].id].offset].value
+#define GET_FLAGS(x)   ulogd_keyh[intr_ids[x].id].interp->result[ulogd_keyh[intr_ids[x].id].offset].flags
+
+int printpkt_print(ulog_iret_t *res, char *buf, int prefix)
+{
+       char *timestr;
+       char *tmp;
+       time_t now;
+
+       char *buf_cur = buf;
+
+       if (prefix) {
+               now = (time_t) GET_VALUE(0).ui32;
+               timestr = ctime(&now) + 4;
+
+               /* truncate time */
+               if ((tmp = strchr(timestr, '\n')))
+                       *tmp = '\0';
+
+               /* truncate hostname */
+               if ((tmp = strchr(hostname, '.')))
+                       *tmp = '\0';
+
+               /* print time and hostname */
+               buf_cur += sprintf(buf_cur, "%.15s %s", timestr, hostname);
+       }
+
+       if (*(char *) GET_VALUE(1).ptr)
+               buf_cur += sprintf(buf_cur, " %s", (char *) GET_VALUE(1).ptr);
+
+       buf_cur += sprintf(buf_cur," IN=%s OUT=%s ", 
+                          (char *) GET_VALUE(2).ptr, 
+                          (char *) GET_VALUE(3).ptr);
+
+       /* FIXME: configurable */
+       buf_cur += sprintf(buf_cur, "MAC=%s ", 
+               (GET_FLAGS(4) & ULOGD_RETF_VALID) ? (char *) GET_VALUE(4).ptr : "");
+
+       buf_cur += sprintf(buf_cur, "SRC=%s ", 
+                      inet_ntoa((struct in_addr) {htonl(GET_VALUE(5).ui32)}));
+       buf_cur += sprintf(buf_cur, "DST=%s ", 
+                      inet_ntoa((struct in_addr) {htonl(GET_VALUE(6).ui32)}));
+
+       buf_cur += sprintf(buf_cur,"LEN=%u TOS=%02X PREC=0x%02X TTL=%u ID=%u ", 
+                       GET_VALUE(7).ui16, GET_VALUE(8).ui8 & IPTOS_TOS_MASK, 
+                       GET_VALUE(8).ui8 & IPTOS_PREC_MASK, GET_VALUE(9).ui8,
+                       GET_VALUE(10).ui16);
+
+       if (GET_VALUE(10).ui16 & IP_RF) 
+               buf_cur += sprintf(buf_cur, "CE ");
+
+       if (GET_VALUE(11).ui16 & IP_DF)
+               buf_cur += sprintf(buf_cur, "DF ");
+
+       if (GET_VALUE(11).ui16 & IP_MF)
+               buf_cur += sprintf(buf_cur, "MF ");
+
+       if (GET_VALUE(11).ui16 & IP_OFFMASK)
+               buf_cur += sprintf(buf_cur, "FRAG:%u ", 
+                               GET_VALUE(11).ui16 & IP_OFFMASK);
+
+       switch (GET_VALUE(12).ui8) {
+
+       case IPPROTO_TCP:
+               buf_cur += sprintf(buf_cur, "PROTO=TCP ");
+               buf_cur += sprintf(buf_cur, "SPT=%u DPT=%u ",
+                               GET_VALUE(13).ui16, GET_VALUE(14).ui16);
+               /* FIXME: config */
+               buf_cur += sprintf(buf_cur, "SEQ=%u ACK=%u ", 
+                               GET_VALUE(15).ui32, GET_VALUE(16).ui32);
+
+               buf_cur += sprintf(buf_cur, "WINDOW=%u ", GET_VALUE(17).ui16);
+
+//             buf_cur += sprintf(buf_cur, "RES=0x%02x ", 
+               
+               if (GET_VALUE(18).b)
+                       buf_cur += sprintf(buf_cur, "URG ");
+
+               if (GET_VALUE(19).b)
+                       buf_cur += sprintf(buf_cur, "ACK ");
+
+               if (GET_VALUE(20).b)
+                       buf_cur += sprintf(buf_cur, "PSH ");
+
+               if (GET_VALUE(21).b)
+                       buf_cur += sprintf(buf_cur, "RST ");
+
+               if (GET_VALUE(22).b)
+                       buf_cur += sprintf(buf_cur, "SYN ");
+
+               if (GET_VALUE(23).b)
+                       buf_cur += sprintf(buf_cur, "FIN ");
+
+               buf_cur += sprintf(buf_cur, "URGP=%u ", GET_VALUE(24).ui16);
+
+               break;
+       case IPPROTO_UDP:
+
+               buf_cur += sprintf(buf_cur, "PROTO=UDP ");
+
+               buf_cur += sprintf(buf_cur, "SPT=%u DPT=%u LEN=%u ", 
+                               GET_VALUE(25).ui16, GET_VALUE(26).ui16, 
+                               GET_VALUE(27).ui16);
+                       break;
+       case IPPROTO_ICMP:
+
+               buf_cur += sprintf(buf_cur, "PROTO=ICMP ");
+
+               buf_cur += sprintf(buf_cur, "TYPE=%u CODE=%u ",
+                               GET_VALUE(28).ui8, GET_VALUE(29).ui8);
+
+               switch (GET_VALUE(28).ui8) {
+               case ICMP_ECHO:
+               case ICMP_ECHOREPLY:
+                       buf_cur += sprintf(buf_cur, "ID=%u SEQ=%u ", 
+                                          GET_VALUE(30).ui16,
+                                          GET_VALUE(31).ui16);
+                       break;
+               case ICMP_PARAMETERPROB:
+                       buf_cur += sprintf(buf_cur, "PARAMETER=%u ",
+                                          GET_VALUE(32).ui32 >> 24);
+                       break;
+               case ICMP_REDIRECT:
+                       buf_cur += sprintf(buf_cur, "GATEWAY=%s ", inet_ntoa((struct in_addr) {htonl(GET_VALUE(32).ui32)}));
+                       break;
+               case ICMP_DEST_UNREACH:
+                       if (GET_VALUE(29).ui8 == ICMP_FRAG_NEEDED)
+                               buf_cur += sprintf(buf_cur, "MTU=%u ", 
+                                                  GET_VALUE(33).ui16);
+                       break;
+               }
+               break;
+       default:
+
+               buf_cur += sprintf(buf_cur, "PROTO=%u ", GET_VALUE(11).ui8);
+       }
+       strcat(buf_cur, "\n");
+
+       return 0;
+}
+
+/* get all key id's for the keys we are intrested in */
+static int get_ids(void)
+{
+       int i;
+       struct intr_id *cur_id;
+
+       for (i = 0; i < INTR_IDS; i++) {
+               cur_id = &intr_ids[i];
+               cur_id->id = keyh_getid(cur_id->name);
+               if (!cur_id->id) {
+                       ulogd_log(ULOGD_ERROR, 
+                               "Cannot resolve keyhash id for %s\n", 
+                               cur_id->name);
+                       return 1;
+               }
+       }       
+       return 0;
+}
+
+int printpkt_init(void)
+{
+       if (gethostname(hostname, sizeof(hostname)) < 0) {
+               ulogd_log(ULOGD_FATAL, "can't gethostname(): %s\n",
+                         strerror(errno));
+               exit(2);
+       }
+
+       if (get_ids())
+               return 1;
+
+       return 0;
+}
diff --git a/extensions/printpkt.h b/extensions/printpkt.h
new file mode 100644 (file)
index 0000000..ce42de4
--- /dev/null
@@ -0,0 +1,7 @@
+#ifndef _PRINTPKT_H
+#define _PRINTPKT_H
+
+int printpkt_print(ulog_iret_t *res, char *buf, int prefix);
+int printpkt_init(void);
+
+#endif
index ad8a3e602a5c2751fef8a0eb2d23b87465853653..d8a9b5fac9b8924f004a222a875ba81fa974146a 100644 (file)
@@ -1,4 +1,4 @@
-/* ulogd_LOGEMU.c, Version $Revision: 1.14 $
+/* ulogd_LOGEMU.c, Version $Revision: 1.15 $
  *
  * ulogd output target for syslog logging emulation
  *
@@ -20,7 +20,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: ulogd_LOGEMU.c,v 1.14 2003/09/12 09:00:21 laforge Exp $
+ * $Id: ulogd_LOGEMU.c,v 1.15 2003/09/28 15:19:26 laforge Exp $
  *
  */
 
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <time.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netinet/ip.h>
-#include <netinet/ip_icmp.h>
 #include <ulogd/ulogd.h>
 #include <ulogd/conffile.h>
+#include "printpkt.c"
 
 #ifndef ULOGD_LOGEMU_DEFAULT
 #define ULOGD_LOGEMU_DEFAULT   "/var/log/ulogd.syslogemu"
@@ -63,185 +57,13 @@ static config_entry_t syslsync_ce = { &syslogf_ce, "sync",
 
 static FILE *of = NULL;
 
-static char hostname[255];
-
-struct intr_id {
-       char* name;
-       unsigned int id;                
-};
-
-#define INTR_IDS       35
-static struct intr_id intr_ids[INTR_IDS] = {
-       { "oob.time.sec", 0 },
-       { "oob.prefix", 0 },
-       { "oob.in", 0 },
-       { "oob.out", 0 },
-       { "raw.mac", 0 },
-       { "ip.saddr", 0 },
-       { "ip.daddr", 0 },
-       { "ip.totlen", 0 },
-       { "ip.tos", 0 },
-       { "ip.ttl", 0 },
-       { "ip.id", 0 },
-       { "ip.fragoff", 0 },
-       { "ip.protocol", 0 },
-       { "tcp.sport", 0 },
-       { "tcp.dport", 0 },
-       { "tcp.seq", 0 },
-       { "tcp.ackseq", 0 },
-       { "tcp.window", 0 },
-       { "tcp.urg", 0 },
-       { "tcp.ack", 0 },
-       { "tcp.psh", 0 },
-       { "tcp.rst", 0 },
-       { "tcp.syn", 0 },
-       { "tcp.fin", 0 },
-       { "tcp.urgp", 0 },
-       { "udp.sport", 0 },
-       { "udp.dport", 0 },
-       { "udp.len", 0 },
-       { "icmp.type", 0 },
-       { "icmp.code", 0 },
-       { "icmp.echoid", 0 },
-       { "icmp.echoseq", 0 },
-       { "icmp.gateway", 0 },
-       { "icmp.fragmtu", 0 },
-       { "ahesp.spi", 0 },
-};
-
-#define GET_VALUE(x)   ulogd_keyh[intr_ids[x].id].interp->result[ulogd_keyh[intr_ids[x].id].offset].value
-#define GET_FLAGS(x)   ulogd_keyh[intr_ids[x].id].interp->result[ulogd_keyh[intr_ids[x].id].offset].flags
-
 int _output_logemu(ulog_iret_t *res)
 {
-       char *timestr;
-       char *tmp;
-       time_t now;
-
-       now = (time_t) GET_VALUE(0).ui32;
-       timestr = ctime(&now) + 4;
-
-       /* truncate time */
-       if ((tmp = strchr(timestr, '\n')))
-               *tmp = '\0';
-
-       /* truncate hostname */
-       if ((tmp = strchr(hostname, '.')))
-               *tmp = '\0';
-
-       /* print time and hostname */
-       fprintf(of, "%.15s %s", timestr, hostname);
-
-
-       if (*(char *) GET_VALUE(1).ptr)
-               fprintf(of, " %s", (char *) GET_VALUE(1).ptr);
-
-       fprintf(of," IN=%s OUT=%s ", 
-               (char *) GET_VALUE(2).ptr, 
-               (char *) GET_VALUE(3).ptr);
-
-       /* FIXME: configurable */
-       fprintf(of, "MAC=%s ",
-               (GET_FLAGS(4) & ULOGD_RETF_VALID) ? (char *) GET_VALUE(4).ptr : "");
-
-       fprintf(of, "SRC=%s ", inet_ntoa((struct in_addr)
-                                        {htonl(GET_VALUE(5).ui32)}));
-       fprintf(of, "DST=%s ", inet_ntoa((struct in_addr)
-                                        {htonl(GET_VALUE(6).ui32)}));
-
-       fprintf(of, "LEN=%u TOS=%02X PREC=0x%02X TTL=%u ID=%u ", 
-                       GET_VALUE(7).ui16, GET_VALUE(8).ui8 & IPTOS_TOS_MASK, 
-                       GET_VALUE(8).ui8 & IPTOS_PREC_MASK, GET_VALUE(9).ui8,
-                       GET_VALUE(10).ui16);
-
-       if (GET_VALUE(10).ui16 & IP_RF) 
-               fprintf(of, "CE ");
-
-       if (GET_VALUE(11).ui16 & IP_DF)
-               fprintf(of, "DF ");
-
-       if (GET_VALUE(11).ui16 & IP_MF)
-               fprintf(of, "MF ");
-
-       if (GET_VALUE(11).ui16 & IP_OFFMASK)
-               fprintf(of, "FRAG:%u ", GET_VALUE(11).ui16 & IP_OFFMASK);
-
-       switch (GET_VALUE(12).ui8) {
-
-               case IPPROTO_TCP:
-                       fprintf(of, "PROTO=TCP ");
-                       fprintf(of, "SPT=%u DPT=%u ", GET_VALUE(13).ui16,
-                               GET_VALUE(14).ui16);
-                       /* FIXME: config */
-                       fprintf(of, "SEQ=%u ACK=%u ", GET_VALUE(15).ui32,
-                               GET_VALUE(16).ui32);
-
-                       fprintf(of, "WINDOW=%u ", GET_VALUE(17).ui16);
-
-//                     fprintf(of, "RES=0x%02x ", 
-               
-                       if (GET_VALUE(18).b)
-                               fprintf(of, "URG ");
-
-                       if (GET_VALUE(19).b)
-                               fprintf(of, "ACK ");
+       static char buf[4096];
 
-                       if (GET_VALUE(20).b)
-                               fprintf(of, "PSH ");
+       printpkt_print(res, buf, 1);
 
-                       if (GET_VALUE(21).b)
-                               fprintf(of, "RST ");
-
-                       if (GET_VALUE(22).b)
-                               fprintf(of, "SYN ");
-
-                       if (GET_VALUE(23).b)
-                               fprintf(of, "FIN ");
-
-                       fprintf(of, "URGP=%u ", GET_VALUE(24).ui16);
-
-                       break;
-               case IPPROTO_UDP:
-
-                       fprintf(of, "PROTO=UDP ");
-
-                       fprintf(of, "SPT=%u DPT=%u LEN=%u ", 
-                               GET_VALUE(25).ui16, GET_VALUE(26).ui16, 
-                               GET_VALUE(27).ui16);
-                       break;
-               case IPPROTO_ICMP:
-
-                       fprintf(of, "PROTO=ICMP ");
-
-                       fprintf(of, "TYPE=%u CODE=%u ", GET_VALUE(28).ui8,
-                               GET_VALUE(29).ui8);
-
-                       switch (GET_VALUE(28).ui8) {
-                               case ICMP_ECHO:
-                               case ICMP_ECHOREPLY:
-                                       fprintf(of, "ID=%u SEQ=%u ", 
-                                               GET_VALUE(30).ui16,
-                                               GET_VALUE(31).ui16);
-                                       break;
-                               case ICMP_PARAMETERPROB:
-                                       fprintf(of, "PARAMETER=%u ",
-                                               GET_VALUE(32).ui32 >> 24);
-                                       break;
-                               case ICMP_REDIRECT:
-                                       fprintf(of, "GATEWAY=%s ", inet_ntoa((struct in_addr) {htonl(GET_VALUE(32).ui32)}));
-                                       break;
-                               case ICMP_DEST_UNREACH:
-                                       if (GET_VALUE(29).ui8 == ICMP_FRAG_NEEDED)
-                                               fprintf(of, "MTU=%u ", 
-                                                       GET_VALUE(33).ui16);
-                                       break;
-                       }
-                       break;
-               default:
-
-                       fprintf(of, "PROTO=%u ", GET_VALUE(11).ui8);
-       }
-       fprintf(of,"\n");
+       fprintf(of, "%s", buf);
 
        if (syslsync_ce.u.value) 
                fflush(of);
@@ -249,25 +71,6 @@ int _output_logemu(ulog_iret_t *res)
        return 0;
 }
 
-/* get all key id's for the keys we are intrested in */
-static int get_ids(void)
-{
-       int i;
-       struct intr_id *cur_id;
-
-       for (i = 0; i < INTR_IDS; i++) {
-               cur_id = &intr_ids[i];
-               cur_id->id = keyh_getid(cur_id->name);
-               if (!cur_id->id) {
-                       ulogd_log(ULOGD_ERROR, 
-                               "Cannot resolve keyhash id for %s\n", 
-                               cur_id->name);
-                       return 1;
-               }
-       }       
-       return 0;
-}
-
 void sighup_handler_logemu(int signal)
 {
        switch (signal) {
@@ -287,32 +90,14 @@ void sighup_handler_logemu(int signal)
 }
                
 
-static ulog_output_t logemu_op[] = {
-       { NULL, "syslogemu", &_output_logemu, &sighup_handler_logemu },
-       { NULL, "", NULL, NULL },
-};
-
-/* register output plugin with ulogd */
-static void _logemu_reg_op(void)
-{
-       ulog_output_t *op = logemu_op;
-       ulog_output_t *p;
-
-       for (p = op; p->output; p++)
-               register_output(p);
-}
+static ulog_output_t logemu_op =
+       { NULL, "syslogemu", &_output_logemu, &sighup_handler_logemu };
 
 void _init(void)
 {
        /* FIXME: error handling */
        config_parse_file("LOGEMU", &syslsync_ce);
 
-       if (gethostname(hostname, sizeof(hostname)) < 0) {
-               ulogd_log(ULOGD_FATAL, "can't gethostname(): %s\n",
-                         strerror(errno));
-               exit(2);
-       }
-
 #ifdef DEBUG_LOGEMU
        of = stdout;
 #else
@@ -323,9 +108,9 @@ void _init(void)
                exit(2);
        }               
 #endif
-       if (get_ids()) {
+       if (printpkt_init()) {
                ulogd_log(ULOGD_ERROR, "can't resolve all keyhash id's\n");
        }
 
-       _logemu_reg_op();
+       register_output(&logemu_op);
 }
diff --git a/extensions/ulogd_SYSLOG.c b/extensions/ulogd_SYSLOG.c
new file mode 100644 (file)
index 0000000..9aeebf9
--- /dev/null
@@ -0,0 +1,126 @@
+/* ulogd_SYSLOG.c, Version $Revision: 1.15 $
+ *
+ * ulogd output target for real syslog() logging
+ *
+ * This target produces a syslog entries identical to the LOG target.
+ *
+ * (C) 2003 by Harald Welte <laforge@gnumonks.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 
+ *  as published by the Free Software Foundation
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * $Id: ulogd_LOGEMU.c,v 1.15 2003/09/28 15:19:26 laforge Exp $
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <syslog.h>
+#include <ulogd/ulogd.h>
+#include <ulogd/conffile.h>
+#include "printpkt.h"
+
+#ifndef SYSLOG_FACILITY_DEFAULT
+#define SYSLOG_FACILITY_DEFAULT        "LOG_KERN"
+#endif
+
+#ifndef SYSLOG_LEVEL_DEFAULT 
+#define SYSLOG_LEVEL_DEFAULT "LOG_NOTICE"
+#endif
+
+static config_entry_t facility_ce = { NULL, "facility", CONFIG_TYPE_STRING, 
+                                 CONFIG_OPT_NONE, 0,
+                                 { string: SYSLOG_FACILITY_DEFAULT } };
+
+static config_entry_t level_ce = { &facility_ce, "level", 
+                                     CONFIG_TYPE_INT, CONFIG_OPT_NONE, 0,
+                                     { value: SYSLOG_LEVEL_DEFAULT }
+                                    };
+
+static int syslog_level, syslog_facility;
+
+int _output_syslog(ulog_iret_t *res)
+{
+       static char buf[4096];
+       
+       printpkt_print(res, buf, 0);
+       syslog(syslog_level|syslog_facility, buf);
+
+       return 0;
+}
+               
+static ulog_output_t syslog_op = { NULL, "syslog", &_output_syslog, NULL };
+
+void _init(void)
+{
+
+       /* FIXME: error handling */
+       config_parse_file("SYSLOG", &level_ce);
+
+       if (!strcmp(facility_ce.u.string, "LOG_DAEMON"))
+               syslog_facility = LOG_DAEMON;
+       else if (!strcmp(facility_ce.u.string, "LOG_KERN"))
+               syslog_facility = LOG_KERN;
+       else if (!strcmp(facility_ce.u.string, "LOG_LOCAL0"))
+               syslog_facility = LOG_LOCAL0;
+       else if (!strcmp(facility_ce.u.string, "LOG_LOCAL1"))
+               syslog_facility = LOG_LOCAL1;
+       else if (!strcmp(facility_ce.u.string, "LOG_LOCAL2"))
+               syslog_facility = LOG_LOCAL2;
+       else if (!strcmp(facility_ce.u.string, "LOG_LOCAL3"))
+               syslog_facility = LOG_LOCAL3;
+       else if (!strcmp(facility_ce.u.string, "LOG_LOCAL4"))
+               syslog_facility = LOG_LOCAL4;
+       else if (!strcmp(facility_ce.u.string, "LOG_LOCAL5"))
+               syslog_facility = LOG_LOCAL5;
+       else if (!strcmp(facility_ce.u.string, "LOG_LOCAL6"))
+               syslog_facility = LOG_LOCAL6;
+       else if (!strcmp(facility_ce.u.string, "LOG_LOCAL7"))
+               syslog_facility = LOG_LOCAL7;
+       else if (!strcmp(facility_ce.u.string, "LOG_USER"))
+               syslog_facility = LOG_USER;
+       else {
+               ulogd_log(ULOGD_FATAL, "unknown facility '%s'\n",
+                         facility_ce.u.string);
+               exit(2);
+       }
+
+       if (!strcmp(level_ce.u.string, "LOG_EMERG"))
+               syslog_level = LOG_EMERG;
+       else if (!strcmp(level_ce.u.string, "LOG_ALERT"))
+               syslog_level = LOG_ALERT;
+       else if (!strcmp(level_ce.u.string, "LOG_CRIT"))
+               syslog_level = LOG_CRIT;
+       else if (!strcmp(level_ce.u.string, "LOG_ERR"))
+               syslog_level = LOG_ERR;
+       else if (!strcmp(level_ce.u.string, "LOG_WARNING"))
+               syslog_level = LOG_WARNING;
+       else if (!strcmp(level_ce.u.string, "LOG_NOTICE"))
+               syslog_level = LOG_NOTICE;
+       else if (!strcmp(level_ce.u.string, "LOG_INFO"))
+               syslog_level = LOG_INFO;
+       else if (!strcmp(level_ce.u.string, "LOG_DEBUg"))
+               syslog_level = LOG_DEBUG;
+       else {
+               ulogd_log(ULOGD_FATAL, "unknown level '%s'\n",
+                       facility_ce.u.string);
+               exit(2);
+       }
+
+       if (printpkt_init())
+               ulogd_log(ULOGD_ERROR, "can't resolve all keyhash id's\n");
+
+       register_output(&syslog_op);
+}