diff options
author | Thomas Haller <thaller@redhat.com> | 2017-03-01 22:00:14 +0100 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2017-03-02 01:33:25 +0100 |
commit | 45cbfb9d11c23d5f64a795fb05205ced48db1c7c (patch) | |
tree | cec9fcb3513f60bd017d1c3eda94b593438fe8fc /tests | |
parent | 3b2071e970995a9a22d46457e60a762161b46231 (diff) | |
download | libnl-45cbfb9d11c23d5f64a795fb05205ced48db1c7c.tar.gz |
include: don't include kernel headers in public libnl3 headers
It would be desirable not to include kernel headers in our public
libnl3 headers. As a test, remove all those includes, and fix
compilation by explicitly including the kernel headers where needed.
In some cases, that requires forward declaration for kernel
structures, as we use them as part of our own headers.
Realistically, we cannot drop those includes as it probalby breaks
compilation for users that expect to get a certain kernel header
when including a libnl3 header. So, this will not be done and the
includes will be restored in the next commit.
Do this step to show how it would be and to verify that we could
build with such a change. The reason not to do this is backward
compatibility (at compile-time).
Diffstat (limited to 'tests')
-rw-r--r-- | tests/check-attr.c | 2 | ||||
-rw-r--r-- | tests/test-cache-mngr.c | 2 | ||||
-rw-r--r-- | tests/test-complex-HTB-with-hash-filters.c | 3 | ||||
-rw-r--r-- | tests/test-create-bond.c | 2 | ||||
-rw-r--r-- | tests/test-create-bridge.c | 2 | ||||
-rw-r--r-- | tests/test-create-ifb.c | 2 | ||||
-rw-r--r-- | tests/test-create-ipvlan.c | 2 | ||||
-rw-r--r-- | tests/test-create-macsec.c | 4 | ||||
-rw-r--r-- | tests/test-create-macvlan.c | 2 | ||||
-rw-r--r-- | tests/test-create-macvtap.c | 2 | ||||
-rw-r--r-- | tests/test-create-veth.c | 2 | ||||
-rw-r--r-- | tests/test-create-vlan.c | 2 | ||||
-rw-r--r-- | tests/test-create-vrf.c | 2 | ||||
-rw-r--r-- | tests/test-create-vxlan.c | 2 | ||||
-rw-r--r-- | tests/test-delete-link.c | 2 | ||||
-rw-r--r-- | tests/test-genl.c | 2 | ||||
-rw-r--r-- | tests/test-nf-cache-mngr.c | 2 | ||||
-rw-r--r-- | tests/test-u32-filter-with-actions.c | 7 |
18 files changed, 42 insertions, 2 deletions
diff --git a/tests/check-attr.c b/tests/check-attr.c index d8622301..0390997c 100644 --- a/tests/check-attr.c +++ b/tests/check-attr.c @@ -13,6 +13,8 @@ #include <netlink/attr.h> #include <netlink/msg.h> +#include <linux/netlink.h> + START_TEST(attr_size) { fail_if(nla_attr_size(0) != NLA_HDRLEN, diff --git a/tests/test-cache-mngr.c b/tests/test-cache-mngr.c index 8999e587..97614520 100644 --- a/tests/test-cache-mngr.c +++ b/tests/test-cache-mngr.c @@ -5,6 +5,8 @@ #include <netlink-private/cache-api.h> +#include <linux/netlink.h> + static int quit = 0; static struct nl_dump_params dp = { diff --git a/tests/test-complex-HTB-with-hash-filters.c b/tests/test-complex-HTB-with-hash-filters.c index 453f8016..c2ac7830 100644 --- a/tests/test-complex-HTB-with-hash-filters.c +++ b/tests/test-complex-HTB-with-hash-filters.c @@ -18,6 +18,7 @@ #include <netlink/route/classifier.h> #include <netlink/route/class.h> #include <linux/if_ether.h> +#include <linux/pkt_cls.h> #include <netlink/attr.h> //#include "include/rtnl_u32.h" @@ -26,6 +27,8 @@ #include <string.h> //#include "include/rtnl_u32_addon.h" +#include <linux/netlink.h> + #define TC_HANDLE(maj, min) (TC_H_MAJ((maj) << 16) | TC_H_MIN(min)) /* some functions are copied from iproute-tc tool */ diff --git a/tests/test-create-bond.c b/tests/test-create-bond.c index 11bc5b09..326e0ef7 100644 --- a/tests/test-create-bond.c +++ b/tests/test-create-bond.c @@ -2,6 +2,8 @@ #include <netlink/route/link.h> #include <netlink/route/link/bonding.h> +#include <linux/netlink.h> + int main(int argc, char *argv[]) { struct rtnl_link *link; diff --git a/tests/test-create-bridge.c b/tests/test-create-bridge.c index c4bec375..fe10c639 100644 --- a/tests/test-create-bridge.c +++ b/tests/test-create-bridge.c @@ -2,6 +2,8 @@ #include <netlink/route/link.h> #include <netlink/route/link/bridge.h> +#include <linux/netlink.h> + #define TEST_BRIDGE_NAME "testbridge" #define TEST_INTERFACE_NAME "testtap1" diff --git a/tests/test-create-ifb.c b/tests/test-create-ifb.c index 99336f55..d154ffdc 100644 --- a/tests/test-create-ifb.c +++ b/tests/test-create-ifb.c @@ -1,6 +1,8 @@ #include <netlink/netlink.h> #include <netlink/route/link.h> +#include <linux/netlink.h> + int main(int argc, char *argv[]) { struct rtnl_link *link; diff --git a/tests/test-create-ipvlan.c b/tests/test-create-ipvlan.c index dd61b800..50bac541 100644 --- a/tests/test-create-ipvlan.c +++ b/tests/test-create-ipvlan.c @@ -2,6 +2,8 @@ #include <netlink/route/link.h> #include <netlink/route/link/ipvlan.h> +#include <linux/netlink.h> + int main(int argc, char *argv[]) { struct rtnl_link *link; diff --git a/tests/test-create-macsec.c b/tests/test-create-macsec.c index abdb7f60..efadf6b5 100644 --- a/tests/test-create-macsec.c +++ b/tests/test-create-macsec.c @@ -1,5 +1,9 @@ #include <netlink/netlink.h> #include <netlink/route/link.h> + +#include <linux/netlink.h> +#include <linux/if_link.h> + #include <netlink/route/link/macsec.h> int main(int argc, char *argv[]) diff --git a/tests/test-create-macvlan.c b/tests/test-create-macvlan.c index d94839be..f520b674 100644 --- a/tests/test-create-macvlan.c +++ b/tests/test-create-macvlan.c @@ -4,6 +4,8 @@ #include <netlink/route/link.h> #include <netlink/route/link/macvlan.h> +#include <linux/netlink.h> + int main(int argc, char *argv[]) { struct rtnl_link *link; diff --git a/tests/test-create-macvtap.c b/tests/test-create-macvtap.c index dc7df952..27d1969d 100644 --- a/tests/test-create-macvtap.c +++ b/tests/test-create-macvtap.c @@ -4,6 +4,8 @@ #include <netlink/route/link.h> #include <netlink/route/link/macvtap.h> +#include <linux/netlink.h> + int main(int argc, char *argv[]) { struct rtnl_link *link; diff --git a/tests/test-create-veth.c b/tests/test-create-veth.c index db5ab8b1..9600f8dd 100644 --- a/tests/test-create-veth.c +++ b/tests/test-create-veth.c @@ -2,6 +2,8 @@ #include <netlink/route/link.h> #include <netlink/route/link/veth.h> +#include <linux/netlink.h> + int main(int argc, char *argv[]) { struct rtnl_link *link; diff --git a/tests/test-create-vlan.c b/tests/test-create-vlan.c index 64e478f4..04756d4a 100644 --- a/tests/test-create-vlan.c +++ b/tests/test-create-vlan.c @@ -2,6 +2,8 @@ #include <netlink/route/link.h> #include <netlink/route/link/vlan.h> +#include <linux/netlink.h> + int main(int argc, char *argv[]) { struct rtnl_link *link; diff --git a/tests/test-create-vrf.c b/tests/test-create-vrf.c index 7db6d8a5..c3d23e7f 100644 --- a/tests/test-create-vrf.c +++ b/tests/test-create-vrf.c @@ -2,6 +2,8 @@ #include <netlink/route/link.h> #include <netlink/route/link/vrf.h> +#include <linux/netlink.h> + int main(int argc, char *argv[]) { struct nl_cache *link_cache; diff --git a/tests/test-create-vxlan.c b/tests/test-create-vxlan.c index 98a5103c..855fdb5d 100644 --- a/tests/test-create-vxlan.c +++ b/tests/test-create-vxlan.c @@ -2,6 +2,8 @@ #include <netlink/route/link.h> #include <netlink/route/link/vxlan.h> +#include <linux/netlink.h> + int main(int argc, char *argv[]) { struct rtnl_link *link; diff --git a/tests/test-delete-link.c b/tests/test-delete-link.c index 9cf1034e..86331239 100644 --- a/tests/test-delete-link.c +++ b/tests/test-delete-link.c @@ -1,6 +1,8 @@ #include <netlink/netlink.h> #include <netlink/route/link.h> +#include <linux/netlink.h> + int main(int argc, char *argv[]) { struct rtnl_link *link; diff --git a/tests/test-genl.c b/tests/test-genl.c index 74aea106..d96daddf 100644 --- a/tests/test-genl.c +++ b/tests/test-genl.c @@ -1,5 +1,7 @@ #include <netlink/cli/utils.h> + #include <linux/taskstats.h> +#include <linux/genetlink.h> static struct nla_policy attr_policy[TASKSTATS_TYPE_MAX+1] = { [TASKSTATS_TYPE_PID] = { .type = NLA_U32 }, diff --git a/tests/test-nf-cache-mngr.c b/tests/test-nf-cache-mngr.c index b4f30223..7625e3fe 100644 --- a/tests/test-nf-cache-mngr.c +++ b/tests/test-nf-cache-mngr.c @@ -1,5 +1,7 @@ #include <netlink/cli/utils.h> +#include <linux/netlink.h> + static void change_cb(struct nl_cache *cache, struct nl_object *obj, int action, void *data) { diff --git a/tests/test-u32-filter-with-actions.c b/tests/test-u32-filter-with-actions.c index 70bab4df..0ca216cb 100644 --- a/tests/test-u32-filter-with-actions.c +++ b/tests/test-u32-filter-with-actions.c @@ -20,12 +20,15 @@ #include <netlink/route/act/mirred.h> #include <netlink/route/act/skbedit.h> #include <netlink/route/class.h> -#include <linux/if_ether.h> - #include <netlink/attr.h> + #include <stdio.h> #include <string.h> +#include <linux/if_ether.h> +#include <linux/tc_act/tc_mirred.h> +#include <linux/netlink.h> + #define TC_HANDLE(maj, min) (TC_H_MAJ((maj) << 16) | TC_H_MIN(min)) /* some functions are copied from iproute-tc tool */ |