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.16 by pajs, Sun May 19 19:42:41 2002 UTC vs.
Revision 1.37 by pajs, Mon Mar 10 16:01:09 2003 UTC

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

Diff Legend

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