From d9cdd669d2cbb4172b47142e141fe06d516dbf0b Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Fri, 8 Jul 2022 09:47:22 +0200
Subject: [PATCH] SNMP: Add IPaddress scalar to clixon mib and fix ipv4 set
 translation

---
 apps/snmp/snmp_lib.c           |  3 ++-
 test/mibs/CLIXON-TYPES-MIB.txt | 13 ++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/apps/snmp/snmp_lib.c b/apps/snmp/snmp_lib.c
index 2c2e41d3..4d30ba4e 100644
--- a/apps/snmp/snmp_lib.c
+++ b/apps/snmp/snmp_lib.c
@@ -127,7 +127,8 @@ static const map_str2int snmp_orig_map[] = {
     {"binary",                ASN_OCTET_STR}, // 4
     {"timeticks",             ASN_TIMETICKS}, // 0x43 / 67
     {"timestamp",             ASN_TIMETICKS}, // 0x43 / 67
-    {"InetAddress",           ASN_IPADDRESS}, // 0x40 / 64
+    {"InetAddress",           ASN_IPADDRESS}, // 0x40 / 64 (Dont see this being used)
+    {"ipv4-address",          ASN_IPADDRESS}, // 0x40 / 64 (This is used instead)
     {"phys-address",          CLIXON_ASN_PHYS_ADDR},    /* Clixon extended string type */
     {"SnmpAdminString",       CLIXON_ASN_ADMIN_STRING}, /* cf extension display-type 255T? */
     {NULL,                    -1}
diff --git a/test/mibs/CLIXON-TYPES-MIB.txt b/test/mibs/CLIXON-TYPES-MIB.txt
index cc467f14..4523d6cb 100644
--- a/test/mibs/CLIXON-TYPES-MIB.txt
+++ b/test/mibs/CLIXON-TYPES-MIB.txt
@@ -5,7 +5,7 @@ CLIXON-TYPES-MIB DEFINITIONS ::= BEGIN
 IMPORTS
     MODULE-IDENTITY, OBJECT-TYPE, Integer32,
     TimeTicks, Counter32, Gauge32, Counter64,
-    NOTIFICATION-TYPE                       FROM SNMPv2-SMI
+    NOTIFICATION-TYPE, IpAddress            FROM SNMPv2-SMI
     SnmpAdminString                         FROM SNMP-FRAMEWORK-MIB
     netSnmp                                 FROM NET-SNMP-MIB
     TruthValue, TimeStamp,
@@ -204,7 +204,6 @@ ifCounterDiscontinuityTime OBJECT-TYPE
     ::= { clixonExampleScalars 11 }
 ifStackStatus  OBJECT-TYPE
     SYNTAX         RowStatus
---    MAX-ACCESS     read-create
     MAX-ACCESS     read-only
     STATUS         current
     DESCRIPTION
@@ -216,7 +215,15 @@ ifStackStatus  OBJECT-TYPE
             interfaces, and many implementations will choose not to
             support write-access for any type of interface."
     ::= { clixonExampleScalars 12 }
-    
+
+ifIpAddr  OBJECT-TYPE
+    SYNTAX         IpAddress
+    MAX-ACCESS     read-write
+    STATUS         current
+    DESCRIPTION
+            "IP address example."
+    ::= { clixonExampleScalars 13 }
+
 --
 --  Example Tables
 --