Attachment #640734 for bug #707454

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




++ b/src/nagios_common_snmp.h

/*********************************** Utilities ****************************************/
/* cache utilities */

extern char plugin_name[30]; /* plugin name */
extern char plugin_tmp_prefix[50];

/* defined in configure script */
/*#define BASE_CACHE "/tmp/cache"*/


/* maximum caracters in ouput */
#define MAX_OUTPUT 500
extern char output[MAX_OUTPUT];
extern int output_overflow;

/* maximum caracters for performance output label*/
#define MAX_LABEL_SIZE 50
extern char *p_output;

/* Put data in output */
void strcat_output(const char *string);

#define TIMEOUT_DEFAULT 3

/* standard options */
extern char *o_host;
extern int o_verb;
extern char* error; 
/* snmp options */
extern int o_port,o_timeout;
extern int o_help, o_verbose,o_version,o_v2c; 
extern int retries;
extern int o_snmpver,snmp_bulk;
extern char *o_community,*o_login,*o_passwd,*o_privpasswd;
extern char *o_protocols[2],*o_authproto,*o_privproto;
/* snmp sessions */
extern struct snmp_session session, *ss;

/* Common options definition and check */
#define common_usage "[-v -V] -H <host> -C <snmp_community> [-2] | (-l login -x passwd [-X pass -L <authp>,<privp>)  [-p <port>] [-t <timeout>]"
++ b/src/nagios_common_snmp.c

#include "nagios_common_snmp.h"

char plugin_name[30]; /* plugin name */
char plugin_tmp_prefix[50];
char output[MAX_OUTPUT];
int output_overflow;
char *p_output;
char *o_host;
int o_verb;
char* error; 
int o_port,o_timeout;
int o_help, o_verbose,o_version,o_v2c; 
int retries;
int o_snmpver,snmp_bulk;
char *o_community,*o_login,*o_passwd,*o_privpasswd;
char *o_protocols[2],*o_authproto,*o_privproto;
struct snmp_session session, *ss;

int init_plugins_gettext(){
	if (setlocale( LC_ALL, "" )==NULL) return 1;
	bindtextdomain( PACKAGE, LOCALEDIR );

Return to bug 707454

Line Link Here

(-)file_not_specified_in_diff (-17 / +33 lines)
0	-- a/src/nagios_common_snmp.h	0	++ b/src/nagios_common_snmp.h
Lines 56-63 Link Here
56	/********************************* Utilities **************************************/	56	/********************************* Utilities **************************************/
57	/* cache utilities */	57	/* cache utilities */
58		58
59	char plugin_name[30]; /* plugin name */	59	extern char plugin_name[30]; /* plugin name */
60	char plugin_tmp_prefix[50];	60	extern char plugin_tmp_prefix[50];
61		61
62	/* defined in configure script */	62	/* defined in configure script */
63	/#define BASE_CACHE "/tmp/cache"/	63	/#define BASE_CACHE "/tmp/cache"/
Lines 71-82 Link Here
71		71
72	/* maximum caracters in ouput */	72	/* maximum caracters in ouput */
73	#define MAX_OUTPUT 500	73	#define MAX_OUTPUT 500
74	char output[MAX_OUTPUT];	74	extern char output[MAX_OUTPUT];
75	int output_overflow;	75	extern int output_overflow;
76		76
77	/* maximum caracters for performance output label*/	77	/* maximum caracters for performance output label*/
78	#define MAX_LABEL_SIZE 50	78	#define MAX_LABEL_SIZE 50
79	char *p_output;	79	extern char *p_output;
80		80
81	/* Put data in output */	81	/* Put data in output */
82	void strcat_output(const char *string);	82	void strcat_output(const char *string);
Lines 143-160 Link Here
143	#define TIMEOUT_DEFAULT 3	143	#define TIMEOUT_DEFAULT 3
144		144
145	/* standard options */	145	/* standard options */
146	char *o_host;	146	extern char *o_host;
147	int o_verb;	147	extern int o_verb;
148	char* error;	148	extern char* error;
149	/* snmp options */	149	/* snmp options */
150	int o_port,o_timeout;	150	extern int o_port,o_timeout;
151	int o_help, o_verbose,o_version,o_v2c;	151	extern int o_help, o_verbose,o_version,o_v2c;
152	int retries;	152	extern int retries;
153	int o_snmpver,snmp_bulk;	153	extern int o_snmpver,snmp_bulk;
154	char o_community,o_login,o_passwd,o_privpasswd;	154	extern char o_community,o_login,o_passwd,o_privpasswd;
155	char o_protocols[2],o_authproto,*o_privproto;	155	extern char o_protocols[2],o_authproto,*o_privproto;
156	/* snmp sessions */	156	/* snmp sessions */
157	struct snmp_session session, *ss;	157	extern struct snmp_session session, *ss;
158		158
159	/* Common options definition and check */	159	/* Common options definition and check */
160	#define common_usage "[-v -V] -H <host> -C <snmp_community> [-2] \| (-l login -x passwd [-X pass -L <authp>,<privp>) [-p <port>] [-t <timeout>]"	160	#define common_usage "[-v -V] -H <host> -C <snmp_community> [-2] \| (-l login -x passwd [-X pass -L <authp>,<privp>) [-p <port>] [-t <timeout>]"
161	-- a/src/nagios_common_snmp.c	161	++ b/src/nagios_common_snmp.c
Lines 1-5 Link Here
1	#include "nagios_common_snmp.h"	1	#include "nagios_common_snmp.h"
2		2
		3	char plugin_name[30]; /* plugin name */
		4	char plugin_tmp_prefix[50];
		5	char output[MAX_OUTPUT];
		6	int output_overflow;
		7	char *p_output;
		8	char *o_host;
		9	int o_verb;
		10	char* error;
		11	int o_port,o_timeout;
		12	int o_help, o_verbose,o_version,o_v2c;
		13	int retries;
		14	int o_snmpver,snmp_bulk;
		15	char o_community,o_login,o_passwd,o_privpasswd;
		16	char o_protocols[2],o_authproto,*o_privproto;
		17	struct snmp_session session, *ss;
		18
3	int init_plugins_gettext(){	19	int init_plugins_gettext(){
4	if (setlocale( LC_ALL, "" )==NULL) return 1;	20	if (setlocale( LC_ALL, "" )==NULL) return 1;
5	bindtextdomain( PACKAGE, LOCALEDIR );	21	bindtextdomain( PACKAGE, LOCALEDIR );