]> git.proxmox.com Git - mirror_iproute2.git/blobdiff - misc/ss.c
ss: make local variables static
[mirror_iproute2.git] / misc / ss.c
index ffc6f27b69a86638c38f0430ac9408c6aca57bb7..e4d6ae489e798419fa6ce6fb0f4b8b0b3232adf6 100644 (file)
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -16,6 +16,7 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
+#include <sys/sysmacros.h>
 #include <netinet/in.h>
 #include <string.h>
 #include <errno.h>
@@ -95,20 +96,20 @@ static int security_get_initial_context(char *name,  char **context)
 }
 #endif
 
-int resolve_services = 1;
+static int resolve_services = 1;
 int preferred_family = AF_UNSPEC;
-int show_options;
+static int show_options;
 int show_details;
-int show_users;
-int show_mem;
-int show_tcpinfo;
-int show_bpf;
-int show_proc_ctx;
-int show_sock_ctx;
-int show_header = 1;
-int follow_events;
-int sctp_ino;
-int show_tipcinfo;
+static int show_users;
+static int show_mem;
+static int show_tcpinfo;
+static int show_bpf;
+static int show_proc_ctx;
+static int show_sock_ctx;
+static int show_header = 1;
+static int follow_events;
+static int sctp_ino;
+static int show_tipcinfo;
 
 enum col_id {
        COL_NETID,
@@ -344,13 +345,72 @@ static const struct filter default_afs[AF_MAX] = {
 static int do_default = 1;
 static struct filter current_filter;
 
-static void filter_db_set(struct filter *f, int db)
+static void filter_db_set(struct filter *f, int db, bool enable)
 {
-       f->states   |= default_dbs[db].states;
-       f->dbs      |= 1 << db;
+       if (enable) {
+               f->states   |= default_dbs[db].states;
+               f->dbs      |= 1 << db;
+       } else {
+               f->dbs &= ~(1 << db);
+       }
        do_default   = 0;
 }
 
+static int filter_db_parse(struct filter *f, const char *s)
+{
+       const struct {
+               const char *name;
+               int dbs[MAX_DB + 1];
+       } db_name_tbl[] = {
+#define ENTRY(name, ...) { #name, { __VA_ARGS__, MAX_DB } }
+               ENTRY(all, UDP_DB, DCCP_DB, TCP_DB, RAW_DB,
+                          UNIX_ST_DB, UNIX_DG_DB, UNIX_SQ_DB,
+                          PACKET_R_DB, PACKET_DG_DB, NETLINK_DB,
+                          SCTP_DB, VSOCK_ST_DB, VSOCK_DG_DB),
+               ENTRY(inet, UDP_DB, DCCP_DB, TCP_DB, SCTP_DB, RAW_DB),
+               ENTRY(udp, UDP_DB),
+               ENTRY(dccp, DCCP_DB),
+               ENTRY(tcp, TCP_DB),
+               ENTRY(sctp, SCTP_DB),
+               ENTRY(raw, RAW_DB),
+               ENTRY(unix, UNIX_ST_DB, UNIX_DG_DB, UNIX_SQ_DB),
+               ENTRY(unix_stream, UNIX_ST_DB),
+               ENTRY(u_str, UNIX_ST_DB),       /* alias for unix_stream */
+               ENTRY(unix_dgram, UNIX_DG_DB),
+               ENTRY(u_dgr, UNIX_DG_DB),       /* alias for unix_dgram */
+               ENTRY(unix_seqpacket, UNIX_SQ_DB),
+               ENTRY(u_seq, UNIX_SQ_DB),       /* alias for unix_seqpacket */
+               ENTRY(packet, PACKET_R_DB, PACKET_DG_DB),
+               ENTRY(packet_raw, PACKET_R_DB),
+               ENTRY(p_raw, PACKET_R_DB),      /* alias for packet_raw */
+               ENTRY(packet_dgram, PACKET_DG_DB),
+               ENTRY(p_dgr, PACKET_DG_DB),     /* alias for packet_dgram */
+               ENTRY(netlink, NETLINK_DB),
+               ENTRY(vsock, VSOCK_ST_DB, VSOCK_DG_DB),
+               ENTRY(vsock_stream, VSOCK_ST_DB),
+               ENTRY(v_str, VSOCK_ST_DB),      /* alias for vsock_stream */
+               ENTRY(vsock_dgram, VSOCK_DG_DB),
+               ENTRY(v_dgr, VSOCK_DG_DB),      /* alias for vsock_dgram */
+#undef ENTRY
+       };
+       bool enable = true;
+       unsigned int i;
+       const int *dbp;
+
+       if (s[0] == '!') {
+               enable = false;
+               s++;
+       }
+       for (i = 0; i < ARRAY_SIZE(db_name_tbl); i++) {
+               if (strcmp(s, db_name_tbl[i].name))
+                       continue;
+               for (dbp = db_name_tbl[i].dbs; *dbp != MAX_DB; dbp++)
+                       filter_db_set(f, *dbp, enable);
+               return 0;
+       }
+       return -1;
+}
+
 static void filter_af_set(struct filter *f, int af)
 {
        f->states          |= default_afs[af].states;
@@ -364,24 +424,6 @@ static int filter_af_get(struct filter *f, int af)
        return !!(f->families & FAMILY_MASK(af));
 }
 
-static void filter_default_dbs(struct filter *f)
-{
-       filter_db_set(f, UDP_DB);
-       filter_db_set(f, DCCP_DB);
-       filter_db_set(f, TCP_DB);
-       filter_db_set(f, RAW_DB);
-       filter_db_set(f, UNIX_ST_DB);
-       filter_db_set(f, UNIX_DG_DB);
-       filter_db_set(f, UNIX_SQ_DB);
-       filter_db_set(f, PACKET_R_DB);
-       filter_db_set(f, PACKET_DG_DB);
-       filter_db_set(f, NETLINK_DB);
-       filter_db_set(f, SCTP_DB);
-       filter_db_set(f, VSOCK_ST_DB);
-       filter_db_set(f, VSOCK_DG_DB);
-       filter_db_set(f, TIPC_DB);
-}
-
 static void filter_states_set(struct filter *f, int states)
 {
        if (states)
@@ -433,7 +475,6 @@ static FILE *generic_proc_open(const char *env, const char *name)
                                                        "net/packet")
 #define net_netlink_open()     generic_proc_open("PROC_NET_NETLINK", \
                                                        "net/netlink")
-#define slabinfo_open()                generic_proc_open("PROC_SLABINFO", "slabinfo")
 #define net_sockstat_open()    generic_proc_open("PROC_NET_SOCKSTAT", \
                                                        "net/sockstat")
 #define net_sockstat6_open()   generic_proc_open("PROC_NET_SOCKSTAT6", \
