diff options
| author | Cong Wang <xiyou.wangcong@gmail.com> | 2013-12-05 23:48:29 (GMT) |
|---|---|---|
| committer | Thomas Graf <tgraf@suug.ch> | 2013-12-09 14:36:14 (GMT) |
| commit | 507897a53ee033b3cc9375582a5b790c39b65271 (patch) | |
| tree | 4e8d71e811a0e9b47f3c823fb722219bd986b1ae | |
| parent | ffbfe92d74e8e7617cd4d04f09a05edabd4c2139 (diff) | |
| download | libnl-507897a53ee033b3cc9375582a5b790c39b65271.zip libnl-507897a53ee033b3cc9375582a5b790c39b65271.tar.gz libnl-507897a53ee033b3cc9375582a5b790c39b65271.tar.bz2 | |
u32: add action removal API
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: Thomas Graf <tgraf@suug.ch>
| -rw-r--r-- | include/netlink/route/action.h | 1 | ||||
| -rw-r--r-- | include/netlink/route/cls/u32.h | 1 | ||||
| -rw-r--r-- | lib/route/act.c | 16 | ||||
| -rw-r--r-- | lib/route/cls/u32.c | 19 |
4 files changed, 37 insertions, 0 deletions
diff --git a/include/netlink/route/action.h b/include/netlink/route/action.h index be52767..c80f6cf 100644 --- a/include/netlink/route/action.h +++ b/include/netlink/route/action.h @@ -38,6 +38,7 @@ extern int rtnl_act_build_delete_request(struct rtnl_act *, int, extern int rtnl_act_delete(struct nl_sock *, struct rtnl_act *, int); extern int rtnl_act_append(struct rtnl_act **, struct rtnl_act *); +extern int rtnl_act_remove(struct rtnl_act **, struct rtnl_act *); extern int rtnl_act_fill(struct nl_msg *, int, struct rtnl_act *); extern void rtnl_act_put_all(struct rtnl_act **); extern int rtnl_act_parse(struct rtnl_act **, struct nlattr *); diff --git a/include/netlink/route/cls/u32.h b/include/netlink/route/cls/u32.h index 5d8d1ab..34328d9 100644 --- a/include/netlink/route/cls/u32.h +++ b/include/netlink/route/cls/u32.h @@ -43,6 +43,7 @@ extern int rtnl_u32_add_key_in_addr(struct rtnl_cls *, struct in_addr *, extern int rtnl_u32_add_key_in6_addr(struct rtnl_cls *, struct in6_addr *, uint8_t, int, int); extern int rtnl_u32_add_action(struct rtnl_cls *, struct rtnl_act *); +extern int rtnl_u32_del_action(struct rtnl_cls *, struct rtnl_act *); #ifdef __cplusplus } diff --git a/lib/route/act.c b/lib/route/act.c index 32613e0..9c00453 100644 --- a/lib/route/act.c +++ b/lib/route/act.c @@ -49,6 +49,22 @@ int rtnl_act_append(struct rtnl_act **head, struct rtnl_act *new) return 0; } +int rtnl_act_remove(struct rtnl_act **head, struct rtnl_act *act) +{ + struct rtnl_act *a, **ap; + + for (ap = head; (a = *ap) != NULL; ap = &a->a_next) + if (a == act) + break; + if (a) { + *ap = a->a_next; + a->a_next = NULL; + return 0; + } + + return -NLE_OBJ_NOTFOUND; +} + static int rtnl_act_fill_one(struct nl_msg *msg, struct rtnl_act *act, int order) { struct rtnl_tc *tc = TC_CAST(act); diff --git a/lib/route/cls/u32.c b/lib/route/cls/u32.c index 687690d..e79ec9b 100644 --- a/lib/route/cls/u32.c +++ b/lib/route/cls/u32.c @@ -481,6 +481,25 @@ int rtnl_u32_add_action(struct rtnl_cls *cls, struct rtnl_act *act) return rtnl_act_append(&u->cu_act, act); } +int rtnl_u32_del_action(struct rtnl_cls *cls, struct rtnl_act *act) +{ + struct rtnl_u32 *u; + int ret; + + if (!act) + return 0; + + if (!(u = rtnl_tc_data(TC_CAST(cls)))) + return -NLE_NOMEM; + + if (!(u->cu_mask & U32_ATTR_ACTION)) + return -NLE_INVAL; + + ret = rtnl_act_remove(&u->cu_act, act); + if (!u->cu_act) + u->cu_mask &= ~U32_ATTR_ACTION; + return ret; +} /** @} */ /** |