- Fixed snmp system Group; all objects are now returned.

        - Fixed snmp system Group sysDescr and sysContact.

diff --git a/ChangeLog b/ChangeLog
index b1c7c4ce31fcbe251b90529d38f471ceedacf271..265b7a30a29e78abf4efc0e1ab728d2a6b6a85c4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,9 @@
        - We can now cache HTTP replies with Set-Cookie.  These evil
          headers are now filtered out for cache hits on the client
          side.
+       - Fixed snmpwalk crash. snmpwalks do not crash squid anymore.
+       - Fixed snmp system Group; all objects are now returned.
+       - Fixed snmp system Group sysDescr and sysContact.
 
 Changes to squid-1.2.beta22 (June 1, 1998):
 

diff --git a/include/cache_snmp.h b/include/cache_snmp.h
index f0035c81e0078cb2e88b0e1f5274070d2ef4b649..14397501d0faaec709f82aec3a193672853c94ab 100644 (file)
--- a/include/cache_snmp.h
+++ b/include/cache_snmp.h
@@ -29,6 +29,11 @@
 #define CURRENT_MIB_VERSION "-- v 1.14 1998/04/03 kostas@nlanr.net"
 #endif
 
+/* Base value for sysDescr */
+#ifndef SQUID_SYS_DESCR
+#define SQUID_SYS_DESCR "Squid Internet Object Cache"
+#endif
+
 /* MIB definitions
  * We start from the SQUIDMIB as the root of the subtree
  *
@@ -59,14 +64,13 @@
 
 enum {                         /* basic system mib info group */
     SYSMIB_START,
-    VERSION_DESCR,
-    VERSION_ID,
-    UPTIME,
-    SYSCONTACT,
-    SYSYSNAME,
-    SYSLOCATION,
-    SYSSERVICES,
-    SYSORLASTCHANGE,
+    SYS_DESCR,
+    SYS_OBJECT_ID,
+    SYS_UPTIME,
+    SYS_CONTACT,
+    SYS_NAME,
+    SYS_LOCATION,
+    SYS_SERVICES,
     SYSMIB_END
 };
 

diff --git a/src/snmp_agent.cc b/src/snmp_agent.cc
index 9fa36d6d6e81a1f0471a919656b9d140423f8718..5bf3ff4b036f9ee765d8913eaef7ac0c5661c6df 100644 (file)
--- a/src/snmp_agent.cc
+++ b/src/snmp_agent.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: snmp_agent.cc,v 1.44 1998/04/04 01:44:02 kostas Exp $
+ * $Id: snmp_agent.cc,v 1.45 1998/07/08 17:36:18 glenn Exp $
  *
  * DEBUG: section 49     SNMP Interface
  * AUTHOR: Kostas Anagnostakis
@@ -61,38 +61,43 @@ snmp_basicFn(variable_list * Var, snint * ErrP)
     *ErrP = SNMP_ERR_NOERROR;
 
     switch (Var->name[7]) {
-    case VERSION_DESCR:
-    case VERSION_ID:
+    case SYS_DESCR:
+       pp = SQUID_SYS_DESCR;
+        Answer->type = ASN_OCTET_STR;
+        Answer->val_len = strlen(pp);
+        Answer->val.string = (u_char *) xstrdup(pp);
+        break;
+    case SYS_OBJECT_ID:
        pp = SQUID_VERSION;
        Answer->type = ASN_OCTET_STR;
        Answer->val_len = strlen(pp);
        Answer->val.string = (u_char *) xstrdup(pp);
        break;
-    case UPTIME:
-    case SYSORLASTCHANGE:
+    case SYS_UPTIME:
        Answer->val_len = sizeof(snint);
        Answer->val.integer = xmalloc(Answer->val_len);
        Answer->type = SMI_TIMETICKS;
        *(Answer->val.integer) = (snint) (tvSubDsec(squid_start, current_time));
        break;
-    case SYSCONTACT:
+    case SYS_CONTACT:
        Answer->type = ASN_OCTET_STR;
        Answer->val_len = strlen(Config.adminEmail);
        Answer->val.string = (u_char *) xstrdup(Config.adminEmail);
-    case SYSYSNAME:
+       break;
+    case SYS_NAME:
        if ((pp = Config.visibleHostname) == NULL)
            pp = (char *) getMyHostname();
        Answer->type = ASN_OCTET_STR;
        Answer->val_len = strlen(pp);
        Answer->val.string = (u_char *) xstrdup(pp);
        break;
-    case SYSLOCATION:
+    case SYS_LOCATION:
        pp = "Cyberspace";
        Answer->type = ASN_OCTET_STR;
        Answer->val_len = strlen(pp);
        Answer->val.string = (u_char *) xstrdup(pp);
        break;
-    case SYSSERVICES:
+    case SYS_SERVICES:
        Answer->val_len = sizeof(snint);
        Answer->val.integer = xmalloc(Answer->val_len);
        Answer->type = ASN_INTEGER;