Rewrite as a stand-alone snmpd agent.

* NEWS: Document new features.
* configure.ac: Raise version number.
* src/.gitignore: Update.
* src/Makefile.am: Build as an agent.
* src/main.c: New file.
* src/modconf.c: Remove "varnish" prefix from the configuration
directives.
(varnish_mib_config_init): Use program name as the base for the
configuration file name.
(varnish_mib_config_help): New function.
* src/modconf.h (progname, pid_file, pid_file_immutable): New externs.
* src/varnish-mib.8: Rewrite.
* src/varnish_mib.mib2c (varnish_snmp_init)
(varnish_snmp_deinit): Remove.
(post_config): Extern. Called from main().

9 files changed, 451 insertions, 112 deletions

diff --git a/NEWS b/NEWS
index 34ba295..8e0cbb4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,12 @@
-Varnish-mib NEWS -- history of user-visible changes. 2018-12-10
+Varnish-mib NEWS -- history of user-visible changes. 2019-02-14
 See the end of file for copying conditions.
 
 Please send Varnish-mib bug reports to <gray@gnu.org>
 
+Version 3.99.90 (git)
+
+Rewrite as a stand-alone snmpd agent.
+
 Version 3.1, 2018-12-10
 
 Supports Varnish 6.0.2.
@@ -115,7 +119,7 @@ Initial release.
 
 * Copyright information:
 
-Copyright (C) 2014-2018 Sergey Poznyakoff
+Copyright (C) 2014-2019 Sergey Poznyakoff
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/configure.ac b/configure.ac
index f2bca53..af72e65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # This file is part of Varnish-mib -*- autoconf -*-
-# Copyright (C) 2014-2018 Sergey Poznyakoff
+# Copyright (C) 2014-2019 Sergey Poznyakoff
 #
 # Varnish-mib is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
 # along with Varnish-mib.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.69)
-AC_INIT([varnish-mib], 3.1, [gray@gnu.org])
+AC_INIT([varnish-mib], 3.99.90, [gray@gnu.org])
 AC_CONFIG_SRCDIR(src/varnish_mib.mib2c)
 AM_CONFIG_HEADER(config.h)
 AC_CONFIG_AUX_DIR([build-aux])
@@ -50,7 +50,11 @@ AC_PATH_PROG([NET_SNMP_CONFIG], net-snmp-config, none, $PATH)
 if test "$NET_SNMP_CONFIG" = "none"; then
   AC_MSG_ERROR([cannot find Net-SNMP (net-snmp-config not found)])
 fi
-AC_SUBST(NET_SNMP_CONFIG)
+
+AC_SUBST(NET_SNMP_LIBS, `$NET_SNMP_CONFIG --agent-libs`)
+AC_SUBST(NET_SNMP_EXLIBS, `$NET_SNMP_CONFIG --external-libs`)
+AC_SUBST(NET_SNMP_MIBDIRS, `$NET_SNMP_CONFIG --mibdirs`)
+AC_SUBST(NET_SNMP_MIBS, `$NET_SNMP_CONFIG --default-mibs`)
 
 # Checks for header files.
 AC_HEADER_STDC
diff --git a/src/.gitignore b/src/.gitignore
index f40282a..e6ff459 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,3 +1,4 @@
+varnish-mib
 varnish_mib.c
 varnish_mib.h
 belex.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 5c79dfc..6019c39 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 # This file is part of varnish-mib -*- automake -*-
-# Copyright (C) 2014-2018 Sergey Poznyakoff
+# Copyright (C) 2014-2019 Sergey Poznyakoff
 #
 # varnish-mib is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,15 +14,14 @@
 # You should have received a copy of the GNU General Public License
 # along with varnish-mib.  If not, see <http://www.gnu.org/licenses/>.
 
-dlmoddir=@DLMODDIR@
-dlmod_LTLIBRARIES = varnish-mib.la
-
-varnish_mib_la_SOURCES = \
+sbin_PROGRAMS = varnish-mib
+varnish_mib_SOURCES = \
  auth.c\
  ban.c\
  backend.h\
  belex.l\
  betab.c\
+ main.c\
  modconf.h\
  modconf.c\
  sha256.c\
