* [ss PATCH 1/2] libnetlink: ignore some errors from SOCK_DIAG_BY_FAMILY
2015-11-18 1:52 Support SOCK_DESTROY in ss Lorenzo Colitti
@ 2015-11-18 1:52 ` Lorenzo Colitti
2015-11-18 1:52 ` [ss PATCH 2/2] ss: support closing inet sockets via SOCK_DIAG Lorenzo Colitti
2015-11-18 3:28 ` Support SOCK_DESTROY in ss Stephen Hemminger
2 siblings, 0 replies; 5+ messages in thread
From: Lorenzo Colitti @ 2015-11-18 1:52 UTC (permalink / raw)
To: netdev; +Cc: edumazet, ek, maze, dtor, Lorenzo Colitti
rtnl_dump ignors ENOENT or EOPNOTSUPP when attempting
SOCK_DIAG_BY_FAMILY dumps. Do the same in rtnl_talk.
Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
---
include/libnetlink.h | 3 +++
lib/libnetlink.c | 5 +++++
2 files changed, 8 insertions(+)
diff --git a/include/libnetlink.h b/include/libnetlink.h
index 2280c39..9855fd5 100644
--- a/include/libnetlink.h
+++ b/include/libnetlink.h
@@ -65,6 +65,9 @@ struct rtnl_dump_filter_arg
int rtnl_dump_filter_l(struct rtnl_handle *rth,
const struct rtnl_dump_filter_arg *arg);
int rtnl_dump_filter(struct rtnl_handle *rth, rtnl_filter_t filter, void *arg);
+int rtnl_talk_l(struct rtnl_handle *rtnl, struct nlmsghdr *n,
+ struct nlmsghdr *answer, size_t len, int expect_success)
+ __attribute__((warn_unused_result));
int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n,
struct nlmsghdr *answer, size_t len)
__attribute__((warn_unused_result));
diff --git a/lib/libnetlink.c b/lib/libnetlink.c
index 09b0e91..7e768a6 100644
--- a/lib/libnetlink.c
+++ b/lib/libnetlink.c
@@ -417,6 +417,11 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n,
return 0;
}
+ if (rtnl->proto == NETLINK_SOCK_DIAG &&
+ (errno == ENOENT ||
+ errno == EOPNOTSUPP))
+ return -1;
+
fprintf(stderr, "RTNETLINK answers: %s\n",
strerror(-err->error));
errno = -err->error;
--
2.6.0.rc2.230.g3dd15c0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [ss PATCH 2/2] ss: support closing inet sockets via SOCK_DIAG.
2015-11-18 1:52 Support SOCK_DESTROY in ss Lorenzo Colitti
2015-11-18 1:52 ` [ss PATCH 1/2] libnetlink: ignore some errors from SOCK_DIAG_BY_FAMILY Lorenzo Colitti
@ 2015-11-18 1:52 ` Lorenzo Colitti
2015-11-18 3:12 ` Eric Dumazet
2015-11-18 3:28 ` Support SOCK_DESTROY in ss Stephen Hemminger
2 siblings, 1 reply; 5+ messages in thread
From: Lorenzo Colitti @ 2015-11-18 1:52 UTC (permalink / raw)
To: netdev; +Cc: edumazet, ek, maze, dtor, Lorenzo Colitti
Invoking ss with -K or --kill attempts to forcibly close matching
inet sockets using SOCK_DESTROY.
This is implemented by adding a new "struct action" to struct
filter. If necessary, this can be extended later on to support
further actions on sockets.
Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
---
include/linux/sock_diag.h | 1 +
misc/ss.c | 38 ++++++++++++++++++++++++++++++++++++--
2 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
index 024e1f4..dafcb89 100644
--- a/include/linux/sock_diag.h
+++ b/include/linux/sock_diag.h
@@ -4,6 +4,7 @@
#include <linux/types.h>
#define SOCK_DIAG_BY_FAMILY 20
+#define SOCK_DESTROY 21
struct sock_diag_req {
__u8 sdiag_family;
diff --git a/misc/ss.c b/misc/ss.c
index a9ae85e..d62f741 100644
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -154,12 +154,18 @@ enum {
#include "ssfilter.h"
+struct action
+{
+ int kill;
+};
+
struct filter
{
int dbs;
int states;
int families;
struct ssfilter *f;
+ struct action action;
};
static const struct filter default_dbs[MAX_DB] = {
@@ -2197,6 +2203,27 @@ struct inet_diag_arg {
int protocol;
};
+static int kill_inet_sock(const struct sockaddr_nl *addr,
+ struct nlmsghdr *h, void *arg)
+{
+ struct rtnl_handle rth;
+ if (rtnl_open_byproto(&rth, 0, NETLINK_SOCK_DIAG))
+ return -1;
+
+ struct inet_diag_arg *diag_arg = arg;
+ struct inet_diag_msg *d = NLMSG_DATA(h);
+ DIAG_REQUEST(req, struct inet_diag_req_v2 r);
+ req.nlh.nlmsg_type = SOCK_DESTROY;
+ req.nlh.nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK;
+ req.r.sdiag_family = d->idiag_family;
+ req.r.sdiag_protocol = diag_arg->protocol;
+ req.r.id = d->id;
+
+ int err = rtnl_talk(&rth, &req.nlh, NULL, 0);
+ rtnl_close(&rth);
+ return err;
+}
+
static int show_one_inet_sock(const struct sockaddr_nl *addr,
struct nlmsghdr *h, void *arg)
{
@@ -2208,7 +2235,8 @@ static int show_one_inet_sock(const struct sockaddr_nl *addr,
return 0;
if ((err = inet_show_sock(h, diag_arg->f, diag_arg->protocol)) < 0)
return err;
-
+ if (diag_arg->f->action.kill && (err = kill_inet_sock(addr, h, arg)))
+ return err;
return 0;
}
@@ -3484,6 +3512,8 @@ static void _usage(FILE *dest)
" -x, --unix display only Unix domain sockets\n"
" -f, --family=FAMILY display sockets of type FAMILY\n"
"\n"
+" -K, --kill forcibly close sockets instead of displaying them\n"
+"\n"
" -A, --query=QUERY, --socket=QUERY\n"
" QUERY := {all|inet|tcp|udp|raw|unix|unix_dgram|unix_stream|unix_seqpacket|packet|netlink}[,QUERY]\n"
"\n"
@@ -3574,6 +3604,7 @@ static const struct option long_opts[] = {
{ "context", 0, 0, 'Z' },
{ "contexts", 0, 0, 'z' },
{ "net", 1, 0, 'N' },
+ { "kill", 0, 0, 'K' },
{ 0 }
};
@@ -3588,7 +3619,7 @@ int main(int argc, char *argv[])
int ch;
int state_filter = 0;
- while ((ch = getopt_long(argc, argv, "dhaletuwxnro460spbEf:miA:D:F:vVzZN:",
+ while ((ch = getopt_long(argc, argv, "dhaletuwxnro460spbEf:miA:D:F:vVzZN:K",
long_opts, NULL)) != EOF) {
switch(ch) {
case 'n':
@@ -3769,6 +3800,9 @@ int main(int argc, char *argv[])
if (netns_switch(optarg))
exit(1);
break;
+ case 'K':
+ current_filter.action.kill = 1;
+ break;
case 'h':
help();
case '?':
--
2.6.0.rc2.230.g3dd15c0
^ permalink raw reply related [flat|nested] 5+ messages in thread