userspace/snmpd: add wrsPtpInstanceExtensionCfg to wrsPtpInstanceTable

Signed-off-by: Adam Wujek <dev_public@wujek.eu>

userspace/snmpd/WR-SWITCH-MIB.txt

@@ -26,6 +26,13 @@ wrSwitchMIB MODULE-IDENTITY
     DESCRIPTION  "White Rabbit Switch internal details
                  "
 
+    REVISION     "202311300000Z"
+    DESCRIPTION
+        "Updates for v7.0 WRS firmware release
+        Added objects:
+         - wrsPtpInstanceExtensionCfg
+        "
+
     REVISION     "202303260000Z"
     DESCRIPTION
         "Updates for v6.1 WRS firmware release
@@ -2917,7 +2924,8 @@ WrsPtpInstanceEntry ::=
         wrsPtpInstancePeerVid           INTEGER,
         wrsPtpInstanceVlanNum           INTEGER,
         wrsPtpInstanceVlanListStr       DisplayString,
-        wrsPtpInstanceStatusError       INTEGER
+        wrsPtpInstanceStatusError       INTEGER,
+        wrsPtpInstanceExtensionCfg      INTEGER
     }
 
 wrsPtpInstancePortIndex OBJECT-TYPE
@@ -3199,6 +3207,20 @@ wrsPtpInstanceVlanListStr  OBJECT-TYPE
              "
     ::= { wrsPtpInstanceEntry 26 }
 
+wrsPtpInstanceExtensionCfg  OBJECT-TYPE
+    SYNTAX         INTEGER {                   --ppsi/include/ppsi/ppsi.h
+                        na(0),
+                        none(1),               -- PPSI_EXT_NONE
+                        whiteRabbit(2),        -- PPSI_EXT_WR
+                        l1Sync(3),             -- PPSI_EXT_L1S
+                        haWrAutonegotiation(4) -- autonegotiation between HA nad WR
+    }
+    MAX-ACCESS     read-only
+    STATUS         current
+    DESCRIPTION
+            "Extension configured on the PTP Instance"
+    ::= { wrsPtpInstanceEntry 27 }
+
 --wrsNetworking
 --Configuration
 

userspace/snmpd/oids.txt

@@ -310,6 +310,7 @@
 "wrsPtpInstanceVlanNum"			"1.3.6.1.4.1.96.100.7.8.1.24"
 "wrsPtpInstanceVlanListStr"			"1.3.6.1.4.1.96.100.7.8.1.25"
 "wrsPtpInstanceStatusError"			"1.3.6.1.4.1.96.100.7.8.1.26"
+"wrsPtpInstanceExtensionCfg"			"1.3.6.1.4.1.96.100.7.8.1.27"
 "wrsId"			"1.3.6.1.4.1.96.100.1000"
 "wrsIdUnkn"			"1.3.6.1.4.1.96.100.1000.1"
 "wrsIdUnknUnkn"			"1.3.6.1.4.1.96.100.1000.1.1"

userspace/snmpd/wrsPtpInstanceTable.c

@@ -41,6 +41,7 @@ static struct pickinfo wrsPtpInstanceTable_pickinfo[] = {
 	FIELD(wrsPtpInstanceTable_s, ASN_OCTET_STR, wrsPtpInstanceVlanListStr),
 
 	FIELD(wrsPtpInstanceTable_s, ASN_INTEGER,   wrsPtpInstanceStatusError),
+	FIELD(wrsPtpInstanceTable_s, ASN_INTEGER,   wrsPtpInstanceExtensionCfg),
 };
 static char *slog_obj_name;
 static char *wrsPtpInstanceStatusError_str = "wrsPtpInstanceStatusError";
@@ -249,6 +250,11 @@ time_t wrsPtpInstanceTable_data_fill(unsigned int *n_rows)
 					}
 				}
 			}
+			if (ppsi_i->cfg.extAutonegEnable == PPSI_EXT_AUTONEG_ENABLE) {
+				pit->wrsPtpInstanceExtensionCfg = WRS_PTP_INSTANCE_EXTENSION_CFG_HAWRAUTONEGOTIATION;
+			} else {
+				pit->wrsPtpInstanceExtensionCfg = ppsi_i->cfg.extension + 1;
+			}
 		}
 
 		retries++;

userspace/snmpd/wrsPtpInstanceTable.h

@@ -15,6 +15,8 @@
 					  * equal to 0 (NA),shouldn't happen in
 					  * normal operation */
 
+#define WRS_PTP_INSTANCE_EXTENSION_CFG_HAWRAUTONEGOTIATION		4
+
 
 struct wrsPtpInstanceTable_s {
 	uint32_t wrsPtpInstancePortIndex;		/* not reported, index fields has t o be marked
@@ -47,6 +49,7 @@ struct wrsPtpInstanceTable_s {
 	 * because SNMP does not allow table within table */
 	char wrsPtpInstanceVlanListStr[WRSPTPINSTANCEVLANLISTSTRLEN];
         int wrsPtpInstanceStatusError;
+	int wrsPtpInstanceExtensionCfg;
 };
 
 extern struct wrsPtpInstanceTable_s wrsPtpInstanceTable_array[PP_MAX_LINKS];