summaryrefslogtreecommitdiff
path: root/cleopatre/application/spidnetsnmp/agent
diff options
context:
space:
mode:
authorOlivier Dufour2012-12-20 13:09:56 +0100
committerOlivier Dufour2013-01-02 14:40:07 +0100
commita38aee1fd54383bee82bd443fb1cd0be1955d479 (patch)
treed3f067d76a59b5e118e843fceae43748f902a1a5 /cleopatre/application/spidnetsnmp/agent
parent11080a13a47cc75723df97fdff11ab6e15856f78 (diff)
cleo/app/spidnetsnmp: use libspid nvram interface, refs #3607
Diffstat (limited to 'cleopatre/application/spidnetsnmp/agent')
-rw-r--r--cleopatre/application/spidnetsnmp/agent/mibgroup/EoCCommon.h1
-rw-r--r--cleopatre/application/spidnetsnmp/agent/mibgroup/eoc-alarms-traps/EoCAlarmsAndTraps.c1
-rw-r--r--cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocCBATAdminGroup/eocCBATDevInfoGroup/eocCBATDevInfoGroup.c111
-rw-r--r--cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocCBATAdminGroup/eocCBATNetworkAttrGroup/eocCBATNetworkAttrGroup.c9
-rw-r--r--cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocCBATCardMACGroup/eocCBATCardTable/eocCBATCardTable_data_access.c111
-rw-r--r--cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocSoftwareUpgradeGroup/eocSoftwareUpgradeTable/eocSoftwareUpgradeTable_data_access.c1
-rw-r--r--cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCCLTAdminGroup/modEoCCLTAdminGroup.c74
-rw-r--r--cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCCLTMACGroup/modEoCOnlineCLTTable/modEoCOnlineCLTTable_data_access.c29
-rw-r--r--cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCSoftwareUpgradeGroup/modEoCSoftwareUpgradeTable/modEoCSoftwareUpgradeTable_data_access.c1
9 files changed, 44 insertions, 294 deletions
diff --git a/cleopatre/application/spidnetsnmp/agent/mibgroup/EoCCommon.h b/cleopatre/application/spidnetsnmp/agent/mibgroup/EoCCommon.h
index 92bf7984ea..e1fc0d5ba4 100644
--- a/cleopatre/application/spidnetsnmp/agent/mibgroup/EoCCommon.h
+++ b/cleopatre/application/spidnetsnmp/agent/mibgroup/EoCCommon.h
@@ -2,6 +2,7 @@
#define EOCCOMMON_H
#include "libspid.h"
+#include "nvram_utils.h"
typedef char mac_t[6];
diff --git a/cleopatre/application/spidnetsnmp/agent/mibgroup/eoc-alarms-traps/EoCAlarmsAndTraps.c b/cleopatre/application/spidnetsnmp/agent/mibgroup/eoc-alarms-traps/EoCAlarmsAndTraps.c
index 971b249d31..27e1586728 100644
--- a/cleopatre/application/spidnetsnmp/agent/mibgroup/eoc-alarms-traps/EoCAlarmsAndTraps.c
+++ b/cleopatre/application/spidnetsnmp/agent/mibgroup/eoc-alarms-traps/EoCAlarmsAndTraps.c
@@ -1467,7 +1467,6 @@ registerAlarm (char *alarm_oid_str, int state, int value)
char value_str[16];
char admin_mac_addr[6];
- spidcom_nvram_t nvram;
oid alarm_oid[LIBSPID_OID_MAX_LEN];
size_t alarm_oid_len = LIBSPID_OID_MAX_LEN;
diff --git a/cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocCBATAdminGroup/eocCBATDevInfoGroup/eocCBATDevInfoGroup.c b/cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocCBATAdminGroup/eocCBATDevInfoGroup/eocCBATDevInfoGroup.c
index f2694fe516..8ebbbe8c35 100644
--- a/cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocCBATAdminGroup/eocCBATDevInfoGroup/eocCBATDevInfoGroup.c
+++ b/cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocCBATAdminGroup/eocCBATDevInfoGroup/eocCBATDevInfoGroup.c
@@ -316,7 +316,6 @@ handle_eocCBATAdminManufactoryInfo(netsnmp_mib_handler *handler,
{
int ret;
char manufactory_info[DEFAULT_SNMP_STRING_MAX_LENGTH];
- spidcom_nvram_t nvram;
/*
* We are never called for a GETNEXT if it's registered as a
@@ -330,34 +329,14 @@ handle_eocCBATAdminManufactoryInfo(netsnmp_mib_handler *handler,
{
case MODE_GET:
/* read NVRAM contents */
- ret = libspid_system_get_nvram (&nvram);
- if (LIBSPID_SUCCESS != ret)
+ ret = libspid_get_manufactory_info (manufactory_info, DEFAULT_SNMP_STRING_MAX_LENGTH);
+ if (ret)
{
snmp_log (LOG_ERR, "libspid_system_get_nvram error\n");
/* Manufactory info is set to empty string to
* permit walk requests */
strcpy (manufactory_info, "");
}
- else
- {
- memset (manufactory_info, 0, DEFAULT_SNMP_STRING_MAX_LENGTH);
- if (sizeof (nvram.manufactory_info) <=
- DEFAULT_SNMP_STRING_MAX_LENGTH)
- {
- strncpy (manufactory_info,
- nvram.manufactory_info,
- sizeof (nvram.manufactory_info));
- }
- else
- {
- /* if the buffer read from NVRAM is larger than maximum
- * value, copy only maximum permitted number of bytes */
- strncpy (manufactory_info,
- nvram.manufactory_info,
- DEFAULT_SNMP_STRING_MAX_LENGTH - 1);
- manufactory_info[DEFAULT_SNMP_STRING_MAX_LENGTH - 1] = '\0';
- }
- }
DEBUGMSGTL (("eocCBATDevInfoGroup: "
"handle_eocCBATAdminManufactoryInfo",
@@ -388,7 +367,6 @@ handle_eocCBATAdminModelNumber(netsnmp_mib_handler *handler,
{
int ret;
char model_number[DEFAULT_SNMP_STRING_MAX_LENGTH];
- spidcom_nvram_t nvram;
/*
* We are never called for a GETNEXT if it's registered as a
@@ -403,31 +381,13 @@ handle_eocCBATAdminModelNumber(netsnmp_mib_handler *handler,
case MODE_GET:
/* read NVRAM contents */
- ret = libspid_system_get_nvram (&nvram);
- if (LIBSPID_SUCCESS != ret)
+ ret = libspid_get_product_name (model_number, DEFAULT_SNMP_STRING_MAX_LENGTH);
+ if (ret)
{
snmp_log (LOG_ERR, "libspid_system_get_nvram error\n");
/* Model number is set to empty string to permit walk requests */
strcpy (model_number, "");
}
- else
- {
- memset (model_number, 0, DEFAULT_SNMP_STRING_MAX_LENGTH);
- if (sizeof (nvram.product_name) <= DEFAULT_SNMP_STRING_MAX_LENGTH)
- {
- strncpy (model_number, nvram.product_name,
- sizeof (nvram.product_name));
- }
- else
- {
- /* if the buffer read from NVRAM is larger than
- * maximum value, copy only maximum permitted number of
- * bytes */
- strncpy (model_number, nvram.product_name,
- DEFAULT_SNMP_STRING_MAX_LENGTH - 1);
- model_number[DEFAULT_SNMP_STRING_MAX_LENGTH - 1] = '\0';
- }
- }
snmp_set_var_typed_value (requests->requestvb, ASN_OCTET_STR,
(u_char *) model_number,
strlen (model_number));
@@ -453,7 +413,6 @@ handle_eocCBATAdminSerialNumber(netsnmp_mib_handler *handler,
{
int ret;
char serial_number[DEFAULT_SNMP_STRING_MAX_LENGTH];
- spidcom_nvram_t nvram;
/* We are never called for a GETNEXT if it's registered as a
"instance", as it's "magically" handled for us. */
@@ -464,22 +423,13 @@ handle_eocCBATAdminSerialNumber(netsnmp_mib_handler *handler,
{
case MODE_GET:
/* read NVRAM contents */
- ret = libspid_system_get_nvram (&nvram);
- if (LIBSPID_SUCCESS != ret)
+ ret = libspid_get_serial_number (serial_number, DEFAULT_SNMP_STRING_MAX_LENGTH);
+ if (ret)
{
snmp_log (LOG_ERR, "libspid_system_get_nvram error\n");
/* Serial number set to empty string to permit walk requests */
strcpy (serial_number, "");
}
- else
- {
- /* if the buffer read from NVRAM is larger than maximum value,
- * copy only maximum permitted number of bytes */
- strncpy (serial_number,
- nvram.serial_number,
- DEFAULT_SNMP_STRING_MAX_LENGTH - 1);
- serial_number[DEFAULT_SNMP_STRING_MAX_LENGTH-1]='\0';
- }
DEBUGMSGTL (("eocCBATDevInfoGroup: handle_eocCBATAdminSerialNumber",
"serial number: |%s|\n", serial_number));
@@ -572,7 +522,6 @@ handle_eocCBATAdminHardwareVersion(netsnmp_mib_handler *handler,
{
int ret;
char hw_version[DEFAULT_SNMP_STRING_MAX_LENGTH];
- spidcom_nvram_t nvram;
/* We are never called for a GETNEXT if it's registered as a
"instance", as it's "magically" handled for us. */
@@ -584,32 +533,13 @@ handle_eocCBATAdminHardwareVersion(netsnmp_mib_handler *handler,
case MODE_GET:
/* read NVRAM contents */
- ret = libspid_system_get_nvram (&nvram);
- if (LIBSPID_SUCCESS != ret)
+ ret = libspid_get_product_partnb (hw_version, DEFAULT_SNMP_STRING_MAX_LENGTH);
+ if (ret)
{
snmp_log (LOG_ERR, "libspid_system_get_nvram error\n");
/* HW version set to empty string to permit walk requests */
strcpy (hw_version, "");
}
- else
- {
- memset (hw_version, 0, DEFAULT_SNMP_STRING_MAX_LENGTH);
- if (sizeof (nvram.product_partnb) <=
- DEFAULT_SNMP_STRING_MAX_LENGTH)
- {
- strncpy (hw_version, nvram.product_partnb, sizeof (nvram.product_partnb));
- }
- else
- {
- /* if the buffer read from NVRAM is larger than
- * maximum value, copy only maximum permitted number
- * of bytes */
- strncpy (hw_version,
- nvram.product_partnb,
- DEFAULT_SNMP_STRING_MAX_LENGTH - 1);
- hw_version[DEFAULT_SNMP_STRING_MAX_LENGTH - 1] = '\0';
- }
- }
DEBUGMSGTL (("eocCBATDevInfoGroup: handle_eocCBATAdminHardwareVersion",
"hw version: |%s|\n", hw_version));
@@ -640,7 +570,6 @@ handle_eocCBATAdminVendorSpecialInfo(netsnmp_mib_handler *handler,
{
int ret;
char vendor_spec_info[DEFAULT_SNMP_STRING_MAX_LENGTH];
- spidcom_nvram_t nvram;
/* We are never called for a GETNEXT if it's registered as a
"instance", as it's "magically" handled for us. */
@@ -651,34 +580,14 @@ handle_eocCBATAdminVendorSpecialInfo(netsnmp_mib_handler *handler,
{
case MODE_GET:
/* read NVRAM contents */
- ret = libspid_system_get_nvram (&nvram);
- if (LIBSPID_SUCCESS != ret)
+ ret = libspid_get_oem_info (vendor_spec_info, DEFAULT_SNMP_STRING_MAX_LENGTH);
+ if (ret)
{
snmp_log (LOG_ERR, "libspid_system_get_nvram error\n");
/* Vendor spec. info set to empty string to permit
* walk requests */
strcpy (vendor_spec_info, "");
}
- else
- {
- memset (vendor_spec_info, 0, DEFAULT_SNMP_STRING_MAX_LENGTH);
- if (sizeof (nvram.oem_info) <=
- DEFAULT_SNMP_STRING_MAX_LENGTH)
- {
- strncpy (vendor_spec_info,
- nvram.oem_info,
- sizeof (nvram.oem_info));
- }
- else
- {
- /* if the buffer read from NVRAM is larger than maximum
- * value, copy only maximum permitted number of bytes */
- strncpy (vendor_spec_info,
- nvram.oem_info,
- DEFAULT_SNMP_STRING_MAX_LENGTH - 1);
- vendor_spec_info[DEFAULT_SNMP_STRING_MAX_LENGTH - 1] = '\0';
- }
- }
DEBUGMSGTL (("eocCBATDevInfoGroup: "
"handle_eocCBATAdminVendorSpecialInfo",
diff --git a/cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocCBATAdminGroup/eocCBATNetworkAttrGroup/eocCBATNetworkAttrGroup.c b/cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocCBATAdminGroup/eocCBATNetworkAttrGroup/eocCBATNetworkAttrGroup.c
index b45ec6d577..a8ea6dc673 100644
--- a/cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocCBATAdminGroup/eocCBATNetworkAttrGroup/eocCBATNetworkAttrGroup.c
+++ b/cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocCBATAdminGroup/eocCBATNetworkAttrGroup/eocCBATNetworkAttrGroup.c
@@ -61,7 +61,6 @@ handle_eocCBATAdminMACAddress(netsnmp_mib_handler *handler,
{
int ret;
char admin_mac_addr[LIBSPID_MAC_BIN_LEN];
- spidcom_nvram_t nvram;
/* We are never called for a GETNEXT if it's registered as a
"instance", as it's "magically" handled for us. */
@@ -72,15 +71,11 @@ handle_eocCBATAdminMACAddress(netsnmp_mib_handler *handler,
{
case MODE_GET:
/* read NVRAM contents */
- ret = libspid_system_get_nvram (&nvram);
- if (LIBSPID_SUCCESS != ret)
+ ret = libspid_get_plc_address (admin_mac_addr, LIBSPID_MAC_BIN_LEN);
+ if (ret)
{
memset (admin_mac_addr, 0, LIBSPID_MAC_BIN_LEN);
}
- else
- {
- memcpy (admin_mac_addr, nvram.plc_address, LIBSPID_MAC_BIN_LEN);
- }
DEBUGMSGTL (("ocCBATNetworkAttrGroup: handle_eocCBATAdminMACAddress",
"MAC address copied to admin MAC addr: "
diff --git a/cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocCBATCardMACGroup/eocCBATCardTable/eocCBATCardTable_data_access.c b/cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocCBATCardMACGroup/eocCBATCardTable/eocCBATCardTable_data_access.c
index f7721da888..4d11ac400b 100644
--- a/cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocCBATCardMACGroup/eocCBATCardTable/eocCBATCardTable_data_access.c
+++ b/cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocCBATCardMACGroup/eocCBATCardTable/eocCBATCardTable_data_access.c
@@ -246,7 +246,6 @@ eocCBATCardTable_container_load (netsnmp_container * container)
/* declarations for calls to libspid */
char buffer[LIBSPID_CONFIG_KEY_MAX_LEN];
int ret;
- spidcom_nvram_t nvram;
char mtd_name[64];
spidcom_image_desc_t desc;
DEBUGMSGTL (("verbose:eocCBATCardTable:eocCBATCardTable_container_load",
@@ -296,15 +295,11 @@ eocCBATCardTable_container_load (netsnmp_container * container)
*/
/** no mapping */
/* read NVRAM contents */
- ret = libspid_system_get_nvram (&nvram);
- if (LIBSPID_SUCCESS != ret)
+ ret = libspid_get_plc_address (eocCBATCardMACAddress, 6);
+ if (ret)
{
memset (eocCBATCardMACAddress, 0, 6);
}
- else
- {
- memcpy (eocCBATCardMACAddress, nvram.plc_address, 6);
- }
rowreq_ctx->data.eocCBATCardMACAddress_len = 6;
/*
* make sure there is enough space for eocCBATCardMACAddress data
@@ -336,29 +331,12 @@ eocCBATCardTable_container_load (netsnmp_container * container)
*/
/** no mapping */
/* read NVRAM contents */
- ret = libspid_system_get_nvram (&nvram);
- if (LIBSPID_SUCCESS != ret)
+ ret = libspid_get_product_name (eocCBATCardModelNumber, DEFAULT_SNMP_STRING_MAX_LENGTH);
+ if (ret)
{
/* Model number is set to empty string to permit walk requests */
strcpy (eocCBATCardModelNumber, "");
}
- else
- {
- memset (eocCBATCardModelNumber, 0, DEFAULT_SNMP_STRING_MAX_LENGTH);
- if (sizeof (nvram.product_name) <= DEFAULT_SNMP_STRING_MAX_LENGTH)
- {
- strncpy (eocCBATCardModelNumber,
- nvram.product_name, sizeof (nvram.product_name));
- }
- else
- {
- /* if the buffer read from NVRAM is larger than
- * maximum value, copy only maximum permitted number of bytes*/
- strncpy (eocCBATCardModelNumber, nvram.product_name,
- DEFAULT_SNMP_STRING_MAX_LENGTH - 1);
- eocCBATCardModelNumber[DEFAULT_SNMP_STRING_MAX_LENGTH - 1] = '\0';
- }
- }
eocCBATCardModelNumber_len = strlen (eocCBATCardModelNumber) + 1;
rowreq_ctx->data.eocCBATCardModelNumber_len = eocCBATCardModelNumber_len;
@@ -679,32 +657,13 @@ eocCBATCardTable_container_load (netsnmp_container * container)
* char(char)//L/A/w/e/R/d/h
*/
/** no mapping */
- ret = libspid_system_get_nvram (&nvram);
- if (LIBSPID_SUCCESS != ret)
+ ret = libspid_get_manufactory_info (eocCBATCardManufactoryInfo, DEFAULT_SNMP_STRING_MAX_LENGTH);
+ if (ret)
{
snmp_log (LOG_ERR, "libspid_system_get_nvram error\n");
/* Manufactory info is set to empty string to permit walk requests */
strcpy (eocCBATCardManufactoryInfo, "");
}
- else
- {
- memset (eocCBATCardManufactoryInfo, 0,
- DEFAULT_SNMP_STRING_MAX_LENGTH);
- if (sizeof (nvram.manufactory_info) <= DEFAULT_SNMP_STRING_MAX_LENGTH)
- {
- strncpy (eocCBATCardManufactoryInfo, nvram.manufactory_info,
- sizeof (nvram.manufactory_info));
- }
- else
- {
- /* if the buffer read from NVRAM is larger than maximum value,
- * copy only maximum permitted number of bytes */
- strncpy (eocCBATCardManufactoryInfo, nvram.manufactory_info,
- DEFAULT_SNMP_STRING_MAX_LENGTH - 1);
- eocCBATCardManufactoryInfo[DEFAULT_SNMP_STRING_MAX_LENGTH - 1] =
- '\0';
- }
- }
eocCBATCardManufactoryInfo_len = strlen (eocCBATCardManufactoryInfo) + 1;
rowreq_ctx->data.eocCBATCardManufactoryInfo_len =
eocCBATCardManufactoryInfo_len;
@@ -733,21 +692,13 @@ eocCBATCardTable_container_load (netsnmp_container * container)
* char(char)//L/A/w/e/R/d/h
*/
/** no mapping */
- ret = libspid_system_get_nvram (&nvram);
- if (LIBSPID_SUCCESS != ret)
+ ret = libspid_get_serial_number (eocCBATCardSerialNumber, DEFAULT_SNMP_STRING_MAX_LENGTH);
+ if (ret)
{
snmp_log (LOG_ERR, "libspid_system_get_nvram error\n");
/* Serial number set to empty string to permit walk requests */
strcpy (eocCBATCardSerialNumber, "");
}
- else
- {
- /* if the buffer read from NVRAM is larger than maximum value,
- * copy only maximum permitted number of bytes */
- strncpy (eocCBATCardSerialNumber, nvram.serial_number,
- DEFAULT_SNMP_STRING_MAX_LENGTH - 1);
- eocCBATCardSerialNumber[DEFAULT_SNMP_STRING_MAX_LENGTH - 1] = '\0';
- }
eocCBATCardSerialNumber_len = strlen (eocCBATCardSerialNumber) + 1;
rowreq_ctx->data.eocCBATCardSerialNumber_len =
eocCBATCardSerialNumber_len;
@@ -773,32 +724,13 @@ eocCBATCardTable_container_load (netsnmp_container * container)
* char(char)//L/A/w/e/R/d/h
*/
/** no mapping */
- ret = libspid_system_get_nvram (&nvram);
- if (LIBSPID_SUCCESS != ret)
+ ret = libspid_get_product_partnb (eocCBATCardHardwareVersion, DEFAULT_SNMP_STRING_MAX_LENGTH);
+ if (ret)
{
snmp_log (LOG_ERR, "libspid_system_get_nvram error\n");
/* HW version set to empty string to permit walk requests */
strcpy (eocCBATCardHardwareVersion, "");
}
- else
- {
- memset (eocCBATCardHardwareVersion, 0,
- DEFAULT_SNMP_STRING_MAX_LENGTH);
- if (sizeof (nvram.product_partnb) <= DEFAULT_SNMP_STRING_MAX_LENGTH)
- {
- strncpy (eocCBATCardHardwareVersion, nvram.product_partnb,
- sizeof (nvram.product_partnb));
- }
- else
- {
- /* if the buffer read from NVRAM is larger than maximum value,
- * copy only maximum permitted number of bytes */
- strncpy (eocCBATCardHardwareVersion, nvram.product_partnb,
- DEFAULT_SNMP_STRING_MAX_LENGTH - 1);
- eocCBATCardHardwareVersion[DEFAULT_SNMP_STRING_MAX_LENGTH - 1] =
- '\0';
- }
- }
eocCBATCardHardwareVersion_len = strlen (eocCBATCardHardwareVersion) + 1;
rowreq_ctx->data.eocCBATCardHardwareVersion_len =
eocCBATCardHardwareVersion_len;
@@ -827,32 +759,13 @@ eocCBATCardTable_container_load (netsnmp_container * container)
* char(char)//L/A/W/e/R/d/h
*/
/** no mapping */
- ret = libspid_system_get_nvram (&nvram);
- if (LIBSPID_SUCCESS != ret)
+ ret = libspid_get_product_name (eocCBATCardModelNumberProvisioned, DEFAULT_SNMP_STRING_MAX_LENGTH);
+ if (ret)
{
snmp_log (LOG_ERR, "libspid_system_get_nvram error\n");
/* Model number is set to empty string to permit walk requests */
strcpy (eocCBATCardModelNumberProvisioned, "");
}
- else
- {
- memset (eocCBATCardModelNumberProvisioned, 0,
- DEFAULT_SNMP_STRING_MAX_LENGTH);
- if (sizeof (nvram.product_name) <= DEFAULT_SNMP_STRING_MAX_LENGTH)
- {
- strncpy (eocCBATCardModelNumberProvisioned, nvram.product_name,
- sizeof (nvram.product_name));
- }
- else
- {
- /* if the buffer read from NVRAM is larger than maximum value,
- * copy only maximum permitted number of bytes */
- strncpy (eocCBATCardModelNumberProvisioned, nvram.product_name,
- DEFAULT_SNMP_STRING_MAX_LENGTH - 1);
- eocCBATCardModelNumberProvisioned[DEFAULT_SNMP_STRING_MAX_LENGTH -
- 1] = '\0';
- }
- }
eocCBATCardModelNumberProvisioned_len =
strlen (eocCBATCardModelNumberProvisioned) + 1;
rowreq_ctx->data.eocCBATCardModelNumberProvisioned_len =
diff --git a/cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocSoftwareUpgradeGroup/eocSoftwareUpgradeTable/eocSoftwareUpgradeTable_data_access.c b/cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocSoftwareUpgradeGroup/eocSoftwareUpgradeTable/eocSoftwareUpgradeTable_data_access.c
index e490f7a349..29939e4132 100644
--- a/cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocSoftwareUpgradeGroup/eocSoftwareUpgradeTable/eocSoftwareUpgradeTable_data_access.c
+++ b/cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocSoftwareUpgradeGroup/eocSoftwareUpgradeTable/eocSoftwareUpgradeTable_data_access.c
@@ -238,7 +238,6 @@ eocSoftwareUpgradeTable_container_load(netsnmp_container *container)
/* white list entries read from config file */
libspid_eoc_wl_entry_t wl_config_entries[LIBSPID_WHITE_LIST_MAX_STA_NUM];
- spidcom_nvram_t nvram;
char mac_str[LIBSPID_MAC_STR_LEN];
diff --git a/cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCCLTAdminGroup/modEoCCLTAdminGroup.c b/cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCCLTAdminGroup/modEoCCLTAdminGroup.c
index 26d77b9156..68d5f6e273 100644
--- a/cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCCLTAdminGroup/modEoCCLTAdminGroup.c
+++ b/cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCCLTAdminGroup/modEoCCLTAdminGroup.c
@@ -481,7 +481,6 @@ handle_modEoCCLTAdminManufactoryInfo (netsnmp_mib_handler *handler,
int ret;
char manufactory_info[DEFAULT_SNMP_STRING_MAX_LENGTH];
- spidcom_nvram_t nvram;
/*
* We are never called for a GETNEXT if it's registered as a
@@ -500,21 +499,12 @@ handle_modEoCCLTAdminManufactoryInfo (netsnmp_mib_handler *handler,
case MODE_GET:
/* read NVRAM contents */
- ret = libspid_system_get_nvram (&nvram);
- if (LIBSPID_SUCCESS != ret)
+ ret = libspid_get_manufactory_info (manufactory_info, DEFAULT_SNMP_STRING_MAX_LENGTH);
+ if (ret)
{
snmp_log (LOG_ERR, "libspid_system_get_nvram error\n");
/* Manufactory info is set to empty string to permit walk requests */
strcpy (manufactory_info, "");
- } else {
- memset (manufactory_info, 0, DEFAULT_SNMP_STRING_MAX_LENGTH);
- if (sizeof(nvram.manufactory_info) <= DEFAULT_SNMP_STRING_MAX_LENGTH){
- strncpy (manufactory_info, nvram.manufactory_info, sizeof (nvram.manufactory_info));
- } else {
- /* if the buffer read from NVRAM is larger than maximum value, copy only maximum permitted number of bytes */
- strncpy (manufactory_info, nvram.manufactory_info, DEFAULT_SNMP_STRING_MAX_LENGTH-1);
- manufactory_info[DEFAULT_SNMP_STRING_MAX_LENGTH-1]='\0';
- }
}
DEBUGMSGTL(("modEoCCLTAdminGroup: handle_modEoCCLTAdminManufactoryInfo", "manufactory info: |%s|\n", manufactory_info));
@@ -547,7 +537,6 @@ handle_modEoCCLTAdminModelNumber (netsnmp_mib_handler *handler,
{
int ret;
char model_number[DEFAULT_SNMP_STRING_MAX_LENGTH];
- spidcom_nvram_t nvram;
/*
* We are never called for a GETNEXT if it's registered as a
@@ -564,21 +553,12 @@ handle_modEoCCLTAdminModelNumber (netsnmp_mib_handler *handler,
case MODE_GET:
/* read NVRAM contents */
- ret = libspid_system_get_nvram(&nvram);
- if (LIBSPID_SUCCESS != ret)
+ ret = libspid_get_product_name (model_number, DEFAULT_SNMP_STRING_MAX_LENGTH);
+ if (ret)
{
snmp_log (LOG_ERR, "libspid_system_get_nvram error\n");
/* Model number is set to empty string to permit walk requests */
strcpy (model_number, "");
- } else {
- memset (model_number, 0, DEFAULT_SNMP_STRING_MAX_LENGTH);
- if (sizeof (nvram.product_name) <= DEFAULT_SNMP_STRING_MAX_LENGTH){
- strncpy (model_number, nvram.product_name, sizeof(nvram.product_name));
- } else {
- /* if the buffer read from NVRAM is larger than maximum value, copy only maximum permitted number of bytes */
- strncpy (model_number, nvram.product_name, DEFAULT_SNMP_STRING_MAX_LENGTH-1);
- model_number[DEFAULT_SNMP_STRING_MAX_LENGTH-1]='\0';
- }
}
snmp_set_var_typed_value (requests->requestvb, ASN_OCTET_STR,
(u_char *) model_number /* a pointer to the scalar's data */
@@ -610,7 +590,6 @@ handle_modEoCCLTAdminSerialNumber (netsnmp_mib_handler *handler,
{
int ret;
char serial_number[DEFAULT_SNMP_STRING_MAX_LENGTH];
- spidcom_nvram_t nvram;
/*
@@ -629,16 +608,12 @@ handle_modEoCCLTAdminSerialNumber (netsnmp_mib_handler *handler,
case MODE_GET:
/* read NVRAM contents */
- ret = libspid_system_get_nvram (&nvram);
- if (LIBSPID_SUCCESS != ret)
+ ret = libspid_get_serial_number (serial_number, DEFAULT_SNMP_STRING_MAX_LENGTH);
+ if (ret)
{
snmp_log (LOG_ERR, "libspid_system_get_nvram error\n");
/* Serial number set to empty string to permit walk requests */
strcpy (serial_number, "");
- } else {
- /* if the buffer read from NVRAM is larger than maximum value, copy only maximum permitted number of bytes */
- strncpy (serial_number, nvram.serial_number, DEFAULT_SNMP_STRING_MAX_LENGTH-1);
- serial_number[DEFAULT_SNMP_STRING_MAX_LENGTH-1]='\0';
}
DEBUGMSGTL(("modEoCCLTAdminGroup: handle_modEoCCLTAdminSerialNumber", "serial number: |%s|\n", serial_number));
@@ -731,7 +706,6 @@ handle_modEoCCLTAdminHardwareVersion (netsnmp_mib_handler *handler,
{
int ret;
char hw_version[DEFAULT_SNMP_STRING_MAX_LENGTH];
- spidcom_nvram_t nvram;
/*
* We are never called for a GETNEXT if it's registered as a
@@ -747,21 +721,12 @@ handle_modEoCCLTAdminHardwareVersion (netsnmp_mib_handler *handler,
case MODE_GET:
/* read NVRAM contents */
- ret = libspid_system_get_nvram (&nvram);
- if (LIBSPID_SUCCESS != ret)
+ ret = libspid_get_product_partnb (hw_version, DEFAULT_SNMP_STRING_MAX_LENGTH);
+ if (ret)
{
snmp_log (LOG_ERR, "libspid_system_get_nvram error\n");
/* HW version set to empty string to permit walk requests */
strcpy (hw_version, "");
- } else {
- memset (hw_version, 0, DEFAULT_SNMP_STRING_MAX_LENGTH);
- if (sizeof (nvram.product_partnb) <= DEFAULT_SNMP_STRING_MAX_LENGTH){
- strncpy (hw_version, nvram.product_partnb, sizeof (nvram.product_partnb));
- } else {
- /* if the buffer read from NVRAM is larger than maximum value, copy only maximum permitted number of bytes */
- strncpy (hw_version, nvram.product_partnb, DEFAULT_SNMP_STRING_MAX_LENGTH-1);
- hw_version[DEFAULT_SNMP_STRING_MAX_LENGTH-1]='\0';
- }
}
DEBUGMSGTL(("modEoCCLTAdminGroup: handle_modEoCCLTAdminHardwareVersion", "hw version: |%s|\n", hw_version));
@@ -793,7 +758,6 @@ handle_modEoCCLTAdminVendorSpecialInfo (netsnmp_mib_handler *handler,
{
int ret;
char vendor_spec_info[DEFAULT_SNMP_STRING_MAX_LENGTH];
- spidcom_nvram_t nvram;
/*
* We are never called for a GETNEXT if it's registered as a
@@ -809,21 +773,12 @@ handle_modEoCCLTAdminVendorSpecialInfo (netsnmp_mib_handler *handler,
case MODE_GET:
/* read NVRAM contents */
- ret = libspid_system_get_nvram (&nvram);
- if (LIBSPID_SUCCESS != ret)
+ ret = libspid_get_oem_info (vendor_spec_info, DEFAULT_SNMP_STRING_MAX_LENGTH);
+ if (ret)
{
snmp_log (LOG_ERR, "libspid_system_get_nvram error\n");
/* Vendor spec. info set to empty string to permit walk requests */
strcpy (vendor_spec_info, "");
- } else {
- memset (vendor_spec_info, 0, DEFAULT_SNMP_STRING_MAX_LENGTH);
- if (sizeof (nvram.oem_info) <= DEFAULT_SNMP_STRING_MAX_LENGTH){
- strncpy (vendor_spec_info, nvram.oem_info, sizeof (nvram.oem_info));
- } else {
- /* if the buffer read from NVRAM is larger than maximum value, copy only maximum permitted number of bytes */
- strncpy (vendor_spec_info, nvram.oem_info, DEFAULT_SNMP_STRING_MAX_LENGTH-1);
- vendor_spec_info[DEFAULT_SNMP_STRING_MAX_LENGTH-1]='\0';
- }
}
DEBUGMSGTL(("modEoCCLTAdminGroup: handle_modEoCCLTAdminVendorSpecialInfo", "vendor spec info: |%s|\n", vendor_spec_info));
@@ -855,7 +810,6 @@ handle_modEoCCLTAdminMACAddress(netsnmp_mib_handler *handler,
{
int ret;
char admin_mac_addr[6];
- spidcom_nvram_t nvram;
/* We are never called for a GETNEXT if it's registered as a
@@ -871,15 +825,11 @@ handle_modEoCCLTAdminMACAddress(netsnmp_mib_handler *handler,
case MODE_GET:
/* read NVRAM contents */
- ret = libspid_system_get_nvram (&nvram);
- if (LIBSPID_SUCCESS != ret)
+ ret = libspid_get_plc_address (admin_mac_addr, 6);
+ if (ret)
{
memset (admin_mac_addr, 0, 6);
}
- else
- {
- memcpy (admin_mac_addr, nvram.plc_address, 6);
- }
DEBUGMSGTL(("modEoCCLTAdminGroup: handle_modEoCCLTAdminMACAddress", "MAC address copied to admin MAC addr: %x %x %x %x %x %x \n",admin_mac_addr[0],
admin_mac_addr[1], admin_mac_addr[2],admin_mac_addr[3],admin_mac_addr[4],admin_mac_addr[5]));
diff --git a/cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCCLTMACGroup/modEoCOnlineCLTTable/modEoCOnlineCLTTable_data_access.c b/cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCCLTMACGroup/modEoCOnlineCLTTable/modEoCOnlineCLTTable_data_access.c
index 7b12ca4824..d07f4ca6cd 100644
--- a/cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCCLTMACGroup/modEoCOnlineCLTTable/modEoCOnlineCLTTable_data_access.c
+++ b/cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCCLTMACGroup/modEoCOnlineCLTTable/modEoCOnlineCLTTable_data_access.c
@@ -231,7 +231,6 @@ modEoCOnlineCLTTable_container_load(netsnmp_container * container)
/* declarations for calls to libspid */
char buffer[LIBSPID_LINE_MAX_LEN];
int ret;
- spidcom_nvram_t nvram;
char mtd_name[64];
spidcom_image_desc_t desc;
@@ -280,14 +279,11 @@ modEoCOnlineCLTTable_container_load(netsnmp_container * container)
*/
/* read NVRAM contents */
- ret = libspid_system_get_nvram(&nvram);
- if (LIBSPID_SUCCESS != ret){
+ ret = libspid_get_plc_address(modEoCOnlineCLTMACAddress, 6);
+ if (ret){
memset(modEoCOnlineCLTMACAddress, 0, 6);
- } else {
- memcpy(modEoCOnlineCLTMACAddress, nvram.plc_address, 6);
}
-
- rowreq_ctx->data.modEoCOnlineCLTMACAddress_len = 6;
+ rowreq_ctx->data.modEoCOnlineCLTMACAddress_len = 6;
/*
* make sure there is enough space for modEoCOnlineCLTMACAddress data
@@ -313,19 +309,10 @@ modEoCOnlineCLTTable_container_load(netsnmp_container * container)
*/
/* read NVRAM contents */
- ret = libspid_system_get_nvram(&nvram);
- if (LIBSPID_SUCCESS != ret){
+ ret = libspid_get_product_name(modEoCOnlineCLTModelNumber, DEFAULT_SNMP_STRING_MAX_LENGTH);
+ if (ret){
/* Model number is set to empty string to permit walk requests */
strcpy(modEoCOnlineCLTModelNumber, "");
- } else {
- memset(modEoCOnlineCLTModelNumber, 0, DEFAULT_SNMP_STRING_MAX_LENGTH);
- if (sizeof(nvram.product_name) <= DEFAULT_SNMP_STRING_MAX_LENGTH){
- strncpy(modEoCOnlineCLTModelNumber, nvram.product_name, sizeof(nvram.product_name));
- } else {
- /* if the buffer read from NVRAM is larger than maximum value, copy only maximum permitted number of bytes */
- strncpy(modEoCOnlineCLTModelNumber, nvram.product_name, DEFAULT_SNMP_STRING_MAX_LENGTH-1);
- modEoCOnlineCLTModelNumber[DEFAULT_SNMP_STRING_MAX_LENGTH-1]='\0';
- }
}
modEoCOnlineCLTModelNumber_len = strlen(modEoCOnlineCLTModelNumber) + 1;
@@ -485,11 +472,9 @@ modEoCOnlineCLTTable_container_load(netsnmp_container * container)
*/
/* read NVRAM contents */
- ret = libspid_system_get_nvram(&nvram);
- if (LIBSPID_SUCCESS != ret){
+ ret = libspid_get_eth1_address(modEoCOnlineCLTUpLinkDeviceMACAddress, 6);
+ if (ret){
memset(modEoCOnlineCLTUpLinkDeviceMACAddress, 0, 6);
- } else {
- memcpy(modEoCOnlineCLTUpLinkDeviceMACAddress, nvram.eth1_address, 6);
}
rowreq_ctx->data.modEoCOnlineCLTUpLinkDeviceMACAddress_len = 6;
diff --git a/cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCSoftwareUpgradeGroup/modEoCSoftwareUpgradeTable/modEoCSoftwareUpgradeTable_data_access.c b/cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCSoftwareUpgradeGroup/modEoCSoftwareUpgradeTable/modEoCSoftwareUpgradeTable_data_access.c
index 50527e20b9..1b9653b068 100644
--- a/cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCSoftwareUpgradeGroup/modEoCSoftwareUpgradeTable/modEoCSoftwareUpgradeTable_data_access.c
+++ b/cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCSoftwareUpgradeGroup/modEoCSoftwareUpgradeTable/modEoCSoftwareUpgradeTable_data_access.c
@@ -250,7 +250,6 @@ modEoCSoftwareUpgradeTable_container_load(netsnmp_container * container)
/* white list entries read from config file */
libspid_eoc_wl_entry_t wl_config_entries[LIBSPID_WHITE_LIST_MAX_STA_NUM];
- spidcom_nvram_t nvram;
char mac_str[LIBSPID_MAC_STR_LEN];