]> git.ipfire.org Git - thirdparty/ulogd2.git/log
thirdparty/ulogd2.git
17 years agoThis patch introduces a new plugin MAC2STR which is in charge
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sat, 5 Apr 2008 14:43:43 +0000 (14:43 +0000)] 
This patch introduces a new plugin MAC2STR which is in charge
of conversion to string of MAC address. It is used by database
output plugin to store MAC related information.

Signed-off-by: Eric Leblond <eric@inl.fr>
17 years agoType of the raw.mac_len key was set to string but this is an unsigned
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sat, 5 Apr 2008 14:39:56 +0000 (14:39 +0000)] 
Type of the raw.mac_len key was set to string but this is an unsigned
interger. This patch fix this in the ULOG module.

Signed-off-by: Eric Leblond <eric@inl.fr>
17 years agoType of the raw.mac_len key was set to string but this is an unsigned
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sat, 5 Apr 2008 14:39:01 +0000 (14:39 +0000)] 
Type of the raw.mac_len key was set to string but this is an unsigned
interger. This patch fix this in the NFLOG module.

Signed-off-by: Eric Leblond <eric@inl.fr>
17 years agoThis patch fixes a problem in SQL reconnection algorithm which is managed in
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sat, 5 Apr 2008 14:02:56 +0000 (14:02 +0000)] 
This patch fixes a problem in SQL reconnection algorithm which is managed in
the db.c file for PgSQL and MySQL. In case of problem during request execution
a new connection to the database was immediatly started without closing the
previous one. The consequence was to block the database by having too much
simultaneous open connections.

This patch fixes the problem by disconnectinng from the database after a
request failure and trying to reconnect after a delay which is by default
of 2 secondes. This delay can be customized via the reconnect configuration
variable in the database configuration section.

Signed-off-by: Eric Leblond <eric@inl.fr>
17 years agoThis patch adds support of event type display in printflow filter. This is used
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Wed, 26 Mar 2008 09:42:20 +0000 (09:42 +0000)] 
This patch adds support of event type display in printflow filter. This is used
to display event type in textual output modules. Here's an output example:

[DESTROY] ORIG: SRC=192.168.1.2 DST=192.168.1.255 PROTO=UDP SPT=631 DPT=631 \\
PKTS=1 BYTES=197 , REPLY: SRC=192.168.1.255 DST=192.168.1.2 \\
PROTO=UDP SPT=631 DPT=631 PKTS=0 BYTES=0

Signed-off-by: Eric Leblond <eric@inl.fr>
17 years agoThis patch contains two linked modifications in NFCT input plugin:
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Wed, 26 Mar 2008 09:40:05 +0000 (09:40 +0000)] 
This patch contains two linked modifications in NFCT input plugin:
- event mask is now configurable though the event_mask configuration variable
- event type is now stored in the ct.event output key. This can be used to
  display the information or to use it to implement some tracking algorithm in
  userspace.

Signed-off-by: Eric Leblond <eric@inl.fr>
17 years agoThis patch updates included configuration file example by adding some plugins
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Wed, 26 Mar 2008 00:39:10 +0000 (00:39 +0000)] 
This patch updates included configuration file example by adding some plugins
loading and stack example.

Signed-off-by: Eric Leblond <eric@inl.fr>
17 years agoThis patch adds support for duplication of the message to be
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Tue, 25 Mar 2008 10:09:06 +0000 (10:09 +0000)] 
This patch adds support for duplication of the message to be
able to use multiple time the same instance of NFCT.

Signed-off-by: Eric Leblond <eric@inl.fr>
17 years agoA specific instance of NFLOG can now be use in multiple stacks. This is done
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Tue, 25 Mar 2008 10:06:15 +0000 (10:06 +0000)] 
A specific instance of NFLOG can now be use in multiple stacks. This is done
by duplicating the interpretation of the message.

Signed-off-by: Eric Leblond <eric@inl.fr>
17 years agoAn instance of NFLOG can now be use in multiple stacks. This is done
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Tue, 25 Mar 2008 10:01:34 +0000 (10:01 +0000)] 
An instance of NFLOG can now be use in multiple stacks. This is done
by duplicating the interpretation of the message.

