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.22 by pajs, Tue May 21 16:04:34 2002 UTC

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

Diff Legend

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