[cmdline] Add "ntp" command

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

diff --git a/src/config/config.c b/src/config/config.c
index 6f9e66cd4e6baaafaf4084d1ca5501a9ebd659fd..e24cfe0d050a83c1443d901b4763c3546e846752 100644 (file)
--- a/src/config/config.c
+++ b/src/config/config.c
@@ -278,6 +278,9 @@ REQUIRE_OBJECT ( ipstat_cmd );
 #ifdef PROFSTAT_CMD
 REQUIRE_OBJECT ( profstat_cmd );
 #endif
+#ifdef NTP_CMD
+REQUIRE_OBJECT ( ntp_cmd );
+#endif
 
 /*
  * Drag in miscellaneous objects

diff --git a/src/config/general.h b/src/config/general.h
index a215015003500de715e9991f270da9eb8ecb5faf..a71ba726fc21ffe3694a6db514bb111c1370434f 100644 (file)
--- a/src/config/general.h
+++ b/src/config/general.h
@@ -147,6 +147,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 //#define CONSOLE_CMD          /* Console command */
 //#define IPSTAT_CMD           /* IP statistics commands */
 //#define PROFSTAT_CMD         /* Profiling commands */
+//#define NTP_CMD              /* NTP commands */
 
 /*
  * ROM-specific options

diff --git a/src/hci/commands/ntp_cmd.c b/src/hci/commands/ntp_cmd.c
new file mode 100644 (file)
index 0000000..8f741a5
--- /dev/null
+++ b/src/hci/commands/ntp_cmd.c
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2016 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.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+
+#include <stdio.h>
+#include <string.h>
+#include <getopt.h>
+#include <ipxe/command.h>
+#include <ipxe/parseopt.h>
+#include <usr/ntpmgmt.h>
+
+/** @file
+ *
+ * NTP commands
+ *
+ */
+
+/** "ntp" options */
+struct ntp_options {};
+
+/** "ntp" option list */
+static struct option_descriptor ntp_opts[] = {};
+
+/** "ntp" command descriptor */
+static struct command_descriptor ntp_cmd =
+       COMMAND_DESC ( struct ntp_options, ntp_opts, 1, 1, "<server>" );
+
+/**
+ * "ntp" command
+ *
+ * @v argc             Argument count
+ * @v argv             Argument list
+ * @ret rc             Return status code
+ */
+static int ntp_exec ( int argc, char **argv ) {
+       struct ntp_options opts;
+       const char *hostname;
+       int rc;
+
+       /* Parse options */
+       if ( ( rc = parse_options ( argc, argv, &ntp_cmd, &opts ) ) != 0 )
+               return rc;
+
+       /* Parse hostname */
+       hostname = argv[optind];
+
+       /* Get time and date via NTP */
+       if ( ( rc = ntp ( hostname ) ) != 0 ) {
+               printf ( "Could not get time and date: %s\n", strerror ( rc ) );
+               return rc;
+       }
+
+       return 0;
+}
+
+/** NTP command */
+struct command ntp_command __command = {
+       .name = "ntp",
+       .exec = ntp_exec,
+};

diff --git a/src/include/usr/ntpmgmt.h b/src/include/usr/ntpmgmt.h
new file mode 100644 (file)
index 0000000..284e668
--- /dev/null
+++ b/src/include/usr/ntpmgmt.h
@@ -0,0 +1,14 @@
+#ifndef _USR_NTPMGMT_H
+#define _USR_NTPMGMT_H
+
+/** @file
+ *
+ * NTP management
+ *
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+
+extern int ntp ( const char *hostname );
+
+#endif /* _USR_NTPMGMT_H */

diff --git a/src/usr/ntpmgmt.c b/src/usr/ntpmgmt.c
new file mode 100644 (file)
index 0000000..765c6dc
--- /dev/null
+++ b/src/usr/ntpmgmt.c
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2016 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.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <ipxe/ntp.h>
+#include <ipxe/monojob.h>
+#include <usr/ntpmgmt.h>
+
+/** @file
+ *
+ * NTP management
+ *
+ */
+
+/**
+ * Get time and date via NTP
+ *
+ * @v hostname         Hostname
+ * @ret rc             Return status code
+ */
+int ntp ( const char *hostname ) {
+       int rc;
+
+       /* Start NTP client */
+       if ( ( rc = start_ntp ( &monojob, hostname ) ) != 0 )
+               return rc;
+
+       /* Wait for NTP to complete */
+       if ( ( rc = monojob_wait ( NULL, 0 ) ) != 0 )
+               return rc;
+
+       return 0;
+}