Signed-off-by: Eric Leblond <eric@inl.fr>
17 years agoThis patch adds plist a linked list to the pluginstance
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Tue, 25 Mar 2008 09:57:12 +0000 (09:57 +0000)] 
This patch adds plist a linked list to the pluginstance
structure. It can be used by input modules to duplicate an
entry. This solves the issue of not being able to use the same
plugin instance twice.

Signed-off-by: Eric Leblond <eric@inl.fr>
17 years agoWhen a plugin instance is used in multiple stack it is not necessary to
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Tue, 25 Mar 2008 08:56:08 +0000 (08:56 +0000)] 
When a plugin instance is used in multiple stack it is not necessary to
call the start function for each stack.

Signed-off-by: Eric Leblond <eric@inl.fr>
17 years agoMinor indentation fix in ulogd_inppkt_NFLOG.c.
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Tue, 25 Mar 2008 08:50:57 +0000 (08:50 +0000)] 
Minor indentation fix in ulogd_inppkt_NFLOG.c.

Signed-off-by: Eric Leblond <eric@inl.fr>
17 years agoIP2BIN filter convert IP address from host storage to a "binary" string which
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Tue, 25 Mar 2008 08:49:21 +0000 (08:49 +0000)] 
IP2BIN filter convert IP address from host storage to a "binary" string which
can be use by MySQL. This is not strictly speaking raw data but it was of type
RAW.

Following remark from Hugo Mildenberger, I introduce in this patch a dedicated
type ULOGD_RET_RAWSTR. The main reason not to use a ULOGD_RET_STRING parameter
is that the paramater is not human readable.

Signed-off-by: Eric Leblond <eric@inl.fr>
17 years agoThis patch adds oob.hook to the list of fields export to the databases. This
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Tue, 25 Mar 2008 08:46:01 +0000 (08:46 +0000)] 
This patch adds oob.hook to the list of fields export to the databases. This
adds the capability to know where the packet has been logged and will be used
to make a link between connection and logged packets.

Signed-off-by: Eric Leblond <eric@inl.fr>
17 years agoadd missing timer.h
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Fri, 22 Feb 2008 00:29:23 +0000 (00:29 +0000)] 
add missing timer.h

17 years agoImprove fd_sets handling. Based on a previous patch from Holger Eitzenberger.
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Tue, 19 Feb 2008 19:46:12 +0000 (19:46 +0000)] 
Improve fd_sets handling. Based on a previous patch from Holger Eitzenberger.

17 years ago- implement a synchronous timer framework
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Tue, 19 Feb 2008 18:53:07 +0000 (18:53 +0000)] 
- implement a synchronous timer framework
- fix crash when enabling pollinterval clause in flow-based accounting

17 years agoSends one message for each connection event instead of two
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Tue, 19 Feb 2008 16:04:48 +0000 (16:04 +0000)] 
Sends one message for each connection event instead of two

Signed-off-by: Eric Leblond <eric@inl.fr>
17 years agoThis patch adds a sample configuration for logging with ebtables through nflog out...
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Tue, 19 Feb 2008 10:59:23 +0000 (10:59 +0000)] 
This patch adds a sample configuration for logging with ebtables through nflog out to LOGEMU and SYSLOG. It also fixes a config bug with ipv6 (log2)

Signed-off-by: Peter Warasin <peter@endian.com>
17 years agoadds AF_BRIDGE support to IP2STR
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Tue, 19 Feb 2008 10:56:41 +0000 (10:56 +0000)] 
adds AF_BRIDGE support to IP2STR

This patch make the ip address string converter AF_BRIDGE compatible and add ip address ARP keys in order to make them also convert.

Signed-off-by: Peter Warasin <peter@endian.com>
17 years agoThis patch adds support for AF_BRIDGE to the PRINTPKT plugin, which allows to form...
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Tue, 19 Feb 2008 01:02:26 +0000 (01:02 +0000)] 
This patch adds support for AF_BRIDGE to the PRINTPKT plugin, which allows to form log lines for packets coming from ebtables. Currently it supports IPv4, IPv6 and ARP.

Signed-off-by: Peter Warasin <peter@endian.com>
17 years agoAdds AF_BRIDGE and ARP header interpreter to BASE plugin
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Tue, 19 Feb 2008 00:46:15 +0000 (00:46 +0000)] 
Adds AF_BRIDGE and ARP header interpreter to BASE plugin

This patch adds an AF_BRIDGE interpreter to ulogd_raw2packet_BASE plugin, which allows to log packets coming from ebtables. It also adds an ARP header decoder.

