summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* From: Eric Leblond <eric@inl.fr>:/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-093-33/+23
| | | | | | | | | | | | 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.
* From Eric Leblond <eric@inl.fr>:/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-077-589/+51
| | | | | | | 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).
* remove old mysql and pgsql definitions/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-034-195/+1
|
* From: Pierre Chifflier <chifflier@inl.fr>/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-032-84/+72
| | | | | This patch fixes the type of some fields in the SQL schema to sync with datatype of the corresponding ulogd2 keys.
* From: Eric leblond <eric@inl.fr>/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-031-4/+1
| | | | Description of ULOGD_RET_IPADDR was incorrect in information display mode.
* From: Eric leblond <eric@inl.fr>/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-031-0/+28
| | | | | This patch adds an state extension to SQL schema. This can be used to store the information about the packet being dropped or accepted.
* From: Pierre Chifflier <chifflier@inl.fr>/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-031-4/+4
| | | | | SQL standard says a function has to be called with SELECT and not CALL. This patch modify code accordingly.
* From: Eric leblond <eric@inl.fr>/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-031-2/+2
| | | | This patch fixes some small typo in MySQL schema.
* From: Pierre Chifflier <chifflier@inl.fr>/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-032-75/+170
| | | | 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.
* From: Pierre Chifflier <chifflier@inl.fr>/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-031-0/+5
| | | | | Change from procedure to function in mysql schema adds the need to free MySQL result after request.
* From: Eric leblond <eric@inl.fr>/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-031-0/+4
| | | | | With this patch, BASE filter module is able fill oob_family when parsing IPv6 address.
* From: Eric leblond <eric@inl.fr>/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-031-0/+1
| | | | OOB_FAMILY output was not set by NFLOG because the key was not set as valid.
* From: Eric leblond <eric@inl.fr>/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-031-0/+2
| | | | Fix a bug in IPv4 output of IP2BIN module.
* From: Eric Leblond <eric@inl.fr>/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-031-3/+1
| | | | | MySQL need no to be able to print RAW data to be able to display IP addresses.
* From: Eric Leblond <eric@inl.fr>/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-031-5/+2
| | | | Fix description and indenting (cleanups)
* From: Eric leblond <eric@inl.fr>/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-032-1/+220
| | | | | This module convert IP from internal notation to a string in binary notation which is used by the MySQL output plugin.
* From: Pierre Chifflier <chifflier@inl.fr>/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-031-1/+2
| | | | Mark ID as inactive (sequence in pg schema)
* From: Pierre Chifflier <chifflier@inl.fr>/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-031-2/+2
| | | | Fix incorrect options for PGsql module.
* From: Eric leblond <eric@inl.fr>/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-034-45/+21
| | | | | - 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
* From: Eric leblond <eric@inl.fr>/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-032-1/+190
| | | | 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.
* From: Eric Leblond <eric@inl.fr>/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-031-0/+14
| | | | MySQL client library does not reconnect automatically since 5.0.
* From: Eric Leblond <eric@inl.fr>/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-031-0/+1
| | | | Request at least autoconf 2.50 (needed for large file support macro).
* From: Eric Leblond <eric@inl.fr>/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-031-1/+2
| | | | | Display filename in the other error case. Based on Marius Tomaschewski work.
* From: Eric Leblond <eric@inl.fr>: /C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-031-1/+2
| | | | | Changed to show pcap file name when open failed. Based on Marius Tomaschewski work.
* From: Eric Leblond <eric@inl.fr>: /C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-031-2/+2
| | | | | Put O at the real end of the string. Based on Marius Tomaschewski work.
* From: Eric Leblond <eric@inl.fr>/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-031-2/+2
| | | | | Add some missing line break. Based on Marius Tomaschewski work.
* From: Eric Leblond <eric@inl.fr>: /C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-031-1/+4
| | | | | For OPRINT, changed sighup_handler_print to fallback to continue using old descriptor on new file opening failure. Based on Marius Tomaschewski work.
* From: Eric Leblond <eric@inl.fr>:/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-031-0/+1
| | | | | Added explicit null termination of the hostname buffer This patch is a backport of Marius Tomaschewski <mt@suse.de> work on ulogd.
* From: Eric Leblond <eric@inl.fr>:/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-031-1/+4
| | | | | | 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.
* From: Eric leblond <eric@inl.fr>/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-031-8/+140
| | | | | | | | | | | | | | | | | | | 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)
* From: Eric leblond <eric@inl.fr>/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-032-40/+123
| | | | | This patch update the printflow output module to be able to print a whole conntrack entry on a single line.
* From: Eric leblond <eric@inl.fr>/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-033-39/+52
| | | | This patch clarifies code which will be modified in next patch.
* From: Pierre Chifflier <p.chifflier@inl.fr>/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-032-87/+213
| | | | Add insert functions for the PostgreSQL version
* From: Eric leblond <eric@inl.fr>/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-035-20/+1120
| | | | | | | | | 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
* Holger Eitzenberger <heitzenberger@astaro.com>:/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-021-0/+2
| | | | renice to -1 on startup
* Holger Eitzenberger <heitzenberger.org@astaro.com>:/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-021-20/+15
| | | | conffile cleanup, use common pr_debug()
* Holger Heitzenberger <heitzenberger@astaro.com>:/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-022-1/+49
| | | | add common.h
* Holger Eitzenberger <heitzenberger@astaro.com>:/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-02-022-1/+210
| | | | Add NACCT output plugin
* Ulogd2: fix db OUTPUT system/C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net2008-01-121-1/+4
| | | | | | | | | | 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>
* Ulogd2: fix some indenting/C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net2008-01-122-23/+23
| | | | | | | The following patch fixes some indenting and typo in various ulogd2 files. Eric Leblond <eric@inl.fr>
* [PATCH 5/5] stores the converted syslog parameters set within config file/C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net2008-01-121-0/+4
| | | | | | | | | 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>
* [PATCH 4/5] Workaround of recvfrom() EAGAIN bug/C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net2008-01-121-0/+2
| | | | | | | | | | | | | | | | | | | | 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]
* [PATCH 3/5] Logs also ipulog_strerror() and strerror() within ULOG plugin/C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net2008-01-121-2/+5
| | | | | | | | 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>
* [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.net2008-01-121-1/+1
| | | | | | | Stores mac_len correctly, since within ULOG structire it is not stored in network byte order. Signed-off-by: Peter Warasin <peter@endian.com>
* [PATCH 1/5] openlog() to syslog for global ulogd log messages/C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net2008-01-121-0/+1
| | | | | | | | 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>
* [PATCH]: ulogd2: fix ULOG input plugin/C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net2008-01-042-38/+76
| | | | | | | 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>
* [PATCH]: Ulogd2: code cleaning/C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net2008-01-041-32/+50
| | | | | | | | | | | | | | | | | 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>
* Eric Leblond <eric@inl.fr>/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org2008-01-034-7567/+18
| | | | | | | - 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.
* ulogd large file support (Andreas Lundin <lunde@dreamhosted.se>)/C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net2007-06-191-0/+1
|
* Add 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.org2007-03-065-315/+872
| | | | | repeat by using symbolic names to make sure the assignment matches the array index.