@@ -453,7 +494,7 @@ struct user_ent {
 };
 
 #define USER_ENT_HASH_SIZE     256
-struct user_ent *user_ent_hash[USER_ENT_HASH_SIZE];
+static struct user_ent *user_ent_hash[USER_ENT_HASH_SIZE];
 
 static int user_ent_hashfn(unsigned int ino)
 {
@@ -687,67 +728,6 @@ next:
        return cnt;
 }
 
-/* Get stats from slab */
-
-struct slabstat {
-       int socks;
-       int tcp_ports;
-       int tcp_tws;
-       int tcp_syns;
-       int skbs;
-};
-
-static struct slabstat slabstat;
-
-static int get_slabstat(struct slabstat *s)
-{
-       char buf[256];
-       FILE *fp;
-       int cnt;
-       static int slabstat_valid;
-       static const char * const slabstat_ids[] = {
-               "sock",
-               "tcp_bind_bucket",
-               "tcp_tw_bucket",
-               "tcp_open_request",
-               "skbuff_head_cache",
-       };
-
-       if (slabstat_valid)
-               return 0;
-
-       memset(s, 0, sizeof(*s));
-
-       fp = slabinfo_open();
-       if (!fp)
-               return -1;
-
-       cnt = sizeof(*s)/sizeof(int);
-
-       if (!fgets(buf, sizeof(buf), fp)) {
-               fclose(fp);
-               return -1;
-       }
-       while (fgets(buf, sizeof(buf), fp) != NULL) {
-               int i;
-
-               for (i = 0; i < ARRAY_SIZE(slabstat_ids); i++) {
-                       if (memcmp(buf, slabstat_ids[i], strlen(slabstat_ids[i])) == 0) {
-                               sscanf(buf, "%*s%d", ((int *)s) + i);
-                               cnt--;
-                               break;
-                       }
-               }
-               if (cnt <= 0)
-                       break;
-       }
-
-       slabstat_valid = 1;
-
-       fclose(fp);
-       return 0;
-}
-
 static unsigned long long cookie_sk_get(const uint32_t *cookie)
 {
        return (((unsigned long long)cookie[1] << 31) << 1) | cookie[0];
@@ -997,6 +977,7 @@ static int buf_update(int len)
 }
 
 /* Append content to buffer as part of the current field */
