experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SNMP: Add IPaddress scalar to clixon mib and fix ipv4 set translation

Browse source
This commit is contained in:
Olof hagsand 2022-07-08 09:47:22 +02:00
parent 1b66dfe1b9
commit d9cdd669d2
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
apps/snmp/snmp_lib.c
View file

@ -127,7 +127,8 @@ static const map_str2int snmp_orig_map[] = {
{"binary", ASN_OCTET_STR}, // 4 {"binary", ASN_OCTET_STR}, // 4
{"timeticks", ASN_TIMETICKS}, // 0x43 / 67 {"timeticks", ASN_TIMETICKS}, // 0x43 / 67
{"timestamp", 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 */ {"phys-address", CLIXON_ASN_PHYS_ADDR}, /* Clixon extended string type */
{"SnmpAdminString", CLIXON_ASN_ADMIN_STRING}, /* cf extension display-type 255T? */ {"SnmpAdminString", CLIXON_ASN_ADMIN_STRING}, /* cf extension display-type 255T? */
{NULL, -1} {NULL, -1}

11
test/mibs/CLIXON-TYPES-MIB.txt
View file

@ -5,7 +5,7 @@ CLIXON-TYPES-MIB DEFINITIONS ::= BEGIN
IMPORTS IMPORTS
MODULE-IDENTITY, OBJECT-TYPE, Integer32, MODULE-IDENTITY, OBJECT-TYPE, Integer32,
TimeTicks, Counter32, Gauge32, Counter64, TimeTicks, Counter32, Gauge32, Counter64,
NOTIFICATION-TYPE FROM SNMPv2-SMI NOTIFICATION-TYPE, IpAddress FROM SNMPv2-SMI
SnmpAdminString FROM SNMP-FRAMEWORK-MIB SnmpAdminString FROM SNMP-FRAMEWORK-MIB
netSnmp FROM NET-SNMP-MIB netSnmp FROM NET-SNMP-MIB
TruthValue, TimeStamp, TruthValue, TimeStamp,
@ -204,7 +204,6 @@ ifCounterDiscontinuityTime OBJECT-TYPE
::= { clixonExampleScalars 11 } ::= { clixonExampleScalars 11 }
ifStackStatus OBJECT-TYPE ifStackStatus OBJECT-TYPE
SYNTAX RowStatus SYNTAX RowStatus
-- MAX-ACCESS read-create
MAX-ACCESS read-only MAX-ACCESS read-only
STATUS current STATUS current
DESCRIPTION DESCRIPTION
@ -217,6 +216,14 @@ ifStackStatus OBJECT-TYPE
support write-access for any type of interface." support write-access for any type of interface."
::= { clixonExampleScalars 12 } ::= { clixonExampleScalars 12 }
ifIpAddr OBJECT-TYPE
SYNTAX IpAddress
MAX-ACCESS read-write
STATUS current
DESCRIPTION
"IP address example."
::= { clixonExampleScalars 13 }
-- --
-- Example Tables -- Example Tables
-- --