Fixes #18.

Quick fix solution.
shortbloke · Jul 7, 2022 · 6679e43 · 6679e43
1 parent 69995ec
commit 6679e43
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG for SNMP Manager For ESP8266/ESP32/Arduino
 
+## 1.1.7
+
+- Fixes #18 support OID that use large integers, up to 4 bytes.
+
 ## 1.1.6
 
 - Allow non standard port to be used when making SNMP requests. Default UDP port 161 can be overridden using `setPort(<port number>)`.

diff --git a/library.properties b/library.properties
@@ -1,10 +1,10 @@
 name=SNMP Manager
-version=1.1.6
+version=1.1.7
 author=Martin Rowan <martin@martinrowan.co.uk>
 maintainer=Martin Rowan <martin@martinrowan.co.uk>
-sentence=A SNMP Manager for esp32/esp8266 to send SNMP requests to other SNMP enabled devices.
-paragraph=Supports SNMP v1 and v2c, sending SNMP GET requests and decoding the GET-RESPONSE for INTEGER, OCTET STRING, OID, COUNTER, COUNTER64, TIMETICKS and GUAGE data types.
+sentence=An SNMP Manager library to make SNMP requests to other SNMP enabled devices.
+paragraph=Supporting SNMP v1 and v2, SNMP requests can be sent (GetRequest) and their responses received (GetResponse) for various SNMP data types.
 category=Communication
 url=https://github.com/shortbloke/Arduino_SNMP_Manager
-architectures=esp32,esp8266
+architectures=*
 includes=Arduino_SNMP_Manager.h
diff --git a/src/BER.h b/src/BER.h
@@ -315,23 +315,30 @@ class OIDType : public BER_CONTAINER
             strncpy(tempBuf, start, end - start + 1);
             long tempVal;
             tempVal = atoi(tempBuf);
-            if (tempVal > 127)
+            if (tempVal < 128)
+            {
+                _length += 1;
+                *ptr++ = (char)tempVal;
+            }
+            else
             {
                 // Serial.print("large num: ");Serial.println(tempVal);
+                // FIXME: This will only encode integers upto 4 bytes. Ideall this should be a loop.
+                if (tempVal / 128 / 128 > 128)
+                {
+                    *ptr++ = ((tempVal / 128 / 128 / 128 ) | 0x80) & 0xFF;
+                    _length += 1;
+                }
                 if (tempVal / 128 > 128)
                 {
-                    *ptr++ = ((tempVal / 128 / 128) | 0x80) & 0xFF; // dodgy
+                    *ptr++ = ((tempVal / 128 / 128) | 0x80) & 0xFF;
                     _length += 1;
                 }
                 *ptr++ = ((tempVal / 128) | 0x80) & 0xFF;
+
                 *ptr++ = tempVal % 128 & 0xFF;
                 _length += 2;
             }
-            else
-            {
-                _length += 1;
-                *ptr++ = (char)tempVal;
-            }
 
             valuePtr = end + 1;