| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
Use a more modern alternative to bzip2.
Suggested-by: Jan Engelhardt <jengelh@inai.de>
Suggested-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
|
|
|
|
|
| |
This release contains the quota support available in the Linux
kernel >= 3.16.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
|
|
|
| |
the original output format looks a bit like JSON, but isn't. The XML
output is useful if you deal with XML, but a lot of applications prefer
more lightweight formats like YAML/JSON.
This adds the JSON output format to libnetfilter_acct, which will
subsequently be used by a similar change in the nfacct utility.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
| |
Signed-off-by: Felix Janda <felix.janda@posteo.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
|
|
|
| |
Current implementation shows "packet" for none byte quota type.
It means "packet" was used for overquota counter as well and it
wasn't so informative.
This commmit adds additional column - overquota with yes/no value.
Signed-off-by: Alexey Perevalov <a.perevalov@samsung.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
|
| |
In 948fa3b ("Extend accounting capabilities to support quotas"), the
error handling of snprintf is incorrect since this function may
return -1 on error. Add a new SNPRINTF_CHECK() macro to offload the
complicated handling of snprintf.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
|
| |
The accounting framework already supports accounting at the
quota and byte level. As such it is a natural extention to
add a ceiling limit to those metrics.
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
| |
The nfacct_snprintf_xml used to ouput accounting in XML format
was inverting packet and bytes. This patch restores the correct
order.
Signed-off-by: Eric Leblond <eric@regit.org>
|
|
|
|
|
| |
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
| |
It is present since the initial import, but it doesn't seem to be
useful these days.
Reported-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
| |
Reported-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
|
| |
This patch corrects all nfacct_snprintf_* functions to use PRIu64,
given that we are using uint64_t type variables and also removes
the unnecessary casts.
Signed-off-by: Mr Dash Four <mr.dash.four@googlemail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
| |
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
| |
Pkts and bytes are inversed in some part of the code. This patch
fixes most of the occurence of this problem.
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
libnetfilter_acct.c: In function 'nfacct_nlmsg_build_payload':
libnetfilter_acct.c:422: warning: implicit declaration of function
'htobe64'
libnetfilter_acct.c: In function 'nfacct_nlmsg_parse_payload':
libnetfilter_acct.c:477: warning: implicit declaration of function
'be64toh'
Signed-off-by: Jan Engelhardt <jengelh@inai.de>
|
|
|
|
|
|
|
|
|
|
| |
[ 24s] In file included from libnetfilter_acct.c:18:
[ 24s] ../include/linux/netfilter/nfnetlink.h:4:46: error:
linux/netfilter/nfnetlink_compat.h: No such file or directory
Slurp in new headers from the kernel du jour (v3.6-10970-g4d7127d).
Signed-off-by: Jan Engelhardt <jengelh@inai.de>
|
|
|
|
|
|
|
| |
This partially reverts commit 6e8573c9f62fc9db99c120298d9539be27fe282e.
%lu in 32-bits arch is only 4 bytes. Thanks to Jan Engelhardt for
spotting this.
|
|\
| |
| |
| | |
Pick extremely little change in configure.ac from Jan's tree.
|
| |
| |
| |
| |
| |
| |
| |
| | |
am/ltlibrary.am: warning: 'libnetfilter_acct.la': linking libtool
libraries using a non-POSIX archiver requires 'AM_PROG_AR' in
'configure.ac'
Signed-off-by: Jan Engelhardt <jengelh@inai.de>
|
| |
| |
| |
| |
| |
| |
| | |
No need to duplicate the same code to validate their size since
they are both unsigned 64-bits integers.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|/
|
|
| |
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
| |
Signed-off-by: Jan Engelhardt <jengelh@inai.de>
|
|
|
|
|
|
|
| |
To satisfy ulogd2 correct library version checking. Even if there's
no plan to release a new version of the library anytime soon.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
| |
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
| |
I forgot to adapt it to use the new nfacct_snprintf API.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch adds supports for XML output for nfacct_snprintf().
This also bumps the library current version number and it adds
a new version in the symbol map. I decided to do so because,
although no official release has happened so far. Many distributors
have already decided to provide packages for this.
We don't provide the old symbol version for nfacct_snprintf,
I think that's too much (given the lifetime of it). But we make
sure that we break the binary gracefully in case of version
mismatches (not silently, with unexpectable side effects).
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
| |
* Detail how to compile if you get a working copy from the git tree.
* Include licensing terms.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
| |
Instead of returning the data even if unset.
Reported-by: Alejandro Castaño del Castillo <alex@wadobo.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
| |
Instead of checking is name, packets and bytes are set.
Reported-by: Alejandro Castaño del Castillo <alex@wadobo.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
|
| |
Now it looks like:
{ pkts = 00000000000000000000, bytes = 00000000000000000000 } = test1;
{ pkts = 00000000000000000000, bytes = 00000000000000000000 } = test2;
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
| |
Otherwise, the preprocessor may fail to find libmnl if it is not in a
standard-searched directory.
|
| |
|
|
|
|
| |
Only ignore these paths if they are a directory.
|
|
|
|
| |
${EXEEXT} is nowhere used in Makefiles.
|
|
|
|
| |
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
|
|
|
|
| |
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
|
|
| |
This patch includes the recent changes that Jan proposed for
other library.
Also, this patch relaxes the libmnl dependency to >= 1.0.0
(previously it checked for 1.0.1, not really required).
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
| |
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
|
| |
License is LGPLv2.1+, fix header of libnetfilter_acct.c which
tells LGPLv2 or any later (mind the missing .1 after v2).
Examples of this library are in the public domain.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
| |
This patch adds the library documentation in doxygen format.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch reworks the initial API. Now it provides functions to:
- allocate/release accounting objects.
- set/unset/get attributes of accounting objects.
- build one netlink message from one accounting object.
- parse one netlink message to one accounting object.
- print one accounting object into a buffer.
Binary layout of nfacct objects are opaque. This is good for
extensibility without breaking backward compatibility.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
| |
to get it in sync with kernel changes.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
| |
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
| |
|
|
|
|
| |
This also fixes one wrong flag in nfacct_delete(...)
|
| |
|
| |
|
| |
|
|
|
|
|
| |
In nfnetlink, the policy is that attributes are in network byte
order.
|