forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

unix_diag: Add the MEMINFO extension

Browse source 
[ Fix indentation of sock_diag*() calls. -DaveM ]

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pavel Emelyanov 2011-12-30 09:27:43 +00:00 • committed by David S. Miller
parent c0636faa53
commit 257b529876
2 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/linux/unix_diag.h
View file

@ -18,6 +18,7 @@ struct unix_diag_req {
#define UDIAG_SHOW_PEER 0x00000004 /* show peer socket info */ #define UDIAG_SHOW_PEER 0x00000004 /* show peer socket info */
#define UDIAG_SHOW_ICONS 0x00000008 /* show pending connections */ #define UDIAG_SHOW_ICONS 0x00000008 /* show pending connections */
#define UDIAG_SHOW_RQLEN 0x00000010 /* show skb receive queue len */ #define UDIAG_SHOW_RQLEN 0x00000010 /* show skb receive queue len */
#define UDIAG_SHOW_MEMINFO 0x00000020 /* show memory info of a socket */
struct unix_diag_msg { struct unix_diag_msg {
__u8 udiag_family; __u8 udiag_family;
@ -35,6 +36,7 @@ enum {
UNIX_DIAG_PEER, UNIX_DIAG_PEER,
UNIX_DIAG_ICONS, UNIX_DIAG_ICONS,
UNIX_DIAG_RQLEN, UNIX_DIAG_RQLEN,
UNIX_DIAG_MEMINFO,
UNIX_DIAG_MAX, UNIX_DIAG_MAX,
}; };

4
net/unix/diag.c
View file

@ -146,6 +146,10 @@ static int sk_diag_fill(struct sock *sk, struct sk_buff *skb, struct unix_diag_r
sk_diag_show_rqlen(sk, skb)) sk_diag_show_rqlen(sk, skb))
goto nlmsg_failure; goto nlmsg_failure;
if ((req->udiag_show & UDIAG_SHOW_MEMINFO) &&
sock_diag_put_meminfo(sk, skb, UNIX_DIAG_MEMINFO))
goto nlmsg_failure;
nlh->nlmsg_len = skb_tail_pointer(skb) - b; nlh->nlmsg_len = skb_tail_pointer(skb) - b;
return skb->len; return skb->len;