lagertonne/nut
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Imported Upstream version 2.6.5

Browse source
This commit is contained in:
Laurent Bigonville 2012-08-12 23:39:31 +02:00
parent fefe62b2bd
commit a1fa151fc7
201 changed files with 7974 additions and 709 deletions
Download patch file Download diff file Expand all files Collapse all files

67
drivers/snmp-ups.c
View file

@ -60,6 +60,8 @@ static mib2nut_info_t *mib2nut[] = {
&aphel_genesisII,
&aphel_revelation,
&eaton_marlin,
&pulizzi_switched1,
&pulizzi_switched2,
&raritan,
&baytech,
&compaq,
@ -91,7 +93,7 @@ const char *mibvers;
static void disable_transfer_oids(void);
#define DRIVER_NAME "Generic SNMP UPS driver"
#define DRIVER_VERSION "0.66"
#define DRIVER_VERSION "0.68"
/* driver description structure */
upsdrv_info_t upsdrv_info = {
@ -122,13 +124,10 @@ int outlet_index_base = -1;
void upsdrv_initinfo(void)
{
snmp_info_t *su_info_p;
char version[128];
upsdebugx(1, "SNMP UPS driver : entering upsdrv_initinfo()");
snprintf(version, sizeof version, "%s (mib: %s %s)",
DRIVER_VERSION, mibname, mibvers);
dstate_setinfo("driver.version.internal", "%s", version);
dstate_setinfo("driver.version.data", "%s MIB %s", mibname, mibvers);
/* add instant commands to the info database.
* outlet commands are processed later, during initial walk */
@ -955,7 +954,7 @@ const char *su_find_infoval(info_lkp_t *oid2info, long value)
info_lkp_t *info_lkp;
for (info_lkp = oid2info; (info_lkp != NULL) &&
(strcmp(info_lkp->info_value, "NULL")); info_lkp++) {
(strcmp(info_lkp->info_value, "NULL")) && (info_lkp->info_value != NULL); info_lkp++) {
if (info_lkp->oid_value == value) {
upsdebugx(1, "su_find_infoval: found %s (value: %ld)",
@ -1055,6 +1054,32 @@ int base_nut_outlet_offset(void)
return (outlet_index_base==0)?1:0;
}
/* try to determine the number of outlets, using a template definition,
* that we walk, until we can't get anymore values */
static int guestimate_outlet_count(const char *OID_template)
{
int base_index = 0;
char test_OID[SU_INFOSIZE];
int base_count;
upsdebugx(1, "guestimate_outlet_count(%s)", OID_template);
/* Determine if OID index starts from 0 or 1? */
sprintf(test_OID, OID_template, base_index);
if (nut_snmp_get(test_OID) == NULL)
base_index++;
/* Now, actually iterate */
for (base_count = 0 ; ; base_count++) {
sprintf(test_OID, OID_template, base_index + base_count);
if (nut_snmp_get(test_OID) == NULL)
break;
}
upsdebugx(3, "guestimate_outlet_count: %i", base_count);
return base_count;
}
/* process a single data from a walk */
bool_t get_and_process_data(int mode, snmp_info_t *su_info_p)
{
@ -1236,10 +1261,20 @@ bool_t snmp_ups_walk(int mode)
if(dstate_getinfo("outlet.count") == NULL) {
/* FIXME: should we disable it?
* su_info_p->flags &= ~SU_FLAG_OK; */
continue;
* su_info_p->flags &= ~SU_FLAG_OK;
* or rely on guestimation? */
if ((outlet_count = guestimate_outlet_count(su_info_p->OID)) == -1) {
/* Failed */
continue;
}
else {
/* Publish the count estimation */
dstate_setinfo("outlet.count", "%i", outlet_count);
}
}
else {
outlet_count = atoi(dstate_getinfo("outlet.count"));
}
outlet_count = atoi(dstate_getinfo("outlet.count"));
/* general init of data using the template */
instantiate_info(su_info_p, &cur_info_p);
@ -1495,11 +1530,14 @@ int su_instcmd(const char *cmdname, const char *extradata)
snmp_info_t *su_info_p = NULL;
int status;
int retval = STAT_INSTCMD_FAILED;
int cmd_offset = 0;
upsdebugx(2, "entering su_instcmd(%s, %s)", cmdname, extradata);
if (strncmp(cmdname, "outlet", 6))
/* FIXME: this should only apply if strchr(%)! */
if (strncmp(cmdname, "outlet", 6)) {
su_info_p = su_find_info(cmdname);
}
else {
snmp_info_t *tmp_info_p;
char *outlet_number_ptr = strchr(cmdname, '.');
@ -1539,8 +1577,15 @@ int su_instcmd(const char *cmdname, const char *extradata)
}
/* adapt the OID */
if (su_info_p->OID != NULL) {
/* Workaround buggy Eaton Pulizzi implementation
* which have different offsets index for data & commands! */
if (su_info_p->flags & SU_CMD_OFFSET) {
upsdebugx(3, "Adding command offset");
cmd_offset++;
}
sprintf((char *)su_info_p->OID, tmp_info_p->OID,
outlet_number - base_nut_outlet_offset());
outlet_number - base_nut_outlet_offset() + cmd_offset);
} else {
free_info(su_info_p);
return STAT_INSTCMD_UNKNOWN;