Attachment #321392 for bug #430894

View | Details | Raw Unified | Return to bug 430894
Collapse All | Expand All





   if (!strcmp(Sid->DeviceVendor, "APC") ||
       !strcmp(Sid->DeviceVendor, "APC_NOTRAP")) {
      Sid->mib = malloc(sizeof(powernet_mib_t));
      if (Sid->mib == NULL) {
         log_event(ups, LOG_ERR, "Out of memory.");
         exit(1);
      }

      memset(Sid->mib, 0, sizeof(powernet_mib_t));

      /* Run powernet specific init */
      return powernet_snmp_ups_open(ups);
   }

   if (!strcmp(Sid->DeviceVendor, "RFC")) {
      Sid->mib = malloc(sizeof(ups_mib_t));
      if (Sid->mib == NULL) {
         log_event(ups, LOG_ERR, "Out of memory.");
         exit(1);
      }

      memset(Sid->mib, 0, sizeof(ups_mib_t));
      return 1;
   }





   struct snmp_ups_internal_data *Sid =
      (struct snmp_ups_internal_data *)ups->driver_internal_data;
   struct snmp_session *s = &Sid->session;
   ups_mib_t *data = (ups_mib_t *)Sid->mib;

   /*
    * Check the Ethernet COMMLOST first, then check the

   struct snmp_ups_internal_data *Sid =
      (struct snmp_ups_internal_data *)ups->driver_internal_data;
   struct snmp_session *s = &Sid->session;
   ups_mib_t *data = (ups_mib_t *)Sid->mib;
   
   if (rfc_1628_check_alarms(ups) == 0) {
     return 0;

   struct snmp_ups_internal_data *Sid =
      (struct snmp_ups_internal_data *)ups->driver_internal_data;
   struct snmp_session *s = &Sid->session;
   ups_mib_t *data = (ups_mib_t *)Sid->mib;

   if (rfc_1628_check_alarms(ups) == 0) {
     return 0;

Lines 79-85 Link Here

(-)src/drivers/snmp/snmp.h~ (-1 / +1 lines)
79	unsigned short remote_port; /* Remote socket, usually 161 */	79	unsigned short remote_port; /* Remote socket, usually 161 */
80	char DeviceVendor; / Vendor (ex. APC\|RFC) */	80	char DeviceVendor; / Vendor (ex. APC\|RFC) */
81	char community; / Community name */	81	char community; / Community name */
82	void MIB; / Pointer to MIB data */	82	void mib; / Pointer to MIB data */
83	struct snmp_session trap_session; / snmp session for traps */	83	struct snmp_session trap_session; / snmp session for traps */
84	bool trap_received; /* Have we seen a trap? */	84	bool trap_received; /* Have we seen a trap? */
85	};	85	};




   struct snmp_ups_internal_data *Sid =
      (struct snmp_ups_internal_data *)ups->driver_internal_data;
   struct snmp_session *s = &Sid->session;
   powernet_mib_t *data = (powernet_mib_t *)Sid->mib;
   int ret = 1;

   /*

   struct snmp_ups_internal_data *Sid = 
      (struct snmp_ups_internal_data *)ups->driver_internal_data;
   struct snmp_session *s = &Sid->session;
   powernet_mib_t *data = (powernet_mib_t *)Sid->mib;

   if (powernet_check_comm_lost(ups) == 0)
      return 0;

   struct snmp_ups_internal_data *Sid =
      (struct snmp_ups_internal_data *)ups->driver_internal_data;
   struct snmp_session *s = &Sid->session;
   powernet_mib_t *data = (powernet_mib_t *)Sid->mib;

   if (powernet_check_comm_lost(ups) == 0)
      return 0;

Return to bug 430894

Lines 140-165 Link Here

(-)src/drivers/snmp/snmp.c~ (-6 / +6 lines)
140		140
141	if (!strcmp(Sid->DeviceVendor, "APC") \|\|	141	if (!strcmp(Sid->DeviceVendor, "APC") \|\|
142	!strcmp(Sid->DeviceVendor, "APC_NOTRAP")) {	142	!strcmp(Sid->DeviceVendor, "APC_NOTRAP")) {
143	Sid->MIB = malloc(sizeof(powernet_mib_t));	143	Sid->mib = malloc(sizeof(powernet_mib_t));
144	if (Sid->MIB == NULL) {	144	if (Sid->mib == NULL) {
145	log_event(ups, LOG_ERR, "Out of memory.");	145	log_event(ups, LOG_ERR, "Out of memory.");
146	exit(1);	146	exit(1);
147	}	147	}
148		148
149	memset(Sid->MIB, 0, sizeof(powernet_mib_t));	149	memset(Sid->mib, 0, sizeof(powernet_mib_t));
150		150
151	/* Run powernet specific init */	151	/* Run powernet specific init */
152	return powernet_snmp_ups_open(ups);	152	return powernet_snmp_ups_open(ups);
153	}	153	}
154		154
155	if (!strcmp(Sid->DeviceVendor, "RFC")) {	155	if (!strcmp(Sid->DeviceVendor, "RFC")) {
156	Sid->MIB = malloc(sizeof(ups_mib_t));	156	Sid->mib = malloc(sizeof(ups_mib_t));
157	if (Sid->MIB == NULL) {	157	if (Sid->mib == NULL) {
158	log_event(ups, LOG_ERR, "Out of memory.");	158	log_event(ups, LOG_ERR, "Out of memory.");
159	exit(1);	159	exit(1);
160	}	160	}
161		161
162	memset(Sid->MIB, 0, sizeof(ups_mib_t));	162	memset(Sid->mib, 0, sizeof(ups_mib_t));
163	return 1;	163	return 1;
164	}	164	}
165		165

