Merge branch 'iproute2-master' into iproute2-next

[mirror_iproute2.git] / misc / nstat.c

diff --git a/misc/nstat.c b/misc/nstat.c
index a9e0f20789e3c15036ca45b7f7315c2876a9c2a3..88f1c7698243235b12f58cd067afce488af1be4c 100644 (file)
--- a/misc/nstat.c
+++ b/misc/nstat.c
@@ -30,13 +30,13 @@
 
 #include <json_writer.h>
 #include <SNAPSHOT.h>
+#include "utils.h"
 
 int dump_zeros;
 int reset_history;
 int ignore_history;
 int no_output;
 int json_output;
-int pretty;
 int no_update;
 int scan_interval;
 int time_constant;
@@ -75,6 +75,11 @@ static int net_snmp6_open(void)
        return generic_proc_open("PROC_NET_SNMP6", "net/snmp6");
 }
 
+static int net_sctp_snmp_open(void)
+{
+       return generic_proc_open("PROC_NET_SCTP_SNMP", "net/sctp/snmp");
+}
+
 struct nstat_ent {
        struct nstat_ent *next;
        char             *id;
@@ -95,7 +100,7 @@ static int useless_number(const char *id)
 {
        int i;
 
-       for (i = 0; i < sizeof(useless_numbers)/sizeof(*useless_numbers); i++)
+       for (i = 0; i < ARRAY_SIZE(useless_numbers); i++)
                if (strcmp(id, useless_numbers[i]) == 0)
                        return 1;
        return 0;
@@ -172,12 +177,12 @@ static int count_spaces(const char *line)
 
 static void load_ugly_table(FILE *fp)
 {
-       char buf[4096];
+       char buf[2048];
        struct nstat_ent *db = NULL;
        struct nstat_ent *n;
 
        while (fgets(buf, sizeof(buf), fp) != NULL) {
-               char idbuf[sizeof(buf)];
+               char idbuf[4096];
                int  off;
                char *p;
                int count1, count2, skip = 0;
@@ -246,6 +251,16 @@ static void load_ugly_table(FILE *fp)
        }
 }
 
+static void load_sctp_snmp(void)
+{
+       FILE *fp = fdopen(net_sctp_snmp_open(), "r");
+
+       if (fp) {
+               load_good_table(fp);
+               fclose(fp);
+       }
+}
+
 static void load_snmp(void)
 {
        FILE *fp = fdopen(net_snmp_open(), "r");
@@ -284,6 +299,7 @@ static void dump_kern_db(FILE *fp, int to_hist)
 
        h = hist_db;
        if (jw) {
+               jsonw_start_object(jw);
                jsonw_pretty(jw, pretty);
                jsonw_name(jw, info_source);
                jsonw_start_object(jw);
@@ -316,6 +332,8 @@ static void dump_kern_db(FILE *fp, int to_hist)
        }
 
        if (jw) {
+               jsonw_end_object(jw);
+
                jsonw_end_object(jw);
                jsonw_destroy(&jw);
        }
@@ -328,6 +346,7 @@ static void dump_incr_db(FILE *fp)
 
        h = hist_db;
        if (jw) {
+               jsonw_start_object(jw);
                jsonw_pretty(jw, pretty);
                jsonw_name(jw, info_source);
                jsonw_start_object(jw);
@@ -363,6 +382,8 @@ static void dump_incr_db(FILE *fp)
        }
 
        if (jw) {
+               jsonw_end_object(jw);
+
                jsonw_end_object(jw);
                jsonw_destroy(&jw);
        }
@@ -384,6 +405,7 @@ static void update_db(int interval)
        load_netstat();
        load_snmp6();
        load_snmp();
+       load_sctp_snmp();
 
        h = kern_db;
        kern_db = n;
@@ -443,6 +465,7 @@ static void server_loop(int fd)
        load_netstat();
        load_snmp6();
        load_snmp();
+       load_sctp_snmp();
 
        for (;;) {
                int status;
@@ -502,17 +525,17 @@ static void usage(void)
 {
        fprintf(stderr,
 "Usage: nstat [OPTION] [ PATTERN [ PATTERN ] ]\n"
-"   -h, --help         this message\n"
-"   -a, --ignore       ignore history\n"
-"   -d, --scan=SECS    sample every statistics every SECS\n"
-"   -j, --json          format output in JSON\n"
-"   -n, --nooutput     do history only\n"
-"   -p, --pretty        pretty print\n"
-"   -r, --reset                reset history\n"
-"   -s, --noupdate     don\'t update history\n"
-"   -t, --interval=SECS        report average over the last SECS\n"
-"   -V, --version      output version information\n"
-"   -z, --zeros                show entries with zero activity\n");
+"   -h, --help           this message\n"
+"   -a, --ignore         ignore history\n"
+"   -d, --scan=SECS      sample every statistics every SECS\n"
+"   -j, --json           format output in JSON\n"
+"   -n, --nooutput       do history only\n"
+"   -p, --pretty         pretty print\n"
+"   -r, --reset          reset history\n"
+"   -s, --noupdate       don't update history\n"
+"   -t, --interval=SECS  report average over the last SECS\n"
+"   -V, --version        output version information\n"
+"   -z, --zeros          show entries with zero activity\n");
        exit(-1);
 }
 
@@ -682,12 +705,18 @@ int main(int argc, char *argv[])
            && verify_forging(fd) == 0) {
                FILE *sfp = fdopen(fd, "r");
 
-               load_good_table(sfp);
-               if (hist_db && source_mismatch) {
-                       fprintf(stderr, "nstat: history is stale, ignoring it.\n");
-                       hist_db = NULL;
+               if (!sfp) {
+                       fprintf(stderr, "nstat: fdopen failed: %s\n",
+                               strerror(errno));
+                       close(fd);
+               } else {
+                       load_good_table(sfp);
+                       if (hist_db && source_mismatch) {
+                               fprintf(stderr, "nstat: history is stale, ignoring it.\n");
+                               hist_db = NULL;
+                       }
+                       fclose(sfp);
                }
-               fclose(sfp);
        } else {
                if (fd >= 0)
                        close(fd);
@@ -699,6 +728,7 @@ int main(int argc, char *argv[])
                load_netstat();
                load_snmp6();
                load_snmp();
+               load_sctp_snmp();
                if (info_source[0] == 0)
                        strcpy(info_source, "kernel");
        }