Signed-off-by: Peter Warasin <peter@endian.com>
17 years agorevert r7369 until clarified
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Thu, 14 Feb 2008 15:24:06 +0000 (15:24 +0000)] 
revert r7369 until clarified

17 years agoAdds AF_BRIDGE and ARP header interpreter to BASE plugin
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Thu, 14 Feb 2008 15:07:24 +0000 (15:07 +0000)] 
Adds AF_BRIDGE and ARP header interpreter to BASE plugin

This patch adds an AF_BRIDGE interpreter to
ulogd_raw2packet_BASE plugin, which allows to log
packets coming from ebtables.
It also adds an ARP header decoder.

Signed-off-by: Peter Warasin <peter@endian.com>
17 years agoAdds input key enumeration in order to address the fields
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Thu, 14 Feb 2008 14:48:28 +0000 (14:48 +0000)] 
Adds input key enumeration in order to address the fields
with symbols instead of numbers.
Shortens the lines by the use of GET_VALUE()

Signed-off-by: Peter Warasin <peter@endian.com>
17 years agoEric Leblond <eric@inl.fr>:
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sun, 10 Feb 2008 02:08:42 +0000 (02:08 +0000)] 
Eric Leblond <eric@inl.fr>:
Document the difference between IPv4 and IPv6 logging.

17 years agorevert r7348
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sun, 10 Feb 2008 02:07:42 +0000 (02:07 +0000)] 
revert r7348

17 years agoFrom: Eric Leblond <eric@inl.fr>
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sat, 9 Feb 2008 17:44:30 +0000 (17:44 +0000)] 
From: Eric Leblond <eric@inl.fr>
Add UID display to PRINTPKT filter.

17 years agoFrom: Eric Leblond <eric@inl.fr>
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sat, 9 Feb 2008 17:43:32 +0000 (17:43 +0000)] 
From: Eric Leblond <eric@inl.fr>
Add support for UID dumping to NFLOG input plugin.

17 years agoFrom: Pierre Chifflier <chifflier@inl.fr> and Eric Leblond <eric@inl.fr>
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sat, 9 Feb 2008 17:38:24 +0000 (17:38 +0000)] 
From: Pierre Chifflier <chifflier@inl.fr> and Eric Leblond <eric@inl.fr>
Add Icmpv6 support to SQL schema.

17 years agoFrom: Eric Leblond <eric@inl.fr>
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sat, 9 Feb 2008 17:34:00 +0000 (17:34 +0000)] 
From: Eric Leblond <eric@inl.fr>
Some macros were defined several time. This was the case of GET_VALUE,
pp_is_valid. This patch puts the definition in ulogd.h and fixes the
definition of pp_is_valid which was wrong (causing segfault by acessing to
fields at NULL).

17 years agoFrom: Eric Leblond <eric@inl.fr>
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sat, 9 Feb 2008 17:30:38 +0000 (17:30 +0000)] 
From: Eric Leblond <eric@inl.fr>
The treatment of the return of some functions from libnetfilter_log API was wrong and this was preventing some fields to be propagated through the stack.

17 years agoFrom: Eric Leblond <eric@inl.fr>
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sat, 9 Feb 2008 17:25:51 +0000 (17:25 +0000)] 
From: Eric Leblond <eric@inl.fr>

This patch adds some examples of stack to the configuration file.
It also fixes some comments to avoid confusion. IP2BIN has been
added to the list of loaded modules.

17 years agoFrom: Eric Leblond <eric@inl.fr>:
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sat, 9 Feb 2008 17:24:41 +0000 (17:24 +0000)] 
From: Eric Leblond <eric@inl.fr>:
Fix a crash in ulogd2 when dealing with default value given as string.

17 years agoFrom: Eric Leblond <eric@inl.fr>:
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sat, 9 Feb 2008 17:23:16 +0000 (17:23 +0000)] 
From: Eric Leblond <eric@inl.fr>:

When using NFLOG or ULOG, obb.family (protocol IPv4 or IPv6) has
to be setup manually in ulogd.conf configuration file. This is
used by the BASE filter to properly parse the packet. This
patch suppress oob.family as output keys of NFLOG and ULOG and let
the BASE filter determine the family of the packet by itself (by
parsing the raw header).

A good side effect is to be able to log in IPv6 and IPv4 in the
same group. Before that, two loggers have to be setup separatly.

17 years agoFrom Eric Leblond <eric@inl.fr>:
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Thu, 7 Feb 2008 06:47:11 +0000 (06:47 +0000)] 
From Eric Leblond <eric@inl.fr>:
This patch modify ulogd_filter_IFINDEX to use libnfnetlink for index to
interface name mapping instead of using local version. This requires at least
libnfnetlink 0.0.30. This dependancy is checked in configure (thanks to
Sebastien Tricaud for his patch).

17 years agoremove old mysql and pgsql definitions
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sun, 3 Feb 2008 12:39:20 +0000 (12:39 +0000)] 
remove old mysql and pgsql definitions

17 years agoFrom: Pierre Chifflier <chifflier@inl.fr>
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sun, 3 Feb 2008 12:31:30 +0000 (12:31 +0000)] 
From: Pierre Chifflier <chifflier@inl.fr>

This patch fixes the type of some fields in the SQL schema to sync
with datatype of the corresponding ulogd2 keys.

17 years agoFrom: Eric leblond <eric@inl.fr>
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sun, 3 Feb 2008 12:30:04 +0000 (12:30 +0000)] 
From: Eric leblond <eric@inl.fr>

Description of ULOGD_RET_IPADDR was incorrect in information display mode.

17 years agoFrom: Eric leblond <eric@inl.fr>
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sun, 3 Feb 2008 12:29:05 +0000 (12:29 +0000)] 
From: Eric leblond <eric@inl.fr>

This patch adds an state extension to SQL schema. This can be used to store
the information about the packet being dropped or accepted.

17 years agoFrom: Pierre Chifflier <chifflier@inl.fr>
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sun, 3 Feb 2008 12:26:32 +0000 (12:26 +0000)] 
From: Pierre Chifflier <chifflier@inl.fr>

SQL standard says a function has to be called with SELECT and not CALL.
This patch modify code accordingly.

17 years agoFrom: Eric leblond <eric@inl.fr>
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sun, 3 Feb 2008 12:26:01 +0000 (12:26 +0000)] 
From: Eric leblond <eric@inl.fr>

This patch fixes some small typo in MySQL schema.

17 years agoFrom: Pierre Chifflier <chifflier@inl.fr>
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sun, 3 Feb 2008 12:24:50 +0000 (12:24 +0000)] 
From: Pierre Chifflier <chifflier@inl.fr>
This patch adds oob_family to the schema. Thus it is now possible to easily select IPv4 or IPv6 entries in the database. This patch also explicitly selects fields to create view.

17 years agoFrom: Pierre Chifflier <chifflier@inl.fr>
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sun, 3 Feb 2008 12:24:08 +0000 (12:24 +0000)] 
From: Pierre Chifflier <chifflier@inl.fr>

Change from procedure to function in mysql schema adds the need to free MySQL
result after request.

17 years agoFrom: Eric leblond <eric@inl.fr>
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sun, 3 Feb 2008 12:23:10 +0000 (12:23 +0000)] 
From: Eric leblond <eric@inl.fr>
With this patch, BASE filter module is able fill oob_family when parsing IPv6
address.

17 years agoFrom: Eric leblond <eric@inl.fr>
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sun, 3 Feb 2008 12:13:54 +0000 (12:13 +0000)] 
From: Eric leblond <eric@inl.fr>
OOB_FAMILY output was not set by NFLOG because the key was not set as valid.

17 years agoFrom: Eric leblond <eric@inl.fr>
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sun, 3 Feb 2008 12:11:44 +0000 (12:11 +0000)] 
From: Eric leblond <eric@inl.fr>
Fix a bug in IPv4 output of IP2BIN module.

17 years agoFrom: Eric Leblond <eric@inl.fr>
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sun, 3 Feb 2008 12:10:48 +0000 (12:10 +0000)] 
From: Eric Leblond <eric@inl.fr>
MySQL need no to be able to print RAW data to be able to display
IP addresses.

17 years agoFrom: Eric Leblond <eric@inl.fr>
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sun, 3 Feb 2008 12:08:23 +0000 (12:08 +0000)] 
From: Eric Leblond <eric@inl.fr>
Fix description and indenting (cleanups)

17 years agoFrom: Eric leblond <eric@inl.fr>
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sun, 3 Feb 2008 12:06:23 +0000 (12:06 +0000)] 
From: Eric leblond <eric@inl.fr>
This module convert IP from internal notation to a string in binary notation
which is used by the MySQL output plugin.

17 years agoFrom: Pierre Chifflier <chifflier@inl.fr>
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sun, 3 Feb 2008 12:03:21 +0000 (12:03 +0000)] 
From: Pierre Chifflier <chifflier@inl.fr>
Mark ID as inactive (sequence in pg schema)

17 years agoFrom: Pierre Chifflier <chifflier@inl.fr>
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sun, 3 Feb 2008 12:02:20 +0000 (12:02 +0000)] 
From: Pierre Chifflier <chifflier@inl.fr>
Fix incorrect options for PGsql module.

17 years agoFrom: Eric leblond <eric@inl.fr>
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sun, 3 Feb 2008 11:59:47 +0000 (11:59 +0000)] 
From: Eric leblond <eric@inl.fr>
- This patch suppress key relative to IPv6 address because IPv4 and IPv6 can be stored in the same key.
- Add missing IP2STR line to ulogd.conf.in

17 years agoFrom: Eric leblond <eric@inl.fr>
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sun, 3 Feb 2008 11:57:24 +0000 (11:57 +0000)] 
From: Eric leblond <eric@inl.fr>

This module is a generic module which is used to convert an IP from internal representation to string representation. This is a task needed by several modules like printpkt or pgsql. This module factorizes the code.

17 years agoFrom: Eric Leblond <eric@inl.fr>
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sun, 3 Feb 2008 11:46:58 +0000 (11:46 +0000)] 
From: Eric Leblond <eric@inl.fr>
MySQL client library does not reconnect automatically since 5.0.

17 years agoFrom: Eric Leblond <eric@inl.fr>
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sun, 3 Feb 2008 11:46:04 +0000 (11:46 +0000)] 
From: Eric Leblond <eric@inl.fr>
Request at least autoconf 2.50 (needed for large file support macro).

17 years agoFrom: Eric Leblond <eric@inl.fr>
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sun, 3 Feb 2008 11:45:03 +0000 (11:45 +0000)] 
From: Eric Leblond <eric@inl.fr>
Display filename in the other error case.
Based on Marius Tomaschewski work.

17 years agoFrom: Eric Leblond <eric@inl.fr>:
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sun, 3 Feb 2008 11:43:48 +0000 (11:43 +0000)] 
From: Eric Leblond <eric@inl.fr>:
Changed to show pcap file name when open failed.
Based on Marius Tomaschewski work.

17 years agoFrom: Eric Leblond <eric@inl.fr>:
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sun, 3 Feb 2008 11:42:40 +0000 (11:42 +0000)] 
From: Eric Leblond <eric@inl.fr>:
Put O at the real end of the string.
Based on Marius Tomaschewski work.

17 years agoFrom: Eric Leblond <eric@inl.fr>
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sun, 3 Feb 2008 11:41:25 +0000 (11:41 +0000)] 
From: Eric Leblond <eric@inl.fr>
Add some missing line break.
Based on Marius Tomaschewski work.

17 years agoFrom: Eric Leblond <eric@inl.fr>:
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sun, 3 Feb 2008 11:39:34 +0000 (11:39 +0000)] 
From: Eric Leblond <eric@inl.fr>:
For OPRINT, changed sighup_handler_print to fallback to continue using old descriptor on new file opening failure.
Based on Marius Tomaschewski work.

17 years agoFrom: Eric Leblond <eric@inl.fr>:
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sun, 3 Feb 2008 11:37:50 +0000 (11:37 +0000)] 
From: Eric Leblond <eric@inl.fr>:
Added explicit null termination of the hostname buffer
This patch is a backport of Marius Tomaschewski <mt@suse.de> work on ulogd.

17 years agoFrom: Eric Leblond <eric@inl.fr>:
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sun, 3 Feb 2008 11:33:56 +0000 (11:33 +0000)] 
From: Eric Leblond <eric@inl.fr>:
Changed sighup_handler_print to fallback to continue using old descriptor on new file opening failure.

This patch is a backport of Marius Tomaschewski <mt@suse.de> work on ulogd.

17 years agoFrom: Eric leblond <eric@inl.fr>
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sun, 3 Feb 2008 11:30:34 +0000 (11:30 +0000)] 
From: Eric leblond <eric@inl.fr>
It is difficult to find how to configure a plugin. This patch adds an info
option which can be used to display:
* Name
* Configuration variables
* Input keys
* Output keys