@@ -44,18 +43,7 @@ varnish_mib.c varnish_mib.h: varnish_mib.mib2c VARNISH-MIB.txt
         PERL5LIB=${top_srcdir}/lib \
          mib2c -c $< -f $@ varnish
 
-#NET_SNMP_INCLUDES = `$(NET_SNMP_CONFIG) --cflags`
-#NET_SNMP_INCLUDES =
-NET_SNMP_LIBS = `$(NET_SNMP_CONFIG) --libs`
-NET_SNMP_EXLIBS = `$(NET_SNMP_CONFIG) --external-libs`
-NET_SNMP_MIBDIRS = `net-snmp-config --mibdirs`
-NET_SNMP_MIBS = `net-snmp-config --default-mibs`
-
 AM_LDFLAGS = \
- -module \
- -export-dynamic\
- -avoid-version \
- -rpath '$(dlmoddir)'\
  ${VARNISHAPI_LIBS}\
  $(NET_SNMP_LIBS)\
  $(NET_SNMP_EXLIBS)
diff --git a/src/main.c b/src/main.c
new file mode 100644
index 0000000..a8d089f
--- /dev/null
+++ b/src/main.c
@@ -0,0 +1,282 @@
+#include "varnish_mib.h"
+#include <unistd.h>
+#include <sys/types.h>
+#include <signal.h>
+
+char *progname;
+
+static void pidfile_check(char const *pid_file);
+static void pidfile_create(char const *pid_file);
+static int pidfile_remove(char const *pid_file);
+
+void
+usage(FILE *fp)
+{
+        fprintf(fp, "usage: varnish-mib [OPTIONS]\n");
+        fprintf(fp, "SNMP agent for Varnish Cache monitoring\n");
+        fprintf(fp, "OPTIONS are:\n\n");
+
+        fprintf(fp,
+                "  -A          append to the log file rather than truncating it\n");
+        fprintf(fp,
+                "  -C          do not read any configuration files except the ones optionally\n"
+                "              specified by the -c option\n");
+        fprintf(fp,
+                "  -D TOKEN[,TOKEN...]\n"
+                "              turn on debugging output for the given TOKENs\n");
+        fprintf(fp,
+                "  -H          display a list of configuration file directives understood\n"
+                "              by the agent and then exit\n");
+        fprintf(fp,
+                "  -L[efos]    configure logging\n");
+        fprintf(fp,
+                "  -c FILE     ead FILE as a configuration file (or a comma-separated list of\n"
+                "              configuration files\n");
+        fprintf(fp,
+                "  -d          dump (in hexadecimal) the sent and received SNMP packets\n");
+        fprintf(fp,
+                "  -f          remain in the foreground\n");
+        fprintf(fp,
+                "  -h, -?      print this help summary\n");
+        fprintf(fp,
+                "  -n NAME     assume this program name\n");
+        fprintf(fp,
+                "  -p          save the process ID of the daemon in FILE\n");
+        fprintf(fp, "\n");
+        fprintf(fp, "default configuration path is: %s\n",
+                get_configuration_directory());
+}
+
+static volatile int stop;
+
+static void
+stophandler(int sig)
+{
+        stop = 1;
+}
+
+int
+main(int argc, char **argv)
+{
+        int c, i;
+        int foreground = 0;
+        struct sigaction sa;
+        static int signo[] = {
+                SIGHUP,
+                SIGINT,
+                SIGQUIT,
+                SIGTERM,
+                0
+        };
+        int log_set = 0;
+        int snmp_dump_packet = 0;
+        
+        progname = strrchr(argv[0], '/');
+        if (progname)
+                progname++;
+        else
+                progname = argv[0];
+        if (strncmp(progname, "lt-", 3) == 0)
+                progname += 3;
+
+        while ((c = getopt(argc, argv, "ACD:HL:c:dfhn:p:")) != EOF) {
+                switch (c) {
+                case 'A':
+                        netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID,
+                                               NETSNMP_DS_LIB_APPEND_LOGFILES,
+                                               1);
+                        break;
+
+                case 'C':
+                        netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID,
+                                               NETSNMP_DS_LIB_DONT_READ_CONFIGS,
+                                               1);
+                        break;
+                        
+                case 'D':