Skip to content

S
Software for White Rabbit PTP Core
Commit 5d421fd7 authored by Adam Wujek's avatar Adam Wujek 💬
Browse files
Options

lib/snmp: move an "*Entry" part of OID to the limb part of OID 

Move wrpcSfpEntry and wrpcTemperatureEntry to be a part of limb not a twig.
Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent cd2d1e07
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 15 deletions
lib/snmp.c
View file @ 5d421fd7
...@@ -119,12 +119,11 @@ ...@@ -119,12 +119,11 @@
#define applyFailedInvalidPN 203 #define applyFailedInvalidPN 203
/* defines for wrpcTemperatureTable */ /* defines for wrpcTemperatureTable */
#define TABLE_ROW 2 #define TABLE_ROW 1
#define TABLE_COL 1 #define TABLE_COL 0
#define TABLE_ENTRY 0 #define TABLE_ENTRY 0
#define TABLE_FIRST_ROW 1 #define TABLE_FIRST_ROW 1
#define TABLE_FIRST_COL 2 #define TABLE_FIRST_COL 2
#define TABLE_TABLE_OID_LEN 3
/* Limit community length. Standard says nothing about maximum length, but we /* Limit community length. Standard says nothing about maximum length, but we
* want to limit it to save memory */ * want to limit it to save memory */
...@@ -241,12 +240,14 @@ static void snmp_fix_size(uint8_t *buf, int size); ...@@ -241,12 +240,14 @@ static void snmp_fix_size(uint8_t *buf, int size);
static uint8_t oid_wrpcVersionGroup[] = {0x2B,6,1,4,1,96,101,1,1}; static uint8_t oid_wrpcVersionGroup[] = {0x2B,6,1,4,1,96,101,1,1};
static uint8_t oid_wrpcTimeGroup[] = {0x2B,6,1,4,1,96,101,1,2}; static uint8_t oid_wrpcTimeGroup[] = {0x2B,6,1,4,1,96,101,1,2};
static uint8_t oid_wrpcTemperatureTable[] = {0x2B,6,1,4,1,96,101,1,3}; /* Include wrpcTemperatureEntry into OID */
static uint8_t oid_wrpcTemperatureTable[] = {0x2B,6,1,4,1,96,101,1,3,1};
static uint8_t oid_wrpcSpllStatusGroup[] = {0x2B,6,1,4,1,96,101,1,4}; static uint8_t oid_wrpcSpllStatusGroup[] = {0x2B,6,1,4,1,96,101,1,4};
static uint8_t oid_wrpcPtpGroup[] = {0x2B,6,1,4,1,96,101,1,5}; static uint8_t oid_wrpcPtpGroup[] = {0x2B,6,1,4,1,96,101,1,5};
static uint8_t oid_wrpcPtpConfigGroup[] = {0x2B,6,1,4,1,96,101,1,6}; static uint8_t oid_wrpcPtpConfigGroup[] = {0x2B,6,1,4,1,96,101,1,6};
static uint8_t oid_wrpcPortGroup[] = {0x2B,6,1,4,1,96,101,1,7}; static uint8_t oid_wrpcPortGroup[] = {0x2B,6,1,4,1,96,101,1,7};
static uint8_t oid_wrpcSfpTable[] = {0x2B,6,1,4,1,96,101,1,8}; /* Include wrpcSfpEntry into OID */
static uint8_t oid_wrpcSfpTable[] = {0x2B,6,1,4,1,96,101,1,8,1};
/* wrpcVersionGroup */ /* wrpcVersionGroup */
static uint8_t oid_wrpcVersionHwType[] = {1,0}; static uint8_t oid_wrpcVersionHwType[] = {1,0};
...@@ -260,8 +261,8 @@ static uint8_t oid_wrpcTimeTAIString[] = {2,0}; ...@@ -260,8 +261,8 @@ static uint8_t oid_wrpcTimeTAIString[] = {2,0};
static uint8_t oid_wrpcTimeSystemUptime[] = {3,0}; static uint8_t oid_wrpcTimeSystemUptime[] = {3,0};
/* wrpcTemperatureTable */ /* wrpcTemperatureTable */
static uint8_t oid_wrpcTemperatureName[] = {1,2}; static uint8_t oid_wrpcTemperatureName[] = {2};
static uint8_t oid_wrpcTemperatureValue[] = {1,3}; static uint8_t oid_wrpcTemperatureValue[] = {3};
/* wrpcSpllStatusGroup */ /* wrpcSpllStatusGroup */
static uint8_t oid_wrpcSpllMode[] = {1,0}; static uint8_t oid_wrpcSpllMode[] = {1,0};
...@@ -309,10 +310,10 @@ static uint8_t oid_wrpcPortInternalTX[] = {4,0}; ...@@ -309,10 +310,10 @@ static uint8_t oid_wrpcPortInternalTX[] = {4,0};
static uint8_t oid_wrpcPortInternalRX[] = {5,0}; static uint8_t oid_wrpcPortInternalRX[] = {5,0};
/* oid_wrpcSfpTable */ /* oid_wrpcSfpTable */
static uint8_t oid_wrpcSfpPn[] = {1,2}; static uint8_t oid_wrpcSfpPn[] = {2};
static uint8_t oid_wrpcSfpDeltaTx[] = {1,3}; static uint8_t oid_wrpcSfpDeltaTx[] = {3};
static uint8_t oid_wrpcSfpDeltaRx[] = {1,4}; static uint8_t oid_wrpcSfpDeltaRx[] = {4};
static uint8_t oid_wrpcSfpAlpha[] = {1,5}; static uint8_t oid_wrpcSfpAlpha[] = {5};
/* NOTE: to have SNMP_GET_NEXT working properly this array has to be sorted by /* NOTE: to have SNMP_GET_NEXT working properly this array has to be sorted by
OIDs */ OIDs */
...@@ -828,8 +829,8 @@ static int get_temp(uint8_t *buf, struct snmp_oid *obj) ...@@ -828,8 +829,8 @@ static int get_temp(uint8_t *buf, struct snmp_oid *obj)
int col; int col;
char buffer[20]; char buffer[20];
row = obj->oid_match[2]; row = obj->oid_match[TABLE_ROW];
col = obj->oid_match[1]; col = obj->oid_match[TABLE_COL];
snmp_verbose("%s: row%d, col%d\n", __func__, row, col); snmp_verbose("%s: row%d, col%d\n", __func__, row, col);
for (p = wrc_temp_getnext(NULL); p; p = wrc_temp_getnext(p), i++) { for (p = wrc_temp_getnext(NULL); p; p = wrc_temp_getnext(p), i++) {
if (row == i) { if (row == i) {
...@@ -874,8 +875,8 @@ static int get_sfp(uint8_t *buf, struct snmp_oid *obj) ...@@ -874,8 +875,8 @@ static int get_sfp(uint8_t *buf, struct snmp_oid *obj)
int temp; int temp;
char sfp_pn[SFP_PN_LEN + 1]; char sfp_pn[SFP_PN_LEN + 1];
row = obj->oid_match[2]; row = obj->oid_match[TABLE_ROW];
col = obj->oid_match[1]; col = obj->oid_match[TABLE_COL];
snmp_verbose("%s: row%d, col%d\n", __func__, row, col); snmp_verbose("%s: row%d, col%d\n", __func__, row, col);
for (i = 1; i < sfpcount+1; ++i) { for (i = 1; i < sfpcount+1; ++i) {
sfpcount = storage_get_sfp(&sfp, SFP_GET, i - 1); sfpcount = storage_get_sfp(&sfp, SFP_GET, i - 1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment