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

ss: should support CONFIG_INET_UDP_DIAG=n kernels 

ss -x currently fails if CONFIG_INET_UDP_DIAG=n or old kernels

Also close file descriptors while we are at it.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Eric Dumazet 2012-01-30 17:05:45 +01:00 committed by Stephen Hemminger
parent 50c6f3ee5b
commit a3fd8e58c1
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
misc/ss.c
View File

@ -2092,8 +2092,10 @@ static int unix_show_netlink(struct filter *f, FILE *dump_fp)
.msg_iovlen = f->f ? 3 : 1, .msg_iovlen = f->f ? 3 : 1,
}; };
if (sendmsg(fd, &msg, 0) < 0) if (sendmsg(fd, &msg, 0) < 0) {
close(fd);
return -1; return -1;
}
iov[0] = (struct iovec){ iov[0] = (struct iovec){
.iov_base = buf, .iov_base = buf,
@ -2121,6 +2123,7 @@ static int unix_show_netlink(struct filter *f, FILE *dump_fp)
} }
if (status == 0) { if (status == 0) {
fprintf(stderr, "EOF on netlink\n"); fprintf(stderr, "EOF on netlink\n");
close(fd);
return 0; return 0;
} }
@ -2135,22 +2138,28 @@ static int unix_show_netlink(struct filter *f, FILE *dump_fp)
h->nlmsg_seq != 123456) h->nlmsg_seq != 123456)
goto skip_it; goto skip_it;
if (h->nlmsg_type == NLMSG_DONE) if (h->nlmsg_type == NLMSG_DONE) {
close(fd);
return 0; return 0;
}
if (h->nlmsg_type == NLMSG_ERROR) { if (h->nlmsg_type == NLMSG_ERROR) {
struct nlmsgerr *err = (struct nlmsgerr*)NLMSG_DATA(h); struct nlmsgerr *err = (struct nlmsgerr*)NLMSG_DATA(h);
if (h->nlmsg_len < NLMSG_LENGTH(sizeof(struct nlmsgerr))) { if (h->nlmsg_len < NLMSG_LENGTH(sizeof(struct nlmsgerr))) {
fprintf(stderr, "ERROR truncated\n"); fprintf(stderr, "ERROR truncated\n");
} else { } else {
errno = -err->error; errno = -err->error;
perror("TCPDIAG answers"); if (errno != ENOENT)
fprintf(stderr, "UDIAG answers %d\n", errno);
} }
return 0; close(fd);
return -1;
} }
if (!dump_fp) { if (!dump_fp) {
err = unix_show_sock(h, f); err = unix_show_sock(h, f);
if (err < 0) if (err < 0) {
close(fd);
return err; return err;
}
} }
skip_it: skip_it:
@ -2165,6 +2174,7 @@ skip_it:
exit(1); exit(1);
} }
} }
close(fd);
return 0; return 0;
} }
@ -2241,7 +2251,7 @@ int unix_show(struct filter *f)
cnt = 0; cnt = 0;
} }
} }
fclose(fp);
if (list) { if (list) {
unix_list_print(list, f); unix_list_print(list, f);
unix_list_free(list); unix_list_free(list);