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 |
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 <sys/types.h> |
34 |
|
#include "statgrab.h" |
35 |
|
#include <time.h> |
36 |
|
#include <sys/socket.h> |
32 |
– |
#include <netinet/in.h> |
37 |
|
#include <arpa/inet.h> |
38 |
|
#include <syslog.h> |
39 |
|
|
36 |
– |
#define versionNo 0.8 |
40 |
|
#define RECONFIGURE_RETURN_CODE 2 |
41 |
|
#define UDP_MAX_PACKET_SIZE 8192 |
42 |
|
#define PID_FILE "/var/tmp/.ihost.pid" |
142 |
|
logmessage(LOG_ERR, "sa family is wrong type"); |
143 |
|
return -1; |
144 |
|
} |
145 |
< |
|
146 |
< |
if((ihost_state->my_ip=inet_ntoa(((struct sockaddr_in *)&ip)->sin_addr))==NULL){ |
145 |
> |
|
146 |
> |
if(ihost_state->my_ip!=NULL) free(ihost_state->my_ip); |
147 |
> |
if((ihost_state->my_ip=strdup(inet_ntoa(((struct sockaddr_in *)&ip)->sin_addr)))==NULL){ |
148 |
|
logmessage(LOG_ERR, "Failed to get IP (%m)"); |
149 |
|
return -1; |
150 |
|
} |
395 |
|
xml_size+=strlen(stats[x]); |
396 |
|
} |
397 |
|
|
398 |
< |
xml_data=malloc(xml_size); |
398 |
> |
xml_data=malloc(xml_size+1); |
399 |
|
xml_data=strcpy(xml_data, stats[0]); |
400 |
< |
|
400 |
> |
free(stats[0]); |
401 |
|
for(x=1;x<NUM_STATS;x++){ |
402 |
|
strcat(xml_data, stats[x]); |
403 |
+ |
free(stats[x]); |
404 |
|
} |
405 |
|
|
406 |
|
xml_data_p=xml_data; |
428 |
|
logmessage(LOG_ERR, "Failed to resolve address %s (%m)", ihost_state->server_fqdn); |
429 |
|
return -1; |
430 |
|
} |
431 |
< |
logmessage(LOG_DEBUG,"Creating UDP connection to %s on %d",ihost_state->server_fqdn, ihost_state->server_udp_port); |
431 |
> |
logmessage(LOG_DEBUG,"Creating UDP socket to %s on %d",ihost_state->server_fqdn, ihost_state->server_udp_port); |
432 |
|
if((sd=socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0){ |
433 |
|
logmessage(LOG_ERR, "failed to create UDP socket (%m)"); |
434 |
|
return -1; |
489 |
|
ihost_state.last_modified=NULL; |
490 |
|
ihost_state.files_list=NULL; |
491 |
|
ihost_state.key=NULL; |
492 |
+ |
ihost_state.my_ip=NULL; |
493 |
|
|
494 |
|
errf_set_progname(argv[0]); |
495 |
|
|
515 |
|
break; |
516 |
|
|
517 |
|
case 'V': |
518 |
< |
errf("%s version %f",argv[0], versionNo); |
518 |
> |
errf("%s version %s",argv[0], VERSION); |
519 |
|
break; |
520 |
|
|
521 |
|
default: |
582 |
|
logmessage(LOG_DEBUG,"Writing PID FILE"); |
583 |
|
pid=getpid(); |
584 |
|
if((f=fopen(PID_FILE,"w")) == NULL){ |
585 |
< |
logmessage(LOG_WARNING, "Failed to write PID file"); |
585 |
> |
logmessage(LOG_WARNING, "Failed to write PID file (%m)"); |
586 |
|
}else{ |
587 |
< |
if((fprintf(f,"%d",(int)pid)) != sizeof(pid)){ |
588 |
< |
logmessage(LOG_WARNING, "Failed to write PID file"); |
587 |
> |
if((fprintf(f,"%d",(int)pid)) <= 0 ){ |
588 |
> |
logmessage(LOG_WARNING, "Failed to write PID file (%m)"); |
589 |
|
} |
590 |
|
if((fclose(f))!=0){ |
591 |
|
logmessage(LOG_ERR, "failed to close PID file"); |
620 |
|
|
621 |
|
if(cur_time>=udp_time){ |
622 |
|
logmessage(LOG_DEBUG,"Sending udp data"); |
623 |
< |
|
623 |
> |
/* Work out how long it takes to get the stats for next time round |
624 |
> |
so the sleep time can be adjusted accordingly */ |
625 |
|
stat_grab_time=time(NULL); |
626 |
|
if((xml_stats=stat_grab(&ihost_state, counter++)) == NULL){ |
627 |
|
logmessage(LOG_ERR,"Failed to get stats (%m)"); |