Fork 0
Commit Graph

810 Commits (master)

Author SHA1 Message Date
Patrick McHardy 6ae22c1b39 Merge /home/kaber/src/repos/libnl.git 2013-06-28 18:11:40 +02:00
Thomas Graf 01cfa9c1db msg: Avoid returning a negative value for nlmsg_attrlen()
If a hdrlen was provided that was greather than the actual
message length, a negative attributes length would result.

This was typically happening for RTM_GETLINK requests where
we can get a away with a 4 bytes header on the request side
but the response would use a 16 bytes header.

This resulted in strange -8 bytes leftover debug messages.

Signed-off-by: Thomas Graf <>
2013-06-27 18:29:17 +02:00
Holger Eitzenberger d612180cda netfilter/queue: introduce nfnl_queue_msg_send_verdict_batch()
The batched verdict implicitely ACKs all queue packet IDs up to the
one send back, which reduces the number of verdict messages send
to the kernel.

Signed-off-by: Holger Eitzenberger <>
Signed-off-by: Thomas Graf <>
2013-06-27 01:16:15 +02:00
Holger Eitzenberger 34a96ba5c2 netfilter/queue: generalize nfnl_queue_msg_build_verdict()
Generalize netfilter/queue to allow sending batched verdicts

Signed-off-by: Holger Eitzenberger <>
Signed-off-by: Thomas Graf <>
2013-06-27 01:15:34 +02:00
Andrew Collins 53ac502a2b Handle -NLE_AGAIN in nl_cache_mngr_data_ready
Since commit "nl: Return -NLE_AGAIN if non-blocking socket would block",
nl_cache_mngr_data_ready returns -NLE_AGAIN to callers on non-blocking sockets.
Change it to consider -NLE_AGAIN as a non-error case as it is expected behavior
with the nl_recv changes.

Signed-off-by: Thomas Graf <>
2013-06-27 01:12:36 +02:00
Andrew Collins 87bbfb6b12 Default to comparing all attributes if no oo_id_attrs defined
Since commit: "cache pickup: Avoid duplicates during cache pickup",
nfnl_ct_alloc_cache no longer properly fills the cache, as it doesn't
define oo_id_attrs so all items are considered duplicates.

Instead of adding a ~0 oo_id_attrs to ct_obj, this changes
nl_object_identical to default to comparing all attributes if
neither oo_id_attrs_get or oo_id_attrs are provided.

Signed-off-by: Thomas Graf <>
2013-06-27 01:12:28 +02:00
Thomas Graf c1de0f3129 Merge branch 'master' of 2013-05-24 14:37:02 +02:00
Michael Braun c76393e203 Add macvlan support
This patch add support for kernel macvlan interfaces.

Signed-off-by: Michael Braun <>
2013-05-16 17:04:08 +02:00
Thomas Graf c4d846f239 3.2.22 release 2013-05-14 14:09:07 +02:00
Thomas Graf 807fddc4cd nl: Increase receive buffer size to 4 pages
Assuming that the kernel does not send more than a page is no longer valid,
and enabling MSG_PEEK'ing by default to figure out the exact message buffer
requirements can have a negative influence on the performance of existing
applications. Bumping the default receive buffer space to 4 pages seems
a sane default.

Signed-off-by: Thomas Graf <>
2013-05-08 13:52:27 +02:00
Nathan Lynch 8983fa9914 rtnl_link_af_unregister: fix locking
rtnl_link_af_unregister() attempts to write-lock info_lock twice
instead of releasing it before returning.  It also will return with
info_lock write-locked if passed a NULL ops.

Signed-off-by: Thomas Graf <>
2013-05-08 13:48:24 +02:00
Thomas Graf 183052d047 Prepare for 3.2.22-rc1 release
Signed-off-by: Thomas Graf <>
2013-04-28 12:52:26 +02:00
Thomas Graf ed1f4cba2c tests: Include util.h in dist
Signed-off-by: Thomas Graf <>
2013-04-28 12:51:58 +02:00
Thomas Graf 4e9aa6a9a6 tests: Add basic attribute unit tests
Signed-off-by: Thomas Graf <>
2013-04-28 12:31:52 +02:00
Thomas Graf ffc0ee3540 configure: Convert ENABLE_UNIT_TESTS to a mere AM conditional
Signed-off-by: Thomas Graf <>
2013-04-28 11:41:15 +02:00
Emmanuel Thierry 979ea335b0 Wrong calcultation in nla_reserve
There seams to be an error in the calculation of needed space for the message in nla_reserve. The current size of the message is counted twice: Once in NLMSG_ALIGN, once in the condition below.
This causes nla_put_* calls to be rejected if the allocation size of the message has been strictly calculated by the caller.

