Add command line option to show the version

OK claudio@

diff --git a/usr.sbin/bgpctl/bgpctl.8 b/usr.sbin/bgpctl/bgpctl.8
index 990e39c..32e3462 100644 (file)
--- a/usr.sbin/bgpctl/bgpctl.8
+++ b/usr.sbin/bgpctl/bgpctl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bgpctl.8,v 1.98 2021/05/20 10:03:43 claudio Exp $
+.\" $OpenBSD: bgpctl.8,v 1.99 2021/06/16 16:24:12 job Exp $
 .\"
 .\" Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: May 20 2021 $
+.Dd $Mdocdate: June 16 2021 $
 .Dt BGPCTL 8
 .Os
 .Sh NAME
@@ -22,7 +22,7 @@
 .Nd control the Border Gateway Protocol daemon
 .Sh SYNOPSIS
 .Nm bgpctl
-.Op Fl jn
+.Op Fl jnV
 .Op Fl s Ar socket
 .Ar command
 .Op Ar argument ...
@@ -60,6 +60,8 @@ To administer
 in a different routing domain, run
 .Nm
 in said routing domain.
+.It Fl V
+Show the version and exit.
 .El
 .Pp
 The commands are as follows:

diff --git a/usr.sbin/bgpctl/bgpctl.c b/usr.sbin/bgpctl/bgpctl.c
index 13bc565..0821406 100644 (file)
--- a/usr.sbin/bgpctl/bgpctl.c
+++ b/usr.sbin/bgpctl/bgpctl.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: bgpctl.c,v 1.268 2021/05/27 08:29:06 claudio Exp $ */
+/*     $OpenBSD: bgpctl.c,v 1.269 2021/06/16 16:24:11 job Exp $ */
 
 /*
  * Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
@@ -39,6 +39,7 @@
 #include "bgpd.h"
 #include "session.h"
 #include "rde.h"
+#include "version.h"
 
 #include "bgpctl.h"
 #include "parser.h"
@@ -94,7 +95,7 @@ main(int argc, char *argv[])
        if (asprintf(&sockname, "%s.%d", SOCKET_NAME, tableid) == -1)
                err(1, "asprintf");
 
-       while ((ch = getopt(argc, argv, "jns:")) != -1) {
+       while ((ch = getopt(argc, argv, "jns:V")) != -1) {
                switch (ch) {
                case 'n':
                        if (++nodescr > 1)
@@ -106,6 +107,9 @@ main(int argc, char *argv[])
                case 's':
                        sockname = optarg;
                        break;
+               case 'V':
+                       fprintf(stderr, "OpenBGPD %s\n", BGPD_VERSION);
+                       return 0;
                default:
                        usage();
                        /* NOTREACHED */

diff --git a/usr.sbin/bgpd/bgpd.8 b/usr.sbin/bgpd/bgpd.8
index eb5082e..58ce1cf 100644 (file)
--- a/usr.sbin/bgpd/bgpd.8
+++ b/usr.sbin/bgpd/bgpd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bgpd.8,v 1.67 2021/05/25 14:18:44 claudio Exp $
+.\" $OpenBSD: bgpd.8,v 1.68 2021/06/16 16:24:12 job Exp $
 .\"
 .\" Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: May 25 2021 $
+.Dd $Mdocdate: June 16 2021 $
 .Dt BGPD 8
 .Os
 .Sh NAME
@@ -23,7 +23,7 @@
 .Sh SYNOPSIS
 .Nm bgpd
 .Bk -words
-.Op Fl cdnv
+.Op Fl cdnvV
 .Op Fl D Ar macro Ns = Ns Ar value
 .Op Fl f Ar file
 .Ek
@@ -203,6 +203,8 @@ Configtest mode.
 Only check the configuration file for validity.
 .It Fl v
 Produce more verbose output.
+.It Fl V
+Show the version and exit.
 .El
 .Sh FILES
 .Bl -tag -width "/var/run/bgpd.sock.<rdomain>" -compact

diff --git a/usr.sbin/bgpd/bgpd.c b/usr.sbin/bgpd/bgpd.c
index 88427f5..863c257 100644 (file)
--- a/usr.sbin/bgpd/bgpd.c
+++ b/usr.sbin/bgpd/bgpd.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: bgpd.c,v 1.237 2021/05/17 10:47:07 claudio Exp $ */
+/*     $OpenBSD: bgpd.c,v 1.238 2021/06/16 16:24:12 job Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -36,6 +36,7 @@
 #include "bgpd.h"
 #include "session.h"
 #include "log.h"
+#include "version.h"
 
 void           sighdlr(int);
 __dead void    usage(void);
@@ -145,7 +146,7 @@ main(int argc, char *argv[])
        if (saved_argv0 == NULL)
                saved_argv0 = "bgpd";
 
-       while ((ch = getopt(argc, argv, "cdD:f:nRSTv")) != -1) {
+       while ((ch = getopt(argc, argv, "cdD:f:nRSTvV")) != -1) {
                switch (ch) {
                case 'c':
                        cmd_opts |= BGPD_OPT_FORCE_DEMOTE;
@@ -178,6 +179,9 @@ main(int argc, char *argv[])
                case 'T':
                        proc = PROC_RTR;
                        break;
+               case 'V':
+                       fprintf(stderr, "OpenBGPD %s\n", BGPD_VERSION);
+                       return 0;
                default:
                        usage();
                        /* NOTREACHED */

diff --git a/usr.sbin/bgpd/version.h b/usr.sbin/bgpd/version.h
new file mode 100644 (file)
index 0000000..a69bc51
--- /dev/null
+++ b/usr.sbin/bgpd/version.h
@@ -0,0 +1,2 @@
+
+#define BGPD_VERSION   "7.0"