Output example:
/opt/ulogd2/sbin/ulogd --info /opt/ulogd2/lib/ulogd/ulogd_filter_IFINDEX.so
Name: IFINDEX
Input keys:
Key: oob.ifindex_in (unsigned int 32)
Key: oob.ifindex_out (unsigned int 32)
Output keys:
Key: oob.in (string)
Key: oob.out (string)

17 years agoFrom: Eric leblond <eric@inl.fr>
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sun, 3 Feb 2008 11:27:14 +0000 (11:27 +0000)] 
From: Eric leblond <eric@inl.fr>
This patch update the printflow output module to be able to print a
whole conntrack entry on a single line.

17 years agoFrom: Eric leblond <eric@inl.fr>
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sun, 3 Feb 2008 11:24:07 +0000 (11:24 +0000)] 
From: Eric leblond <eric@inl.fr>
This patch clarifies code which will be modified in next patch.

17 years agoFrom: Pierre Chifflier <p.chifflier@inl.fr>
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sun, 3 Feb 2008 11:18:05 +0000 (11:18 +0000)] 
From: Pierre Chifflier <p.chifflier@inl.fr>
Add insert functions for the PostgreSQL version

17 years agoFrom: Eric leblond <eric@inl.fr>
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sun, 3 Feb 2008 10:59:16 +0000 (10:59 +0000)] 
From: Eric leblond <eric@inl.fr>

This patch adds new SQL schema for MySQL and PGsql. The goal is to improve the one line per entry format. There is no more a big table with all fields because this sort of storage is causing bad performance (databases don't like to have a lot of NULL fields to store).

Main changes are :
* Add new schema for MySQL and PGsql
* Use call to configurable procedure in SQL OUTPUT modules
* Arguments of a procedure are given by the list of fields of a selected table

17 years agoHolger Eitzenberger <heitzenberger@astaro.com>:
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sat, 2 Feb 2008 21:48:18 +0000 (21:48 +0000)] 
Holger Eitzenberger <heitzenberger@astaro.com>:
renice to -1 on startup

17 years agoHolger Eitzenberger <heitzenberger.org@astaro.com>:
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sat, 2 Feb 2008 21:44:26 +0000 (21:44 +0000)] 
Holger Eitzenberger <heitzenberger.org@astaro.com>:
conffile cleanup, use common pr_debug()

17 years agoHolger Heitzenberger <heitzenberger@astaro.com>:
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sat, 2 Feb 2008 21:30:11 +0000 (21:30 +0000)] 
Holger Heitzenberger <heitzenberger@astaro.com>:
add common.h

17 years agoHolger Eitzenberger <heitzenberger@astaro.com>:
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Sat, 2 Feb 2008 21:26:38 +0000 (21:26 +0000)] 
Holger Eitzenberger <heitzenberger@astaro.com>:
Add NACCT output plugin

17 years agoUlogd2: fix db OUTPUT system
/C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net [Sat, 12 Jan 2008 14:55:41 +0000 (14:55 +0000)] 
Ulogd2: fix db OUTPUT system

The following patch fixes MySQL and Pgsql output modules.

The callback function was not correctly initialized and this was leading
to a crash by calling the a NULL function. This patch correctly inits
the callback.

Eric Leblond <eric@inl.fr>

17 years agoUlogd2: fix some indenting
/C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net [Sat, 12 Jan 2008 14:54:41 +0000 (14:54 +0000)] 
Ulogd2: fix some indenting

The following patch fixes some indenting and typo in various ulogd2
files.

Eric Leblond <eric@inl.fr>

17 years ago[PATCH 5/5] stores the converted syslog parameters set within config file
/C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net [Sat, 12 Jan 2008 14:53:35 +0000 (14:53 +0000)] 
[PATCH 5/5] stores the converted syslog parameters set within config file

This patch stores the converted values from the configuration file
into the syslog instance structure.
Otherwise configuration parameters are senseless and only the
default values will be used.

Signed-off-by: Peter Warasin <peter@endian.com>
17 years ago[PATCH 4/5] Workaround of recvfrom() EAGAIN bug
/C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net [Sat, 12 Jan 2008 14:51:49 +0000 (14:51 +0000)] 
[PATCH 4/5] Workaround of recvfrom() EAGAIN bug

