final snmp goop

diff --git a/src/Makefile.in b/src/Makefile.in
index 7e74a0b2aa3a3d73d3a8b095fee97b26aaf24025..94054e1a662cbdd3d2892fe9f92ef7a65136531c 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.97 1997/11/21 00:29:34 wessels Exp $
+#  $Id: Makefile.in,v 1.98 1997/11/21 00:47:54 wessels Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -17,12 +17,17 @@ ALARM_UPDATES_TIME = # -DALARM_UPDATES_TIME=1
 STORE_KEY_SHA  = # -DSTORE_KEY_SHA=1
 USE_ASYNC_IO   = # -DUSE_ASYNC_IO=1
 
+# define all three for SNMP support
+SQUID_SNMP     = -DSQUID_SNMP=1
+SQUID_MIB      = mib.txt 
+SQUID_SNMP_LIBS = -L../snmplib -lsnmp
+
 DEFINES         = $(HOST_OPT) \
                   $(ICMP_OPT) $(DELAY_HACK) $(USERAGENT_OPT) \
                   $(KILL_PARENT_OPT) $(USE_POLL_OPT) \
                   $(USE_SPLAY_TREE) $(USE_BIN_TREE) \
                  $(ALARM_UPDATES_TIME) $(STORE_KEY_SHA) \
-                 $(USE_ASYNC_IO)
+                 $(USE_ASYNC_IO) $(SQUID_SNMP)
 
 prefix         = @prefix@
 exec_prefix    = @exec_prefix@

diff --git a/src/cf.data.pre b/src/cf.data.pre
index ffc4bc242bcb7afdb84a71e159dd70f092109fae..bc6202ed84d184d6684aa6cd44f429846a7a6d95 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1925,4 +1925,56 @@ DOC_START
 maximum_single_addr_tries 3
 DOC_END
 
+NAME: snmp_port
+TYPE: ushort
+LOC: Config.Port.snmp
+DEFAULT: 3401
+DOC_START
+       Port for snmp. <=0 to disable.
+DOC_END
+
+NAME: snmp_config_file
+TYPE: string
+LOC: Config.Snmp.configFile
+DEFAULT: @DEFAULT_SNMP_CONF@
+DOC_START
+       External snmp configuration file, CMU-snmpd style.
+DOC_END
+
+NAME: snmp_do_queueing
+TYPE: onoff
+LOC: Config.Snmp.do_queueing
+DEFAULT: on
+DOC_START
+       If disabled, snmp packets will not be queued but delivered
+       immediately. This could be performant when you want to monitor a
+       cache in trouble, but this could also bring squid to block.
+DOC_END
+NAME: forward_snmpd_port
+TYPE: ushort
+LOC: Config.Snmp.localPort
+DEFAULT: 0
+DOC_START
+       This configures whether we should be forwarding SNMP requests to
+       another snmpd. The reason for putting this piece of
+       functionality into squid was to enable access to the system's
+       installed snmpd with minimal changes.  This option is turned off
+       by default, check with your /etc/services for your system's snmp
+       port (usually 161).  We do not use getservbyname() to allow you
+       to set squid into port 161 and your system's snmpd to another
+       port by changing /etc/services.  WARNING: Because of squid
+       acting as a proxy snmpd for system  you have to do security
+       checks on THIS snmpd for all objects.  Check your
+       snmp_config_file
+DOC_END
+
+NAME: snmp_mib_path
+TYPE: string
+LOC: Config.Snmp.mibPath
+DEFAULT: @DEFAULT_MIB_PATH@
+DOC_START
+       The location of squid's mib.
+DOC_END
+
+
 EOF