matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ss: Refactor to use macro for define diag nl request 

Signed-off-by: Vadim Kochan <vadim4j@gmail.com>
This commit is contained in:
vadimk 2014-10-30 18:49:25 +02:00 committed by Stephen Hemminger
parent 1b94414854
commit 5fb421d434
1 changed files with 17 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
misc/ss.c
View File

@ -41,6 +41,19 @@
#include <linux/packet_diag.h> #include <linux/packet_diag.h>
#include <linux/netlink_diag.h> #include <linux/netlink_diag.h>
#define DIAG_REQUEST(_req, _r) \
struct { \
struct nlmsghdr nlh; \
_r; \
} _req = { \
.nlh = { \
.nlmsg_type = SOCK_DIAG_BY_FAMILY, \
.nlmsg_flags = NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST,\
.nlmsg_seq = 123456, \
.nlmsg_len = sizeof(_req), \
}, \
}
#if HAVE_SELINUX #if HAVE_SELINUX
#include <selinux/selinux.h> #include <selinux/selinux.h>
#else #else
@ -1810,10 +1823,7 @@ static int tcpdiag_send(int fd, int protocol, struct filter *f)
static int sockdiag_send(int family, int fd, int protocol, struct filter *f) static int sockdiag_send(int family, int fd, int protocol, struct filter *f)
{ {
struct sockaddr_nl nladdr; struct sockaddr_nl nladdr;
struct { DIAG_REQUEST(req, struct inet_diag_req_v2 r);
struct nlmsghdr nlh;
struct inet_diag_req_v2 r;
} req;
char *bc = NULL; char *bc = NULL;
int bclen; int bclen;
struct msghdr msg; struct msghdr msg;
@ -1826,11 +1836,6 @@ static int sockdiag_send(int family, int fd, int protocol, struct filter *f)
memset(&nladdr, 0, sizeof(nladdr)); memset(&nladdr, 0, sizeof(nladdr));
nladdr.nl_family = AF_NETLINK; nladdr.nl_family = AF_NETLINK;
req.nlh.nlmsg_len = sizeof(req);
req.nlh.nlmsg_type = SOCK_DIAG_BY_FAMILY;
req.nlh.nlmsg_flags = NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST;
req.nlh.nlmsg_pid = 0;
req.nlh.nlmsg_seq = 123456;
memset(&req.r, 0, sizeof(req.r)); memset(&req.r, 0, sizeof(req.r));
req.r.sdiag_family = family; req.r.sdiag_family = family;
req.r.sdiag_protocol = protocol; req.r.sdiag_protocol = protocol;
@ -2592,16 +2597,7 @@ close_it:
static int unix_show_netlink(struct filter *f, FILE *dump_fp) static int unix_show_netlink(struct filter *f, FILE *dump_fp)
{ {
struct { DIAG_REQUEST(req, struct unix_diag_req r);
struct nlmsghdr nlh;
struct unix_diag_req r;
} req;
memset(&req, 0, sizeof(req));
req.nlh.nlmsg_len = sizeof(req);
req.nlh.nlmsg_type = SOCK_DIAG_BY_FAMILY;
req.nlh.nlmsg_flags = NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST;
req.nlh.nlmsg_seq = 123456;
req.r.sdiag_family = AF_UNIX; req.r.sdiag_family = AF_UNIX;
req.r.udiag_states = f->states; req.r.udiag_states = f->states;
@ -2793,21 +2789,12 @@ static int packet_show_sock(struct nlmsghdr *nlh, struct filter *f)
static int packet_show_netlink(struct filter *f, FILE *dump_fp) static int packet_show_netlink(struct filter *f, FILE *dump_fp)
{ {
int fd; int fd;
struct { DIAG_REQUEST(req, struct packet_diag_req r);
struct nlmsghdr nlh;
struct packet_diag_req r;
} req;
char buf[16384]; char buf[16384];
if ((fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_INET_DIAG)) < 0) if ((fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_INET_DIAG)) < 0)
return -1; return -1;
memset(&req, 0, sizeof(req));
req.nlh.nlmsg_len = sizeof(req);
req.nlh.nlmsg_type = SOCK_DIAG_BY_FAMILY;
req.nlh.nlmsg_flags = NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST;
req.nlh.nlmsg_seq = 123456;
req.r.sdiag_family = AF_PACKET; req.r.sdiag_family = AF_PACKET;
req.r.pdiag_show = PACKET_SHOW_INFO | PACKET_SHOW_MEMINFO | PACKET_SHOW_FILTER; req.r.pdiag_show = PACKET_SHOW_INFO | PACKET_SHOW_MEMINFO | PACKET_SHOW_FILTER;
@ -3104,16 +3091,7 @@ static int netlink_show_sock(struct nlmsghdr *nlh, struct filter *f)
static int netlink_show_netlink(struct filter *f, FILE *dump_fp) static int netlink_show_netlink(struct filter *f, FILE *dump_fp)
{ {
struct { DIAG_REQUEST(req, struct netlink_diag_req r);
struct nlmsghdr nlh;
struct netlink_diag_req r;
} req;
memset(&req, 0, sizeof(req));
req.nlh.nlmsg_len = sizeof(req);
req.nlh.nlmsg_type = SOCK_DIAG_BY_FAMILY;
req.nlh.nlmsg_flags = NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST;
req.nlh.nlmsg_seq = 123456;
req.r.sdiag_family = AF_NETLINK; req.r.sdiag_family = AF_NETLINK;
req.r.sdiag_protocol = NDIAG_PROTO_ALL; req.r.sdiag_protocol = NDIAG_PROTO_ALL;