| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch is *not* changing the licensing terms of this library (which
was initially released under GPLv2 and later on extended to GPLv2+ after
contacting all the contributors who kindly agreed to extend it to any
later GPL version).
Jan says: "In libnetfilter_conntrack, there are many .c files declaring
GNU GPL incorporated herein by reference without telling which version(s)
exactly apply. Given src/main.c for example is actually GPL-2.0+,
the reference made is ambiguous."
This patch should definitely clarify this.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|\ |
|
| | |
|
| | |
|
| |
| |
| |
| | |
Only ignore these paths if they are a directory.
|
| |
| |
| |
| |
| |
| |
| | |
expect_get now allows you get the expectation that has been
created with expect_create.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
| |
| |
| |
| |
| |
| |
| | |
NFCT_HELPER_NAME_MAX is 16, which is the maximum helper name
allowed since 2.6.29.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Now, the output of nfexp_snprintf looks like this:
299 proto=6 src=192.168.1.130 dst=130.89.148.12 sport=0 dport=45420 mask-src=255.255.255.255 mask-dst=255.255.255.255 sport=0 dport=65535 master-src=192.168.1.130 master-dst=130.89.148.12 sport=46368 dport=21 helper=ftp
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|/
|
|
|
|
|
|
| |
This patch adds support for CTA_EXPECT_HELP_NAME.
We now have the ATTR_EXP_HELPER_NAME attribute.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
| |
It is like nfct_send() but for expectations, for API symmetry.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch adds mask and master tuple information regarding one
expectation. This information has been not shown so far. I consider
that it is interesting because you can use this information to
troubleshoot expectation issues. Moreover, you can know which is
the master conntrack that this expectation is attached to.
This extends the text-based output for `conntrack -L exp'. This
can be considered a backward compatibily issue since existing
tools that are parsing this interface may break. But this is not
our fault, we provide an API to the conntrack table via
libnetfilter_conntrack. People should use those.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
| |
Otherwise, we don't print it.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
| |
The master tuple was not parsed. This patch also fixes an incorrect
use of the exp->set field for the expectation and mask tuples.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
| |
This closes netfilter bugzilla #754:
http://bugzilla.netfilter.org/show_bug.cgi?id=754
Reported-by: <abirvalg@lavabit.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
static analysis (analysis based only on compiling of sources, not based
on running of binary) of the code revealed the following problem:
conntrack/objopt.c:63: self_assign: Assignment operation
"ct->snat.l4max.all = ct->snat.l4max.all"
has no effect.
Signed-off-by: Jiri Popelka <jpopelka@redhat.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
|
|
| |
This patch adds nfct_destroy() to all the examples in the utils folder.
Although this may be obvious to some, when I wrote my first code using
libnetfilter_conntract, I used the examples but subsequently missed out
all the calls to nfct_destroy().
Signed-off-by: Andrew Beverley <andy@andybev.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
| |
I guess that Jan Engelhardt is going to like this? :-)
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
| |
This patch bumps version to 0.9.1 and it bumps the API revision number.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
> CC parse.lo
> parse.c: In function ‘__parse_conntrack’:
> parse.c:434:15: warning: array subscript is above array bounds
>
> struct nfattr *tb[CTA_SECCTX_MAX]
> 434: ct->secctx = strdup(NFA_DATA(tb[CTA_SECCTX-1]))
>
> CTA_SECCTX has value 19, and CTA_SECCTX_MAX is just 1.
Reported-by: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch deprecates the low level API. This API is not currently
used by any known clients (at least, at a quick glance at google).
These functions are a problem if we plan to port libnetfilter_conntrack
upon libmnl since they contain specific libnfnetlink bits.
I have also added __build_query_[ct|exp] to avoid compilation warnings.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
|
| |
These functions are evil since they allow the use of memcpy() instead
of nfct_copy(). This is a problem because it violates the design
principle that the library follows, that is to provide opaque objects
in which the client code does not care on the binary layout.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
| |
Thus, we have a fast version of nfct_copy() which allows to
copy the destination to the origin. After this call, the
destination is a clone of the origin.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
| |
This problem was caught by qa/test_api.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch adds the connection tracking extension that allows
conntrack timestamping.
This requires a Linux kernel >= 2.6.38.
We have now 65 attributes, we need 96 bits to store what attributes
are set in the objects.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
| |
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
|
|
| |
This patch fixes an embarasing a use-after-free in nfct_destroy()
that was introduced by myself in:
http://git.netfilter.org/cgi-bin/gitweb.cgi?p=libnetfilter_conntrack.git;a=commit;h=fdda1474cc8654430f245b7f01c30e8ff171fa60
Reported-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
| |
This patch adds support for the new attribute CTA_SECCTX that
supersedes CTA_SECMARK.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
-Wall flags this:
make test_api test_filter
make[1]: Entering directory `/home/jengelh/code/libnetfilter_conntrack/qa'
CC test_api.o
test_api.c:16:8: warning: return type defaults to "int"
test_api.c: In function "eval_sigterm":
test_api.c:23:18: warning: too many arguments for format
test_api.c: In function "main":
test_api.c:55:2: warning: implicit declaration of function "fork"
test_api.c:34:22: warning: unused variable "h"
test_api.c:102:1: warning: control reaches end of non-void function
test_api.c: In function "eval_sigterm":
test_api.c:29:1: warning: control reaches end of non-void function
CCLD test_api
CC test_filter.o
test_filter.c: In function "main":
test_filter.c:58:4: warning: implicit declaration of function "inet_addr"
test_filter.c:74:2: warning: implicit declaration of function "strerror"
test_filter.c:74:2: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
test_filter.c:75:1: warning: control reaches end of non-void function
CCLD test_filter
make[1]: Leaving directory `/home/jengelh/code/libnetfilter_conntrack/qa'
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The addition of -Wall flagged some legitimate warnings:
make expect_dump expect_create expect_get expect_delete expect_flush expect_events expect_create_userspace conntrack_create conntrack_dump conntrack_update conntrack_delete conntrack_flush conntrack_create_nat conntrack_get conntrack_events conntrack_master conntrack_filter conntrack_grp_create ctexp_events
make[1]: Entering directory `/home/jengelh/code/libnetfilter_conntrack/utils'
CC expect_dump.o
expect_dump.c: In function "main":
expect_dump.c:36:3: warning: implicit declaration of function "strerror"
expect_dump.c:36:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
CCLD expect_dump
CC expect_create.o
expect_create.c: In function "main":
expect_create.c:31:2: warning: implicit declaration of function "inet_addr"
expect_create.c:54:3: warning: implicit declaration of function "strerror"
expect_create.c:54:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
expect_create.c:117:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
CCLD expect_create
CC expect_get.o
expect_get.c: In function "main":
expect_get.c:33:2: warning: implicit declaration of function "inet_addr"
expect_get.c:59:3: warning: implicit declaration of function "strerror"
expect_get.c:59:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
CCLD expect_get
CC expect_delete.o
expect_delete.c: In function "main":
expect_delete.c:21:2: warning: implicit declaration of function "inet_addr"
expect_delete.c:46:3: warning: implicit declaration of function "strerror"
expect_delete.c:46:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
CCLD expect_delete
CC expect_flush.o
expect_flush.c: In function "main":
expect_flush.c:23:3: warning: implicit declaration of function "strerror"
expect_flush.c:23:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
CCLD expect_flush
CC expect_events.o
expect_events.c: In function "main":
expect_events.c:44:3: warning: implicit declaration of function "strerror"
expect_events.c:44:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
CCLD expect_events
CC expect_create_userspace.o
expect_create_userspace.c: In function "main":
expect_create_userspace.c:31:2: warning: implicit declaration of function "inet_addr"
expect_create_userspace.c:58:3: warning: implicit declaration of function "strerror"
expect_create_userspace.c:58:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
expect_create_userspace.c:121:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
CCLD expect_create_userspace
CC conntrack_create.o
conntrack_create.c: In function "main":
conntrack_create.c:21:2: warning: implicit declaration of function "inet_addr"
conntrack_create.c:43:3: warning: implicit declaration of function "strerror"
conntrack_create.c:43:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
CCLD conntrack_create
CC conntrack_dump.o
conntrack_dump.c: In function "main":
conntrack_dump.c:37:3: warning: implicit declaration of function "strerror"
conntrack_dump.c:37:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
conntrack_dump.c:24:7: warning: unused variable "buf"
CCLD conntrack_dump
CC conntrack_update.o
conntrack_update.c: In function "main":
conntrack_update.c:21:2: warning: implicit declaration of function "inet_addr"
conntrack_update.c:43:3: warning: implicit declaration of function "strerror"
conntrack_update.c:43:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
CCLD conntrack_update
CC conntrack_delete.o
conntrack_delete.c: In function "main":
conntrack_delete.c:21:2: warning: implicit declaration of function "inet_addr"
conntrack_delete.c:38:3: warning: implicit declaration of function "strerror"
conntrack_delete.c:38:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
CCLD conntrack_delete
CC conntrack_flush.o
conntrack_flush.c: In function "main":
conntrack_flush.c:24:3: warning: implicit declaration of function "strerror"
conntrack_flush.c:24:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
conntrack_flush.c:12:7: warning: unused variable "buf"
CCLD conntrack_flush
CC conntrack_create_nat.o
conntrack_create_nat.c: In function "main":
conntrack_create_nat.c:21:2: warning: implicit declaration of function "inet_addr"
conntrack_create_nat.c:45:3: warning: implicit declaration of function "strerror"
conntrack_create_nat.c:45:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
CCLD conntrack_create_nat
CC conntrack_get.o
conntrack_get.c: In function "main":
conntrack_get.c:33:2: warning: implicit declaration of function "inet_addr"
conntrack_get.c:52:3: warning: implicit declaration of function "strerror"
conntrack_get.c:52:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
CCLD conntrack_get
CC conntrack_events.o
conntrack_events.c: In function "main":
conntrack_events.c:45:3: warning: implicit declaration of function "strerror"
conntrack_events.c:45:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
conntrack_events.c:29:7: warning: unused variable "buf"
conntrack_events.c:28:23: warning: unused variable "ct"
conntrack_events.c:26:11: warning: unused variable "family"
CCLD conntrack_events
CC conntrack_master.o
conntrack_master.c: In function "main":
conntrack_master.c:22:2: warning: implicit declaration of function "inet_addr"
conntrack_master.c:44:3: warning: implicit declaration of function "strerror"
conntrack_master.c:44:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
conntrack_master.c:86:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
CCLD conntrack_master
CC conntrack_filter.o
conntrack_filter.c: In function "main":
conntrack_filter.c:58:3: warning: implicit declaration of function "inet_addr"
conntrack_filter.c:98:3: warning: implicit declaration of function "strerror"
conntrack_filter.c:98:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
conntrack_filter.c:31:7: warning: unused variable "buf"
conntrack_filter.c:30:23: warning: unused variable "ct"
conntrack_filter.c:27:11: warning: unused variable "family"
CCLD conntrack_filter
CC conntrack_grp_create.o
conntrack_grp_create.c: In function "main":
conntrack_grp_create.c:21:3: warning: implicit declaration of function "inet_addr"
conntrack_grp_create.c:49:3: warning: implicit declaration of function "strerror"
conntrack_grp_create.c:49:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
CCLD conntrack_grp_create
CC ctexp_events.o
ctexp_events.c: In function "main":
ctexp_events.c:63:3: warning: implicit declaration of function "strerror"
ctexp_events.c:63:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
CCLD ctexp_events
make[1]: Leaving directory `/home/jengelh/code/libnetfilter_conntrack/utils'
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
|
|
|
|
| |
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
|
|
|
|
| |
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
|
|\ |
|
| |
| |
| |
| | |
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
|
| |
| |
| |
| | |
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
|
| |
| |
| |
| | |
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
|
| |
| |
| |
| |
| |
| | |
This fixes a minor problem introduced in b245e4092c5a7f09729e64868a42e13f48a
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|/
|
|
|
|
|
|
|
|
|
| |
This patch uses CTA_PROTOINFO_DCCP_HANDSHAKE_SEQ instead which is the
name that is used in the Linux kernel header. Thus, both the headers
and the internal copy for the library are in sync.
This problem was probably introduced at the time that we added support
for the DCCP handshake sequence number.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
|
|
|
| |
This patch exports several low-level function that allow to build
and parse netlink messages that contain ctnetlink expectation
information. They have been in the tree for quite so long, but
they were not exported. To leave the library in a consistent state
(ctnetlink conntrack functions provide the similar functionality)
I have decided to export them.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
| |
With this patch, the expect_events example also listens to other
sort of expectation events that were added in Linux kernel 2.6.37-rc.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
|
|
| |
This patch re-works the callback handling to allow the use the same socket
to send/receive commands and listen to events of both conntrack and
expectation subsystems. Now you can register one callback for conntrack
and one for expectation with the same handler with no problems (before
this patch, this was not possible, you required two different handlers).
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|\ |
|
| |
| |
| |
| | |
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
|
| |
| |
| |
| | |
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
|
| |
| |
| |
| | |
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
|
|/
|
|
|
|
|
| |
This patch updates the README file and it includes the re-licensing
of this library to make it GPLv2+.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
| |
|
|
|
|
|
|
|
|
|
|
| |
PKG_CHECK_MODULES already produces its own (and more verbose) messsage
when a module cannot be found.
Mucking around with CFLAGS and LIBS is also not needed since pkgconfig
takes care of providing variables, so let's use them in Makefile.am.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
|
|
|
|
|
|
| |
libtool automatically adds PIC flags as needed.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
|
|
|
|
| |
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
|
|
|
|
| |
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
|