stv0g/libnl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Allow parser callbacks to return NL_OK, NL_SKIP, NL_EXIT

Browse source 
Obsoletes internal P_ACCEPT/P_IGNORE
This commit is contained in:
Thomas Graf 2008-05-15 14:01:57 +02:00
parent 8cd39c9f4c
commit 28233246cd
14 changed files with 1 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/netlink-local.h
View file

@ -124,9 +124,6 @@ static inline int nl_cb_call(struct nl_cb *cb, int type, struct nl_msg *msg)
#define __exit __attribute__ ((destructor))
#define __deprecated __attribute__ ((deprecated))
#define P_ACCEPT 0
#define P_IGNORE 0
#define min(x,y) ({ \
typeof(x) _x = (x); \
typeof(y) _y = (y); \

5
lib/genl/ctrl.c
View file

@ -128,11 +128,6 @@ static int ctrl_msg_parser(struct nl_cache_ops *ops, struct genl_cmd *cmd,
}
err = pp->pp_cb((struct nl_object *) family, pp);
if (err < 0)
goto errout;
err = P_ACCEPT;
errout:
genl_family_put(family);
return err;

5
lib/netfilter/ct.c
View file

@ -364,11 +364,6 @@ static int ct_msg_parser(struct nl_cache_ops *ops, struct sockaddr_nl *who,
goto errout;
err = pp->pp_cb((struct nl_object *) ct, pp);
if (err < 0)
goto errout;
err = P_ACCEPT;
errout:
nfnl_ct_put(ct);
return err;

5
lib/netfilter/log_msg.c
View file

@ -176,11 +176,6 @@ static int log_msg_parser(struct nl_cache_ops *ops, struct sockaddr_nl *who,
goto errout;
err = pp->pp_cb((struct nl_object *) msg, pp);
if (err < 0)
goto errout;
err = P_ACCEPT;
errout:
nfnl_log_msg_put(msg);
return err;

5
lib/netfilter/queue_msg.c
View file

@ -154,11 +154,6 @@ static int queue_msg_parser(struct nl_cache_ops *ops, struct sockaddr_nl *who,
goto errout;
err = pp->pp_cb((struct nl_object *) msg, pp);
if (err < 0)
goto errout;
err = P_ACCEPT;
errout:
nfnl_queue_msg_put(msg);
return err;

5
lib/route/addr.c
View file

@ -282,11 +282,6 @@ static int addr_msg_parser(struct nl_cache_ops *ops, struct sockaddr_nl *who,
}
err = pp->pp_cb((struct nl_object *) addr, pp);
if (err < 0)
goto errout;
err = P_ACCEPT;
errout:
rtnl_addr_put(addr);

5
lib/route/class.c
View file

@ -53,11 +53,6 @@ static int class_msg_parser(struct nl_cache_ops *ops, struct sockaddr_nl *who,
}
err = pp->pp_cb((struct nl_object *) class, pp);
if (err < 0)
goto errout_free;
err = P_ACCEPT;
errout_free:
rtnl_class_put(class);
errout:

5
lib/route/classifier.c
View file

@ -64,11 +64,6 @@ static int cls_msg_parser(struct nl_cache_ops *ops, struct sockaddr_nl *who,
}
err = pp->pp_cb((struct nl_object *) cls, pp);
if (err < 0)
goto errout_free;
err = P_ACCEPT;
errout_free:
rtnl_cls_put(cls);
errout:

5
lib/route/link.c
View file

@ -417,11 +417,6 @@ static int link_msg_parser(struct nl_cache_ops *ops, struct sockaddr_nl *who,
}
err = pp->pp_cb((struct nl_object *) link, pp);
if (err < 0)
goto errout;
err = P_ACCEPT;
errout:
rtnl_link_put(link);
return err;

5
lib/route/neigh.c
View file

@ -317,11 +317,6 @@ static int neigh_msg_parser(struct nl_cache_ops *ops, struct sockaddr_nl *who,
}
err = pp->pp_cb((struct nl_object *) neigh, pp);
if (err < 0)
goto errout;
err = P_ACCEPT;
errout:
rtnl_neigh_put(neigh);
return err;

4
lib/route/neightbl.c
View file

@ -217,10 +217,6 @@ static int neightbl_msg_parser(struct nl_cache_ops *ops,
}
err = pp->pp_cb((struct nl_object *) ntbl, pp);
if (err < 0)
goto errout;
err = P_ACCEPT;
errout:
rtnl_neightbl_put(ntbl);
return err;

5
lib/route/qdisc.c
View file

@ -122,11 +122,6 @@ static int qdisc_msg_parser(struct nl_cache_ops *ops, struct sockaddr_nl *who,
}
err = pp->pp_cb((struct nl_object *) qdisc, pp);
if (err < 0)
goto errout_free;
err = P_ACCEPT;
errout_free:
rtnl_qdisc_put(qdisc);
errout:

6
lib/route/route.c
View file

@ -36,12 +36,8 @@ static int route_msg_parser(struct nl_cache_ops *ops, struct sockaddr_nl *who,
if ((err = rtnl_route_parse(nlh, &route)) < 0)
return err;
if ((err = pp->pp_cb((struct nl_object *) route, pp)) < 0)
goto errout;
err = pp->pp_cb((struct nl_object *) route, pp);
err = P_ACCEPT;
errout:
rtnl_route_put(route);
return err;
}

5
lib/route/rule.c
View file

@ -155,11 +155,6 @@ static int rule_msg_parser(struct nl_cache_ops *ops, struct sockaddr_nl *who,
}
err = pp->pp_cb((struct nl_object *) rule, pp);
if (err < 0)
goto errout;
err = P_ACCEPT;
errout:
rtnl_rule_put(rule);
return err;