Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 17447
b: refs/heads/master
c: 4e852c0
h: refs/heads/master
i:
  17445: 7e8342f
  17443: a6ca660
  17439: 47b7d68
v: v3
  • Loading branch information
Arnaldo Carvalho de Melo authored and David S. Miller committed Jan 9, 2006
1 parent db22310 commit ab0fa58
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 30 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7dbf0755249336f44f57368bdbf6f84103b3ba75
refs/heads/master: 4e852c027989c9fd5c51fb0080e28590c35c75ba
57 changes: 28 additions & 29 deletions trunk/net/ipv4/inet_diag.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ static struct sock *idiagnl;
RTA_DATA(__RTA_PUT(skb, attrtype, attrlen))

static int inet_diag_fill(struct sk_buff *skb, struct sock *sk,
int ext, u32 pid, u32 seq, u16 nlmsg_flags,
const struct nlmsghdr *unlh)
int ext, u32 pid, u32 seq, u16 nlmsg_flags,
const struct nlmsghdr *unlh)
{
const struct inet_sock *inet = inet_sk(sk);
const struct inet_connection_sock *icsk = inet_csk(sk);
Expand All @@ -77,7 +77,7 @@ static int inet_diag_fill(struct sk_buff *skb, struct sock *sk,
if (ext & (1 << (INET_DIAG_INFO - 1)))
info = INET_DIAG_PUT(skb, INET_DIAG_INFO,
handler->idiag_info_size);

if ((ext & (1 << (INET_DIAG_CONG - 1))) && icsk->icsk_ca_ops) {
size_t len = strlen(icsk->icsk_ca_ops->name);
strcpy(INET_DIAG_PUT(skb, INET_DIAG_CONG, len + 1),
Expand Down Expand Up @@ -185,7 +185,8 @@ static int inet_diag_fill(struct sk_buff *skb, struct sock *sk,
return -1;
}

static int inet_diag_get_exact(struct sk_buff *in_skb, const struct nlmsghdr *nlh)
static int inet_diag_get_exact(struct sk_buff *in_skb,
const struct nlmsghdr *nlh)
{
int err;
struct sock *sk;
Expand Down Expand Up @@ -283,7 +284,7 @@ static int bitstring_match(const u32 *a1, const u32 *a2, int bits)


static int inet_diag_bc_run(const void *bc, int len,
const struct inet_diag_entry *entry)
const struct inet_diag_entry *entry)
{
while (len > 0) {
int yes = 1;
Expand Down Expand Up @@ -322,7 +323,7 @@ static int inet_diag_bc_run(const void *bc, int len,
yes = 0;
break;
}

if (cond->prefix_len == 0)
break;

Expand All @@ -331,7 +332,8 @@ static int inet_diag_bc_run(const void *bc, int len,
else
addr = entry->daddr;

if (bitstring_match(addr, cond->addr, cond->prefix_len))
if (bitstring_match(addr, cond->addr,
cond->prefix_len))
break;
if (entry->family == AF_INET6 &&
cond->family == AF_INET) {
Expand All @@ -346,7 +348,7 @@ static int inet_diag_bc_run(const void *bc, int len,
}
}

if (yes) {
if (yes) {
len -= op->yes;
bc += op->yes;
} else {
Expand Down Expand Up @@ -407,14 +409,14 @@ static int inet_diag_bc_audit(const void *bytecode, int bytecode_len)
default:
return -EINVAL;
}
bc += op->yes;
bc += op->yes;
len -= op->yes;
}
return len == 0 ? 0 : -EINVAL;
}

static int inet_diag_dump_sock(struct sk_buff *skb, struct sock *sk,
struct netlink_callback *cb)
struct netlink_callback *cb)
{
struct inet_diag_req *r = NLMSG_DATA(cb->nlh);

Expand Down Expand Up @@ -445,13 +447,12 @@ static int inet_diag_dump_sock(struct sk_buff *skb, struct sock *sk,
}

return inet_diag_fill(skb, sk, r->idiag_ext, NETLINK_CB(cb->skb).pid,
cb->nlh->nlmsg_seq, NLM_F_MULTI, cb->nlh);
cb->nlh->nlmsg_seq, NLM_F_MULTI, cb->nlh);
}

static int inet_diag_fill_req(struct sk_buff *skb, struct sock *sk,
struct request_sock *req,
u32 pid, u32 seq,
const struct nlmsghdr *unlh)
struct request_sock *req, u32 pid, u32 seq,
const struct nlmsghdr *unlh)
{
const struct inet_request_sock *ireq = inet_rsk(req);
struct inet_sock *inet = inet_sk(sk);
Expand Down Expand Up @@ -504,7 +505,7 @@ static int inet_diag_fill_req(struct sk_buff *skb, struct sock *sk,
}

static int inet_diag_dump_reqs(struct sk_buff *skb, struct sock *sk,
struct netlink_callback *cb)
struct netlink_callback *cb)
{
struct inet_diag_entry entry;
struct inet_diag_req *r = NLMSG_DATA(cb->nlh);
Expand Down Expand Up @@ -556,7 +557,7 @@ static int inet_diag_dump_reqs(struct sk_buff *skb, struct sock *sk,
inet6_rsk(req)->loc_addr.s6_addr32 :
#endif
&ireq->loc_addr;
entry.daddr =
entry.daddr =
#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
(entry.family == AF_INET6) ?
inet6_rsk(req)->rmt_addr.s6_addr32 :
Expand Down Expand Up @@ -599,7 +600,7 @@ static int inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)
handler = inet_diag_table[cb->nlh->nlmsg_type];
BUG_ON(handler == NULL);
hashinfo = handler->idiag_hashinfo;

s_i = cb->args[1];
s_num = num = cb->args[2];

Expand Down Expand Up @@ -672,7 +673,6 @@ static int inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)
s_num = 0;

read_lock_bh(&head->lock);

num = 0;
sk_for_each(sk, node, &head->chain) {
struct inet_sock *inet = inet_sk(sk);
Expand All @@ -684,7 +684,8 @@ static int inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)
if (r->id.idiag_sport != inet->sport &&
r->id.idiag_sport)
goto next_normal;
if (r->id.idiag_dport != inet->dport && r->id.idiag_dport)
if (r->id.idiag_dport != inet->dport &&
r->id.idiag_dport)
goto next_normal;
if (inet_diag_dump_sock(skb, sk, cb) < 0) {
read_unlock_bh(&head->lock);
Expand Down Expand Up @@ -724,8 +725,7 @@ static int inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)
return skb->len;
}

static __inline__ int
inet_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
static inline int inet_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
{
if (!(nlh->nlmsg_flags&NLM_F_REQUEST))
return 0;
Expand Down Expand Up @@ -755,9 +755,8 @@ inet_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
}
return netlink_dump_start(idiagnl, skb, nlh,
inet_diag_dump, NULL);
} else {
} else
return inet_diag_get_exact(skb, nlh);
}

err_inval:
return -EINVAL;
Expand All @@ -766,15 +765,15 @@ inet_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)

static inline void inet_diag_rcv_skb(struct sk_buff *skb)
{
int err;
struct nlmsghdr * nlh;

if (skb->len >= NLMSG_SPACE(0)) {
nlh = (struct nlmsghdr *)skb->data;
if (nlh->nlmsg_len < sizeof(*nlh) || skb->len < nlh->nlmsg_len)
int err;
struct nlmsghdr *nlh = (struct nlmsghdr *)skb->data;

if (nlh->nlmsg_len < sizeof(*nlh) ||
skb->len < nlh->nlmsg_len)
return;
err = inet_diag_rcv_msg(skb, nlh);
if (err || nlh->nlmsg_flags & NLM_F_ACK)
if (err || nlh->nlmsg_flags & NLM_F_ACK)
netlink_ack(skb, nlh, err);
}
}
Expand Down

0 comments on commit ab0fa58

Please sign in to comment.