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

ss: Use rtnl_dump_filter for inet_show_netlink 

Just another refactoring for ss to use rtnl API from lib

Signed-off-by: Vadim Kochan <vadim4j@gmail.com>
This commit is contained in:
Vadim Kochan 2014-12-26 04:26:27 +02:00 committed by Stephen Hemminger
parent 417b2180a5
commit 486ccd99a0
3 changed files with 50 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/libnetlink.h
View File

@ -19,6 +19,7 @@ struct rtnl_handle
__u32 seq; __u32 seq;
__u32 dump; __u32 dump;
int proto; int proto;
FILE *dump_fp;
}; };
extern int rcvbuf; extern int rcvbuf;

17
lib/libnetlink.c
View File

@ -220,12 +220,15 @@ int rtnl_dump_filter_l(struct rtnl_handle *rth,
return -1; return -1;
} }
if (rth->dump_fp)
fwrite(buf, 1, NLMSG_ALIGN(status), rth->dump_fp);
for (a = arg; a->filter; a++) { for (a = arg; a->filter; a++) {
struct nlmsghdr *h = (struct nlmsghdr*)buf; struct nlmsghdr *h = (struct nlmsghdr*)buf;
msglen = status; msglen = status;
while (NLMSG_OK(h, msglen)) { while (NLMSG_OK(h, msglen)) {
int err; int err = 0;
if (nladdr.nl_pid != 0 || if (nladdr.nl_pid != 0 ||
h->nlmsg_pid != rth->local.nl_pid || h->nlmsg_pid != rth->local.nl_pid ||
@ -247,16 +250,20 @@ int rtnl_dump_filter_l(struct rtnl_handle *rth,
} else { } else {
errno = -err->error; errno = -err->error;
if (rth->proto == NETLINK_SOCK_DIAG && if (rth->proto == NETLINK_SOCK_DIAG &&
errno == ENOENT) (errno == ENOENT ||
errno == EOPNOTSUPP))
return -1; return -1;
perror("RTNETLINK answers"); perror("RTNETLINK answers");
} }
return -1; return -1;
} }
err = a->filter(&nladdr, h, a->arg1);
if (err < 0) if (!rth->dump_fp) {
return err; err = a->filter(&nladdr, h, a->arg1);
if (err < 0)
return err;
}
skip_it: skip_it:
h = NLMSG_NEXT(h, msglen); h = NLMSG_NEXT(h, msglen);

139
misc/ss.c
View File

@ -1871,122 +1871,57 @@ static int sockdiag_send(int family, int fd, int protocol, struct filter *f)
return 0; return 0;
} }
struct inet_diag_arg {
struct filter *f;
int protocol;
};
static int show_one_inet_sock(const struct sockaddr_nl *addr,
struct nlmsghdr *h, void *arg)
{
int err;
struct inet_diag_arg *diag_arg = arg;
struct inet_diag_msg *r = NLMSG_DATA(h);
if (!(diag_arg->f->families & (1 << r->idiag_family)))
return 0;
if ((err = inet_show_sock(h, NULL, diag_arg->protocol)) < 0)
return err;
return 0;
}
static int inet_show_netlink(struct filter *f, FILE *dump_fp, int protocol) static int inet_show_netlink(struct filter *f, FILE *dump_fp, int protocol)
{ {
int fd, family; int err = 0;
struct sockaddr_nl nladdr; struct rtnl_handle rth;
struct msghdr msg; int family = PF_INET;
char buf[16384]; struct inet_diag_arg arg = { .f = f, .protocol = protocol };
struct iovec iov[3];
if ((fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_INET_DIAG)) < 0) if (rtnl_open_byproto(&rth, 0, NETLINK_SOCK_DIAG))
return -1; return -1;
rth.dump = MAGIC_SEQ;
rth.dump_fp = dump_fp;
family = PF_INET;
again: again:
if (sockdiag_send(family, fd, protocol, f)) if ((err = sockdiag_send(family, rth.fd, protocol, f)))
return -1; goto Exit;
memset(&nladdr, 0, sizeof(nladdr)); if ((err = rtnl_dump_filter(&rth, show_one_inet_sock, &arg))) {
nladdr.nl_family = AF_NETLINK; if (family != PF_UNSPEC) {
family = PF_UNSPEC;
iov[0] = (struct iovec){ goto again;
.iov_base = buf,
.iov_len = sizeof(buf)
};
while (1) {
int status;
struct nlmsghdr *h;
msg = (struct msghdr) {
(void*)&nladdr, sizeof(nladdr),
iov, 1,
NULL, 0,
0
};
status = recvmsg(fd, &msg, 0);
if (status < 0) {
if (errno == EINTR)
continue;
perror("OVERRUN");
continue;
}
if (status == 0) {
fprintf(stderr, "EOF on netlink\n");
close(fd);
return 0;
}
if (dump_fp)
fwrite(buf, 1, NLMSG_ALIGN(status), dump_fp);
h = (struct nlmsghdr*)buf;
while (NLMSG_OK(h, status)) {
int err;
struct inet_diag_msg *r = NLMSG_DATA(h);
if (/*h->nlmsg_pid != rth->local.nl_pid ||*/
h->nlmsg_seq != MAGIC_SEQ)
goto skip_it;
if (h->nlmsg_type == NLMSG_DONE)
goto done;
if (h->nlmsg_type == NLMSG_ERROR) {
struct nlmsgerr *err = (struct nlmsgerr*)NLMSG_DATA(h);
if (h->nlmsg_len < NLMSG_LENGTH(sizeof(struct nlmsgerr))) {
fprintf(stderr, "ERROR truncated\n");
} else {
if (family != PF_UNSPEC) {
family = PF_UNSPEC;
goto again;
}
errno = -err->error;
if (errno == EOPNOTSUPP) {
close(fd);
return -1;
}
perror("TCPDIAG answers");
}
goto done;
}
if (!dump_fp) {
if (!(f->families & (1<<r->idiag_family))) {
h = NLMSG_NEXT(h, status);
continue;
}
err = inet_show_sock(h, NULL, protocol);
if (err < 0) {
close(fd);
return err;
}
}
skip_it:
h = NLMSG_NEXT(h, status);
}
if (msg.msg_flags & MSG_TRUNC) {
fprintf(stderr, "Message truncated\n");
continue;
}
if (status) {
fprintf(stderr, "!!!Remnant of size %d\n", status);
exit(1);
} }
goto Exit;
} }
done:
if (family == PF_INET) { if (family == PF_INET) {
family = PF_INET6; family = PF_INET6;
goto again; goto again;
} }
close(fd); Exit:
return 0; rtnl_close(&rth);
return err;
} }
static int tcp_show_netlink_file(struct filter *f) static int tcp_show_netlink_file(struct filter *f)