inet_diag: Generalize inet_diag dump and get_exact calls
Introduce two callbacks in inet_diag_handler -- one for dumping all sockets (with filters) and the other one for dumping a single sk. Replace direct calls to icsk handlers with indirect calls to callbacks provided by handlers. Make existing TCP and DCCP handlers use provided helpers for icsk-s. The UDP diag module will provide its own. Signed-off-by: Pavel Emelyanov <xemul@parallels.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
3c4d05c805
commit
1942c518ca
|
@ -138,9 +138,18 @@ struct inet_hashinfo;
|
||||||
struct nlattr;
|
struct nlattr;
|
||||||
struct nlmsghdr;
|
struct nlmsghdr;
|
||||||
struct sk_buff;
|
struct sk_buff;
|
||||||
|
struct netlink_callback;
|
||||||
|
|
||||||
struct inet_diag_handler {
|
struct inet_diag_handler {
|
||||||
struct inet_hashinfo *idiag_hashinfo;
|
void (*dump)(struct sk_buff *skb,
|
||||||
|
struct netlink_callback *cb,
|
||||||
|
struct inet_diag_req *r,
|
||||||
|
struct nlattr *bc);
|
||||||
|
|
||||||
|
int (*dump_one)(struct sk_buff *in_skb,
|
||||||
|
const struct nlmsghdr *nlh,
|
||||||
|
struct inet_diag_req *req);
|
||||||
|
|
||||||
void (*idiag_get_info)(struct sock *sk,
|
void (*idiag_get_info)(struct sock *sk,
|
||||||
struct inet_diag_msg *r,
|
struct inet_diag_msg *r,
|
||||||
void *info);
|
void *info);
|
||||||
|
@ -152,6 +161,13 @@ int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk,
|
||||||
struct sk_buff *skb, struct inet_diag_req *req,
|
struct sk_buff *skb, struct inet_diag_req *req,
|
||||||
u32 pid, u32 seq, u16 nlmsg_flags,
|
u32 pid, u32 seq, u16 nlmsg_flags,
|
||||||
const struct nlmsghdr *unlh);
|
const struct nlmsghdr *unlh);
|
||||||
|
void inet_diag_dump_icsk(struct inet_hashinfo *h, struct sk_buff *skb,
|
||||||
|
struct netlink_callback *cb, struct inet_diag_req *r,
|
||||||
|
struct nlattr *bc);
|
||||||
|
int inet_diag_dump_one_icsk(struct inet_hashinfo *hashinfo,
|
||||||
|
struct sk_buff *in_skb, const struct nlmsghdr *nlh,
|
||||||
|
struct inet_diag_req *req);
|
||||||
|
|
||||||
int inet_diag_bc_sk(const struct nlattr *_bc, struct sock *sk);
|
int inet_diag_bc_sk(const struct nlattr *_bc, struct sock *sk);
|
||||||
int inet_diag_check_cookie(struct sock *sk, struct inet_diag_req *req);
|
int inet_diag_check_cookie(struct sock *sk, struct inet_diag_req *req);
|
||||||
|
|
||||||
|
|
|
@ -48,8 +48,21 @@ static void dccp_diag_get_info(struct sock *sk, struct inet_diag_msg *r,
|
||||||
dccp_get_info(sk, _info);
|
dccp_get_info(sk, _info);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void dccp_diag_dump(struct sk_buff *skb, struct netlink_callback *cb,
|
||||||
|
struct inet_diag_req *r, struct nlattr *bc)
|
||||||
|
{
|
||||||
|
inet_diag_dump_icsk(&dccp_hashinfo, skb, cb, r, bc);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int dccp_diag_dump_one(struct sk_buff *in_skb, const struct nlmsghdr *nlh,
|
||||||
|
struct inet_diag_req *req)
|
||||||
|
{
|
||||||
|
return inet_diag_dump_one_icsk(&dccp_hashinfo, in_skb, nlh, req);
|
||||||
|
}
|
||||||
|
|
||||||
static const struct inet_diag_handler dccp_diag_handler = {
|
static const struct inet_diag_handler dccp_diag_handler = {
|
||||||
.idiag_hashinfo = &dccp_hashinfo,
|
.dump = dccp_diag_dump,
|
||||||
|
.dump_one = dccp_diag_dump_one,
|
||||||
.idiag_get_info = dccp_diag_get_info,
|
.idiag_get_info = dccp_diag_get_info,
|
||||||
.idiag_type = IPPROTO_DCCP,
|
.idiag_type = IPPROTO_DCCP,
|
||||||
};
|
};
|
||||||
|
|
|
@ -273,7 +273,7 @@ int inet_diag_check_cookie(struct sock *sk, struct inet_diag_req *req)
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(inet_diag_check_cookie);
|
EXPORT_SYMBOL_GPL(inet_diag_check_cookie);
|
||||||
|
|
||||||
static int inet_diag_dump_one_icsk(struct inet_hashinfo *hashinfo, struct sk_buff *in_skb,
|
int inet_diag_dump_one_icsk(struct inet_hashinfo *hashinfo, struct sk_buff *in_skb,
|
||||||
const struct nlmsghdr *nlh, struct inet_diag_req *req)
|
const struct nlmsghdr *nlh, struct inet_diag_req *req)
|
||||||
{
|
{
|
||||||
int err;
|
int err;
|
||||||
|
@ -339,6 +339,7 @@ out:
|
||||||
out_nosk:
|
out_nosk:
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
EXPORT_SYMBOL_GPL(inet_diag_dump_one_icsk);
|
||||||
|
|
||||||
static int inet_diag_get_exact(struct sk_buff *in_skb,
|
static int inet_diag_get_exact(struct sk_buff *in_skb,
|
||||||
const struct nlmsghdr *nlh,
|
const struct nlmsghdr *nlh,
|
||||||
|
@ -351,8 +352,7 @@ static int inet_diag_get_exact(struct sk_buff *in_skb,
|
||||||
if (IS_ERR(handler))
|
if (IS_ERR(handler))
|
||||||
err = PTR_ERR(handler);
|
err = PTR_ERR(handler);
|
||||||
else
|
else
|
||||||
err = inet_diag_dump_one_icsk(handler->idiag_hashinfo,
|
err = handler->dump_one(in_skb, nlh, req);
|
||||||
in_skb, nlh, req);
|
|
||||||
inet_diag_unlock_handler(handler);
|
inet_diag_unlock_handler(handler);
|
||||||
|
|
||||||
return err;
|
return err;
|
||||||
|
@ -731,7 +731,7 @@ out:
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void inet_diag_dump_icsk(struct inet_hashinfo *hashinfo, struct sk_buff *skb,
|
void inet_diag_dump_icsk(struct inet_hashinfo *hashinfo, struct sk_buff *skb,
|
||||||
struct netlink_callback *cb, struct inet_diag_req *r, struct nlattr *bc)
|
struct netlink_callback *cb, struct inet_diag_req *r, struct nlattr *bc)
|
||||||
{
|
{
|
||||||
int i, num;
|
int i, num;
|
||||||
|
@ -880,6 +880,7 @@ done:
|
||||||
out:
|
out:
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
EXPORT_SYMBOL_GPL(inet_diag_dump_icsk);
|
||||||
|
|
||||||
static int __inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb,
|
static int __inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb,
|
||||||
struct inet_diag_req *r, struct nlattr *bc)
|
struct inet_diag_req *r, struct nlattr *bc)
|
||||||
|
@ -888,7 +889,7 @@ static int __inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb,
|
||||||
|
|
||||||
handler = inet_diag_lock_handler(r->sdiag_protocol);
|
handler = inet_diag_lock_handler(r->sdiag_protocol);
|
||||||
if (!IS_ERR(handler))
|
if (!IS_ERR(handler))
|
||||||
inet_diag_dump_icsk(handler->idiag_hashinfo, skb, cb, r, bc);
|
handler->dump(skb, cb, r, bc);
|
||||||
inet_diag_unlock_handler(handler);
|
inet_diag_unlock_handler(handler);
|
||||||
|
|
||||||
return skb->len;
|
return skb->len;
|
||||||
|
|
|
@ -34,8 +34,21 @@ static void tcp_diag_get_info(struct sock *sk, struct inet_diag_msg *r,
|
||||||
tcp_get_info(sk, info);
|
tcp_get_info(sk, info);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void tcp_diag_dump(struct sk_buff *skb, struct netlink_callback *cb,
|
||||||
|
struct inet_diag_req *r, struct nlattr *bc)
|
||||||
|
{
|
||||||
|
inet_diag_dump_icsk(&tcp_hashinfo, skb, cb, r, bc);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int tcp_diag_dump_one(struct sk_buff *in_skb, const struct nlmsghdr *nlh,
|
||||||
|
struct inet_diag_req *req)
|
||||||
|
{
|
||||||
|
return inet_diag_dump_one_icsk(&tcp_hashinfo, in_skb, nlh, req);
|
||||||
|
}
|
||||||
|
|
||||||
static const struct inet_diag_handler tcp_diag_handler = {
|
static const struct inet_diag_handler tcp_diag_handler = {
|
||||||
.idiag_hashinfo = &tcp_hashinfo,
|
.dump = tcp_diag_dump,
|
||||||
|
.dump_one = tcp_diag_dump_one,
|
||||||
.idiag_get_info = tcp_diag_get_info,
|
.idiag_get_info = tcp_diag_get_info,
|
||||||
.idiag_type = IPPROTO_TCP,
|
.idiag_type = IPPROTO_TCP,
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue