fix GET-NEXT in PTLib-SNMP (for snmpwalk)

willamowius · willamowius · commit 773eafea4504 · 2019-12-12T21:03:27.000+01:00
diff --git a/changes.txt b/changes.txt
@@ -1,5 +1,6 @@
 Changes from 5.3 to 5.4
 =======================
+- BUGFIX(snmp.cxx) fix GET-NEXT in PTLib-SNMP (for snmpwalk)
 - new module: MQTTAcct - send accounting to MQTT server
 - BUGFIX(RasSrv.*) fix sending alternate gatekeeper list to endpoints with assigned gatekeeper
 - BUGFIX(GkClient.cxx) improve DRQ from client gatekeeper
diff --git a/snmp.cxx b/snmp.cxx
@@ -491,9 +491,11 @@ PBoolean PTLibSNMPAgent::OnGetRequest(PINDEX reqID, PSNMP::BindingList & vars, P
 
 PBoolean PTLibSNMPAgent::OnGetNextRequest(PINDEX reqID, PSNMP::BindingList & vars, PSNMP::ErrorType & errCode)
 {
-    const PString & oid = vars.front().first;
+    PString oid = vars.front().first;
+    if (oid.Right(2) == ".0")
+        oid = oid.Left(oid.GetLength() - 2);
     list<PString>::const_iterator it = m_nextList.begin();
-    while(it != m_nextList.end() && (OIDCmp(*it, oid) == -1)) {
+    while(it != m_nextList.end() && (OIDCmp(*it, oid) <= 0)) {
         ++it;
     }
     if (it != m_nextList.end() /* TODO: && is in same space? */) {

Original file line number	Diff line number	Diff line change
`@@ -491,9 +491,11 @@ PBoolean PTLibSNMPAgent::OnGetRequest(PINDEX reqID, PSNMP::BindingList & vars, P`
`491`	`491`
`492`	`492`	`PBoolean PTLibSNMPAgent::OnGetNextRequest(PINDEX reqID, PSNMP::BindingList & vars, PSNMP::ErrorType & errCode)`
`493`	`493`	`{`
`494`		`- const PString & oid = vars.front().first;`
	`494`	`+ PString oid = vars.front().first;`
	`495`	`+ if (oid.Right(2) == ".0")`
	`496`	`+ oid = oid.Left(oid.GetLength() - 2);`
`495`	`497`	`list<PString>::const_iterator it = m_nextList.begin();`
`496`		`- while(it != m_nextList.end() && (OIDCmp(*it, oid) == -1)) {`
	`498`	`+ while(it != m_nextList.end() && (OIDCmp(*it, oid) <= 0)) {`
`497`	`499`	`++it;`
`498`	`500`	`}`
`499`	`501`	`if (it != m_nextList.end() /* TODO: && is in same space? */) {`