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.17 by pajs, Mon May 20 12:28:46 2002 UTC vs.
Revision 1.19 by pajs, Tue May 21 14:23:31 2002 UTC

#	Line 19 | Line 19
19
20		#include <stdio.h>
21		#include <stdlib.h>
22	+	#include <sys/types.h>
23		#include <unistd.h>
24		#include <syslog.h>
25		#include <netinet/in.h>
#	Line 30 | Line 31
31		#include <sys/socket.h>
32		#include <netinet/in.h>
33		#include <arpa/inet.h>
34	+	#include <syslog.h>
35
36		#define versionNo 0.8
37		#define RECONFIGURE_RETURN_CODE 2
38		#define UDP_MAX_PACKET_SIZE 8192
39	+	#define PID_FILE "/var/tmp/.ihost.pid"
40
41	+	#define logmessage(level, ...) do { cur_level = level; errf(__VA_ARGS__); } while (0)
42	+
43		typedef struct{
44		int fm_port;
45		char *fm_host;
#	Line 52 | Line 57 | typedef struct{
57
58		}ihost_state_t;
59
60	+	static int log_level;
61	+	static int cur_level;
62	+	static int syslog_logging;
63	+
64	+	void log_errors(const char *message){
65	+	if(log_level>=cur_level){
66	+	if (syslog_logging==1){
67	+	syslog(cur_level, "%s\n", message);
68	+	}else{
69	+	fprintf(stderr, "%s\n", message);
70	+	}
71	+	}
72	+	}
73	+
74		char* sock_comm(FILE *f_r, FILE *f_w, char *sendString){
75		char *reply;
76		fprintf(f_w, "%s\n", sendString);
#	Line 77 | Line 96 | int ihost_configure(ihost_state_t *ihost_state){
96		if (ihost_state->last_modified!=NULL) free(ihost_state->last_modified);
97		if (ihost_state->files_list!=NULL) free(ihost_state->files_list);
98
99	+	logmessage(LOG_DEBUG, "Setting up configure socket to %s on port %d", ihost_state->fm_host, ihost_state->fm_port);
100		if ((sd = socket(AF_INET, SOCK_STREAM, PF_UNSPEC)) < 0) {
101	<	errf("Can't create AF_INET socket (%m)");
101	>	logmessage(LOG_ERR, "Can't create AF_INET socket (%m)");
102		return -1;
103		}
104
105		if (get_host_addr(ihost_state->fm_host, &haddr) != 0){
106	<	errf("Failed to resolve address %s (%m)", ihost_state->fm_host);
106	>	logmessage(LOG_ERR, "Failed to resolve address %s (%m)", ihost_state->fm_host);
107		return -1;
108		}
109
#	Line 93 | Line 113 | int ihost_configure(ihost_state_t *ihost_state){
113		addr.sin_port =  htons(ihost_state->fm_port);
114
115		if (connect(sd, (struct sockaddr *)&addr, sizeof addr) != 0) {
116	<	errf("Failed to connect to %s on port %d (%m)", ihost_state->fm_host, ihost_state->fm_port);
116	>	logmessage(LOG_ERR, "Failed to connect to %s on port %d (%m)", ihost_state->fm_host, ihost_state->fm_port);
117		return -1;
118		}
119
120		/* Need to open 2 files, one for reading one for writing, as it gets confused if we only use 1 :) */
121		if ((fm_fd_r=fdopen(sd,"r")) == NULL){
122	<	errf("Failed to open read stream (%m)");
122	>	logmessage(LOG_ERR, "Failed to open read stream (%m)");
123		return -1;
124		}
125
126		if ((fm_fd_w=fdopen(dup(sd),"w")) == NULL){
127	<	errf("Failed to open write stream (%m)");
127	>	logmessage(LOG_ERR, "Failed to open write stream (%m)");
128		return -1;
129		}
130		ip_len=sizeof ip;
131		memset(&ip, 0, ip_len);
132		if((getsockname(sd, &ip, &ip_len)) != 0){
133	<	errf("Failed to get IP address (%m)");
133	>	logmessage(LOG_ERR, "Failed to get IP address (%m)");
134		return -1;
135		}
136		if (ip.sa_family!=AF_INET){
137	<	errf("sa family is wrong type");
137	>	logmessage(LOG_ERR, "sa family is wrong type");
138		return -1;
139		}
140
141		if((ihost_state->my_ip=inet_ntoa(((struct sockaddr_in *)&ip)->sin_addr))==NULL){
142	<	errf("Failed to get IP (%m)");
142	>	logmessage(LOG_ERR, "Failed to get IP (%m)");
143		return -1;
144		}
145	<
145	>
146	>	logmessage(LOG_DEBUG, "Sending STARTCONIG");
147		reply=sock_comm(fm_fd_r, fm_fd_w, "STARTCONFIG");
148		if ((reply==NULL) || (strncasecmp(reply, "OK", 2) != 0) ) {
149	<	errf("Server error");
149	>	logmessage(LOG_ERR, "Server error on STARTCONFIG");
150		return -1;
151		}
152
153	+	logmessage(LOG_DEBUG, "Sending LASTMODIFIED");
154		reply=sock_comm(fm_fd_r, fm_fd_w, "LASTMODIFIED");
155		if((reply== NULL) || (strncasecmp(reply, "ERROR", 5) ==0)){
156	<	errf("Server error (%m)");
156	>	logmessage(LOG_ERR, "Server error on LASTMODIFIED (%m)");
157		return -1;
158		}
159		if((ihost_state->last_modified=strdup(reply)) == NULL){
160	<	errf("strdup failed (%m)");
160	>	logmessage(LOG_ERR, "strdup failed (%m)");
161		return -1;
162		}
163	<
163	>
164	>	logmessage(LOG_DEBUG, "Sending FILELIST");
165		reply=sock_comm(fm_fd_r, fm_fd_w, "FILELIST");
166		if((reply== NULL) || (strncasecmp(reply, "ERROR", 5) ==0)){
167	<	errf("Server error (%m)");
167	>	logmessage(LOG_ERR, "Server error on FILELIST (%m)");
168		return -1;
169		}
170		if((ihost_state->files_list=strdup(reply)) == NULL){
171	<	errf("strdup failed (%m)");
171	>	logmessage(LOG_ERR, "strdup failed (%m)");
172		return -1;
173		}
174
175	+	logmessage(LOG_DEBUG, "Sending FQDN");
176		reply=sock_comm(fm_fd_r, fm_fd_w, "FQDN");
177		if((reply== NULL) || (strncasecmp(reply, "ERROR", 5)==0)){
178	<	errf("Server error (%m)");
178	>	logmessage(LOG_ERR, "Server error on FQDN (%m)");
179		return -1;
180		}
181		if((ihost_state->my_fqdn=strdup(reply)) == NULL){
182	<	errf("strdup failed (%m)");
182	>	logmessage(LOG_ERR, "strdup failed (%m)");
183		return -1;
184		}
185
186	+	logmessage(LOG_DEBUG, "Sending FQDN");
187		reply=sock_comm(fm_fd_r, fm_fd_w, "UDPUpdateTime");
188		if(reply== NULL){
189	<	errf("Server error (%m)");
189	>	logmessage(LOG_ERR, "Server error (%m)");
190		return -1;
191		}
192		if (strncasecmp(reply, "ERROR", 5) != 0){
193		ihost_state->udp_update_time=atoi(reply);
194		}
195	<
195	>
196	>	logmessage(LOG_DEBUG, "Sending TCPUpdateTime");
197		reply=sock_comm(fm_fd_r, fm_fd_w, "TCPUpdateTime");
198		if(reply== NULL){
199	<	errf("Server error (%m)");
199	>	logmessage(LOG_ERR, "Server error on TCPUpdateTime (%m)");
200		return -1;
201		}
202		if (strncasecmp(reply, "ERROR", 5) != 0){
203		ihost_state->tcp_update_time=atoi(reply);
204		}
205
206	+	logmessage(LOG_DEBUG, "Sending ENDCONFIG");
207		reply=sock_comm(fm_fd_r, fm_fd_w, "ENDCONFIG");
208		if(reply== NULL){
209	<	errf("Server error (%m)");
209	>	logmessage(LOG_ERR, "Server error on ENDCONFIG (%m)");
210		return -1;
211		}
212
213	+	logmessage(LOG_DEBUG, "Sending FILTER");
214		reply=sock_comm(fm_fd_r, fm_fd_w, "FILTER");
215		if((reply== NULL) || (strncasecmp(reply, "ERROR", 5)==0)){
216	<	errf("Server error FILTER failed (%m)");
216	>	logmessage(LOG_ERR, "Server error FILTER failed (%m)");
217		return -1;
218		}
219		reply_ptr=strchr(reply,';');
220		if (reply_ptr==NULL){
221	<	errf("Incorrect data returned");
221	>	logmessage(LOG_ERR, "Incorrect data returned");
222		return -1;
223		}
224		*reply_ptr='\0';
225		if((ihost_state->server_fqdn=strdup(reply)) == NULL){
226	<	errf("strdup failed (%m)");
226	>	logmessage(LOG_ERR, "strdup failed (%m)");
227		return -1;
228		}
229		reply=reply_ptr + 1;
230		reply_ptr=strchr(reply,';');
231		if (reply_ptr==NULL){
232	<	errf("Incorrect data returned 2");
232	>	logmessage(LOG_ERR, "Incorrect data returned 2");
233		return -1;
234		}
235		*reply_ptr='\0';
#	Line 209 | Line 237 | int ihost_configure(ihost_state_t *ihost_state){
237		reply=reply_ptr+1;
238		ihost_state->server_tcp_port=atoi(reply);
239		if ((ihost_state->server_tcp_port==0) || (ihost_state->server_udp_port==0)){
240	<	errf("Incorrect data returned 3 ");
240	>	logmessage(LOG_ERR, "Incorrect data returned 3 ");
241		return -1;
242		}
243
244	+	logmessage(LOG_DEBUG, "Sending END");
245		reply=sock_comm(fm_fd_r, fm_fd_w, "END");
246		if((reply== NULL) || (strncasecmp(reply, "ERROR", 5) ==0 )){
247	<	errf("Server error (%m)");
247	>	logmessage(LOG_ERR, "Server error on END (%m)");
248		return -1;
249		}
250
251		if(fclose(fm_fd_r) !=0){
252	<	errf("Failed to close read FD (%m)");
252	>	logmessage(LOG_ERR, "Failed to close read FD (%m)");
253		return -1;
254		}
255		if(fclose(fm_fd_w) !=0){
256	<	errf("Failed to close write FD (%m)");
256	>	logmessage(LOG_ERR, "Failed to close write FD (%m)");
257		return -1;
258		}
259
#	Line 239 | Line 268 | int heartbeat(ihost_state_t *ihost_state){
268		char *reply;
269		int exitcode=0;
270
271	+	logmessage(LOG_DEBUG, "Setting up configure socket to %s on port %d", ihost_state->server_fqdn, ihost_state->server_tcp_port);
272		if ((sd = socket(AF_INET, SOCK_STREAM, PF_UNSPEC)) < 0) {
273	<	errf("Can't create AF_INET socket (%m)");
273	>	logmessage(LOG_ERR, "Can't create AF_INET socket (%m)");
274		return -1;
275		}
276
277		if (get_host_addr(ihost_state->server_fqdn, &haddr) != 0){
278	<	errf("Failed to resolve address %s (%m)", ihost_state->fm_host);
278	>	logmessage(LOG_ERR, "Failed to resolve address %s (%m)", ihost_state->server_fqdn);
279		return -1;
280		}
281
#	Line 255 | Line 285 | int heartbeat(ihost_state_t *ihost_state){
285		addr.sin_port =  htons(ihost_state->server_tcp_port);
286
287		if (connect(sd, (struct sockaddr *)&addr, sizeof addr) != 0) {
288	<	errf("Failed to connect to %s on port %d (%m)", ihost_state->fm_host, ihost_state->fm_port);
288	>	logmessage(LOG_ERR, "Failed to connect to %s on port %d (%m)", ihost_state->server_fqdn, ihost_state->server_tcp_port);
289		return -1;
290		}
291
292		/* Need to open 2 files, one for reading one for writing, as it gets confused if we only use 1 :) */
293		if ((fm_fd_r=fdopen(sd,"r")) == NULL){
294	<	errf("Failed to open stream (%m)");
294	>	logmessage(LOG_ERR, "Failed to open stream (%m)");
295		return -1;
296		}
297
298		if ((fm_fd_w=fdopen(dup(sd),"w")) == NULL){
299	<	errf("Failed to open stream (%m)");
299	>	logmessage(LOG_ERR, "Failed to open stream (%m)");
300		return -1;
301		}
302
303	+	logmessage(LOG_DEBUG, "Sending HEARTBEAT");
304		reply=sock_comm(fm_fd_r, fm_fd_w, "HEARTBEAT");
305		if ((reply==NULL) || (strncasecmp(reply, "ERROR", 5) == 0) ) {
306	<	errf("Server error");
306	>	logmessage(LOG_ERR, "Server error on HEARTBEAT");
307		return -1;
308		}
309
310	+	logmessage(LOG_DEBUG, "Sending CONFIG");
311		reply=sock_comm(fm_fd_r, fm_fd_w, "CONFIG");
312		if ((reply==NULL) || (strncasecmp(reply, "ERROR", 5) == 0) ) {
313	<	errf("Server error");
313	>	logmessage(LOG_ERR, "Server error on CONFIG");
314		return -1;
315		}
316
317	+	logmessage(LOG_DEBUG, "Sending %s", ihost_state->files_list);
318		reply=sock_comm(fm_fd_r, fm_fd_w, ihost_state->files_list);
319		if ((reply==NULL) || (strncasecmp(reply, "OK", 2) != 0) ) {
320	<	errf("Server error");
320	>	logmessage(LOG_ERR, "Server error on fileslist");
321		return -1;
322		}
323
324	+	logmessage(LOG_DEBUG, "Sending %s", ihost_state->last_modified);
325		reply=sock_comm(fm_fd_r, fm_fd_w, ihost_state->last_modified);
326		if (reply==NULL) {
327	<	errf("Server error");
327	>	logmessage(LOG_ERR, "Server error NULL recieved on lastmodified");
328		return -1;
329		}
330		if (strncasecmp(reply, "ERROR", 5) == 0){
331		/* Means the config has changed */
332	+	logmessage(LOG_INFO, "Recieved ERROR from server for a reconfigure required");
333		exitcode=RECONFIGURE_RETURN_CODE;
334		}
335	+
336	+	logmessage(LOG_DEBUG,"Sending KEY");
337		reply=sock_comm(fm_fd_r, fm_fd_w, "KEY");
338		if ((reply==NULL) || (strncasecmp(reply, "ERROR", 5) == 0) ) {
339	<	errf("Server error");
339	>	logmessage(LOG_ERR, "Server error on KEY");
340		return -1;
341		}
342		if (ihost_state->key!=NULL) free(ihost_state->key);
343
344		if((ihost_state->key=strdup(reply)) == NULL){
345	<	errf("strdup failed (%m)");
345	>	logmessage(LOG_ERR, "strdup failed (%m)");
346		return -1;
347		}
348
349	+	logmessage(LOG_DEBUG,"Sending ENDHEARTBEAT");
350		reply=sock_comm(fm_fd_r, fm_fd_w, "ENDHEARTBEAT");
351		if((reply== NULL) || (strncasecmp(reply, "ERROR", 5) ==0 )){
352	<	errf("Server error (%m)");
352	>	logmessage(LOG_ERR, "Server error on ENDHEARTBEAT (%m)");
353		return -1;
354		}
355
#	Line 319 | Line 357 | int heartbeat(ihost_state_t *ihost_state){
357		fflush(fm_fd_w);
358
359		if(fclose(fm_fd_r) !=0){
360	<	errf("Failed to close read FD (%m)");
360	>	logmessage(LOG_ERR, "Failed to close read FD (%m)");
361		return -1;
362		}
363		if(fclose(fm_fd_w) !=0){
364	<	errf("Failed to close write FD (%m)");
364	>	logmessage(LOG_ERR, "Failed to close write FD (%m)");
365		return -1;
366		}
367
#	Line 336 | Line 374 | char *stat_grab(ihost_state_t *ihost_state, int counte
374		char *xml_data=NULL;
375		char *xml_data_p;
376		int x=0;
377	<
377	>
378	>	logmessage(LOG_DEBUG,"get_cpu_stats");
379		stats[0]=get_cpu_stats();
380	+	logmessage(LOG_DEBUG,"get_disk_stats");
381		stats[1]=get_disk_stats();
382	+	logmessage(LOG_DEBUG,"get_load_stats");
383		stats[2]=get_load_stats();
384	+	logmessage(LOG_DEBUG,"get_memory_stats");
385		stats[3]=get_memory_stats();
386	+	logmessage(LOG_DEBUG,"get_os_info");
387		stats[4]=get_os_info();
388	+	logmessage(LOG_DEBUG,"get_page_stats");
389		stats[5]=get_page_stats();
390	+	logmessage(LOG_DEBUG,"get_process_stats");
391		stats[6]=get_process_stats();
392	+	logmessage(LOG_DEBUG,"get_swap_stats");
393		stats[7]=get_swap_stats();
394	+	logmessage(LOG_DEBUG,"get_user_stats");
395		stats[8]=get_user_stats();
396
397		for(;x<NUM_STATS;x++){
398		if(stats[x]==NULL){
399	+	logmessage(LOG_ERR,"Function returned NULL");
400		return NULL;
401		}
402		if(xml_data==NULL){
403		if((xml_data=strf("%s", stats[x])) == NULL){
404	<	errf("str failed (%m)");
404	>	logmessage(LOG_ERR, "str failed (%m)");
405		return NULL;
406		}
407		}else{
408		xml_data_p=xml_data;
409		if((xml_data=strf("%s%s", xml_data, stats[x])) == NULL){
410	<	errf("str failed (%m)");
410	>	logmessage(LOG_ERR, "str failed (%m)");
411		return NULL;
412		}
413		free(xml_data_p);
#	Line 369 | Line 417 | char *stat_grab(ihost_state_t *ihost_state, int counte
417		xml_data_p=xml_data;
418		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);
419		free(xml_data_p);
420	<
420	>
421	>	logmessage(LOG_DEBUG,"Generated XML Data of : %s", xml_data);
422		return xml_data;
423		}
424
#	Line 382 | Line 431 | int send_stats(ihost_state_t *ihost_state, char *data_
431
432		len=strlen(data_stream);
433		if(len>UDP_MAX_PACKET_SIZE){
434	<	errf("Too big to send to server. Please reconfigure client and server and recompile");
434	>	logmessage(LOG_ERR, "Too big to send to server. Please reconfigure client and server and recompile");
435		exit(1);
436		}
437	<
437	>	logmessage(LOG_DEBUG,"Resolving IP of server");
438		if (get_host_addr(ihost_state->server_fqdn, &haddr) != 0){
439	<	errf("Failed to resolve address %s (%m)", ihost_state->fm_host);
439	>	logmessage(LOG_ERR, "Failed to resolve address %s (%m)", ihost_state->server_fqdn);
440		return -1;
441		}
442	<
442	>	logmessage(LOG_DEBUG,"Creating UDP connection to %s on %d",ihost_state->server_fqdn, ihost_state->server_udp_port);
443		if((sd=socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0){
444	<	errf("failed to create UDP socket (%m)");
444	>	logmessage(LOG_ERR, "failed to create UDP socket (%m)");
445		return -1;
446		}
447
#	Line 401 | Line 450 | int send_stats(ihost_state_t *ihost_state, char *data_
450		memcpy((char *)&addr.sin_addr, &haddr, sizeof haddr);
451		addr.sin_port =  htons(ihost_state->server_udp_port);
452
453	+	logmessage(LOG_INFO,"Sending packet : %s", data_stream);
454		if((sendto(sd, data_stream, len, 0, (struct sockaddr *) &addr, sizeof(addr))) != len){
455	<	errf("Send the wrong number of bytes (%m)");
455	>	logmessage(LOG_ERR, "Send the wrong number of bytes (%m)");
456		return -1;
457		}
458
#	Line 429 | Line 479 | int main(int argc, char **argv){
479		long udp_time=0, tcp_time=0, stat_grab_time=0, cur_time=0;
480		int sleep_delay=0;
481		char *xml_stats;
482	<
482	>	pid_t pid;
483		int cmdopt;
484		extern int optind;
485	<	int verbose=0, daemon=0, syslog=0 ;
486	<
485	>	int verbose=0, daemon=0;
486	>	extern int syslog_logging;
487	>	extern int log_level;
488	>	extern int cur_level;
489	>	FILE *f;
490	>
491	>	log_level=1;
492	>	cur_level=1;
493	>	syslog_logging=0;
494	>
495	>	errf_set_ofunc(log_errors);
496		/* NULL'ify so i can tell if i need to free it or not */
497		ihost_state.fm_host=NULL;
498		ihost_state.my_fqdn=NULL;
#	Line 443 | Line 502 | int main(int argc, char **argv){
502		ihost_state.key=NULL;
503
504		errf_set_progname(argv[0]);
505	+
506
507		while((cmdopt=getopt(argc, argv, "vdshV")) != -1){
508		switch(cmdopt){
#	Line 451 | Line 511 | int main(int argc, char **argv){
511		break;
512
513		case 'd':
514	+	/* Force syslog logging since stderr will be closed in this case */
515	+	syslog_logging=1;
516		daemon=1;
517		break;
518
519		case 's':
520	<	syslog=1;
520	>	syslog_logging=1;
521		break;
522
523		case 'h':
524		usage(argv[0]);
525		break;
526	+
527		case 'V':
528		errf("%s version %f",argv[0], versionNo);
529		break;
530	+
531		default:
532		usage(argv[0]);
533		exit(1);
#	Line 480 | Line 544 | int main(int argc, char **argv){
544		errf("Invalid port number");
545		usage(argv[0]);
546		}
483	–	printf("%s\n%d\n",ihost_state.fm_host, ihost_state.fm_port);
547
548	+	if(daemon==1){
549	+	pid=fork();
550	+	if(pid==-1){
551	+	errf("Fork failed, can't background. Exiting");
552	+	exit(1);
553	+	}else if(pid!=0){
554	+	/* Parent process */
555	+	return 0;
556	+	}
557	+	/* We should now be in the background*/
558	+	if(setsid()==-1){
559	+	errf("setsid failed (%m)");
560	+	exit(1);
561	+	}
562	+	fclose(stdin);
563	+	fclose(stdout);
564	+	fclose(stderr);
565	+	}
566	+
567	+	if(syslog_logging==1){
568	+	openlog(errf_get_progname(),0,LOG_ERR);
569	+	setlogmask(LOG_UPTO(LOG_DEBUG));
570	+	}
571	+
572	+	switch(verbose){
573	+	case 0:
574	+	/* Critical errors + */
575	+	log_level=LOG_ERR;
576	+	break;
577	+	case 1:
578	+	/* Recoverable errors */
579	+	log_level=LOG_WARNING;
580	+	break;
581	+	case 2:
582	+	/* Print stuff like the XML packets */
583	+	log_level=LOG_INFO;
584	+	break;
585	+	default:
586	+	/* Must have lots of v's */
587	+	/* Print out everything its doing */
588	+	log_level=LOG_DEBUG;
589	+	break;
590	+	}
591	+
592	+	logmessage(LOG_DEBUG,"Writing PID FILE");
593	+	pid=getpid();
594	+	if((f=fopen(PID_FILE,"w")) == NULL){
595	+	logmessage(LOG_WARNING, "Failed to write PID file");
596	+	}else{
597	+	if((fprintf(f,"%d",(int)pid)) != sizeof(pid)){
598	+	logmessage(LOG_WARNING, "Failed to write PID file");
599	+	}
600	+	if((fclose(f))!=0){
601	+	logmessage(LOG_ERR, "failed to close PID file");
602	+	exit(1);
603	+	}
604	+	}
605	+
606		if(ihost_configure(&ihost_state)!=0){
607	<	errf("configure failed");
607	>	logmessage(LOG_ERR,"configure failed");
608		/* Ok, ideally we prob should have 2 copies of the structure and carry on if this
609		happens.. But we dont :) (at the moment) */
610		exit(1);
#	Line 492 | Line 613 | int main(int argc, char **argv){
613		for(;;){
614		cur_time=time(NULL);
615		if(cur_time>=tcp_time){
616	<	/*printf("sending TCP\n");*/
616	>	logmessage(LOG_DEBUG,"Sending heartbeat");
617		heartbeat_exit=heartbeat(&ihost_state);
618		if(heartbeat_exit==RECONFIGURE_RETURN_CODE){
619	<	/*errf("heartbeat needs to be reconfigured");*/
619	>	logmessage(LOG_INFO,"heartbeat needs to be reconfigured");
620		ihost_configure(&ihost_state);
500	–	/* So udp doesn't wait til next sending before updating */
621		udp_time=0;
622		}
623		if(heartbeat_exit==-1){
624	<	errf("ah crap");
624	>	logmessage(LOG_ERR,"Heartbeat failed");
625		exit(1);
626		}
627		tcp_time=time(NULL)+ihost_state.tcp_update_time;
628	+	logmessage(LOG_DEBUG,"next tcp time should be %d", tcp_time);
629		}
630
631		if(cur_time>=udp_time){
632	<	/*printf("sending UDP\n");*/
632	>	logmessage(LOG_DEBUG,"Sending udp data");
633	>
634		stat_grab_time=time(NULL);
635		if((xml_stats=stat_grab(&ihost_state, counter++)) == NULL){
636	<	errf("Failed to get stats (%m)");
636	>	logmessage(LOG_ERR,"Failed to get stats (%m)");
637		exit(1);
638		}
639		stat_grab_time=time(NULL)-stat_grab_time;
640		send_stats(&ihost_state, xml_stats);
641		free(xml_stats);
642		udp_time=time(NULL)+ihost_state.udp_update_time-stat_grab_time;
643	+	logmessage(LOG_DEBUG,"next udp time should be %d", udp_time);
644		}
645
646		if(tcp_time<udp_time){
#	Line 525 | Line 648 | int main(int argc, char **argv){
648		}else{
649		sleep_delay=udp_time-time(NULL);
650		}
651	<
529	<	/*printf("tcp epoc: %ld \t udp epoc: %ld\ntime:%ld \tsleeping: %d\n", tcp_time, udp_time, time(NULL), sleep_delay);*/
651	>	logmessage(LOG_DEBUG,"Sleeping for %d", sleep_delay);
652		if(sleep_delay>0) sleep(sleep_delay);
653		}
654		return 0;

Diff Legend

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