1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
|
Add support for large output
http://opsview-blog.opsera.com/dotorg/2008/08/enhancing-nrpe.htmlIndex: nrpe-2.14/include/common.h
===================================================================
Index: nrpe-2.14/include/common.h
===================================================================
--- nrpe-2.14.orig/include/common.h
+++ nrpe-2.14/include/common.h
@@ -41,7 +41,7 @@
#define DEFAULT_SOCKET_TIMEOUT 10 /* timeout after 10 seconds */
#define DEFAULT_CONNECTION_TIMEOUT 300 /* timeout if daemon is waiting for connection more than this time */
-#define MAX_INPUT_BUFFER 2048 /* max size of most buffers we use */
+#define MAX_INPUT_BUFFER 16384 /* max size of most buffers we use */
#define MAX_FILENAME_LENGTH 256
#define MAX_HOST_ADDRESS_LENGTH 256 /* max size of a host address */
@@ -55,12 +55,14 @@
#define QUERY_PACKET 1 /* id code for a packet containing a query */
#define RESPONSE_PACKET 2 /* id code for a packet containing a response */
+#define RESPONSE_PACKET_WITH_MORE 3 /* id code for a packet containing a response, with more data to follow */
#define NRPE_PACKET_VERSION_3 3 /* packet version identifier */
#define NRPE_PACKET_VERSION_2 2
#define NRPE_PACKET_VERSION_1 1 /* older packet version identifiers (no longer supported) */
#define MAX_PACKETBUFFER_LENGTH 1024 /* max amount of data we'll send in one query/response */
+ /* WARNING - do not change this as older clients/servers will not work */
typedef struct packet_struct{
int16_t packet_version;
Index: nrpe-2.14/src/check_nrpe.c
===================================================================
--- nrpe-2.14.orig/src/check_nrpe.c
+++ nrpe-2.14/src/check_nrpe.c
@@ -221,6 +221,11 @@ int main(int argc, char **argv){
return STATE_UNKNOWN;
}
+ /* Altinity patch: Allow multiple packets to be received */
+ /* Indentation not corrected to allow simpler patching */
+ /* START MULTI_PACKET LOOP */
+ do {
+
/* wait for the response packet */
bytes_to_recv=sizeof(receive_packet);
if(use_ssl==FALSE)
@@ -233,31 +238,24 @@ int main(int argc, char **argv){
/* reset timeout */
alarm(0);
- /* close the connection */
-#ifdef HAVE_SSL
- if(use_ssl==TRUE){
- SSL_shutdown(ssl);
- SSL_free(ssl);
- SSL_CTX_free(ctx);
- }
-#endif
- graceful_close(sd,1000);
-
/* recv() error */
if(rc<0){
printf("CHECK_NRPE: Error receiving data from daemon.\n");
+ graceful_close(sd,1000);
return STATE_UNKNOWN;
}
/* server disconnected */
else if(rc==0){
printf("CHECK_NRPE: Received 0 bytes from daemon. Check the remote server logs for error messages.\n");
+ graceful_close(sd,1000);
return STATE_UNKNOWN;
}
/* receive underflow */
else if(bytes_to_recv<sizeof(receive_packet)){
printf("CHECK_NRPE: Receive underflow - only %d bytes received (%d expected).\n",bytes_to_recv,sizeof(receive_packet));
+ graceful_close(sd,1000);
return STATE_UNKNOWN;
}
@@ -271,21 +269,21 @@ int main(int argc, char **argv){
calculated_crc32=calculate_crc32((char *)&receive_packet,sizeof(receive_packet));
if(packet_crc32!=calculated_crc32){
printf("CHECK_NRPE: Response packet had invalid CRC32.\n");
- close(sd);
+ graceful_close(sd,1000);
return STATE_UNKNOWN;
}
/* check packet version */
if(ntohs(receive_packet.packet_version)!=NRPE_PACKET_VERSION_2){
printf("CHECK_NRPE: Invalid packet version received from server.\n");
- close(sd);
+ graceful_close(sd,1000);
return STATE_UNKNOWN;
}
/* check packet type */
- if(ntohs(receive_packet.packet_type)!=RESPONSE_PACKET){
+ if(ntohs(receive_packet.packet_type)!=RESPONSE_PACKET && ntohs(receive_packet.packet_type)!=RESPONSE_PACKET_WITH_MORE){
printf("CHECK_NRPE: Invalid packet type received from server.\n");
- close(sd);
+ graceful_close(sd,1000);
return STATE_UNKNOWN;
}
@@ -297,8 +295,18 @@ int main(int argc, char **argv){
if(!strcmp(receive_packet.buffer,""))
printf("CHECK_NRPE: No output returned from daemon.\n");
else
- printf("%s\n",receive_packet.buffer);
- }
+ printf("%s",receive_packet.buffer);
+
+ } while (ntohs(receive_packet.packet_type)==RESPONSE_PACKET_WITH_MORE);
+ /* END MULTI_PACKET LOOP */
+
+ /* Finish output with newline */
+ printf("\n");
+
+ /* close the connection */
+ graceful_close(sd,1000);
+
+ }
/* reset the alarm */
else
@@ -434,6 +442,14 @@ int graceful_close(int sd, int timeout){
struct timeval tv;
char buf[1000];
+#ifdef HAVE_SSL
+ if(use_ssl==TRUE){
+ SSL_shutdown(ssl);
+ SSL_free(ssl);
+ SSL_CTX_free(ctx);
+ }
+#endif
+
/* send FIN packet */
shutdown(sd,SHUT_WR);
for(;;){
Index: nrpe-2.14/src/nrpe.c
===================================================================
--- nrpe-2.14.orig/src/nrpe.c
+++ nrpe-2.14/src/nrpe.c
@@ -1056,6 +1056,8 @@ void handle_connection(int sock){
char processed_command[MAX_INPUT_BUFFER];
int result=STATE_OK;
int early_timeout=FALSE;
+ int bytes_copied=0;
+ char *pbuffer=&buffer[0];
int rc;
int x;
#ifdef DEBUG
@@ -1272,6 +1274,14 @@ void handle_connection(int sock){
if(buffer[strlen(buffer)-1]=='\n')
buffer[strlen(buffer)-1]='\x0';
+ /* Altinity patch to allow multi packet responses */
+ /* Loop not indented to allow easier patching */
+ /* START MULTI_PACKET LOOP */
+ do {
+
+ if(debug==TRUE)
+ syslog(LOG_DEBUG,"Sending response - bytes left: %d", strlen(pbuffer));
+
/* clear the response packet buffer */
bzero(&send_packet,sizeof(send_packet));
@@ -1280,11 +1290,17 @@ void handle_connection(int sock){
/* initialize response packet data */
send_packet.packet_version=(int16_t)htons(NRPE_PACKET_VERSION_2);
- send_packet.packet_type=(int16_t)htons(RESPONSE_PACKET);
send_packet.result_code=(int16_t)htons(result);
- strncpy(&send_packet.buffer[0],buffer,MAX_PACKETBUFFER_LENGTH);
+ strncpy(&send_packet.buffer[0],pbuffer,MAX_PACKETBUFFER_LENGTH);
send_packet.buffer[MAX_PACKETBUFFER_LENGTH-1]='\x0';
-
+
+ bytes_copied = strlen(&send_packet.buffer[0]);
+ pbuffer = pbuffer+bytes_copied;
+ if(strlen(pbuffer)>0)
+ send_packet.packet_type=(int16_t)htons(RESPONSE_PACKET_WITH_MORE);
+ else
+ send_packet.packet_type=(int16_t)htons(RESPONSE_PACKET);
+
/* calculate the crc 32 value of the packet */
send_packet.crc32_value=(u_int32_t)0L;
calculated_crc32=calculate_crc32((char *)&send_packet,sizeof(send_packet));
@@ -1303,6 +1319,9 @@ void handle_connection(int sock){
SSL_write(ssl,&send_packet,bytes_to_send);
#endif
+ } while (strlen(pbuffer) > 0);
+ /* END MULTI_PACKET LOOP */
+
#ifdef HAVE_SSL
if(ssl){
complete_SSL_shutdown( ssl);
|
GitWeb