Author: rfm
Date: Fri Nov 28 14:01:12 2014
New Revision: 38211
URL: http://svn.gna.org/viewcvs/gnustep?rev=38211&view=rev
Log:
SNMP fix
Modified:
libs/ec/trunk/ChangeLog
libs/ec/trunk/EcAlarmSinkSNMP.m
Modified: libs/ec/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/ec/trunk/ChangeLog?rev=38211&r1=38210&r2=38211&view=diff
==============================================================================
--- libs/ec/trunk/ChangeLog (original)
+++ libs/ec/trunk/ChangeLog Fri Nov 28 14:01:12 2014
@@ -1,3 +1,8 @@
+2014-11-28 Richard Frith-Macdonald <[email protected]>
+
+ * EcAlarmSinkSNMP.m: Fix incorrect OID setup for alarm table in
+ SNMP agent.
+
2014-11-27 Richard Frith-Macdonald <[email protected]>
* EcUserDefaults.m: The -doubleForKey: method was commented out!
Modified: libs/ec/trunk/EcAlarmSinkSNMP.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/ec/trunk/EcAlarmSinkSNMP.m?rev=38211&r1=38210&r2=38211&view=diff
==============================================================================
--- libs/ec/trunk/EcAlarmSinkSNMP.m (original)
+++ libs/ec/trunk/EcAlarmSinkSNMP.m Fri Nov 28 14:01:12 2014
@@ -472,6 +472,8 @@
/* Now use the dotted integer format 'alarms' OID as the basis to set up
* all the alarm data OIDs.
+ * The OID buffer needs to allow for two more OIDs after the 'alarms'
+ * OID because the alarmsTable (in the alarms OID) has entries in it.
*/
oidString = alarmsOID = [[defaults stringForKey: @"AlarmsOID"] copy];
if (nil == oidString) oidString = @"1.3.6.1.4.1.39543.1";
@@ -485,9 +487,10 @@
oids[len] = 0; // alarmsTable
oids[len+1] = 0; // alarmsEntry
- alarmsTable_len = len + 2;
+ alarmsTable_len = len + 1;
alarmsTable_oid = (oid*)malloc(sizeof(oid) * alarmsTable_len);
- memcpy(alarmsTable_oid, oids, sizeof(oid) * (len + 2));
+ memcpy(alarmsTable_oid, oids, sizeof(oid) * (len + 1));
+ alarmsTable_oid[len] = 1;
resyncFlag_len = len + 1;
resyncFlag_oid = (oid*)malloc(sizeof(oid) * resyncFlag_len);
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
