--- projects/cms/source/ihost/ihost.c	2003/09/26 21:22:44	1.42
+++ projects/cms/source/ihost/ihost.c	2004/05/30 17:13:05	1.50
@@ -170,24 +170,6 @@ void log_msg(int level, char *format, ...){
 	}
 }
 
-/* Takes many pointers, checks if they are NULL or not, and then free's them */
-/* Deprciated - and i only wrote it today! :)
-void m_free(int num_pointers, ...){
-	int x=0;
-	va_list ap;
-	void *p;
-
-	va_start(ap, num_pointers);
-	for(;x<num_pointers;x++){
-		p=va_arg(ap, void*);
-		if(p!=NULL){
-			free(p);
-		}
-	}
-	va_end(ap);
-}
-*/
-
 int create_udp_sockinfo(udp_sockinfo_t *udp_sockinfo, char *hostname, int port){
 
 	struct in_addr haddr;
@@ -259,7 +241,7 @@ int tcp_comm(FILE *f, char *send, char **response, cha
 	*response=fpgetline(f);
 	fseek(f, 0, SEEK_CUR);
 
-	if(*response!=NULL) log_msg(LOG_DEBUG, "Recieved %s", *response);
+	if(*response!=NULL) log_msg(LOG_DEBUG, "Received %s", *response);
 
 	if( (*response==NULL) || (strcmp(*response, "ERROR")==0) ) return -1;
 	
@@ -387,7 +369,6 @@ int ihost_getconfig(ihost_state_t *ihost_state){
                         goto error;
                 }
 
-		printf("string : %s\n", response_ptr);
 	        server_udp_port=atoi(response_ptr);
 
 		if (server_udp_port==0){
@@ -451,17 +432,17 @@ error:
 
 int get_system_stats(int seq_no, ihost_state_t *ihost_state, char *xml, int size){
 	char tmp[size];
-	cpu_percent_t *cpu_percent;	
-	mem_stat_t *mem_stats;
-	load_stat_t *load_stats;
-	user_stat_t *user_stats;
-	swap_stat_t *swap_stats;
-	general_stat_t *general_stats;
-	disk_stat_t *disk_stats;
-	diskio_stat_t *diskio_stats;
-	process_stat_t *process_stats;
-	network_stat_t *network_stats;
-	page_stat_t *page_stats;
+	sg_cpu_percents *cpu_percent;	
+	sg_mem_stats *mem_stats;
+	sg_load_stats *load_stats;
+	sg_user_stats *user_stats;
+	sg_swap_stats *swap_stats;
+	sg_host_info *general_stats;
+	sg_fs_stats *disk_stats;
+	sg_disk_io_stats *diskio_stats;
+	sg_process_count *process_stats;
+	sg_network_io_stats *network_stats;
+	sg_page_stats *page_stats;
 	int disk_entries=0;
 	int diskio_entries=0;
 	int network_entries=0;
@@ -475,7 +456,7 @@ int get_system_stats(int seq_no, ihost_state_t *ihost_
 		 seq_no, ihost_state->host_fqdn, time(NULL), ihost_state->host_ip);
 
 	/* Get cpu stats, check it is correct, then fill in its entry for the xml */
-	if((cpu_percent=cpu_percent_usage())==NULL){
+	if((cpu_percent=sg_get_cpu_percents())==NULL){
 		log_msg(LOG_CRIT, "Failed to get cpu statistics");
 	}else{
 		snprintf(tmp, size, \
@@ -491,7 +472,7 @@ int get_system_stats(int seq_no, ihost_state_t *ihost_
 
 	
 	/*Get mem stats, and fill in xml */	
-	if((mem_stats=get_memory_stats())==NULL){
+	if((mem_stats=sg_get_mem_stats())==NULL){
 		log_msg(LOG_CRIT, "Failed to get memory statistics");
 	}else{
 		snprintf(tmp, size, \
@@ -506,7 +487,7 @@ int get_system_stats(int seq_no, ihost_state_t *ihost_
 
 
 	/* Get load stats */	
-	if((load_stats=get_load_stats())==NULL){
+	if((load_stats=sg_get_load_stats())==NULL){
 		log_msg(LOG_CRIT, "Failed to get load statistics");
 	}else{
 		snprintf(tmp, size, \
@@ -520,7 +501,7 @@ int get_system_stats(int seq_no, ihost_state_t *ihost_
 
 	/* get user stats */
 	
-	if((user_stats=get_user_stats())==NULL){
+	if((user_stats=sg_get_user_stats())==NULL){
 		log_msg(LOG_CRIT, "Failed to get user statistics");
 	}else{
 
@@ -534,7 +515,7 @@ int get_system_stats(int seq_no, ihost_state_t *ihost_
 
 
 	/* swap stats */
-	if((swap_stats=get_swap_stats())==NULL){
+	if((swap_stats=sg_get_swap_stats())==NULL){
 		log_msg(LOG_CRIT, "Failed to get swap statistics");	
 	}else{
 		snprintf(tmp, size, \
@@ -549,7 +530,7 @@ int get_system_stats(int seq_no, ihost_state_t *ihost_
 
 	/* general stats */
 	
-	if((general_stats=get_general_stats())==NULL){
+	if((general_stats=sg_get_host_info())==NULL){
 		log_msg(LOG_CRIT, "Failed to get general statistics");
 	}else{
 		snprintf(tmp, size, \
@@ -567,7 +548,7 @@ int get_system_stats(int seq_no, ihost_state_t *ihost_
 
 	
 	/* process stats */
-	if((process_stats=get_process_stats())==NULL){	
+	if((process_stats=sg_get_process_count())==NULL){	
 		log_msg(LOG_CRIT, "Failed to get general statistics");
 	}else{
 		snprintf(tmp, size, \
@@ -584,7 +565,7 @@ int get_system_stats(int seq_no, ihost_state_t *ihost_
 
 
 	/* Get paging stats */
-	if((page_stats=get_page_stats_diff())==NULL){
+	if((page_stats=sg_get_page_stats_diff())==NULL){
 		log_msg(LOG_CRIT, "Failed to get paging statistics");
 	}else{
 		if(page_stats->systime!=0){
@@ -605,7 +586,7 @@ int get_system_stats(int seq_no, ihost_state_t *ihost_
 
 	/* get diskio stats */
 	
-	if((diskio_stats=get_diskio_stats_diff(&diskio_entries))==NULL){
+	if((diskio_stats=sg_get_disk_io_stats_diff(&diskio_entries))==NULL){
 		log_msg(LOG_CRIT, "Failed to get diskio statistics");
 	}else{
 		strlcat(xml, "<diskio>", size);
@@ -638,7 +619,7 @@ int get_system_stats(int seq_no, ihost_state_t *ihost_
 	
 	/* get networks stats */
 	
-	if((network_stats=get_network_stats_diff(&network_entries))==NULL){
+	if((network_stats=sg_get_network_io_stats_diff(&network_entries))==NULL){
 		log_msg(LOG_CRIT, "Failed to get network statistics");
 	}else{
 		strlcat(xml, "<net>", size);
@@ -670,7 +651,7 @@ int get_system_stats(int seq_no, ihost_state_t *ihost_
 
 	/* get disk stats */
 	
-	if((disk_stats=get_disk_stats(&disk_entries))==NULL){
+	if((disk_stats=sg_get_fs_stats(&disk_entries))==NULL){
 		log_msg(LOG_CRIT, "Failed to get disk statistics");
 	}else{
 		strlcat(xml, "<disk>", size);
@@ -712,14 +693,18 @@ too_big_error:
 
 	
 void usage(char *progname){
-        fprintf(stderr, "Usage %s [options] server port\n", progname);
-        fprintf(stderr, "Options\n");
-        fprintf(stderr, "  -v           Verbose mode,-vv would make even more verbose\n");
-        fprintf(stderr, "  -f           Foreground mode, print errors to stderr\n");
-	fprintf(stderr, "  -s		Set the machine name to be reported as\n");
-	fprintf(stderr, "  -i		Set the IP to be reported as\n");
-        fprintf(stderr, "  -V           Print version number\n");
-        fprintf(stderr, "  -h           Prints this help page\n");
+        fprintf(stderr, "Usage %s [-v[v]] [-f] [-n name] [-i ip] [-s server] [-p port] [-V] [-h]\n\n", progname);
+        fprintf(stderr, "  -v    Verbose mode, -vv would make even more verbose\n");
+        fprintf(stderr, "  -f    Foreground mode, print errors to stderr\n");
+	fprintf(stderr, "  -n    Set the machine name to be reported as\n");
+	fprintf(stderr, "  -i    Set the IP to be reported as\n");
+	fprintf(stderr, "  -s    Specifies the i-scream server to connect to\n");
+	fprintf(stderr, "          default: %s\n", DEF_SERVER_NAME);
+	fprintf(stderr, "  -p    Specifies the i-scream server port\n");
+	fprintf(stderr, "          default: %d\n", DEF_SERVER_PORT);
+        fprintf(stderr, "  -V    Print version number\n");
+        fprintf(stderr, "  -h    Prints this help page\n");
+	fprintf(stderr, "\nReport bugs to <%s>.\n", PACKAGE_BUGREPORT);
         exit(1);
 }
 
@@ -746,7 +731,8 @@ int main(int argc, char **argv){
 	ihost_config.log=stderr;
 
 	/* Blank ihost_state to default settings */
-	ihost_state.filtermanager_host=NULL;
+	ihost_state.filtermanager_host=DEF_SERVER_NAME;
+	ihost_state.filtermanager_port=DEF_SERVER_PORT;
 	ihost_state.host_fqdn=NULL;
 	ihost_state.host_ip=NULL;
 	ihost_state.preset_fqdn = 0;
@@ -755,7 +741,7 @@ int main(int argc, char **argv){
 	ihost_state.file_list=NULL;
 	ihost_state.last_modified=NULL;
 
-        while((cmdopt=getopt(argc, argv, "vfhVs:i:")) != -1){
+        while((cmdopt=getopt(argc, argv, "vfVn:i:s:p:h")) != -1){
                 switch(cmdopt){
                         case 'v':
                                 ihost_config.verbose++;
@@ -766,14 +752,10 @@ int main(int argc, char **argv){
                                 ihost_config.daemon=0;
                                 break;
 
-                        case 'h':
-                                usage(argv[0]);
-                                break;
-
                         case 'V':
                                 fprintf(stderr, "%s version %s\n", argv[0], VERSION);
                                 break;
-			case 's':
+			case 'n':
 				ihost_state.preset_fqdn = 1;
 				ihost_state.host_fqdn = strdup(optarg);
 				if(ihost_state.host_fqdn == NULL){
@@ -791,20 +773,21 @@ int main(int argc, char **argv){
 				}
 				break;
 
+			case 's':
+				ihost_state.filtermanager_host=strdup(optarg);
+				break;
+
+			case 'p':
+				ihost_state.filtermanager_port=atoi(optarg);
+				break;
+
+                        case 'h':
                         default:
                                 usage(argv[0]);
                                 exit(1);
                 }
         }
 
-        if(argc!=optind+2){
-                usage(argv[0]);
-                exit(1);
-        }
-
-	ihost_state.filtermanager_host=strdup(argv[optind]);
-	ihost_state.filtermanager_port=atoi(argv[optind+1]);
-	
 	if(gethostbyname(ihost_state.filtermanager_host)==NULL){
 		log_msg(LOG_CRIT, "Failed to lookup hostname. Please check settings");
 		exit(1);
@@ -841,7 +824,13 @@ int main(int argc, char **argv){
 
         }
 
-	log_msg(LOG_INFO, "Starting ihost");
+	log_msg(LOG_INFO, "Starting ihost...");
+
+	log_msg(LOG_DEBUG, "Running statgrab_init()");
+	if(statgrab_init()){
+		log_msg(LOG_CRIT, "statgrab_init failed (%m)");
+		exit(1);
+	}
 	
         log_msg(LOG_DEBUG,"Writing PID FILE");
 
@@ -869,7 +858,6 @@ int main(int argc, char **argv){
 		sleep(10);
 	}
 
-	printf("%s\n%d\n", ihost_state.server_fqdn, ihost_state.server_udp_port);
 	while((create_udp_sockinfo(&udp_sockinfo, ihost_state.server_fqdn, ihost_state.server_udp_port))!=0){
 		log_msg(LOG_ERR, "Failed to create udp socket");	
 		sleep(10);