+__attribute__((format(printf, 1, 2)))
 static void out(const char *fmt, ...)
 {
        struct column *f = current_field;
@@ -1114,7 +1095,7 @@ static void print_header(void)
 {
        while (!field_is_last(current_field)) {
                if (!current_field->disabled)
-                       out(current_field->header);
+                       out("%s", current_field->header);
                field_next();
        }
 }
@@ -1279,7 +1260,7 @@ static void render(void)
        while (token) {
                /* Print left delimiter only if we already started a line */
                if (line_started++)
-                       printed = printf("%s", current_field->ldelim);
+                       printed = printf("%s", f->ldelim);
                else
                        printed = 0;
 
@@ -1423,7 +1404,7 @@ struct scache {
        const char *proto;
 };
 
-struct scache *rlist;
+static struct scache *rlist;
 
 static void init_service_resolver(void)
 {
@@ -3175,8 +3156,7 @@ static int kill_inet_sock(struct nlmsghdr *h, void *arg, struct sockstat *s)
        return rtnl_talk(rth, &req.nlh, NULL);
 }
 
-static int show_one_inet_sock(const struct sockaddr_nl *addr,
-               struct nlmsghdr *h, void *arg)
+static int show_one_inet_sock(struct nlmsghdr *h, void *arg)
 {
        int err;
        struct inet_diag_arg *diag_arg = arg;
@@ -3331,7 +3311,7 @@ static int tcp_show(struct filter *f)
 {
        FILE *fp = NULL;
        char *buf = NULL;
-       int bufsize = 64*1024;
+       int bufsize = 1024*1024;
 
        if (!filter_af_get(f, AF_INET) && !filter_af_get(f, AF_INET6))
                return 0;
@@ -3346,27 +3326,6 @@ static int tcp_show(struct filter *f)
                return 0;
 
        /* Sigh... We have to parse /proc/net/tcp... */
-
-
-       /* Estimate amount of sockets and try to allocate
-        * huge buffer to read all the table at one read.
-        * Limit it by 16MB though. The assumption is: as soon as
-        * kernel was able to hold information about N connections,
-        * it is able to give us some memory for snapshot.
-        */
-       if (1) {
-               get_slabstat(&slabstat);
-
-               int guess = slabstat.socks+slabstat.tcp_syns;
-
-               if (f->states&(1<<SS_TIME_WAIT))
-                       guess += slabstat.tcp_tws;
-               if (guess > (16*1024*1024)/128)
-                       guess = (16*1024*1024)/128;
-               guess *= 128;
-               if (guess > bufsize)
-                       bufsize = guess;
-       }
        while (bufsize >= 64*1024) {
                if ((buf = malloc(bufsize)) != NULL)
                        break;
@@ -3588,8 +3547,7 @@ static void unix_stats_print(struct sockstat *s, struct filter *f)
        proc_ctx_print(s);
 }
 
-static int unix_show_sock(const struct sockaddr_nl *addr, struct nlmsghdr *nlh,
-               void *arg)
+static int unix_show_sock(struct nlmsghdr *nlh, void *arg)
 {
        struct filter *f = (struct filter *)arg;
        struct unix_diag_msg *r = NLMSG_DATA(nlh);
@@ -3646,6 +3604,21 @@ static int unix_show_sock(const struct sockaddr_nl *addr, struct nlmsghdr *nlh,
                        out(" %c-%c",
                            mask & 1 ? '-' : '<', mask & 2 ? '-' : '>');
                }
+               if (tb[UNIX_DIAG_VFS]) {
+                       struct unix_diag_vfs *uv = RTA_DATA(tb[UNIX_DIAG_VFS]);
+
+                       out(" ino:%u dev:%u/%u", uv->udiag_vfs_ino, major(uv->udiag_vfs_dev),
+                                                minor(uv->udiag_vfs_dev));
+               }
+               if (tb[UNIX_DIAG_ICONS]) {
+                       int len = RTA_PAYLOAD(tb[UNIX_DIAG_ICONS]);
+                       __u32 *peers = RTA_DATA(tb[UNIX_DIAG_ICONS]);
+                       int i;
+
+                       out(" peers:");
+                       for (i = 0; i < len / sizeof(__u32); i++)
+                               out(" %u", peers[i]);
+               }
        }
 
        return 0;
@@ -3683,6 +3656,8 @@ static int unix_show_netlink(struct filter *f)
        req.r.udiag_show = UDIAG_SHOW_NAME | UDIAG_SHOW_PEER | UDIAG_SHOW_RQLEN;
        if (show_mem)
                req.r.udiag_show |= UDIAG_SHOW_MEMINFO;
+       if (show_details)
+               req.r.udiag_show |= UDIAG_SHOW_VFS | UDIAG_SHOW_ICONS;
 
        return handle_netlink_request(f, &req.nlh, sizeof(req), unix_show_sock);
 }
@@ -3866,8 +3841,7 @@ static void packet_show_ring(struct packet_diag_ring *ring)
        out(",features:0x%x", ring->pdr_features);
 }
 
-static int packet_show_sock(const struct sockaddr_nl *addr,
-               struct nlmsghdr *nlh, void *arg)
+static int packet_show_sock(struct nlmsghdr *nlh, void *arg)
 {
        const struct filter *f = arg;
        struct packet_diag_msg *r = NLMSG_DATA(nlh);
@@ -4097,7 +4071,7 @@ static int netlink_show_one(struct filter *f,
 
                if (!pid) {
                        done = 1;
-                       strncpy(procname, "kernel", 6);
+                       strncpy(procname, "kernel", 7);
                } else if (pid > 0) {
                        FILE *fp;
 
@@ -4156,8 +4130,7 @@ static int netlink_show_one(struct filter *f,
        return 0;
 }
 
-static int netlink_show_sock(const struct sockaddr_nl *addr,
-               struct nlmsghdr *nlh, void *arg)
+static int netlink_show_sock(struct nlmsghdr *nlh, void *arg)
 {
        struct filter *f = (struct filter *)arg;
        struct netlink_diag_msg *r = NLMSG_DATA(nlh);
@@ -4280,8 +4253,7 @@ static void vsock_stats_print(struct sockstat *s, struct filter *f)
        proc_ctx_print(s);
 }
 
-static int vsock_show_sock(const struct sockaddr_nl *addr,
-                          struct nlmsghdr *nlh, void *arg)
+static int vsock_show_sock(struct nlmsghdr *nlh, void *arg)
 {
        struct filter *f = (struct filter *)arg;
        struct vsock_diag_msg *r = NLMSG_DATA(nlh);
@@ -4334,8 +4306,7 @@ static void tipc_sock_addr_print(struct rtattr *net_addr, struct rtattr *id)
 
 }
 
-static int tipc_show_sock(const struct sockaddr_nl *addr, struct nlmsghdr *nlh,
-                         void *arg)
+static int tipc_show_sock(struct nlmsghdr *nlh, void *arg)
 {
        struct rtattr *stat[TIPC_NLA_SOCK_STAT_MAX + 1] = {};
        struct rtattr *attrs[TIPC_NLA_SOCK_MAX + 1] = {};
@@ -4423,8 +4394,7 @@ struct sock_diag_msg {
        __u8 sdiag_family;
 };
 
-static int generic_show_sock(const struct sockaddr_nl *addr,
-               struct nlmsghdr *nlh, void *arg)
+static int generic_show_sock(struct nlmsghdr *nlh, void *arg)
 {
        struct sock_diag_msg *r = NLMSG_DATA(nlh);
        struct inet_diag_arg inet_arg = { .f = arg, .protocol = IPPROTO_MAX };
@@ -4434,19 +4404,19 @@ static int generic_show_sock(const struct sockaddr_nl *addr,
        case AF_INET:
        case AF_INET6:
                inet_arg.rth = inet_arg.f->rth_for_killing;
-               ret = show_one_inet_sock(addr, nlh, &inet_arg);
+               ret = show_one_inet_sock(nlh, &inet_arg);
                break;
        case AF_UNIX:
-               ret = unix_show_sock(addr, nlh, arg);
+               ret = unix_show_sock(nlh, arg);
                break;
        case AF_PACKET:
-               ret = packet_show_sock(addr, nlh, arg);
+               ret = packet_show_sock(nlh, arg);
                break;
        case AF_NETLINK:
-               ret = netlink_show_sock(addr, nlh, arg);
+               ret = netlink_show_sock(nlh, arg);
                break;
        case AF_VSOCK:
-               ret = vsock_show_sock(addr, nlh, arg);
+               ret = vsock_show_sock(nlh, arg);
                break;
        default:
                ret = -1;
@@ -4625,23 +4595,15 @@ static int print_summary(void)
        if (get_snmp_int("Tcp:", "CurrEstab", &tcp_estab) < 0)
                perror("ss: get_snmpstat");
 
-       get_slabstat(&slabstat);
+       printf("Total: %d\n", s.socks);
 
-       printf("Total: %d (kernel %d)\n", s.socks, slabstat.socks);
-
-       printf("TCP:   %d (estab %d, closed %d, orphaned %d, synrecv %d, timewait %d/%d), ports %d\n",
-              s.tcp_total + slabstat.tcp_syns + s.tcp_tws,
-              tcp_estab,
-              s.tcp_total - (s.tcp4_hashed+s.tcp6_hashed-s.tcp_tws),
-              s.tcp_orphans,
-              slabstat.tcp_syns,
-              s.tcp_tws, slabstat.tcp_tws,
-              slabstat.tcp_ports
-              );
+       printf("TCP:   %d (estab %d, closed %d, orphaned %d, timewait %d)\n",
+              s.tcp_total + s.tcp_tws, tcp_estab,
+              s.tcp_total - (s.tcp4_hashed + s.tcp6_hashed - s.tcp_tws),
+              s.tcp_orphans, s.tcp_tws);
 
        printf("\n");
        printf("Transport Total     IP        IPv6\n");
-       printf("*         %-9d %-9s %-9s\n", slabstat.socks, "-", "-");
        printf("RAW       %-9d %-9d %-9d\n", s.raw4+s.raw6, s.raw4, s.raw6);
        printf("UDP       %-9d %-9d %-9d\n", s.udp4+s.udp6, s.udp4, s.udp6);
        printf("TCP       %-9d %-9d %-9d\n", s.tcp4_hashed+s.tcp6_hashed, s.tcp4_hashed, s.tcp6_hashed);
@@ -4865,19 +4827,19 @@ int main(int argc, char *argv[])
                        follow_events = 1;
                        break;
                case 'd':
-                       filter_db_set(&current_filter, DCCP_DB);
+                       filter_db_set(&current_filter, DCCP_DB, true);
                        break;
                case 't':
-                       filter_db_set(&current_filter, TCP_DB);
+                       filter_db_set(&current_filter, TCP_DB, true);
                        break;
                case 'S':
-                       filter_db_set(&current_filter, SCTP_DB);
+                       filter_db_set(&current_filter, SCTP_DB, true);
                        break;
                case 'u':
-                       filter_db_set(&current_filter, UDP_DB);
+                       filter_db_set(&current_filter, UDP_DB, true);
                        break;
                case 'w':
-                       filter_db_set(&current_filter, RAW_DB);
+                       filter_db_set(&current_filter, RAW_DB, true);
                        break;
                case 'x':
                        filter_af_set(&current_filter, AF_UNIX);
@@ -4941,60 +4903,7 @@ int main(int argc, char *argv[])
                        do {
                                if ((p1 = strchr(p, ',')) != NULL)
                                        *p1 = 0;
-                               if (strcmp(p, "all") == 0) {
-                                       filter_default_dbs(&current_filter);
-                               } else if (strcmp(p, "inet") == 0) {
-                                       filter_db_set(&current_filter, UDP_DB);
-                                       filter_db_set(&current_filter, DCCP_DB);
-                                       filter_db_set(&current_filter, TCP_DB);
-                                       filter_db_set(&current_filter, SCTP_DB);
-                                       filter_db_set(&current_filter, RAW_DB);
-                               } else if (strcmp(p, "udp") == 0) {
-                                       filter_db_set(&current_filter, UDP_DB);
-                               } else if (strcmp(p, "dccp") == 0) {
-                                       filter_db_set(&current_filter, DCCP_DB);
-                               } else if (strcmp(p, "tcp") == 0) {
-                                       filter_db_set(&current_filter, TCP_DB);
-                               } else if (strcmp(p, "sctp") == 0) {
-                                       filter_db_set(&current_filter, SCTP_DB);
-                               } else if (strcmp(p, "raw") == 0) {
-                                       filter_db_set(&current_filter, RAW_DB);
-                               } else if (strcmp(p, "unix") == 0) {
-                                       filter_db_set(&current_filter, UNIX_ST_DB);
-                                       filter_db_set(&current_filter, UNIX_DG_DB);
-                                       filter_db_set(&current_filter, UNIX_SQ_DB);
-                               } else if (strcasecmp(p, "unix_stream") == 0 ||
-                                          strcmp(p, "u_str") == 0) {
-                                       filter_db_set(&current_filter, UNIX_ST_DB);
-                               } else if (strcasecmp(p, "unix_dgram") == 0 ||
-                                          strcmp(p, "u_dgr") == 0) {
-                                       filter_db_set(&current_filter, UNIX_DG_DB);
-                               } else if (strcasecmp(p, "unix_seqpacket") == 0 ||
-                                          strcmp(p, "u_seq") == 0) {
-                                       filter_db_set(&current_filter, UNIX_SQ_DB);
-                               } else if (strcmp(p, "packet") == 0) {
-                                       filter_db_set(&current_filter, PACKET_R_DB);
-                                       filter_db_set(&current_filter, PACKET_DG_DB);
-                               } else if (strcmp(p, "packet_raw") == 0 ||
-                                          strcmp(p, "p_raw") == 0) {
-                                       filter_db_set(&current_filter, PACKET_R_DB);
-                               } else if (strcmp(p, "packet_dgram") == 0 ||
-                                          strcmp(p, "p_dgr") == 0) {
-                                       filter_db_set(&current_filter, PACKET_DG_DB);
-                               } else if (strcmp(p, "netlink") == 0) {
-                                       filter_db_set(&current_filter, NETLINK_DB);
-                               } else if (strcmp(p, "vsock") == 0) {
-                                       filter_db_set(&current_filter, VSOCK_ST_DB);
-                                       filter_db_set(&current_filter, VSOCK_DG_DB);
-                               } else if (strcmp(p, "vsock_stream") == 0 ||
-                                          strcmp(p, "v_str") == 0) {
-                                       filter_db_set(&current_filter, VSOCK_ST_DB);
-                               } else if (strcmp(p, "vsock_dgram") == 0 ||
-                                          strcmp(p, "v_dgr") == 0) {
-                                       filter_db_set(&current_filter, VSOCK_DG_DB);
-                               } else if (strcmp(optarg, "tipc") == 0) {
-                                       filter_db_set(&current_filter, TIPC_DB);
-                               } else {
+                               if (filter_db_parse(&current_filter, p)) {
                                        fprintf(stderr, "ss: \"%s\" is illegal socket table id\n", p);
                                        usage();
                                }
@@ -5089,7 +4998,7 @@ int main(int argc, char *argv[])
 
        if (do_default) {
                state_filter = state_filter ? state_filter : SS_CONN;
-               filter_default_dbs(&current_filter);
+               filter_db_parse(&current_filter, "all");
        }
 
        filter_states_set(&current_filter, state_filter);