This is a workaround which prevents ulogd from logging each
time when recvfrom() returns error because of EAGAIN.
Since the netlink socket is now O_NONBLOCK, we probably run
into the following bug:

http://bugzilla.kernel.org/show_bug.cgi?id=5498

which causes recvfrom() get an error when select() had a good
return, whenever select() receives a packet with a bad checksum.

ipulog_read() always has this problem once after every successful
ipulog_read().

Signed-off-by: Peter Warasin <peter@endian.com>
[Note: this is not a workaround but correct handling of EAGAIN
 on a non-blocking socket. -Patrick]

17 years ago[PATCH 3/5] Logs also ipulog_strerror() and strerror() within ULOG plugin
/C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net [Sat, 12 Jan 2008 14:49:03 +0000 (14:49 +0000)] 
[PATCH 3/5] Logs also ipulog_strerror() and strerror() within ULOG plugin

This patch logs also the string representations ipulog:_strerror()
and strerror() when an error occurred during receivement of packets
within the ULOG plugin

Signed-off-by: Peter Warasin <peter@endian.com>
17 years ago[PATCH 2/5] Dont ntohs() mac_len of ULOG, since it is not in network byte order
/C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net [Sat, 12 Jan 2008 14:47:47 +0000 (14:47 +0000)] 
[PATCH 2/5] Dont ntohs() mac_len of ULOG, since it is not in network byte order

Stores mac_len correctly, since within ULOG structire it is not stored
in network byte order.

Signed-off-by: Peter Warasin <peter@endian.com>
17 years ago[PATCH 1/5] openlog() to syslog for global ulogd log messages
/C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net [Sat, 12 Jan 2008 14:44:05 +0000 (14:44 +0000)] 
[PATCH 1/5] openlog() to syslog for global ulogd log messages

When [global]'s logfile is syslog, ulogd should log it's own
mesasages (not the firewall log lines) to syslog, which it
does'nt because openlog() is missing. This patch adds openlog()

Signed-off-by: Peter Warasin <peter@endian.com>
17 years ago[PATCH]: ulogd2: fix ULOG input plugin
/C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net [Fri, 4 Jan 2008 14:18:31 +0000 (14:18 +0000)] 
[PATCH]: ulogd2: fix ULOG input plugin

The ULOG input plugin of ulogd2 was not working. This patch fixes this
and cleans the code via introduction of an enum.

Eric Leblond <eric@inl.fr>

17 years ago[PATCH]: Ulogd2: code cleaning
/C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net [Fri, 4 Jan 2008 14:13:48 +0000 (14:13 +0000)] 
[PATCH]: Ulogd2: code cleaning

This patch adds an enum to get rid of access to array via numerical
index in NFLOG input plugin.

This replaces code like:
ret[0].flags |= ULOGD_RETF_VALID;
ret[11].u.value.ui16 = ntohs(hw->hw_addrlen);

with:
ret[NFLOG_KEY_RAW_MAC].flags |= ULOGD_RETF_VALID;
ret[NFLOG_KEY_RAW_MAC_LEN].u.value.ui16 = ntohs(hw->hw_addrlen);

which is more readable.

Eric Leblond <eric@inl.fr>

17 years agoEric Leblond <eric@inl.fr>
/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org [Thu, 3 Jan 2008 17:40:32 +0000 (17:40 +0000)] 
Eric Leblond <eric@inl.fr>
- add a call to autoheader which is needed to compile ulogd2 from subversion.
- add a warning message to ulogd2 when it exits on error. It simply tell to look at the configuration file.
- add an empty section which is needed to have NFCT logging
working.

18 years agoulogd large file support (Andreas Lundin <lunde@dreamhosted.se>)
/C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net [Tue, 19 Jun 2007 14:40:59 +0000 (14:40 +0000)] 
ulogd large file support (Andreas Lundin <lunde@dreamhosted.se>)

18 years agoAdd IPv6 support, fix a few incorrect key assignments and make sure this doesn't
/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=kaber/emailAddress=kaber@netfilter.org [Tue, 6 Mar 2007 13:29:39 +0000 (13:29 +0000)] 
Add IPv6 support, fix a few incorrect key assignments and make sure this doesn't
repeat by using symbolic names to make sure the assignment matches the array
index.

