From 2cf635b06a678ebe09d6ea6db72bc09de09f84c8 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 2 Jan 2014 11:00:31 +0100 Subject: [PATCH] route: add libnl name prefix to global variable link_policy Public names should be prefixed with a libnl specific prefix to avoid name collisions. Rename link_policy to rtln_link_policy. Related bugs: https://github.com/thom311/libnl/issues/52 https://bugzilla.gnome.org/show_bug.cgi?id=720902 https://bugs.gentoo.org/show_bug.cgi?id=494986 https://bugs.gentoo.org/show_bug.cgi?id=494890 Signed-off-by: Thomas Haller --- include/netlink/route/link.h | 2 +- lib/route/link.c | 4 ++-- lib/route/link/veth.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/netlink/route/link.h b/include/netlink/route/link.h index 29a5df9..3345787 100644 --- a/include/netlink/route/link.h +++ b/include/netlink/route/link.h @@ -98,7 +98,7 @@ typedef enum { #define RTNL_LINK_STATS_MAX (__RTNL_LINK_STATS_MAX - 1) -extern struct nla_policy link_policy[]; +extern struct nla_policy rtln_link_policy[]; extern struct rtnl_link *rtnl_link_alloc(void); extern void rtnl_link_put(struct rtnl_link *); diff --git a/lib/route/link.c b/lib/route/link.c index 4bcf615..9979b5b 100644 --- a/lib/route/link.c +++ b/lib/route/link.c @@ -262,7 +262,7 @@ static int link_clone(struct nl_object *_dst, struct nl_object *_src) return 0; } -struct nla_policy link_policy[IFLA_MAX+1] = { +struct nla_policy rtln_link_policy[IFLA_MAX+1] = { [IFLA_IFNAME] = { .type = NLA_STRING, .maxlen = IFNAMSIZ }, [IFLA_MTU] = { .type = NLA_U32 }, @@ -481,7 +481,7 @@ static int link_msg_parser(struct nl_cache_ops *ops, struct sockaddr_nl *who, int err, family; struct nla_policy real_link_policy[IFLA_MAX+1]; - memcpy(&real_link_policy, link_policy, sizeof(link_policy)); + memcpy(&real_link_policy, rtln_link_policy, sizeof(rtln_link_policy)); link = rtnl_link_alloc(); if (link == NULL) { diff --git a/lib/route/link/veth.c b/lib/route/link/veth.c index d5c1926..4ce1f10 100644 --- a/lib/route/link/veth.c +++ b/lib/route/link/veth.c @@ -65,7 +65,7 @@ static int veth_parse(struct rtnl_link *link, struct nlattr *data, err = nla_parse(peer_tb, IFLA_MAX, nla_data(nla_peer) + sizeof(struct ifinfomsg), nla_len(nla_peer) - sizeof(struct ifinfomsg), - link_policy); + rtln_link_policy); if (err < 0) goto errout; -- 2.40.0