-This patch makes "load X Y Z" snmpsettable via snmpset,
-
-it behaves the same as sysName.0, once written in snmpd.conf, it becames
-readonly.
-
-Signed-off-by: Elan Ruusamäe <glen@delfi.ee>
-Upstream-Tracker: https://sourceforge.net/tracker/?func=detail&aid=2931446&group_id=12694&atid=312694
-
---- net-snmp-5.4.2.1/agent/mibgroup/ucd-snmp/loadave.c~ 2009-12-21 21:00:10.094254079 +0200
-+++ net-snmp-5.4.2.1/agent/mibgroup/ucd-snmp/loadave.c 2009-12-21 22:02:45.398903148 +0200
-@@ -135,7 +135,19 @@
- #include "util_funcs.h"
- #include "kernel.h"
-
--double maxload[3];
-+static double maxload[3];
-+static int laConfigSet = 0;
-+
-+static int
-+loadave_store_config(int a, int b, void *c, void *d)
-+{
-+ char line[SNMP_MAXBUF_SMALL];
-+ if (laConfigSet > 0) {
-+ snprintf(line, SNMP_MAXBUF_SMALL, "pload %.02f %.02f %.02f", maxload[0], maxload[1], maxload[2]);
-+ snmpd_store_config(line);
-+ }
-+ return SNMPERR_SUCCESS;
-+}
-
- void
- init_loadave(void)
-@@ -152,7 +164,7 @@
- {ERRORNAME}},
- {LOADAVE, ASN_OCTET_STR, RONLY, var_extensible_loadave, 1,
- {LOADAVE}},
-- {LOADMAXVAL, ASN_OCTET_STR, RONLY, var_extensible_loadave, 1,
-+ {LOADMAXVAL, ASN_OCTET_STR, RWRITE, var_extensible_loadave, 1,
- {LOADMAXVAL}},
- {LOADAVEINT, ASN_INTEGER, RONLY, var_extensible_loadave, 1,
- {LOADAVEINT}},
-@@ -179,9 +191,22 @@
- REGISTER_MIB("ucd-snmp/loadave", extensible_loadave_variables,
- variable2, loadave_variables_oid);
-
-+ laConfigSet = 0;
-+
- snmpd_register_config_handler("load", loadave_parse_config,
- loadave_free_config,
- "max1 [max5] [max15]");
-+
-+ snmpd_register_config_handler("pload",
-+ loadave_parse_config, NULL, NULL);
-+
-+
-+ /*
-+ * we need to be called back later
-+ */
-+ snmp_register_callback(SNMP_CALLBACK_LIBRARY, SNMP_CALLBACK_STORE_DATA,
-+ loadave_store_config, NULL);
-+
- }
-
- void
-@@ -189,6 +214,25 @@
- {
- int i;
-
-+ if (strcmp(token, "pload") == 0) {
-+ if (laConfigSet < 0) {
-+ snmp_log(LOG_WARNING,
-+ "ignoring attempted override of read-only load\n");
-+ return;
-+ } else {
-+ laConfigSet++;
-+ }
-+ } else {
-+ if (laConfigSet > 0) {
-+ snmp_log(LOG_WARNING,
-+ "ignoring attempted override of read-only load\n");
-+ /*
-+ * Fall through and copy in this value.
-+ */
-+ }
-+ laConfigSet = -1;
-+ }
-+
- for (i = 0; i <= 2; i++) {
- if (cptr != NULL)
- maxload[i] = atof(cptr);
-@@ -309,6 +353,71 @@
- return 0;
- }
-
-+static int
-+write_laConfig(int action,
-+ u_char * var_val,
-+ u_char var_val_type,
-+ size_t var_val_len,
-+ u_char * statP, oid * name, size_t name_len)
-+{
-+ static double laConfig = 0;
-+
-+ switch (action) {
-+ case RESERVE1: /* Check values for acceptability */
-+ if (var_val_type != ASN_OCTET_STR) {
-+ DEBUGMSGTL(("ucd-snmp/loadave",
-+ "write to laConfig not ASN_OCTET_STR\n"));
-+ return SNMP_ERR_WRONGTYPE;
-+ }
-+ if (var_val_len > 8 || var_val_len <= 0) {
-+ DEBUGMSGTL(("ucd-snmp/loadave",
-+ "write to laConfig: bad length\n"));
-+ return SNMP_ERR_WRONGLENGTH;
-+ }
-+
-+ if (laConfigSet < 0) {
-+ /*
-+ * The object is set in a read-only configuration file.
-+ */
-+ return SNMP_ERR_NOTWRITABLE;
-+ }
-+ break;
-+
-+ case RESERVE2: /* Allocate memory and similar resources */
-+ {
-+ u_char buf[8];
-+ int old_errno = errno;
-+ double val;
-+ char *endp;
-+
-+ strncpy(buf, var_val, var_val_len);
-+ buf[var_val_len] = '\0';
-+ val = strtod(buf, &endp);
-+
-+ if (errno == ERANGE || *endp != '\0' || val < 0 || val > 65536.00) {
-+ errno = old_errno;
-+ DEBUGMSGTL(("ucd-snmp/loadave",
-+ "write to laConfig: invalid value\n"));
-+ return SNMP_ERR_WRONGVALUE;
-+ }
-+
-+ errno = old_errno;
-+
-+ laConfig = val;
-+ }
-+ break;
-+
-+ case COMMIT:
-+ {
-+ int idx = name[name_len - 1] - 1;
-+ maxload[idx] = laConfig;
-+ laConfigSet = 1;
-+ }
-+ }
-+
-+ return SNMP_ERR_NOERROR;
-+}
-+
- u_char *
- var_extensible_loadave(struct variable * vp,
- oid * name,
-@@ -328,6 +437,10 @@
- case MIBINDEX:
- long_ret = name[*length - 1];
- return ((u_char *) (&long_ret));
-+ case LOADMAXVAL:
-+ /* setup write method, but don't return yet */
-+ *write_method = write_laConfig;
-+ break;
- case ERRORNAME:
- sprintf(errmsg, "Load-%d", ((name[*length - 1] == 1) ? 1 :
- ((name[*length - 1] == 2) ? 5 : 15)));
+--- net-snmp-5.5/agent/mibgroup/ucd-snmp/loadave.c~ 2010-05-12 14:39:47.608334020 +0200
++++ net-snmp-5.5/agent/mibgroup/ucd-snmp/loadave.c 2010-05-12 14:40:38.068953645 +0200
+@@ -166,7 +166,7 @@
+ var_extensible_loadave, 1, {LOADAVE}},
+ {LOADMAXVAL, ASN_OCTET_STR, NETSNMP_OLDAPI_RONLY,
+ var_extensible_loadave, 1, {LOADMAXVAL}},
+- {LOADAVEINT, ASN_INTEGER, NETSNMP_OLDAPI_RONLY,
++ {LOADAVEINT, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+ var_extensible_loadave, 1, {LOADAVEINT}},
+ #ifdef NETSNMP_WITH_OPAQUE_SPECIAL_TYPES
+ {LOADAVEFLOAT, ASN_OPAQUE_FLOAT, NETSNMP_OLDAPI_RONLY,
projects / packages / net-snmp.git / blobdiff