summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* ulogd: change verbosity of a messageEric Leblond2013-03-201-1/+1
| | | | | The "registering plugin" message is not really useful as the message is really explicit if a plugin is missing.
* nfct: use timestamp of conntrack object.Eric Leblond2013-03-051-10/+32
| | | | | | | If conntrack object sent by connection tracking system is containing a timestamp we use it instead of a gettimeofday() based counter. Signed-off-by: Eric Leblond <eric@regit.org>
* Prepare release number to 2.0.2ulogd-2.0.2Eric Leblond2013-02-252-125/+1
| | | | | Update release number and delete Changes file because we can use git changelog fot that.
* Update READMEEric Leblond2013-02-251-56/+63
| | | | Get rid of ULOG only documentation and adds some new stuffs.
* Update man page.Eric Leblond2013-02-251-7/+14
|
* logemu: return error if configuration is invalid.Eric Leblond2013-02-181-4/+1
|
* Add handling of too long line and arguments.Eric Leblond2013-02-183-1/+29
| | | | | When an argument or a line is too long, it can not be store into ulogd configuration and this must results in a error.
* Fix typo in comments.Eric Leblond2013-02-181-3/+3
|
* Use access to ensure readability of config gileEric Leblond2013-02-182-2/+11
| | | | | This patch adds a call to access to check the readability of the configuration file.
* Suppress dead FIXME.Eric Leblond2013-02-182-3/+0
|
* Update TODO.Eric Leblond2013-02-171-7/+0
| | | | Try to sync TODO with real state of the project.
* graphite: fix crash on i386Eric Leblond2013-02-171-2/+2
| | | | | | | | It seems a cast of time_t is needed for i386 system to avoid a crash. I've added a cast to uint64_t that should be ok on all Linux system. Reported-by: netfilter@openenterprise.co.uk
* Fix make distcheckEric Leblond2013-01-251-1/+1
| | | | Recently introduced addr.h was missing from Makefile.am.
* Add TAGS to .gitignoreEric Leblond2013-01-251-0/+1
|
* graphite: fix warning about gnu extension usageEric Leblond2013-01-181-4/+4
| | | | | clang is complaining about missing = being a gnu extension. This patch adds equal sign to fix the warning.
* base: fix warning on pointer handlingEric Leblond2013-01-181-4/+4
|
* Fix warning on formatEric Leblond2013-01-181-1/+1
| | | | | It seems Z is a libc5 only format modifier. Using standard 'z' instead.
* Get rid of SVN tag in comment.Eric Leblond2013-01-1831-70/+33
| | | | This patch also update some copyright and licence declaration.
* Add -l option to set log level from command lineEric Leblond2013-01-182-4/+15
| | | | | | This patch adds a '-l' option which can be used to setup ulogd loglevel. Command line option has precedence on the configuration file one.
* conf: add flag to allow option setup tuningEric Leblond2013-01-182-1/+6
| | | | | | This patch adds a flag to the config_entry structure to be able to tune setup. First usage is to ask config parser not to update a key if it has been already set.
* ulogd: add -v option to display message on stderr.Eric Leblond2013-01-061-8/+33
| | | | | If can be painful to have to check the logfile, so this patch adds a '-v' option which display logs message to stderr.
* addr: fix compilation warningEric Leblond2013-01-051-2/+2
| | | | | This patch fixes a compilation warning related to a signed and unsigned integer comparison.
* nfct: add protocol filterEric Leblond2013-01-052-2/+59
| | | | | | | This patch adds a new configuration variable which is used to limit conntrack event to connection of these protocols: For example: accept_proto_filter=tcp,sctp
* nfct: implement src and dst filterEric Leblond2013-01-052-2/+218
| | | | | | | This patch implements two filtering options in NFCT input plugin. If 'accept_src_filter' is set to a network it will only catch the event where the source is that specific network. 'accept_dst_filter' does the same for the destination.
* addr: add file containing addr utility functions.Eric Leblond2013-01-053-1/+132
|
* nfct: call register callback on opened handlerEric Leblond2013-01-051-1/+1
| | | | | nfctp_callback_register was called on the regular handler instead of begin called on the newly opened handler dedicated to the dump.
* Add GRAPHITE output module.Eric Leblond2012-12-273-1/+261
| | | | | | | Graphite is a web application which provide real-time visualization and storage of numeric time-series data. This patch adds a module named GRAPHITE which sends NFACCT accounting data to a graphite server.
* Add missing u64 function.Eric Leblond2012-12-211-0/+5
|
* Add additional ip6 header fields to database scriptsBob Hockney2012-12-197-31/+108
| | | | | Rename internal keyname ip6.payload_len to remove "_" to facilitate this.
* Handle postgresql schemas correctlyBob Hockney2012-12-192-4/+35
| | | | Add 'schema' variable to look into corresponding schema.
* Fix parsing of ipv6 flowlabel and tc fieldsBob Hockney2012-12-191-2/+2
| | | | Mask should be applied after ntohl conversion.
* build: move remaining preprocessor flags into CPPFLAGSJan Engelhardt2012-11-273-7/+7
| | | | | | | | The flags retrieved from `pkg-config --cflags ...` are generally only preprocessor flags (mostly -I to point to the directories), since anything else would inconvenience downstream users. Signed-off-by: Jan Engelhardt <jengelh@inai.de>
* build: avoid per-target CFLAGSJan Engelhardt2012-11-272-4/+2
| | | | | | | | There is no harm in putting the includes in the global AM_CPPFLAGS; this can generally save number of compilations of a file when a source file is used multiple times. Signed-off-by: Jan Engelhardt <jengelh@inai.de>
* build: resolve compile error due to missing nfacct CPPFLAGSJan Engelhardt2012-11-271-1/+1
| | | | | | | | | | | | | | Fixes this error: make[3]: Entering directory "/home/jengelh/code/ulogd2/output" CC ulogd_output_XML.lo ulogd_output_XML.c:31:49: fatal error: libnetfilter_acct/libnetfilter_acct.h: No such file or directory (Note that pkgconfig-provided cflags are actually cppflags, so I add ${LIBNETFILTER_ACCT_CFLAGS} to AM_CPPFLAGS.) Signed-off-by: Jan Engelhardt <jengelh@inai.de>
* build: resolve automake-1.12 warningsJan Engelhardt2012-11-271-0/+1
| | | | | | | | | /usr/share/automake-1.12/am/ltlibrary.am: warning: 'ulogd_output_SQLITE3.la': linking libtool libraries using a non-POSIX archiver requires 'AM_PROG_AR' in 'configure.ac' (one for each .la) Signed-off-by: Jan Engelhardt <jengelh@inai.de>
* XML: add missing includeEric Leblond2012-11-041-0/+2
| | | | | | Inclusion of libnetfilter_acct.h is not enough as the integer type definition are not included in the header. So if NFCT is disable, the compilation fails.
* Use PRIu64 to print unsigned 64bit intEric Leblond2012-11-042-2/+4
|
* configure: display info about build pluginsEric Leblond2012-11-041-2/+40
| | | | | This patch modifies configure to display the list of plugins that will be built.
* configure: add flag to disable NFLOG buildEric Leblond2012-11-043-4/+18
|
* configure: add flag to disable NFCT buildEric Leblond2012-11-043-2/+16
|
* configure: add flag to disable NFACCT buildEric Leblond2012-11-043-4/+17
| | | | | | It is now possible to pass the --disable-nfacct flag to disable compilation of NFACCT input plugin. Doing this the build of ulogd is possible on system where nfacct is not available.
* autoconf/ulogd: fix broken libpcap AM_CONDITIONALGustavo Zacarias2012-10-101-1/+1
| | | | | | | | The AM_CONDITIONAL lacks the opening bracket, hence it always evaluates as true, even if there's no libpcap found thus causing build breakage. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* bump version to 2.0.1ulogd-2.0.1Pablo Neira Ayuso2012-10-081-4/+4
| | | | | | | And update library dependency. Push users to upgrade to get fixes from library releases. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* ipfix: fix bracket imbalance if IPPROTO_SCTP is definedThomas Jarosch2012-08-061-0/+1
| | | | | | | Detected by cppcheck. Signed-off-by: Thomas Jarosch <thomas.jarosch@intra2net.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* src: update copyright and authors informationPablo Neira Ayuso2012-08-032-1/+5
| | | | | | | | Include Eric and myself in the copyright notice and the AUTHORS file since we're the most recurrent contributors (of course, after the original author of this software, Harald Welte). Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* filter: IP2HBIN: fix compilation warning with gcc-4.7Pablo Neira Ayuso2012-08-031-1/+0
| | | | | | | ulogd_filter_IP2HBIN.c: In function 'interp_ip2hbin': ulogd_filter_IP2HBIN.c:122:6: warning: unused variable 'fret' [-Wunused-variable] Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* ulogd.conf: slightly expand documentation on zerocounter option for nfacctPablo Neira Ayuso2012-08-031-1/+1
| | | | Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* nfacct: add timestamp optionEric Leblond2012-08-032-1/+34
| | | | | | | | | This patch adds a timestamp option to the nfacct plugin. If activated, nfacct output a timestamp which is computed just after sending the nfacct request. Signed-off-by: Eric Leblond <eric@regit.org> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* src: fix version that -V displaysPablo Neira Ayuso2012-08-0329-33/+31
| | | | | | | It was wrong, use VERSION constant which uses the version information available in configure.ac. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* input: NFCT: fix compilation warning with gcc-4.7Pablo Neira Ayuso2012-08-031-2/+0
| | | | | | | | CC ulogd_inpflow_NFCT_la-ulogd_inpflow_NFCT.lo ulogd_inpflow_NFCT.c: In function 'configure_nfct': ulogd_inpflow_NFCT.c:977:28: warning: unused variable 'cpi' [-Wunused-variable] Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>