Lines 32-38 Link Here

(-)src/drivers/snmp/drv_rfc1628.c~ (-3 / +3 lines)
32	struct snmp_ups_internal_data *Sid =	32	struct snmp_ups_internal_data *Sid =
33	(struct snmp_ups_internal_data *)ups->driver_internal_data;	33	(struct snmp_ups_internal_data *)ups->driver_internal_data;
34	struct snmp_session *s = &Sid->session;	34	struct snmp_session *s = &Sid->session;
35	ups_mib_t data = (ups_mib_t )Sid->MIB;	35	ups_mib_t data = (ups_mib_t )Sid->mib;
36		36
37	/*	37	/*
38	* Check the Ethernet COMMLOST first, then check the	38	* Check the Ethernet COMMLOST first, then check the
Lines 76-82 Link Here
76	struct snmp_ups_internal_data *Sid =	76	struct snmp_ups_internal_data *Sid =
77	(struct snmp_ups_internal_data *)ups->driver_internal_data;	77	(struct snmp_ups_internal_data *)ups->driver_internal_data;
78	struct snmp_session *s = &Sid->session;	78	struct snmp_session *s = &Sid->session;
79	ups_mib_t data = (ups_mib_t )Sid->MIB;	79	ups_mib_t data = (ups_mib_t )Sid->mib;
80		80
81	if (rfc_1628_check_alarms(ups) == 0) {	81	if (rfc_1628_check_alarms(ups) == 0) {
82	return 0;	82	return 0;
Lines 98-104 Link Here
98	struct snmp_ups_internal_data *Sid =	98	struct snmp_ups_internal_data *Sid =
99	(struct snmp_ups_internal_data *)ups->driver_internal_data;	99	(struct snmp_ups_internal_data *)ups->driver_internal_data;
100	struct snmp_session *s = &Sid->session;	100	struct snmp_session *s = &Sid->session;
101	ups_mib_t data = (ups_mib_t )Sid->MIB;	101	ups_mib_t data = (ups_mib_t )Sid->mib;
102		102
103	if (rfc_1628_check_alarms(ups) == 0) {	103	if (rfc_1628_check_alarms(ups) == 0) {
104	return 0;	104	return 0;

Lines 34-40 Link Here

(-)src/drivers/snmp/drv_powernet.c~ (-3 / +3 lines)
34	struct snmp_ups_internal_data *Sid =	34	struct snmp_ups_internal_data *Sid =
35	(struct snmp_ups_internal_data *)ups->driver_internal_data;	35	(struct snmp_ups_internal_data *)ups->driver_internal_data;
36	struct snmp_session *s = &Sid->session;	36	struct snmp_session *s = &Sid->session;
37	powernet_mib_t data = (powernet_mib_t )Sid->MIB;	37	powernet_mib_t data = (powernet_mib_t )Sid->mib;
38	int ret = 1;	38	int ret = 1;
39		39
40	/*	40	/*
Lines 161-167 Link Here
161	struct snmp_ups_internal_data *Sid =	161	struct snmp_ups_internal_data *Sid =
162	(struct snmp_ups_internal_data *)ups->driver_internal_data;	162	(struct snmp_ups_internal_data *)ups->driver_internal_data;
163	struct snmp_session *s = &Sid->session;	163	struct snmp_session *s = &Sid->session;
164	powernet_mib_t data = (powernet_mib_t )Sid->MIB;	164	powernet_mib_t data = (powernet_mib_t )Sid->mib;
165		165
166	if (powernet_check_comm_lost(ups) == 0)	166	if (powernet_check_comm_lost(ups) == 0)
167	return 0;	167	return 0;
Lines 300-306 Link Here
300	struct snmp_ups_internal_data *Sid =	300	struct snmp_ups_internal_data *Sid =
301	(struct snmp_ups_internal_data *)ups->driver_internal_data;	301	(struct snmp_ups_internal_data *)ups->driver_internal_data;
302	struct snmp_session *s = &Sid->session;	302	struct snmp_session *s = &Sid->session;
303	powernet_mib_t data = (powernet_mib_t )Sid->MIB;	303	powernet_mib_t data = (powernet_mib_t )Sid->mib;
304		304
305	if (powernet_check_comm_lost(ups) == 0)	305	if (powernet_check_comm_lost(ups) == 0)
306	return 0;	306	return 0;