Signed-off-by: Thomas Graf <>
2013-04-28 10:34:50 +02:00
Thomas Graf 3a6d256da5 attr: Fix typo in nla_is_nested()
Signed-off-by: Thomas Graf <>
2013-04-28 10:33:52 +02:00
Thomas Graf 37f788f391 Merge branch 'fixes' of 2013-04-28 10:25:47 +02:00
Thomas Graf c07a6a30c2 attr: nla_is_nested() must access nla_type directly
Can't used nla_type() as it applies NLA_TYPE_MASK first

Signed-off-by: Thomas Graf <>
2013-04-28 10:23:28 +02:00
Коренберг Марк (дома) 33396faca5 Fix leak of cb if nl_socket_alloc_cb() failed to allocate socket
- each *_get() should have corresponding *_put(). That rule was broken in nl_socket_alloc()
- Also, check if cb is NULL in nl_socket_set_cb (calls BUG())
2013-04-28 02:08:50 +06:00
Thomas Graf ead4cdeb99 tests: Make unit test building optional
Signed-off-by: Thomas Graf <>
2013-04-27 14:27:10 +02:00
Коренберг Марк (дома) 59db7fb35b dump_attrs: "NLA_F_NESTED" => nla_is_nested(nla) 2013-04-26 23:50:54 +06:00
Thomas Graf d505165f2b autoconf: Use PKG_CHECK_MODULES() instead of AM_PATH_CHECK()
Signed-off-by: Thomas Graf <>
2013-04-05 10:44:06 +02:00
Thomas Graf d3cf89ea94 addr: only translate more recent address family names and ARP types if defined
Helps making libnl compilable with older kernel headers

Signed-off-by: Thomas Graf <>
2013-04-05 10:37:55 +02:00
Emmanuel Roullit ea436445ad Perform no operation on nl_object_free(NULL).
Passing a NULL pointer would cause a NULL pointer dereference within
Returning early on NULL pointer is the behavior free(3) and other
nl*_free() functions.

Signed-off-by: Emmanuel Roullit <>
2013-04-03 21:17:33 +02:00
Thomas Graf 56eb22fa74 msg: Pretty print generic netlink header in nl_msg_dump()
Signed-off-by: Thomas Graf <>
2013-04-02 23:13:15 +02:00
Thomas Graf 375a6294a4 nl: Return -NLE_AGAIN if non-blocking socket would block
Previously 0 was returned which gave the caller no chance of detecting
when a non-blocking socket would block. If a caller intends to never
see an error message it should utilize poll()/select() to only read
when the socket has pending data or information.

Reported-by: Holger Eitzenberger <>
Signed-off-by: Thomas Graf <>
2013-04-02 11:58:18 +02:00
Thomas Graf df66b0f267 genl: Fix cb reference leak in genl_ctrl_probe_by_name()
nl_socket_get_cb() bumps the cb reference counter

Signed-off-by: Thomas Graf <>
2013-04-02 11:51:53 +02:00
Holger Eitzenberger 18152ca916 ct: add ICMPv6 type,code and ID
Add ICMPv6 type, code and ID (if set) by using the already available
conntrack atttributes.

Currently the ICMPv6 conntrack objects in libnl are without type, code
and ID.  This e. g. is the output of nl_object_dump() without the patch:

  ipv6-icmp ::1 <-> ::1
  id 0xdd0871f0 family inet6 timeout 30s <NOREPLY,SNAT_INIT,DNAT_INIT>

The attached patch tries to solve that.  It then looks like

  ipv6-icmp ::1 <-> ::1 icmp type 128 code 0 id 28253
  id 0xdf3a11f0 family inet6 timeout 30s <SNAT_INIT,DNAT_INIT>

It is the 'small' approach, because it reuses the existing ICMP
attributes of the conntrack object (currently only used for IPv4).
This way I can avoid to add new _icmp6_get_, _icmp6_set_ and
_icmp6_test_ functions.

Signed-off-by: Holger Eitzenberger <>
Signed-off-by: Thomas Graf <>
2013-04-02 11:42:59 +02:00
Thomas Graf ff567100d6 nl: Print file:line:func in debugging messages and provide --disable-debug to disable debugging
Compiling libnl with --disable-debug will result in the ignorance
of the 'NLDBG' environment variable.

Signed-off-by: Thomas Graf <>
2013-04-02 11:39:30 +02:00
Thomas Graf f9241d57fe cache: Improve debugging messages of cache operations
Signed-off-by: Thomas Graf <>
2013-04-01 11:46:30 +02:00
Patrick McHardy d2b5cbd88a Merge git://
Signed-off-by: Patrick McHardy <>

2013-04-01 11:44:59 +02:00
Thomas Graf ad545f2854 genl: Update mt_id of cache ops when resolving genl id
The cache layer uses the message type array stored in the cache
ops to lookup which cache a message belongs to. Update to the
the message array with the resolved generic netlink id to make
it compatible with the caching API.

