ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/cms/source/ihost/ihost.c
(Generate patch)

Comparing projects/cms/source/ihost/ihost.c (file contents):
Revision 1.21 by pajs, Tue May 21 15:44:34 2002 UTC vs.
Revision 1.24 by pajs, Tue May 21 16:55:59 2002 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 29 | Line 30
30   #include "statgrab.h"
31   #include <time.h>
32   #include <sys/socket.h>
32 – #include <netinet/in.h>
33   #include <arpa/inet.h>
34   #include <syslog.h>
35  
36 < #define versionNo 0.8
36 > #define VERSION_NO "1.0rc1"
37   #define RECONFIGURE_RETURN_CODE 2
38   #define UDP_MAX_PACKET_SIZE 8192
39   #define PID_FILE "/var/tmp/.ihost.pid"
# Line 140 | Line 140 | int ihost_configure(ihost_state_t *ihost_state){
140                  return -1;
141          }
142          
143 <        if((ihost_state->my_ip=inet_ntoa(((struct sockaddr_in *)&ip)->sin_addr))==NULL){
143 >        if((ihost_state->my_ip=strdup(inet_ntoa(((struct sockaddr_in *)&ip)->sin_addr)))==NULL){
144                  logmessage(LOG_ERR, "Failed to get IP (%m)");
145                  return -1;
146          }      
# Line 391 | Line 391 | char *stat_grab(ihost_state_t *ihost_state, int counte
391                  xml_size+=strlen(stats[x]);
392          }
393  
394 <        xml_data=malloc(xml_size);
394 >        xml_data=malloc(xml_size+1);
395          xml_data=strcpy(xml_data, stats[0]);
396 <        
396 >        free(stats[0]);
397          for(x=1;x<NUM_STATS;x++){
398                  strcat(xml_data, stats[x]);
399 +                free(stats[x]);
400          }
401  
402          xml_data_p=xml_data;
# Line 423 | Line 424 | int send_stats(ihost_state_t *ihost_state, char *data_
424                  logmessage(LOG_ERR, "Failed to resolve address %s (%m)", ihost_state->server_fqdn);
425                  return -1;
426          }
427 <        logmessage(LOG_DEBUG,"Creating UDP connection to %s on %d",ihost_state->server_fqdn, ihost_state->server_udp_port);
427 >        logmessage(LOG_DEBUG,"Creating UDP socket to %s on %d",ihost_state->server_fqdn, ihost_state->server_udp_port);
428          if((sd=socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0){
429                  logmessage(LOG_ERR, "failed to create UDP socket (%m)");
430                  return -1;
# Line 509 | Line 510 | int main(int argc, char **argv){
510                                  break;
511  
512                          case 'V':
513 <                                errf("%s version %f",argv[0], versionNo);
513 >                                errf("%s version %s",argv[0], VERSION_NO);
514                                  break;
515  
516                          default:
# Line 578 | Line 579 | int main(int argc, char **argv){
579          if((f=fopen(PID_FILE,"w")) == NULL){
580                  logmessage(LOG_WARNING, "Failed to write PID file");
581          }else{
582 <                if((fprintf(f,"%d",(int)pid)) != sizeof(pid)){
582 >                if((fprintf(f,"%d",(int)pid)) > 0 ){
583                          logmessage(LOG_WARNING, "Failed to write PID file");
584                  }
585                  if((fclose(f))!=0){
# Line 614 | Line 615 | int main(int argc, char **argv){
615  
616                  if(cur_time>=udp_time){
617                          logmessage(LOG_DEBUG,"Sending udp data");
618 <
618 >                        /* Work out how long it takes to get the stats for next time round
619 >                           so the sleep time can be adjusted accordingly */
620                          stat_grab_time=time(NULL);
621                          if((xml_stats=stat_grab(&ihost_state, counter++)) == NULL){
622                                  logmessage(LOG_ERR,"Failed to get stats (%m)");

Diff Legend

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