Skip to content

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

lib/snmp: add wrpcInitScriptConfigGroup to update init script 

If SNMP_INIT enabled it adds 340 bytes
Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent af0069f5
Hide whitespace changes
Inline Side-by-side
Showing with 112 additions and 1 deletion
Kconfig
View file @ 4f77dba8
...@@ -175,13 +175,21 @@ config SNMP_SET ...@@ -175,13 +175,21 @@ config SNMP_SET
help help
This option enables support for SET requests for Mini SNMP responder This option enables support for SET requests for Mini SNMP responder
config SNMP_INIT
depends on SNMP && BUILD_INIT
default y if BUILD_INIT
default n
boolean "Adds support of changing init script/commands via SNMP"
help
This option adds a branch wrpcInitScriptConfigGroup to the SNMP
config SNMP_AUX_DIAG config SNMP_AUX_DIAG
depends on SNMP && AUX_DIAG depends on SNMP && AUX_DIAG
default y if AUX_DIAG default y if AUX_DIAG
default n default n
boolean "Adds support of auxiliary diagnostics registers to SNMP" boolean "Adds support of auxiliary diagnostics registers to SNMP"
help help
This option adds branch wrpcAuxDiag to the SNMP This option adds a branch wrpcAuxDiag to the SNMP
config BUILD_INIT config BUILD_INIT
depends on WR_NODE depends on WR_NODE
......
lib/WR-WRPC-MIB.txt
View file @ 4f77dba8
...@@ -742,6 +742,38 @@ wrpcSfpAlpha OBJECT-TYPE ...@@ -742,6 +742,38 @@ wrpcSfpAlpha OBJECT-TYPE
::= { wrpcSfpEntry 5 } ::= { wrpcSfpEntry 5 }
-- **************************************************************************** -- ****************************************************************************
wrpcInitScriptConfigGroup OBJECT IDENTIFIER ::= { wrpcCore 9 }
wrpcInitScriptConfigApply OBJECT-TYPE
SYNTAX INTEGER {
na(0),
writeToFlash(1),
eraseFlash(50),
applySuccessful(100),
applyFailed(200),
applyFailedEmptyLine(201)
}
MAX-ACCESS read-write
STATUS current
DESCRIPTION
"Make a change to a init script
writeToFlash - Add a defined command from wrpcInitScriptConfigLine to the init script
eraseFlash - Erase init script in the flash.
applySuccessful - Configuration applied successfully.
applyFailed - Failed to update init script.
applyFailedEmptyLine - Failed to update init script because wrpcInitScriptConfigLine is empty.
"
::= { wrpcInitScriptConfigGroup 1 }
wrpcInitScriptConfigLine OBJECT-TYPE
SYNTAX DisplayString (SIZE(0..31))
MAX-ACCESS read-write
STATUS current
DESCRIPTION
"Line to be added to the init script."
::= { wrpcInitScriptConfigGroup 2 }
-- ****************************************************************************
END END
lib/snmp.c
View file @ 4f77dba8
...@@ -122,6 +122,11 @@ ...@@ -122,6 +122,11 @@
#define applyFailedDBFull 202 #define applyFailedDBFull 202
#define applyFailedInvalidPN 203 #define applyFailedInvalidPN 203
/* new defines for wrpcInitScriptConfigApply, some are used from
* wrpcPtpConfigApply */
#define writeToFlash 1
#define applyFailedEmptyLine 201
/* defines for wrpcTemperatureTable */ /* defines for wrpcTemperatureTable */
#define TABLE_ROW 1 #define TABLE_ROW 1
#define TABLE_COL 0 #define TABLE_COL 0
...@@ -213,6 +218,8 @@ struct snmp_oid_limb { ...@@ -213,6 +218,8 @@ struct snmp_oid_limb {
static struct s_sfpinfo snmp_ptp_config; static struct s_sfpinfo snmp_ptp_config;
static int ptp_config_apply_status; static int ptp_config_apply_status;
static int ptp_restart_status; static int ptp_restart_status;
static char init_script_line[32];
static int init_script_config_apply_status;
/* Keep the number of aux diag registers available in the FPGA bitstream */ /* Keep the number of aux diag registers available in the FPGA bitstream */
static uint32_t aux_diag_reg_ro_num; static uint32_t aux_diag_reg_ro_num;
static uint32_t aux_diag_reg_rw_num; static uint32_t aux_diag_reg_rw_num;
...@@ -260,6 +267,7 @@ static int set_pp(uint8_t *buf, struct snmp_oid *obj); ...@@ -260,6 +267,7 @@ static int set_pp(uint8_t *buf, struct snmp_oid *obj);
static int set_p(uint8_t *buf, struct snmp_oid *obj); static int set_p(uint8_t *buf, struct snmp_oid *obj);
static int set_ptp_restart(uint8_t *buf, struct snmp_oid *obj); static int set_ptp_restart(uint8_t *buf, struct snmp_oid *obj);
static int set_ptp_config(uint8_t *buf, struct snmp_oid *obj); static int set_ptp_config(uint8_t *buf, struct snmp_oid *obj);
static int set_init_script_config(uint8_t *buf, struct snmp_oid *obj);
static int set_aux_diag(uint8_t *buf, struct snmp_oid *obj); static int set_aux_diag(uint8_t *buf, struct snmp_oid *obj);
static int data_aux_diag(uint8_t *buf, struct snmp_oid *obj, int mode); static int data_aux_diag(uint8_t *buf, struct snmp_oid *obj, int mode);
...@@ -276,6 +284,7 @@ static uint8_t oid_wrpcPtpConfigGroup[] = {0x2B,6,1,4,1,96,101,1,6}; ...@@ -276,6 +284,7 @@ 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};
/* Include wrpcSfpEntry into OID */ /* Include wrpcSfpEntry into OID */
static uint8_t oid_wrpcSfpTable[] = {0x2B,6,1,4,1,96,101,1,8,1}; static uint8_t oid_wrpcSfpTable[] = {0x2B,6,1,4,1,96,101,1,8,1};
static uint8_t oid_wrpcInitScriptConfigGroup[] = {0x2B,6,1,4,1,96,101,1,9};
/* In below OIDs zeros will be replaced in the snmp_init function by values /* In below OIDs zeros will be replaced in the snmp_init function by values
* read from FPA */ * read from FPA */
static uint8_t oid_wrpcAuxRoTable[] = {0x2B,6,1,4,1,96,101,2,0,0,1,1}; static uint8_t oid_wrpcAuxRoTable[] = {0x2B,6,1,4,1,96,101,2,0,0,1,1};
...@@ -347,6 +356,10 @@ static uint8_t oid_wrpcSfpDeltaTx[] = {3}; ...@@ -347,6 +356,10 @@ static uint8_t oid_wrpcSfpDeltaTx[] = {3};
static uint8_t oid_wrpcSfpDeltaRx[] = {4}; static uint8_t oid_wrpcSfpDeltaRx[] = {4};
static uint8_t oid_wrpcSfpAlpha[] = {5}; static uint8_t oid_wrpcSfpAlpha[] = {5};
/* wrpcInitScriptConfigGroup */
static uint8_t oid_wrpcInitScriptConfigApply[] = {1,0};
static uint8_t oid_wrpcInitScriptConfigLine[] = {2,0};
/* 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 */
/* wrpcVersionGroup */ /* wrpcVersionGroup */
...@@ -440,6 +453,13 @@ static struct snmp_oid oid_array_wrpcSfpTable[] = { ...@@ -440,6 +453,13 @@ static struct snmp_oid oid_array_wrpcSfpTable[] = {
{ 0, } { 0, }
}; };
/* wrpcInitScriptConfigGroup */
static struct snmp_oid oid_array_wrpcInitScriptConfigGroup[] = {
OID_FIELD_VAR( oid_wrpcInitScriptConfigApply, get_p, set_init_script_config, ASN_INTEGER, &init_script_config_apply_status),
OID_FIELD_VAR( oid_wrpcInitScriptConfigLine, get_p, set_p, ASN_OCTET_STR, &init_script_line),
{ 0, }
};
static struct snmp_oid oid_array_wrpcAuxRoTable[] = { static struct snmp_oid oid_array_wrpcAuxRoTable[] = {
OID_FIELD_VAR(NULL, get_aux_diag, NO_SET, ASN_UNSIGNED, AUX_DIAG_RO), OID_FIELD_VAR(NULL, get_aux_diag, NO_SET, ASN_UNSIGNED, AUX_DIAG_RO),
{ 0, } { 0, }
...@@ -461,6 +481,9 @@ static struct snmp_oid_limb oid_limb_array[] = { ...@@ -461,6 +481,9 @@ static struct snmp_oid_limb oid_limb_array[] = {
OID_LIMB_FIELD(oid_wrpcPtpConfigGroup, func_group, oid_array_wrpcPtpConfigGroup), OID_LIMB_FIELD(oid_wrpcPtpConfigGroup, func_group, oid_array_wrpcPtpConfigGroup),
OID_LIMB_FIELD(oid_wrpcPortGroup, func_group, oid_array_wrpcPortGroup), OID_LIMB_FIELD(oid_wrpcPortGroup, func_group, oid_array_wrpcPortGroup),
OID_LIMB_FIELD(oid_wrpcSfpTable, func_table, oid_array_wrpcSfpTable), OID_LIMB_FIELD(oid_wrpcSfpTable, func_table, oid_array_wrpcSfpTable),
#ifdef CONFIG_SNMP_INIT
OID_LIMB_FIELD(oid_wrpcInitScriptConfigGroup, func_group, oid_array_wrpcInitScriptConfigGroup),
#endif
#ifdef CONFIG_SNMP_AUX_DIAG #ifdef CONFIG_SNMP_AUX_DIAG
OID_LIMB_FIELD(oid_wrpcAuxRoTable, func_aux_diag, oid_array_wrpcAuxRoTable), OID_LIMB_FIELD(oid_wrpcAuxRoTable, func_aux_diag, oid_array_wrpcAuxRoTable),
OID_LIMB_FIELD(oid_wrpcAuxRwTable, func_aux_diag, oid_array_wrpcAuxRwTable), OID_LIMB_FIELD(oid_wrpcAuxRwTable, func_aux_diag, oid_array_wrpcAuxRwTable),
...@@ -1335,6 +1358,52 @@ static int set_ptp_config(uint8_t *buf, struct snmp_oid *obj) ...@@ -1335,6 +1358,52 @@ static int set_ptp_config(uint8_t *buf, struct snmp_oid *obj)
return ret; return ret;
} }
static int set_init_script_config(uint8_t *buf, struct snmp_oid *obj)
{
int ret;
int32_t *apply_mode;
char *args[3];
char arg2='\0'; /* end list of args */
apply_mode = obj->p;
ret = set_value(buf, obj, apply_mode);
if (ret <= 0)
return ret;
switch (*apply_mode) {
case writeToFlash:
if (init_script_line[0] == '\0') {
*apply_mode = applyFailedEmptyLine;
pp_printf("SNMP: empty init line\n");
break;
}
/* pass a list of args, the args[0] is ignored by
* storage_init_add, so we don't care */
args[1] = init_script_line;
args[2] = &arg2;
if (storage_init_add((const char **)args) < 0)
*apply_mode = applyFailed;
else
*apply_mode = applySuccessful;
break;
case eraseFlash:
if (storage_init_erase() < 0)
*apply_mode = applyFailed;
else
*apply_mode = applySuccessful;
break;
default:
*apply_mode = applyFailed;
}
snmp_verbose("%s: init_script_line: %s\n", __func__,
init_script_line);
return ret;
}
/* /*
* Perverse... snmpwalk does getnext anyways. * Perverse... snmpwalk does getnext anyways.
* *
...@@ -1507,6 +1576,8 @@ static int snmp_respond(uint8_t *buf) ...@@ -1507,6 +1576,8 @@ static int snmp_respond(uint8_t *buf)
(void) func_aux_diag(NULL, 0, NULL, 0); (void) func_aux_diag(NULL, 0, NULL, 0);
oid_array_wrpcAuxRwTable[0].oid_len = 0; oid_array_wrpcAuxRwTable[0].oid_len = 0;
oid_array_wrpcAuxRoTable[0].oid_len = 0; oid_array_wrpcAuxRoTable[0].oid_len = 0;
oid_array_wrpcInitScriptConfigGroup[0].oid_len = 0;
(void) oid_wrpcInitScriptConfigGroup;
} }
for (a_i = 0, h_i = 0; a_i < sizeof(match_array); a_i++, h_i++) { for (a_i = 0, h_i = 0; a_i < sizeof(match_array); a_i++, h_i++) {
......
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