Allows to use nl_cache_refill() and others for generic netlink
based caches with dynamic generic netlink ids.

Signed-off-by: Thomas Graf <>
2013-04-01 11:21:22 +02:00
Thomas Graf aad041c46f genl: Provide internal function to resolve name to id
Like genl_ops_resolve() but uses its own socket.

Signed-off-by: Thomas Graf <>
2013-04-01 11:14:49 +02:00
roopa 6c9be5a316 nl-route-add: Add NLM_F_EXCL flag to route add
Signed-off-by: Roopa Prabhu <>
Signed-off-by: Thomas Graf <>
2013-03-24 10:58:18 +01:00
Tony Cheneau 23e26e9e05 Remove rtnl_link_free() declaration from the header file.
Reason: there is no rtnl_link_free() definition anywhere in the code.

Signed-off-by: Tony Cheneau <>
Signed-off-by: Thomas Graf <>
2013-03-17 17:31:53 +01:00
Tony Cheneau 4db11517fd Remove superfluous declaration of rtnl_route_put()
rtnl_route_put() is declared twice in the same header file

Signed-off-by: Tony Cheneau <>
Signed-off-by: Thomas Graf <>
2013-03-17 17:31:45 +01:00
Thomas Graf b39c9f7a53 rtnl-addr: Fix invalid call to nl_addr_set_prefixlen() if neither local or peer address are present
Signed-off-by: Thomas Graf <>
2013-03-14 18:57:15 +01:00
Thomas Graf 549d26dc87 rtnl-addr: Inherit prefix length to nl_addr objs in rtnl_addr_set_prefixlen()
Previously if using rtnl_addr_set_prefixlen() the new prefix length
was not forwarded to the corresponding 'struct nl_addr' objects
associated with address already and thus the comparison function
would fail.

This patch also clears the internal ADDR_ATTR_PREFIXLEN flag if
the prefix length has been reset.

Signed-off-by: Thomas Graf <>
2013-03-14 18:52:17 +01:00
Thomas Graf e09e7f1035 tests: Add check based unit test system
Introduces new unit tests based on `check`. Each subsystem/module can
have its own unit tests in tests/check-<name>.c that will be linked
together in tests/check-all.c.

Running 'make check' will compile and run the unit tests automatically.

A reference unit test implementation has been done for the abstract
address module.

Signed-off-by: Thomas Graf <>
2013-03-14 16:25:17 +01:00
Thomas Graf 780a0423dc addr: Update to latest address familiy definition for translation
Signed-off-by: Thomas Graf <>
2013-03-14 16:09:19 +01:00
Thomas Graf 88527534ba addr: improve API reference documentation for nl_addr_*()
Signed-off-by: Thomas Graf <>
2013-03-14 15:37:46 +01:00
Thomas Graf f0f33c394b addr: Reset unused portion of binary address in nl_addr_set_binary_addr()
memset() the binary address before overwriting it with new data
to avoid leaving around old portions of the address.

Signed-off-by: Thomas Graf <>
2013-03-14 14:41:12 +01:00
Thomas Graf f72bfc7220 msg: Pretty print error message header even if incomplete
Signed-off-by: Thomas Graf <>
2013-03-14 12:46:14 +01:00
Thomas Graf c608b4d151 msg: Pretty print padding attributes in nl_msg_dump()
Signed-off-by: Thomas Graf <>
2013-03-14 12:46:12 +01:00
Thomas Graf 1395c69901 attr: Warn application if nla_parse() observes same attribute multiple times
Use a debugging message to warn applications if an attribute is
found multiple times in the same message. It is perfectly valid
to rely on this behaviour but it is likely to indicate a bug.

Signed-off-by: Thomas Graf <>
2013-03-14 12:46:09 +01:00
Thomas Graf 64315f731c attr: No longer warn about attribute of type 0
The kernel will start using type 0 attributes for padding purposes.

Signed-off-by: Thomas Graf <>
2013-03-14 12:46:06 +01:00
Thomas Graf 60b370de8c attr: Do not enforce maximum length for NLA_FLAG attributes
Although wasteful, NLA_FLAG with non zero payload cause no harm
and should thus not be rejected.

Signed-off-by: Thomas Graf <>
2013-03-14 12:46:04 +01:00
Thomas Graf 9e6cdbf6fc attr: Add nla_nest_cancel() to remove partially added nested attributes
Signed-off-by: Thomas Graf <>
2013-03-14 12:46:01 +01:00
Thomas Graf 4d7680c19c Use thread-safe strerror_r() instead of strerror()
We have only ever fed well known error codes into strerror()
so it should never have been a problem though.

Signed-off-by: Thomas Graf <>
2013-02-28 13:07:04 +01:00