diff options
author | Beniamino Galvani <bgalvani@redhat.com> | 2015-10-05 08:55:38 (GMT) |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2015-11-19 16:20:28 (GMT) |
commit | 3f231213c7c586b5a5e8ce6b1ea9c1d3b24d74c0 (patch) | |
tree | c617e155435b2d95abf27eb59070c105975fd242 /lib | |
parent | e6b39c9e2355febfe16555b738ccdcf945497245 (diff) | |
download | libnl-3f231213c7c586b5a5e8ce6b1ea9c1d3b24d74c0.zip libnl-3f231213c7c586b5a5e8ce6b1ea9c1d3b24d74c0.tar.gz libnl-3f231213c7c586b5a5e8ce6b1ea9c1d3b24d74c0.tar.bz2 |
route/link: add macvtap support
This adds support for MAC-VLAN based tap interfaces (macvtap).
http://lists.infradead.org/pipermail/libnl/2015-October/001976.html
Signed-off-by: Beniamino Galvani <bgalvani@redhat.com>
Signed-off-by: Thomas Haller <thaller@redhat.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/route/link/macvlan.c | 201 |
1 files changed, 189 insertions, 12 deletions
diff --git a/lib/route/link/macvlan.c b/lib/route/link/macvlan.c index 4e61d92..3553cbe 100644 --- a/lib/route/link/macvlan.c +++ b/lib/route/link/macvlan.c @@ -11,13 +11,14 @@ /** * @ingroup link - * @defgroup macvlan MACVLAN + * @defgroup macvlan MACVLAN/MACVTAP * MAC-based Virtual LAN link module * * @details * \b Link Type Name: "macvlan" * * @route_doc{link_macvlan, MACVLAN Documentation} + * @route_doc{link_macvtap, MACVTAP Documentation} * * @{ */ @@ -30,6 +31,7 @@ #include <netlink/route/rtnl.h> #include <netlink-private/route/link/api.h> #include <netlink/route/link/macvlan.h> +#include <netlink/route/link/macvtap.h> #include <linux/if_link.h> @@ -74,7 +76,7 @@ static int macvlan_parse(struct rtnl_link *link, struct nlattr *data, struct macvlan_info *mvi; int err; - NL_DBG(3, "Parsing MACVLAN link info\n"); + NL_DBG(3, "Parsing %s link info", link->l_info_ops->io_name); if ((err = nla_parse_nested(tb, IFLA_MACVLAN_MAX, data, macvlan_policy)) < 0) goto errout; @@ -112,12 +114,12 @@ static void macvlan_dump(struct rtnl_link *link, struct nl_dump_params *p) if (mvi->mvi_mask & MACVLAN_HAS_MODE) { rtnl_link_macvlan_mode2str(mvi->mvi_mode, buf, sizeof(buf)); - nl_dump(p, "macvlan-mode %s", buf); + nl_dump(p, "%s-mode %s", link->l_info_ops->io_name, buf); } if (mvi->mvi_mask & MACVLAN_HAS_FLAGS) { rtnl_link_macvlan_flags2str(mvi->mvi_flags, buf, sizeof(buf)); - nl_dump(p, "macvlan-flags %s", buf); + nl_dump(p, "%s-flags %s", link->l_info_ops->io_name, buf); } } @@ -161,16 +163,29 @@ nla_put_failure: } static struct rtnl_link_info_ops macvlan_info_ops = { - .io_name = "macvlan", - .io_alloc = macvlan_alloc, - .io_parse = macvlan_parse, + .io_name = "macvlan", + .io_alloc = macvlan_alloc, + .io_parse = macvlan_parse, .io_dump = { - [NL_DUMP_LINE] = macvlan_dump, - [NL_DUMP_DETAILS] = macvlan_dump, + [NL_DUMP_LINE] = macvlan_dump, + [NL_DUMP_DETAILS] = macvlan_dump, }, - .io_clone = macvlan_clone, - .io_put_attrs = macvlan_put_attrs, - .io_free = macvlan_free, + .io_clone = macvlan_clone, + .io_put_attrs = macvlan_put_attrs, + .io_free = macvlan_free, +}; + +static struct rtnl_link_info_ops macvtap_info_ops = { + .io_name = "macvtap", + .io_alloc = macvlan_alloc, + .io_parse = macvlan_parse, + .io_dump = { + [NL_DUMP_LINE] = macvlan_dump, + [NL_DUMP_DETAILS] = macvlan_dump, + }, + .io_clone = macvlan_clone, + .io_put_attrs = macvlan_put_attrs, + .io_free = macvlan_free, }; /** @cond SKIP */ @@ -179,6 +194,12 @@ static struct rtnl_link_info_ops macvlan_info_ops = { APPBUG("Link is not a macvlan link. set type \"macvlan\" first."); \ return -NLE_OPNOTSUPP; \ } + +#define IS_MACVTAP_LINK_ASSERT(link) \ + if ((link)->l_info_ops != &macvtap_info_ops) { \ + APPBUG("Link is not a macvtap link. set type \"macvtap\" first."); \ + return -NLE_OPNOTSUPP; \ + } /** @endcond */ /** @@ -313,6 +334,140 @@ uint16_t rtnl_link_macvlan_get_flags(struct rtnl_link *link) /** @} */ + +/** + * @name MACVTAP Object + * @{ + */ + +/** + * Allocate link object of type MACVTAP + * + * @return Allocated link object or NULL. + */ +struct rtnl_link *rtnl_link_macvtap_alloc(void) +{ + struct rtnl_link *link; + int err; + + if (!(link = rtnl_link_alloc())) + return NULL; + + if ((err = rtnl_link_set_type(link, "macvtap")) < 0) { + rtnl_link_put(link); + return NULL; + } + + return link; +} + +/** + * Check if link is a MACVTAP link + * @arg link Link object + * + * @return True if link is a MACVTAP link, otherwise false is returned. + */ +int rtnl_link_is_macvtap(struct rtnl_link *link) +{ + return link->l_info_ops && !strcmp(link->l_info_ops->io_name, "macvtap"); +} + +/** + * Set MACVTAP MODE + * @arg link Link object + * @arg mode MACVTAP mode + * + * @return 0 on success or a negative error code + */ +int rtnl_link_macvtap_set_mode(struct rtnl_link *link, uint32_t mode) +{ + struct macvlan_info *mvi = link->l_info; + + IS_MACVTAP_LINK_ASSERT(link); + + mvi->mvi_mode = mode; + mvi->mvi_mask |= MACVLAN_HAS_MODE; + + return 0; +} + +/** + * Get MACVTAP Mode + * @arg link Link object + * + * @return MACVTAP mode, 0 if not set or a negative error code. + */ +uint32_t rtnl_link_macvtap_get_mode(struct rtnl_link *link) +{ + struct macvlan_info *mvi = link->l_info; + + IS_MACVTAP_LINK_ASSERT(link); + + if (mvi->mvi_mask & MACVLAN_HAS_MODE) + return mvi->mvi_mode; + else + return 0; +} + +/** + * Set MACVTAP flags + * @arg link Link object + * @arg flags MACVTAP flags + * + * @return 0 on success or a negative error code. + */ +int rtnl_link_macvtap_set_flags(struct rtnl_link *link, uint16_t flags) +{ + struct macvlan_info *mvi = link->l_info; + + IS_MACVTAP_LINK_ASSERT(link); + + mvi->mvi_flags |= flags; + mvi->mvi_mask |= MACVLAN_HAS_FLAGS; + + return 0; +} + +/** + * Unset MACVTAP flags + * @arg link Link object + * @arg flags MACVTAP flags + * + * Note: kernel currently only has a single flag and lacks flags_mask to + * indicate which flags shall be changed (it always all). + * + * @return 0 on success or a negative error code. + */ +int rtnl_link_macvtap_unset_flags(struct rtnl_link *link, uint16_t flags) +{ + struct macvlan_info *mvi = link->l_info; + + IS_MACVTAP_LINK_ASSERT(link); + + mvi->mvi_flags &= ~flags; + mvi->mvi_mask |= MACVLAN_HAS_FLAGS; + + return 0; +} + +/** + * Get MACVTAP flags + * @arg link Link object + * + * @return MACVTAP flags, 0 if none set, or a negative error code. + */ +uint16_t rtnl_link_macvtap_get_flags(struct rtnl_link *link) +{ + struct macvlan_info *mvi = link->l_info; + + IS_MACVTAP_LINK_ASSERT(link); + + return mvi->mvi_flags; +} + +/** @} */ + + static const struct trans_tbl macvlan_flags[] = { __ADD(MACVLAN_FLAG_NOPROMISC, nopromisc), }; @@ -339,6 +494,16 @@ int rtnl_link_macvlan_str2flags(const char *name) return __str2flags(name, macvlan_flags, ARRAY_SIZE(macvlan_flags)); } +char *rtnl_link_macvtap_flags2str(int flags, char *buf, size_t len) +{ + return __flags2str(flags, buf, len, macvlan_flags, ARRAY_SIZE(macvlan_flags)); +} + +int rtnl_link_macvtap_str2flags(const char *name) +{ + return __str2flags(name, macvlan_flags, ARRAY_SIZE(macvlan_flags)); +} + /** @} */ /** @@ -356,16 +521,28 @@ int rtnl_link_macvlan_str2mode(const char *name) return __str2type(name, macvlan_modes, ARRAY_SIZE(macvlan_modes)); } +char *rtnl_link_macvtap_mode2str(int mode, char *buf, size_t len) +{ + return __type2str(mode, buf, len, macvlan_modes, ARRAY_SIZE(macvlan_modes)); +} + +int rtnl_link_macvtap_str2mode(const char *name) +{ + return __str2type(name, macvlan_modes, ARRAY_SIZE(macvlan_modes)); +} + /** @} */ static void __init macvlan_init(void) { rtnl_link_register_info(&macvlan_info_ops); + rtnl_link_register_info(&macvtap_info_ops); } static void __exit macvlan_exit(void) { rtnl_link_unregister_info(&macvlan_info_ops); + rtnl_link_unregister_info(&macvtap_info_ops); } /** @} */ |