18 years ago[PATCH]: fix a trivial typo in ULOG plugin code (Eric Leblond)
/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=kaber/emailAddress=kaber@netfilter.org [Wed, 11 Oct 2006 06:39:01 +0000 (06:39 +0000)] 
[PATCH]: fix a trivial typo in ULOG plugin code (Eric Leblond)

18 years ago[PATCH]: fix crash in ULOG input plugin due to a free on invalid value (Eric Leblond)
/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=kaber/emailAddress=kaber@netfilter.org [Wed, 11 Oct 2006 06:38:30 +0000 (06:38 +0000)] 
[PATCH]: fix crash in ULOG input plugin due to a free on invalid value (Eric Leblond)

18 years ago[PATCH]: synchronize ULOG input plugin with current ulogd2 API (Eric Leblond)
/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=kaber/emailAddress=kaber@netfilter.org [Wed, 11 Oct 2006 06:37:58 +0000 (06:37 +0000)] 
[PATCH]: synchronize ULOG input plugin with current ulogd2 API (Eric Leblond)

19 years agoAdd a printflow plugin is similar to the PRINTPKT plugin, but for flows. It's
/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org [Tue, 23 May 2006 09:00:01 +0000 (09:00 +0000)] 
Add a printflow plugin is similar to the PRINTPKT plugin, but for flows.  It's
output is compatible with the SYSLOG and LOGEMU plugins. (Philip Craig)

19 years agoMove the printpkt functionality out of SYSLOG and LOGEMU, and into
/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org [Tue, 23 May 2006 08:57:18 +0000 (08:57 +0000)] 
Move the printpkt functionality out of SYSLOG and LOGEMU, and into
a separate PRINTPKT plugin.  This reduces code duplication, and also
makes the SYSLOG and LOGEMU plugins more general. (Philip Craig)

19 years agoIf an optional key is not found, then leave source set to NULL. (Philip Craig)
/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org [Tue, 23 May 2006 08:46:18 +0000 (08:46 +0000)] 
If an optional key is not found, then leave source set to NULL. (Philip Craig)

19 years agoFix a minor memory leak for stack config statements (Philip Craig)
/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org [Tue, 23 May 2006 08:45:25 +0000 (08:45 +0000)] 
Fix a minor memory leak for stack config statements (Philip Craig)

19 years agoReplace the libdir variable in ulogd.conf using the method
/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org [Tue, 23 May 2006 08:43:31 +0000 (08:43 +0000)] 
Replace the libdir variable in ulogd.conf using the method
recommended by the autoconf manual.  (Philip Craig)

19 years agomove definition of ULOGD_LOGFILE_DEFAULT and ULOGD_CONFIGFILE to Makefile.am,
/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org [Tue, 23 May 2006 08:41:28 +0000 (08:41 +0000)] 
move definition of ULOGD_LOGFILE_DEFAULT and ULOGD_CONFIGFILE to Makefile.am,
Set default config and log files based on configure.
Note that these defines cannot be placed in config.h, since they
depend on the prefix, which must be expanded by make. (Philip Craig)

19 years agouse correct libipulog.la libtool name (Philip Craig)
/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org [Tue, 23 May 2006 08:40:06 +0000 (08:40 +0000)] 
use correct libipulog.la libtool name (Philip Craig)

19 years agofix number of config entries in inppkt_ULOG plugin (Philip Craig)
/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org [Tue, 23 May 2006 08:39:28 +0000 (08:39 +0000)] 
fix number of config entries in inppkt_ULOG plugin (Philip Craig)

19 years agoconfigure --without-pgsql" or "configure --with-pgsql=no" should
/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org [Tue, 23 May 2006 08:38:32 +0000 (08:38 +0000)] 
configure --without-pgsql" or "configure --with-pgsql=no" should
force the pgsql plugin to be disabled.  Same for mysql, pcap and sqlite3.
(Philip Craig)

19 years agoupdate aclocal
/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org [Tue, 23 May 2006 08:37:17 +0000 (08:37 +0000)] 
update aclocal

19 years agocommit some more ipfix work
/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org [Mon, 22 May 2006 20:07:22 +0000 (20:07 +0000)] 
commit some more ipfix work

19 years agofix pgsql port parsing
/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org [Tue, 31 Jan 2006 10:34:03 +0000 (10:34 +0000)] 
fix pgsql port parsing