[cmdline] Add the "ipstat" command

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/config/config.c b/src/config/config.c
index 1f17fb26882ffcc56de2cdd86b8612af418647c8..98d3d8b297d45250cc0588e4a0cd08d51b76281c 100644 (file)
--- a/src/config/config.c
+++ b/src/config/config.c
@@ -287,6 +287,9 @@ REQUIRE_OBJECT ( ping_cmd );
 #ifdef CONSOLE_CMD
 REQUIRE_OBJECT ( console_cmd );
 #endif
+#ifdef IPSTAT_CMD
+REQUIRE_OBJECT ( ipstat_cmd );
+#endif
 
 /*
  * Drag in miscellaneous objects

diff --git a/src/config/general.h b/src/config/general.h
index 0b45edfb17e71749cb819fb000bb4233bc0fef83..a714a0af24edf731d81d16ca9cbd63119df38d67 100644 (file)
--- a/src/config/general.h
+++ b/src/config/general.h
@@ -137,6 +137,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 //#define NEIGHBOUR_CMD                /* Neighbour management commands */
 //#define PING_CMD             /* Ping command */
 //#define CONSOLE_CMD          /* Console command */
+//#define IPSTAT_CMD           /* IP statistics commands */
 
 /*
  * ROM-specific options

diff --git a/src/hci/commands/ipstat_cmd.c b/src/hci/commands/ipstat_cmd.c
new file mode 100644 (file)
index 0000000..d565dc0
--- /dev/null
+++ b/src/hci/commands/ipstat_cmd.c
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2014 Michael Brown <mbrown@fensystems.co.uk>.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER );
+
+#include <stdio.h>
+#include <getopt.h>
+#include <ipxe/command.h>
+#include <ipxe/parseopt.h>
+#include <usr/ipstat.h>
+
+/** @file
+ *
+ * IP statistics commands
+ *
+ */
+
+/** "ipstat" options */
+struct ipstat_options {};
+
+/** "ipstat" option list */
+static struct option_descriptor ipstat_opts[] = {};
+
+/** "ipstat" command descriptor */
+static struct command_descriptor ipstat_cmd =
+       COMMAND_DESC ( struct ipstat_options, ipstat_opts, 0, 0, NULL );
+
+/**
+ * The "ipstat" command
+ *
+ * @v argc             Argument count
+ * @v argv             Argument list
+ * @ret rc             Return status code
+ */
+static int ipstat_exec ( int argc, char **argv ) {
+       struct ipstat_options opts;
+       int rc;
+
+       /* Parse options */
+       if ( ( rc = parse_options ( argc, argv, &ipstat_cmd, &opts ) ) != 0 )
+               return rc;
+
+       ipstat();
+
+       return 0;
+}
+
+/** Routing table management commands */
+struct command ipstat_commands[] __command = {
+       {
+               .name = "ipstat",
+               .exec = ipstat_exec,
+       },
+};

diff --git a/src/include/usr/ipstat.h b/src/include/usr/ipstat.h
new file mode 100644 (file)
index 0000000..5ff8b40
--- /dev/null
+++ b/src/include/usr/ipstat.h
@@ -0,0 +1,14 @@
+#ifndef _USR_IPSTAT_H
+#define _USR_IPSTAT_H
+
+/** @file
+ *
+ * IP statistics
+ *
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER );
+
+extern void ipstat ( void );
+
+#endif /* _USR_IPSTAT_H */

diff --git a/src/usr/ipstat.c b/src/usr/ipstat.c
new file mode 100644 (file)
index 0000000..95ad799
--- /dev/null
+++ b/src/usr/ipstat.c
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2014 Michael Brown <mbrown@fensystems.co.uk>.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER );
+
+#include <stdio.h>
+#include <ipxe/ipstat.h>
+#include <usr/ipstat.h>
+
+/** @file
+ *
+ * IP statistics
+ *
+ */
+
+/**
+ * Print IP statistics
+ *
+ */
+void ipstat ( void ) {
+       struct ip_statistics_family *family;
+       struct ip_statistics *stats;
+
+       for_each_table_entry ( family, IP_STATISTICS_FAMILIES ) {
+               stats = family->stats;
+               printf ( "IP version %d:\n", family->version );
+               printf ( "  InReceives:%ld InMcastPkts:%ld InBcastPkts:%ld "
+                        "InOctets:%ld\n", stats->in_receives,
+                        stats->in_mcast_pkts, stats->in_bcast_pkts,
+                        stats->in_octets );
+               printf ( "  InHdrErrors:%ld InAddrErrors:%ld "
+                        "InUnknownProtos:%ld InTruncatedPkts:%ld\n",
+                        stats->in_hdr_errors, stats->in_addr_errors,
+                        stats->in_unknown_protos, stats->in_truncated_pkts );
+               printf ( "  ReasmReqds:%ld ReasmOKs:%ld ReasmFails:%ld\n",
+                        stats->reasm_reqds, stats->reasm_oks,
+                        stats->reasm_fails );
+               printf ( "  InDelivers:%ld OutRequests:%ld OutNoRoutes:%ld\n",
+                        stats->in_delivers, stats->out_requests,
+                        stats->out_no_routes );
+               printf ( "  OutTransmits:%ld OutMcastPkts:%ld OutBcastPkts:%ld "
+                        "OutOctets:%ld\n", stats->out_transmits,
+                        stats->out_mcast_pkts, stats->out_bcast_pkts,
+                        stats->out_octets );
+       }
+}