ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/i-scream/projects/cms/source/ihost/ihost.c

Comparing projects/cms/source/ihost/ihost.c (file contents):
Revision 1.13 by pajs, Sun May 19 14:44:36 2002 UTC vs.
Revision 1.51 by tdb, Mon May 31 13:35:23 2004 UTC

#	Line 1 | Line 1
1		/*
2		* i-scream central monitoring system
3	+	* http://www.i-scream.org
4		* Copyright (C) 2000-2002 i-scream
5		*
6		* This program is free software; you can redistribute it and/or
#	Line 17 | Line 18
18		* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
19		*/
20
21	+	#ifdef HAVE_CONFIG_H
22	+	#include "config.h"
23	+	#endif
24	+
25		#include <stdio.h>
21	–	#include <sys/socket.h>
26		#include <stdlib.h>
27		#include <unistd.h>
24	–	#include <syslog.h>
25	–	#include <netinet/in.h>
26	–	#include "ukcprog.h"
27	–	#include <netdb.h>
28		#include <string.h>
29	<	#include "statgrab.h"
29	>	#include <sys/types.h>
30	>	#include <sys/socket.h>
31	>	#include <stdarg.h>
32	>	#include <errno.h>
33	>	#include <netdb.h>
34	>	#include <netinet/in.h>
35		#include <time.h>
36
37	<	#define RECONFIGURE_RETURN_CODE 2
38	<	#define UDP_MAX_PACKET_SIZE 8192
37	>	#include <ukcprog.h>
38	>	#include <statgrab.h>
39
40	+	#define LOG_CRIT 0
41	+	#define LOG_ERR 1
42	+	#define LOG_INFO 2
43	+	#define LOG_DEBUG 3
44	+
45		typedef struct{
46	<	int fm_port;
47	<	char *fm_host;
48	<
49	<	char *my_fqdn;
46	>	int filtermanager_port;
47	>	char *filtermanager_host;
48	>
49	>	char *host_ip;
50	>	char *host_fqdn;
51	>	int preset_fqdn;
52	>	int preset_ip;
53	>
54		char *server_fqdn;
55		int server_udp_port;
56	<	int server_tcp_port;
56	>
57	>	/* Weird stuff iscream wants sent to it */
58		char *last_modified;
59	<	char *files_list;
60	<	char *key;
59	>	char *file_list;
60	>
61		int udp_update_time;
47	–	int tcp_update_time;
62
63	+	time_t config_ttl;
64	+
65		}ihost_state_t;
66
67	<	char* sock_comm(FILE *f_r, FILE *f_w, char *sendString){
68	<	char *reply;
69	<	fprintf(f_w, "%s\n", sendString);
54	<	fflush(f_w);
55	<	reply=fpgetline(f_r);
56	<	/* Returns pointer to static buffer */
57	<	return reply;
58	<	}
67	>	typedef struct{
68	>	int verbose;
69	>	int daemon;
70
71	<	int ihost_configure(ihost_state_t *ihost_state){
71	>	FILE *log;
72	>	}ihost_config_t;
73	>
74	>	typedef struct{
75		struct sockaddr_in addr;
76	<	struct in_addr haddr;
77	<	int sd;
64	<	FILE *fm_fd_r, *fm_fd_w;
65	<	char *reply;
66	<	char *reply_ptr;
76	>	int sock;
77	>	}udp_sockinfo_t;
78
79	<	/* Check to see if anything needs to be free'd */
69	<	if (ihost_state->my_fqdn!=NULL) free(ihost_state->my_fqdn);
70	<	if (ihost_state->server_fqdn!=NULL) free(ihost_state->server_fqdn);
71	<	if (ihost_state->last_modified!=NULL) free(ihost_state->last_modified);
72	<	if (ihost_state->files_list!=NULL) free(ihost_state->files_list);
79	>	ihost_config_t ihost_config;
80
81	<	if ((sd = socket(AF_INET, SOCK_STREAM, PF_UNSPEC)) < 0) {
75	<	errf("Can't create AF_INET socket (%m)");
76	<	return -1;
77	<	}
81	>	extern int errno;
82
83	<	if (get_host_addr(ihost_state->fm_host, &haddr) != 0){
84	<	errf("Failed to resolve address %s (%m)", ihost_state->fm_host);
85	<	return -1;
83	>	/* Taken from the OpenSSH code. Its licence included in function.*/
84	>	#ifndef HAVE_STRLCAT
85	>
86	>	/*
87	>	* Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
88	>	* All rights reserved.
89	>	*
90	>	* Redistribution and use in source and binary forms, with or without
91	>	* modification, are permitted provided that the following conditions
92	>	* are met:
93	>	* 1. Redistributions of source code must retain the above copyright
94	>	*    notice, this list of conditions and the following disclaimer.
95	>	* 2. Redistributions in binary form must reproduce the above copyright
96	>	*    notice, this list of conditions and the following disclaimer in the
97	>	*    documentation and/or other materials provided with the distribution.
98	>	* 3. The name of the author may not be used to endorse or promote products
99	>	*    derived from this software without specific prior written permission.
100	>	*
101	>	* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
102	>	* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
103	>	* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
104	>	* THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
105	>	* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
106	>	* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
107	>	* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
108	>	* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
109	>	* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
110	>	* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
111	>	*/
112	>
113	>	/*
114	>	* Appends src to string dst of size siz (unlike strncat, siz is the
115	>	* full size of dst, not space left).  At most siz-1 characters
116	>	* will be copied.  Always NUL terminates (unless siz <= strlen(dst)).
117	>	* Returns strlen(src) + MIN(siz, strlen(initial dst)).
118	>	* If retval >= siz, truncation occurred.
119	>	*/
120	>	size_t
121	>	strlcat(dst, src, siz)
122	>	char *dst;
123	>	const char *src;
124	>	size_t siz;
125	>	{
126	>	register char *d = dst;
127	>	register const char *s = src;
128	>	register size_t n = siz;
129	>	size_t dlen;
130	>
131	>	/* Find the end of dst and adjust bytes left but don't go past end */
132	>	while (n-- != 0 && *d != '\0')
133	>	d++;
134	>	dlen = d - dst;
135	>	n = siz - dlen;
136	>
137	>	if (n == 0)
138	>	return(dlen + strlen(s));
139	>	while (*s != '\0') {
140	>	if (n != 1) {
141	>	*d++ = *s;
142	>	n--;
143	>	}
144	>	s++;
145		}
146	+	*d = '\0';
147
148	<	memset(&addr, 0, sizeof addr);
149	<	addr.sin_family = AF_INET;
86	<	memcpy(&addr.sin_addr, &haddr, sizeof haddr);
87	<	addr.sin_port =  htons(ihost_state->fm_port);
148	>	return(dlen + (s - src));       /* count does not include NUL */
149	>	}
150
151	<	if (connect(sd, (struct sockaddr *)&addr, sizeof addr) != 0) {
152	<	errf("Failed to connect to %s on port %d (%m)", ihost_state->fm_host, ihost_state->fm_port);
153	<	return -1;
151	>	#endif
152	>	/* End strlcat function taken from OpenSSH */
153	>
154	>	void log_msg(int level, char *format, ...){
155	>	int cur_errno;
156	>	va_list ap;
157	>
158	>	cur_errno=errno;
159	>
160	>	if(level<=ihost_config.verbose){
161	>	va_start(ap, format);
162	>	vfprintf(ihost_config.log, format, ap);
163	>	va_end(ap);
164	>	if(level==LOG_CRIT){
165	>	fprintf(ihost_config.log, " (%s)\n", strerror(cur_errno));
166	>	}else{
167	>	fprintf(ihost_config.log, "\n");
168	>	}
169	>	fflush(ihost_config.log);
170		}
171	+	}
172
173	<	/* Need to open 2 files, one for reading one for writing, as it gets confused if we only use 1 :) */
174	<	if ((fm_fd_r=fdopen(sd,"r")) == NULL){
175	<	errf("Failed to open read stream (%m)");
176	<	return -1;
173	>	int create_udp_sockinfo(udp_sockinfo_t *udp_sockinfo, char *hostname, int port){
174	>
175	>	struct in_addr haddr;
176	>
177	>	log_msg(LOG_DEBUG, "Resolving name for udp connection");
178	>	if(get_host_addr(hostname, &haddr) != 0){
179	>	log_msg(LOG_CRIT, "Failed to lookup name");
180	>	return 1;
181		}
182
183	<	if ((fm_fd_w=fdopen(dup(sd),"w")) == NULL){
184	<	errf("Failed to open write stream (%m)");
185	<	return -1;
183	>	if((udp_sockinfo->sock=socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0){
184	>	log_msg(LOG_CRIT, "Failed to create UDP socket");
185	>	return 1;
186		}
187
188	<	reply=sock_comm(fm_fd_r, fm_fd_w, "STARTCONFIG");
189	<	if ((reply==NULL) || (strncasecmp(reply, "OK", 2) != 0) ) {
190	<	errf("Server error");
191	<	return -1;
188	>	memset(&(udp_sockinfo->addr), 0, sizeof(struct sockaddr_in));
189	>	udp_sockinfo->addr.sin_family=AF_INET;
190	>	memcpy((char *)&(udp_sockinfo->addr.sin_addr), &haddr, sizeof(haddr));
191	>	udp_sockinfo->addr.sin_port = htons(port);
192	>
193	>	log_msg(LOG_DEBUG, "Socket created");
194	>	return 0;
195	>	}
196	>
197	>	FILE *create_tcp_connection(char *hostname, int port){
198	>	int sock;
199	>	struct sockaddr_in addr;
200	>	struct in_addr haddr;
201	>	FILE *f;
202	>
203	>	log_msg(LOG_DEBUG, "Creating tcp socket");
204	>	if((sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP))<0){
205	>	log_msg(LOG_CRIT, "Failed to make TCP Socket");
206	>	return NULL;
207		}
208
209	<	reply=sock_comm(fm_fd_r, fm_fd_w, "LASTMODIFIED");
210	<	if((reply== NULL) || (strncasecmp(reply, "ERROR", 5) ==0)){
211	<	errf("Server error (%m)");
212	<	return -1;
209	>	if((get_host_addr(hostname, &haddr))!=0){
210	>	log_msg(LOG_CRIT, "Failed to lookup name for %s", hostname);
211	>	close(sock);
212	>	return NULL;
213		}
214	<	if((ihost_state->last_modified=strdup(reply)) == NULL){
215	<	errf("strdup failed (%m)");
216	<	return -1;
217	<	}
218	<
219	<	reply=sock_comm(fm_fd_r, fm_fd_w, "FILELIST");
220	<	if((reply== NULL) || (strncasecmp(reply, "ERROR", 5) ==0)){
221	<	errf("Server error (%m)");
222	<	return -1;
214	>
215	>	memset(&addr, 0, sizeof(addr));
216	>	addr.sin_family = AF_INET;
217	>	memcpy(&addr.sin_addr, &haddr, sizeof(haddr));
218	>	addr.sin_port = htons(port);
219	>
220	>	log_msg(LOG_DEBUG, "Creating a tcp connection");
221	>	if(connect(sock, (struct sockaddr *)&addr, sizeof(addr)) !=0){
222	>	log_msg(LOG_CRIT, "Failed to connect to hostname %s on port %d", hostname, port);
223	>	close(sock);
224	>	return NULL;
225		}
126	–	if((ihost_state->files_list=strdup(reply)) == NULL){
127	–	errf("strdup failed (%m)");
128	–	return -1;
129	–	}
226
227	<	reply=sock_comm(fm_fd_r, fm_fd_w, "FQDN");
228	<	if((reply== NULL) || (strncasecmp(reply, "ERROR", 5)==0)){
229	<	errf("Server error (%m)");
230	<	return -1;
227	>	if((f=fdopen(sock, "r+"))==NULL){
228	>	log_msg(LOG_CRIT, "Failed to connect to open filedescriptor on tcp connection");
229	>	close(sock);
230	>	return NULL;
231		}
232	<	if((ihost_state->my_fqdn=strdup(reply)) == NULL){
233	<	errf("strdup failed (%m)");
232	>
233	>	return f;
234	>	}
235	>
236	>	int tcp_comm(FILE *f, char *send, char **response, char *expected){
237	>
238	>	log_msg(LOG_DEBUG, "Sending %s", send);
239	>	fprintf(f, "%s\n", send);
240	>	fflush(f);
241	>	*response=fpgetline(f);
242	>	fseek(f, 0, SEEK_CUR);
243	>
244	>	if(*response!=NULL) log_msg(LOG_DEBUG, "Received %s", *response);
245	>
246	>	if( (*response==NULL) || (strcmp(*response, "ERROR")==0) ) return -1;
247	>
248	>	if(expected==NULL) return 0;
249	>
250	>	if((strcmp(expected, *response))==0) return 0;
251	>
252	>	log_msg(LOG_DEBUG, "Did not get expected response");
253	>	return -1;
254	>	}
255	>
256	>	int tcp_comm_strdup(FILE *f, char *send, char **response, char *expected){
257	>	if((tcp_comm(f, send, response, expected))!=0){
258		return -1;
259		}
260
261	<	reply=sock_comm(fm_fd_r, fm_fd_w, "UDPUpdateTime");
262	<	if(reply== NULL){
263	<	errf("Server error (%m)");
261	>	*response=strdup(*response);
262	>	if (response==NULL) return -1;
263	>
264	>	return 0;
265	>	}
266	>
267	>	int ihost_getconfig(ihost_state_t *ihost_state){
268	>
269	>	FILE *tcp_con;
270	>	char *response;
271	>	char *response_ptr;
272	>
273	>	/* Keep these in case of a failure and so it can keep running on the old config */
274	>	char *file_list=NULL;
275	>	char *last_modified=NULL;
276	>	char *host_fqdn=NULL;
277	>	char *host_ip=NULL;
278	>	int udp_update_time=0;
279	>	char *server_fqdn=NULL;
280	>	int server_udp_port=0;
281	>	time_t config_ttl=0;
282	>
283	>	if((tcp_con=create_tcp_connection(ihost_state->filtermanager_host, ihost_state->filtermanager_port))==NULL){
284		return -1;
285		}
286	<	if (strncasecmp(reply, "ERROR", 5) != 0){
287	<	ihost_state->udp_update_time=atoi(reply);
286	>
287	>	if(ihost_state->file_list!=NULL || ihost_state->last_modified!=NULL){
288	>	if(tcp_con==NULL){
289	>	goto error;
290	>	}
291	>
292	>	if((tcp_comm(tcp_con, "CHECKCONFIG", &response, "OK"))!=0){
293	>	goto error;
294	>	}
295	>
296	>	if((tcp_comm(tcp_con, ihost_state->file_list, &response, "OK"))!=0){
297	>	goto error;
298	>	}
299	>
300	>	if((tcp_comm(tcp_con, ihost_state->last_modified, &response, "OK"))==0){
301	>	if((tcp_comm(tcp_con, "END", &response, "OK"))!=0){
302	>	goto error;
303	>	}
304	>	fclose(tcp_con);
305	>	return 0;
306	>	}else{
307	>	if((strcmp(response, "EXPIRED"))!=0){
308	>	goto error;
309	>	}
310	>	}
311		}
312
313	<	reply=sock_comm(fm_fd_r, fm_fd_w, "TCPUpdateTime");
314	<	if(reply== NULL){
315	<	errf("Server error (%m)");
316	<	return -1;
313	>	/* If we got to here, the config must of expired */
314	>
315	>	if((tcp_comm(tcp_con, "STARTCONFIG", &response, "OK"))!=0){
316	>	goto error;
317		}
318	<	if (strncasecmp(reply, "ERROR", 5) != 0){
319	<	ihost_state->tcp_update_time=atoi(reply);
318	>
319	>	if((tcp_comm_strdup(tcp_con, "LASTMODIFIED", &response, NULL))!=0){
320	>	goto error;
321		}
322	+	last_modified=response;
323
324	<	reply=sock_comm(fm_fd_r, fm_fd_w, "ENDCONFIG");
325	<	if(reply== NULL){
161	<	errf("Server error (%m)");
162	<	return -1;
324	>	if((tcp_comm_strdup(tcp_con, "FILELIST", &response, NULL))!=0){
325	>	goto error;
326		}
327	+	file_list=response;
328
329	<	reply=sock_comm(fm_fd_r, fm_fd_w, "FILTER");
330	<	if((reply== NULL) || (strncasecmp(reply, "ERROR", 5)==0)){
167	<	errf("Server error FILTER failed (%m)");
168	<	return -1;
329	>	if((tcp_comm_strdup(tcp_con, "FQDN", &response, NULL))!=0){
330	>	goto error;
331		}
332	<	reply_ptr=strchr(reply,';');
333	<	if (reply_ptr==NULL){
334	<	errf("Incorrect data returned");
335	<	return -1;
332	>	host_fqdn=response;
333	>
334	>	if((tcp_comm_strdup(tcp_con, "IP", &response, NULL))!=0){
335	>	goto error;
336		}
337	<	*reply_ptr='\0';
338	<	if((ihost_state->server_fqdn=strdup(reply)) == NULL){
339	<	errf("strdup failed (%m)");
340	<	return -1;
337	>	host_ip=response;
338	>
339	>	if((tcp_comm(tcp_con, "UDPUpdateTime", &response, NULL))!=0){
340	>	goto error;
341		}
342	<	reply=reply_ptr + 1;
343	<	reply_ptr=strchr(reply,';');
344	<	if (reply_ptr==NULL){
345	<	errf("Incorrect data returned 2");
184	<	return -1;
342	>	udp_update_time=atoi(response);
343	>
344	>	if((tcp_comm(tcp_con, "ConfigTTL", &response, NULL))!=0){
345	>	goto error;
346		}
347	<	*reply_ptr='\0';
348	<	ihost_state->server_udp_port=atoi(reply);
349	<	reply=reply_ptr+1;
350	<	ihost_state->server_tcp_port=atoi(reply);
190	<	if ((ihost_state->server_tcp_port==0) || (ihost_state->server_udp_port==0)){
191	<	errf("Incorrect data returned 3 ");
192	<	return -1;
347	>	config_ttl=atoi(response);
348	>
349	>	if((tcp_comm(tcp_con, "ENDCONFIG", &response, NULL))!=0){
350	>	goto error;
351		}
352
353	<	reply=sock_comm(fm_fd_r, fm_fd_w, "END");
354	<	if((reply== NULL) || (strncasecmp(reply, "ERROR", 5) ==0 )){
355	<	errf("Server error (%m)");
356	<	return -1;
353	>	if((tcp_comm(tcp_con, "FILTER", &response, NULL))!=0){
354	>	goto error;
355	>	}else{
356	>	response_ptr=strchr(response,';');
357	>	if(response_ptr==NULL){
358	>	log_msg(LOG_ERR, "Incorrect data sent by server");
359	>	goto error;
360	>	}
361	>	*response_ptr='\0';
362	>	server_fqdn=strdup(response);
363	>	if(server_fqdn==NULL){
364	>	goto error;
365	>	}
366	>	response_ptr++;
367	>	if(response_ptr==NULL){
368	>	log_msg(LOG_ERR, "Incorrect data sent by server");
369	>	goto error;
370	>	}
371	>
372	>	server_udp_port=atoi(response_ptr);
373	>
374	>	if (server_udp_port==0){
375	>	log_msg(LOG_ERR, "Incorrect data sent by server");
376	>	goto error;
377	>	}
378		}
379
380	<	if(fclose(fm_fd_r) !=0){
381	<	errf("Failed to close read FD (%m)");
203	<	return -1;
380	>	if((tcp_comm(tcp_con, "END", &response, "OK"))!=0){
381	>	goto error;
382		}
383	<	if(fclose(fm_fd_w) !=0){
384	<	errf("Failed to close write FD (%m)");
385	<	return -1;
383	>
384	>	fclose(tcp_con);
385	>
386	>	/* We have the data we need, and its all been read correctly */
387	>
388	>	/* Free the old data before pointing them to the new data. m_free copes should
389	>	* this already be NULL */
390	>	if(ihost_state->file_list!=NULL) free(ihost_state->file_list);
391	>	if(ihost_state->last_modified!=NULL) free(ihost_state->last_modified);
392	>	if(ihost_state->server_fqdn!=NULL) free(ihost_state->server_fqdn);
393	>
394	>	if(ihost_state->preset_fqdn){
395	>	if(host_fqdn != NULL) free(host_fqdn);
396	>	}else{
397	>	if(ihost_state->host_fqdn!=NULL) free(ihost_state->host_fqdn);
398	>	ihost_state->host_fqdn=host_fqdn;
399		}
400
401	+	if(ihost_state->preset_ip){
402	+	if(host_ip != NULL) free(host_ip);
403	+	}else{
404	+	if(ihost_state->host_ip!=NULL) free(ihost_state->host_ip);
405	+	ihost_state->host_ip=host_ip;
406	+	}
407	+
408	+
409	+	ihost_state->file_list=file_list;
410	+	ihost_state->last_modified=last_modified;
411	+	ihost_state->server_fqdn=server_fqdn;
412	+	ihost_state->server_udp_port=server_udp_port;
413	+	ihost_state->udp_update_time=udp_update_time;
414	+	ihost_state->config_ttl=config_ttl;
415	+
416	+	log_msg(LOG_DEBUG, "UDP Update time %d", udp_update_time);
417	+	log_msg(LOG_DEBUG, "Configure ttl %d", config_ttl);
418	+
419		return 0;
420	+
421	+	error:
422	+
423	+	if(file_list!=NULL) free(file_list);
424	+	if(last_modified!=NULL) free(last_modified);
425	+	if(host_fqdn!=NULL) free(host_fqdn);
426	+	if(server_fqdn!=NULL) free(server_fqdn);
427	+	if(host_ip!=NULL) free(host_ip);
428	+	fclose(tcp_con);
429	+
430	+	return -1;
431		}
432
433	<	int heartbeat(ihost_state_t *ihost_state){
434	<	struct sockaddr_in addr;
435	<	struct in_addr haddr;
436	<	int sd;
437	<	FILE *fm_fd_r, *fm_fd_w;
438	<	char *reply;
439	<	int exitcode=0;
433	>	int get_system_stats(int seq_no, ihost_state_t *ihost_state, char *xml, int size){
434	>	char tmp[size];
435	>	sg_cpu_percents *cpu_percent;
436	>	sg_mem_stats *mem_stats;
437	>	sg_load_stats *load_stats;
438	>	sg_user_stats *user_stats;
439	>	sg_swap_stats *swap_stats;
440	>	sg_host_info *general_stats;
441	>	sg_fs_stats *disk_stats;
442	>	sg_disk_io_stats *diskio_stats;
443	>	sg_process_count *process_stats;
444	>	sg_network_io_stats *network_stats;
445	>	sg_page_stats *page_stats;
446	>	int disk_entries=0;
447	>	int diskio_entries=0;
448	>	int network_entries=0;
449
450	<	if ((sd = socket(AF_INET, SOCK_STREAM, PF_UNSPEC)) < 0) {
451	<	errf("Can't create AF_INET socket (%m)");
452	<	return -1;
224	<	}
450	>	int counter;
451	>	long long x;
452	>	long long y;
453
454	<	if (get_host_addr(ihost_state->server_fqdn, &haddr) != 0){
455	<	errf("Failed to resolve address %s (%m)", ihost_state->fm_host);
456	<	return -1;
229	<	}
454	>	/* Print start of the packet we want */
455	>	snprintf(xml, size, "<packet seq_no=\"%d\" machine_name=\"%s\" date=\"%ld\" type=\"data\" ip=\"%s\">", \
456	>	seq_no, ihost_state->host_fqdn, (long) time(NULL), ihost_state->host_ip);
457
458	<	memset(&addr, 0, sizeof addr);
459	<	addr.sin_family = AF_INET;
460	<	memcpy(&addr.sin_addr, &haddr, sizeof haddr);
461	<	addr.sin_port =  htons(ihost_state->server_tcp_port);
458	>	/* Get cpu stats, check it is correct, then fill in its entry for the xml */
459	>	if((cpu_percent=sg_get_cpu_percents())==NULL){
460	>	log_msg(LOG_CRIT, "Failed to get cpu statistics: %s (%s)",
461	>	sg_str_error(sg_get_error()), sg_get_error_arg());
462	>	}else{
463	>	snprintf(tmp, size, \
464	>	"<cpu><user>%3.2f</user><kernel>%3.2f</kernel><idle>%3.2f</idle><iowait>%3.2f</iowait><swap>%3.2f</swap></cpu>", \
465	>	cpu_percent->user, \
466	>	cpu_percent->kernel, \
467	>	cpu_percent->idle, \
468	>	cpu_percent->iowait, \
469	>	cpu_percent->swap);
470
471	<	if (connect(sd, (struct sockaddr *)&addr, sizeof addr) != 0) {
472	<	errf("Failed to connect to %s on port %d (%m)", ihost_state->fm_host, ihost_state->fm_port);
238	<	return -1;
239	<	}
471	>	if(strlcat(xml, tmp, size) >= size) goto too_big_error;
472	>	}
473
241	–	/* Need to open 2 files, one for reading one for writing, as it gets confused if we only use 1 :) */
242	–	if ((fm_fd_r=fdopen(sd,"r")) == NULL){
243	–	errf("Failed to open stream (%m)");
244	–	return -1;
245	–	}
474
475	<	if ((fm_fd_w=fdopen(dup(sd),"w")) == NULL){
476	<	errf("Failed to open stream (%m)");
477	<	return -1;
478	<	}
475	>	/*Get mem stats, and fill in xml */
476	>	if((mem_stats=sg_get_mem_stats())==NULL){
477	>	log_msg(LOG_CRIT, "Failed to get memory statistics: %s (%s)",
478	>	sg_str_error(sg_get_error()), sg_get_error_arg());
479	>	}else{
480	>	snprintf(tmp, size, \
481	>	"<memory><total>%lld</total><free>%lld</free><used>%lld</used><cache>%lld</cache></memory>", \
482	>	mem_stats->total, \
483	>	mem_stats->free, \
484	>	mem_stats->used, \
485	>	mem_stats->cache);
486
487	<	reply=sock_comm(fm_fd_r, fm_fd_w, "HEARTBEAT");
488	<	if ((reply==NULL) || (strncasecmp(reply, "ERROR", 5) == 0) ) {
254	<	errf("Server error");
255	<	return -1;
256	<	}
487	>	if(strlcat(xml, tmp, size) >= size) goto too_big_error;
488	>	}
489
258	–	reply=sock_comm(fm_fd_r, fm_fd_w, "CONFIG");
259	–	if ((reply==NULL) || (strncasecmp(reply, "ERROR", 5) == 0) ) {
260	–	errf("Server error");
261	–	return -1;
262	–	}
490
491	<	reply=sock_comm(fm_fd_r, fm_fd_w, ihost_state->files_list);
492	<	if ((reply==NULL) || (strncasecmp(reply, "OK", 2) != 0) ) {
493	<	errf("Server error");
494	<	return -1;
495	<	}
491	>	/* Get load stats */
492	>	if((load_stats=sg_get_load_stats())==NULL){
493	>	log_msg(LOG_CRIT, "Failed to get load statistics: %s (%s)",
494	>	sg_str_error(sg_get_error()), sg_get_error_arg());
495	>	}else{
496	>	snprintf(tmp, size, \
497	>	"<load><load1>%.2lf</load1><load5>%.2lf</load5><load15>%.2lf</load15></load>", \
498	>	load_stats->min1, \
499	>	load_stats->min5, \
500	>	load_stats->min15);
501	>	if(strlcat(xml, tmp, size) >= size) goto too_big_error;
502	>	}
503
504	<	reply=sock_comm(fm_fd_r, fm_fd_w, ihost_state->last_modified);
505	<	if (reply==NULL) {
506	<	errf("Server error");
507	<	return -1;
508	<	}
509	<	if (strncasecmp(reply, "ERROR", 5) == 0){
510	<	/* Means the config has changed */
511	<	exitcode=RECONFIGURE_RETURN_CODE;
504	>
505	>	/* get user stats */
506	>
507	>	if((user_stats=sg_get_user_stats())==NULL){
508	>	log_msg(LOG_CRIT, "Failed to get user statistics: %s (%s)",
509	>	sg_str_error(sg_get_error()), sg_get_error_arg());
510	>	}else{
511	>
512	>	snprintf(tmp, size, \
513	>	"<users><list>%s</list><count>%d</count></users>", \
514	>	user_stats->name_list, \
515	>	user_stats->num_entries);
516	>
517	>	if(strlcat(xml, tmp, size) >= size) goto too_big_error;
518		}
279	–	reply=sock_comm(fm_fd_r, fm_fd_w, "KEY");
280	–	if ((reply==NULL) || (strncasecmp(reply, "ERROR", 5) == 0) ) {
281	–	errf("Server error");
282	–	return -1;
283	–	}
284	–	if (ihost_state->key!=NULL) free(ihost_state->key);
285	–
286	–	if((ihost_state->key=strdup(reply)) == NULL){
287	–	errf("strdup failed (%m)");
288	–	return -1;
289	–	}
519
291	–	reply=sock_comm(fm_fd_r, fm_fd_w, "ENDHEARTBEAT");
292	–	if((reply== NULL) || (strncasecmp(reply, "ERROR", 5) ==0 )){
293	–	errf("Server error (%m)");
294	–	return -1;
295	–	}
520
521	<	fflush(fm_fd_r);
522	<	fflush(fm_fd_w);
521	>	/* swap stats */
522	>	if((swap_stats=sg_get_swap_stats())==NULL){
523	>	log_msg(LOG_CRIT, "Failed to get swap statistics: %s (%s)",
524	>	sg_str_error(sg_get_error()), sg_get_error_arg());
525	>	}else{
526	>	snprintf(tmp, size, \
527	>	"<swap><total>%lld</total><used>%lld</used><free>%lld</free></swap>",\
528	>	swap_stats->total, \
529	>	swap_stats->used, \
530	>	swap_stats->free);
531
532	<	if(fclose(fm_fd_r) !=0){
533	<	errf("Failed to close read FD (%m)");
302	<	return -1;
303	<	}
304	<	if(fclose(fm_fd_w) !=0){
305	<	errf("Failed to close write FD (%m)");
306	<	return -1;
307	<	}
532	>	if(strlcat(xml, tmp, size) >= size) goto too_big_error;
533	>	}
534
309	–	return exitcode;
310	–	}
535
536	<	char *stat_grab(ihost_state_t *ihost_state, int counter){
313	<	#define NUM_STATS 9
314	<	char *stats[NUM_STATS];
315	<	char *xml_data=NULL;
316	<	char *xml_data_p;
317	<	int x=0;
318	<
319	<	stats[0]=get_cpu_stats();
320	<	stats[1]=get_disk_stats();
321	<	stats[2]=get_load_stats();
322	<	stats[3]=get_memory_stats();
323	<	stats[4]=get_os_info();
324	<	stats[5]=get_page_stats();
325	<	stats[6]=get_process_stats();
326	<	stats[7]=get_swap_stats();
327	<	stats[8]=get_user_stats();
536	>	/* general stats */
537
538	<	for(;x<NUM_STATS;x++){
539	<	if(stats[x]==NULL){
540	<	return NULL;
541	<	}
542	<	if(xml_data==NULL){
543	<	if((xml_data=strf("%s", stats[x])) == NULL){
544	<	errf("str failed (%m)");
545	<	return NULL;
546	<	}
538	>	if((general_stats=sg_get_host_info())==NULL){
539	>	log_msg(LOG_CRIT, "Failed to get host info statistics: %s (%s)",
540	>	sg_str_error(sg_get_error()), sg_get_error_arg());
541	>	}else{
542	>	snprintf(tmp, size, \
543	>	"<os><name>%s</name><release>%s</release><version>%s</version><sysname>%s</sysname><platform>%s</platform><uptime>%ld</uptime></os>", \
544	>	general_stats->os_name, \
545	>	general_stats->os_release, \
546	>	general_stats->os_version, \
547	>	general_stats->hostname, \
548	>	general_stats->platform, \
549	>	(long)general_stats->uptime);
550	>
551	>	if(strlcat(xml, tmp, size) >= size) goto too_big_error;
552	>
553	>	}
554	>
555	>
556	>	/* process stats */
557	>	if((process_stats=sg_get_process_count())==NULL){
558	>	log_msg(LOG_CRIT, "Failed to get process statistics: %s (%s)",
559	>	sg_str_error(sg_get_error()), sg_get_error_arg());
560	>	}else{
561	>	snprintf(tmp, size, \
562	>	"<processes><sleeping>%d</sleeping><cpu>%d</cpu><zombie>%d</zombie><stopped>%d</stopped><total>%d</total></processes>",\
563	>	process_stats->sleeping, \
564	>	process_stats->running, \
565	>	process_stats->zombie, \
566	>	process_stats->stopped, \
567	>	process_stats->total);
568	>
569	>	if(strlcat(xml, tmp, size) >= size) goto too_big_error;
570	>
571	>	}
572	>
573	>
574	>	/* Get paging stats */
575	>	if((page_stats=sg_get_page_stats_diff())==NULL){
576	>	log_msg(LOG_CRIT, "Failed to get paging statistics: %s (%s)",
577	>	sg_str_error(sg_get_error()), sg_get_error_arg());
578	>	}else{
579	>	if(page_stats->systime!=0){
580	>	x=page_stats->pages_pagein / page_stats->systime;
581	>	y=page_stats->pages_pageout / page_stats->systime;
582		}else{
583	<	xml_data_p=xml_data;
584	<	if((xml_data=strf("%s%s", xml_data, stats[x])) == NULL){
341	<	errf("str failed (%m)");
342	<	return NULL;
343	<	}
344	<	free(xml_data_p);
583	>	x=page_stats->pages_pagein;
584	>	y=page_stats->pages_pageout;
585		}
586	<	free(stats[x]);
586	>	snprintf(tmp, size, \
587	>	"<pages><pageins>%lld</pageins><pageouts>%lld</pageouts></pages>", \
588	>	x, \
589	>	y);
590	>
591	>	if(strlcat(xml, tmp, size) >= size) goto too_big_error;
592		}
348	–	xml_data_p=xml_data;
349	–	xml_data=strf("<packet seq_no=\"%d\" machine_name=\"%s\" date=\"%ld\" type=\"data\" ip=\"%s\" key=\"%s\">%s</packet>", counter, ihost_state->my_fqdn, time(NULL), "127.0.0.1", ihost_state->key, xml_data);
350	–	free(xml_data_p);
351	–
352	–	return xml_data;
353	–	}
593
355	–	int send_stats(ihost_state_t *ihost_state, char *data_stream){
356	–	struct sockaddr_in addr;
357	–	struct in_addr haddr;
594
595	<	int sd;
360	<	size_t len;
595	>	/* get diskio stats */
596
597	<	len=strlen(data_stream);
598	<	if(len>UDP_MAX_PACKET_SIZE){
599	<	errf("Too big to send to server. Please reconfigure client and server and recompile");
600	<	exit(1);
597	>	if((diskio_stats=sg_get_disk_io_stats_diff(&diskio_entries))==NULL){
598	>	log_msg(LOG_CRIT, "Failed to get disk io statistics: %s (%s)",
599	>	sg_str_error(sg_get_error()), sg_get_error_arg());
600	>	}else{
601	>	strlcat(xml, "<diskio>", size);
602	>	for(counter=0;counter<diskio_entries;counter++){
603	>
604	>	if(diskio_stats->systime!=0){
605	>	x=diskio_stats->read_bytes / diskio_stats->systime;
606	>	y=diskio_stats->write_bytes / diskio_stats->systime;
607	>	}else{
608	>	x=diskio_stats->read_bytes;
609	>	y=diskio_stats->write_bytes;
610	>	}
611	>
612	>	snprintf(tmp, size, \
613	>	"<p%d name=\"%s\" rbytes=\"%lld\" wbytes=\"%lld\"></p%d>", \
614	>	counter, \
615	>	diskio_stats->disk_name, \
616	>	x, \
617	>	y, \
618	>	counter);
619	>
620	>	strlcat(xml, tmp, size);
621	>	diskio_stats++;
622	>	}
623	>
624	>	if(strlcat(xml, "</diskio>", size) >= size) goto too_big_error;
625	>
626		}
367	–
368	–	if (get_host_addr(ihost_state->server_fqdn, &haddr) != 0){
369	–	errf("Failed to resolve address %s (%m)", ihost_state->fm_host);
370	–	return -1;
371	–	}
627
628	<	if((sd=socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0){
629	<	errf("failed to create UDP socket (%m)");
630	<	return -1;
628	>
629	>	/* get networks stats */
630	>
631	>	if((network_stats=sg_get_network_io_stats_diff(&network_entries))==NULL){
632	>	log_msg(LOG_CRIT, "Failed to get network io statistics: %s (%s)",
633	>	sg_str_error(sg_get_error()), sg_get_error_arg());
634	>	}else{
635	>	strlcat(xml, "<net>", size);
636	>	for(counter=0;counter<network_entries;counter++){
637	>	if(network_stats->systime!=0){
638	>	x=network_stats->rx / network_stats->systime;
639	>	y=network_stats->tx / network_stats->systime;
640	>	}else{
641	>	x=network_stats->rx;
642	>	y=network_stats->tx;
643	>	}
644	>
645	>	snprintf(tmp, size, \
646	>	"<p%d name=\"%s\" rx=\"%lld\" tx=\"%lld\"></p%d>", \
647	>	counter, \
648	>	network_stats->interface_name, \
649	>	x, \
650	>	y, \
651	>	counter);
652	>
653	>	strlcat(xml, tmp, size);
654	>	network_stats++;
655	>	}
656	>
657	>	if(strlcat(xml, "</net>", size) >= size) goto too_big_error;
658	>
659		}
660
378	–	memset(&addr, 0, sizeof(addr));
379	–	addr.sin_family=AF_INET;
380	–	memcpy((char *)&addr.sin_addr, &haddr, sizeof haddr);
381	–	addr.sin_port =  htons(ihost_state->server_udp_port);
661
662	<	if((sendto(sd, data_stream, len, 0, (struct sockaddr *) &addr, sizeof(addr))) != len){
663	<	errf("Send the wrong number of bytes (%m)");
664	<	return -1;
662	>	/* get disk stats */
663	>
664	>	if((disk_stats=sg_get_fs_stats(&disk_entries))==NULL){
665	>	log_msg(LOG_CRIT, "Failed to get fs statistics: %s (%s)",
666	>	sg_str_error(sg_get_error()), sg_get_error_arg());
667	>	}else{
668	>	strlcat(xml, "<disk>", size);
669	>	for(counter=0;counter<disk_entries;counter++){
670	>	snprintf(tmp, size, \
671	>	"<p%d name=\"%s\" mount=\"%s\" fstype=\"%s\" total=\"%lld\" used=\"%lld\" avail=\"%lld\" totalinodes=\"%lld\" usedinodes=\"%lld\" freeinodes=\"%lld\"></p%d>", \
672	>	counter, \
673	>	disk_stats->device_name, \
674	>	disk_stats->mnt_point, \
675	>	disk_stats->fs_type, \
676	>	disk_stats->size, \
677	>	disk_stats->used, \
678	>	disk_stats->avail, \
679	>	disk_stats->total_inodes, \
680	>	disk_stats->used_inodes, \
681	>	disk_stats->free_inodes, \
682	>	counter);
683	>
684	>	strlcat(xml, tmp, size);
685	>
686	>	disk_stats++;
687	>	}
688	>
689	>	if(strlcat(xml, "</disk>", size) >= size) goto too_big_error;
690	>
691		}
692
388	–	close(sd);
693
694	<	printf("%s\n",data_stream);
695	<	return 0;
694	>	if(strlcat(xml, "</packet>", size) >= size) goto too_big_error;
695	>
696	>	/*If we got to here, it should of all been filled in nicely now */
697	>	return 0;
698	>
699	>	too_big_error:
700	>	log_msg(LOG_ERR, "UDP Packet is too large. Throwing away the packet");
701	>	return -1;
702		}
703
704	+
705	+
706	+	void usage(char *progname){
707	+	fprintf(stderr, "Usage %s [-v[v]] [-f] [-n name] [-i ip] [-s server] [-p port] [-V] [-h]\n\n", progname);
708	+	fprintf(stderr, "  -v    Verbose mode, -vv would make even more verbose\n");
709	+	fprintf(stderr, "  -f    Foreground mode, print errors to stderr\n");
710	+	fprintf(stderr, "  -n    Set the machine name to be reported as\n");
711	+	fprintf(stderr, "  -i    Set the IP to be reported as\n");
712	+	fprintf(stderr, "  -s    Specifies the i-scream server to connect to\n");
713	+	fprintf(stderr, "         default: %s\n", DEF_SERVER_NAME);
714	+	fprintf(stderr, "  -p    Specifies the i-scream server port\n");
715	+	fprintf(stderr, "         default: %d\n", DEF_SERVER_PORT);
716	+	fprintf(stderr, "  -V    Print version number\n");
717	+	fprintf(stderr, "  -h    Prints this help page\n");
718	+	fprintf(stderr, "\nReport bugs to <%s>.\n", PACKAGE_BUGREPORT);
719	+	exit(1);
720	+	}
721	+
722		int main(int argc, char **argv){
723	+
724		ihost_state_t ihost_state;
725	<	int heartbeat_exit;
397	<	int counter=0;
398	<	long udp_time=0, tcp_time=0, stat_grab_time=0, cur_time=0;
399	<	int sleep_delay=0;
400	<	char *xml_stats;
725	>	udp_sockinfo_t udp_sockinfo;
726
727	<	/* NULL'ify so i can tell if i need to free it or not */
728	<	ihost_state.fm_host=NULL;
729	<	ihost_state.my_fqdn=NULL;
730	<	ihost_state.server_fqdn=NULL;
731	<	ihost_state.last_modified=NULL;
732	<	ihost_state.files_list=NULL;
408	<	ihost_state.key=NULL;
727	>	int cmdopt;
728	>	extern int optind;
729	>	pid_t pid;
730	>	FILE *f;
731	>	int packet_num=0;
732	>	int len;
733
734	<	errf_set_progname(argv[0]);
735	<	if(argc!=3){
736	<	errf_usage("<host> <port>");
734	>	char packet[MAX_UDP_PACKET_SIZE];
735	>
736	>	time_t cur_time, sleep_delay, udp_time=0, config_time=0;
737	>
738	>	/* Set default settings */
739	>	ihost_config.verbose=1;
740	>	ihost_config.daemon=1;
741	>	/* Set all errors to go down stderr until told otherwise */
742	>	ihost_config.log=stderr;
743	>
744	>	/* Blank ihost_state to default settings */
745	>	ihost_state.filtermanager_host=DEF_SERVER_NAME;
746	>	ihost_state.filtermanager_port=DEF_SERVER_PORT;
747	>	ihost_state.host_fqdn=NULL;
748	>	ihost_state.host_ip=NULL;
749	>	ihost_state.preset_fqdn = 0;
750	>	ihost_state.preset_ip = 0;
751	>	ihost_state.server_fqdn=NULL;
752	>	ihost_state.file_list=NULL;
753	>	ihost_state.last_modified=NULL;
754	>
755	>	while((cmdopt=getopt(argc, argv, "vfVn:i:s:p:h")) != -1){
756	>	switch(cmdopt){
757	>	case 'v':
758	>	ihost_config.verbose++;
759	>	break;
760	>
761	>	case 'f':
762	>	/* Force syslog logging since stderr will be closed in this case */
763	>	ihost_config.daemon=0;
764	>	break;
765	>
766	>	case 'V':
767	>	fprintf(stderr, "%s version %s\n", argv[0], VERSION);
768	>	break;
769	>	case 'n':
770	>	ihost_state.preset_fqdn = 1;
771	>	ihost_state.host_fqdn = strdup(optarg);
772	>	if(ihost_state.host_fqdn == NULL){
773	>	fprintf(stderr, "Missing hostname\n");
774	>	usage(argv[0]);
775	>	}
776	>	break;
777	>	case 'i':
778	>	/* Hmm.. Someone could set any string to be the IP, and it will let it */
779	>	ihost_state.preset_ip = 1;
780	>	ihost_state.host_ip = strdup(optarg);
781	>	if(ihost_state.host_ip == NULL){
782	>	fprintf(stderr, "Missing ip\n");
783	>	usage(argv[0]);
784	>	}
785	>	break;
786	>
787	>	case 's':
788	>	ihost_state.filtermanager_host=strdup(optarg);
789	>	break;
790	>
791	>	case 'p':
792	>	ihost_state.filtermanager_port=atoi(optarg);
793	>	break;
794	>
795	>	case 'h':
796	>	default:
797	>	usage(argv[0]);
798	>	exit(1);
799	>	}
800	>	}
801	>
802	>	if(gethostbyname(ihost_state.filtermanager_host)==NULL){
803	>	log_msg(LOG_CRIT, "Failed to lookup hostname. Please check settings");
804		exit(1);
805		}
806	+	if(ihost_state.filtermanager_port==0){
807	+	log_msg(LOG_ERR, "Invalid port number");
808	+	exit(1);
809	+	}
810
811	<	ihost_state.fm_host=argv[1];
812	<	ihost_state.fm_port=atoi(argv[2]);
811	>	if(ihost_config.daemon){
812	>	pid=fork();
813	>	if(pid==-1){
814	>	log_msg(LOG_CRIT, "Failed to background exiting");
815	>	exit(1);
816	>	}else if(pid!=0){
817	>	/* Parent process */
818	>	return 0;
819	>	}
820	>	/* We should now be in the background*/
821	>	if(setsid()==-1){
822	>	log_msg(LOG_CRIT, "setsid failed");
823	>	exit(1);
824	>	}
825
826	<	if(ihost_configure(&ihost_state)!=0){
827	<	errf("configure failed");
828	<	/* Ok, ideally we prob should have 2 copies of the structure and carry on if this
829	<	happens.. But we dont :) (at the moment) */
826	>	if((ihost_config.log=fopen(LOG_FILE, "a"))==NULL){
827	>	ihost_config.log=stderr;
828	>	log_msg(LOG_CRIT, "Failed to open Logfiles %s for writing", LOG_FILE);
829	>	exit(1);
830	>	}
831	>
832	>	fclose(stdin);
833	>	fclose(stdout);
834	>	fclose(stderr);
835	>
836	>	}
837	>
838	>	log_msg(LOG_INFO, "Starting ihost...");
839	>
840	>	log_msg(LOG_DEBUG, "Running sg_init()");
841	>	if(sg_init()){
842	>	log_msg(LOG_CRIT, "sg_init failed: %s (%s)",
843	>	sg_str_error(sg_get_error()), sg_get_error_arg());
844		exit(1);
845		}
846
847	+	log_msg(LOG_DEBUG,"Writing PID FILE");
848	+
849	+	pid=getpid();
850	+
851	+	if((f=fopen(PID_FILE,"w")) == NULL){
852	+	log_msg(LOG_CRIT, "Failed to write PID file");
853	+	}else{
854	+	if((fprintf(f,"%d",(int)pid)) <= 0 ){
855	+	log_msg(LOG_CRIT, "Failed to write PID file");
856	+	}
857	+	if((fclose(f))!=0){
858	+	log_msg(LOG_CRIT, "failed to close PID file");
859	+	}
860	+	}
861	+
862	+	/* Get the initial config from the filter manager. Should this fail,
863	+	* wait, and then try again. */
864	+
865	+	sg_get_disk_io_stats_diff(&packet_num);
866	+	packet_num=0;
867	+
868	+	while(ihost_getconfig(&ihost_state)!=0){
869	+	log_msg(LOG_ERR, "Failed to get ihost config");
870	+	sleep(10);
871	+	}
872	+
873	+	while((create_udp_sockinfo(&udp_sockinfo, ihost_state.server_fqdn, ihost_state.server_udp_port))!=0){
874	+	log_msg(LOG_ERR, "Failed to create udp socket");
875	+	sleep(10);
876	+	}
877	+
878	+	config_time=time(NULL)+ihost_state.config_ttl;
879	+
880	+	/* Now have config.. collect data and send as often as required */
881		for(;;){
882		cur_time=time(NULL);
428	–	if(cur_time>=tcp_time){
429	–	/*printf("sending TCP\n");*/
430	–	heartbeat_exit=heartbeat(&ihost_state);
431	–	if(heartbeat_exit==RECONFIGURE_RETURN_CODE){
432	–	/*errf("heartbeat needs to be reconfigured");*/
433	–	ihost_configure(&ihost_state);
434	–	/* So udp doesn't wait til next sending before updating */
435	–	udp_time=0;
436	–	}
437	–	if(heartbeat_exit==-1){
438	–	errf("ah crap");
439	–	exit(1);
440	–	}
441	–	tcp_time=time(NULL)+ihost_state.tcp_update_time;
442	–	}
883
884		if(cur_time>=udp_time){
885	<	/*printf("sending UDP\n");*/
886	<	stat_grab_time=time(NULL);
447	<	if((xml_stats=stat_grab(&ihost_state, counter++)) == NULL){
448	<	errf("Failed to get stats (%m)");
449	<	exit(1);
885	>	if((get_system_stats(packet_num++, &ihost_state, packet, MAX_UDP_PACKET_SIZE))!=0){
886	>	log_msg(LOG_ERR, "Failed to get system stats");
887		}
888	<	stat_grab_time=time(NULL)-stat_grab_time;
889	<	send_stats(&ihost_state, xml_stats);
890	<	free(xml_stats);
891	<	udp_time=time(NULL)+ihost_state.udp_update_time-stat_grab_time;
888	>
889	>	len=strlen(packet);
890	>	log_msg(LOG_DEBUG, "Packet size: %d\nPacket: %s\n", len, packet);
891	>
892	>	if((sendto(udp_sockinfo.sock, packet, len, 0, (struct sockaddr *) &udp_sockinfo.addr, sizeof(udp_sockinfo.addr)))!=len){
893	>	log_msg(LOG_CRIT, "Failed to send packet");
894	>	}
895	>	udp_time=cur_time+ihost_state.udp_update_time;
896	>	log_msg(LOG_DEBUG, "Next packet should be sent on %d", udp_time);
897		}
898
899	<	if(tcp_time<udp_time){
900	<	sleep_delay=tcp_time-time(NULL);
901	<	}else{
902	<	sleep_delay=udp_time-time(NULL);
899	>	if(cur_time>=config_time){
900	>	if(ihost_getconfig(&ihost_state)!=0){
901	>	/* If we can't get the config, try again 5 minutes time */
902	>	log_msg(LOG_ERR, "Failed to get config, try again 5 minutes time");
903	>	config_time=time(NULL)+300;
904	>	}else{
905	>	close(udp_sockinfo.sock);
906	>
907	>	while((create_udp_sockinfo(&udp_sockinfo, ihost_state.server_fqdn, ihost_state.server_udp_port))!=0){
908	>	log_msg(LOG_CRIT, "Failed to create udp socket");
909	>	sleep(10);
910	>	}
911	>
912	>	config_time=time(NULL)+ihost_state.config_ttl;
913	>
914	>	log_msg(LOG_DEBUG, "Config expires on %d\n", ihost_state.config_ttl);
915	>	}
916		}
917
918	<	/*printf("tcp epoc: %ld \t udp epoc: %ld\ntime:%ld \tsleeping: %d\n", tcp_time, udp_time, time(NULL), sleep_delay);*/
918	>	sleep_delay=udp_time-time(NULL);
919	>	log_msg(LOG_DEBUG, "Sleeping for %d", sleep_delay);
920		if(sleep_delay>0) sleep(sleep_delay);
921		}
466	–	return 0;
467	–	}
922
923	+	return(0);
924	+	}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines