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.20 by pajs, Tue May 21 14:36:23 2002 UTC vs.
Revision 1.23 by tdb, Tue May 21 16:47:12 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 "0.8"
37   #define RECONFIGURE_RETURN_CODE 2
38   #define UDP_MAX_PACKET_SIZE 8192
39   #define PID_FILE "/var/tmp/.ihost.pid"
# Line 73 | Line 73 | void log_errors(const char *message){
73  
74   char* sock_comm(FILE *f_r, FILE *f_w, char *sendString){
75          char *reply;
76 +        logmessage(LOG_DEBUG, "Sending %s",sendString);
77          fprintf(f_w, "%s\n", sendString);
78          fflush(f_w);
79          reply=fpgetline(f_r);
80 +        if (reply!=NULL) logmessage(LOG_DEBUG, "Received %s", reply);
81          /* Returns pointer to static buffer */
82          return reply;
83   }      
# Line 138 | 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          }      
147          
146 –        logmessage(LOG_DEBUG, "Sending STARTCONIG");
148          reply=sock_comm(fm_fd_r, fm_fd_w, "STARTCONFIG");
149          if ((reply==NULL) || (strncasecmp(reply, "OK", 2) != 0) ) {
150                  logmessage(LOG_ERR, "Server error on STARTCONFIG");    
151                  return -1;
152          }
153  
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                  logmessage(LOG_ERR, "Server error on LASTMODIFIED (%m)");
# Line 161 | Line 161 | int ihost_configure(ihost_state_t *ihost_state){
161                  return -1;
162          }
163  
164 –        logmessage(LOG_DEBUG, "Sending FILELIST");
164          reply=sock_comm(fm_fd_r, fm_fd_w, "FILELIST");
165          if((reply== NULL) || (strncasecmp(reply, "ERROR", 5) ==0)){
166                  logmessage(LOG_ERR, "Server error on FILELIST (%m)");
# Line 172 | Line 171 | int ihost_configure(ihost_state_t *ihost_state){
171                  return -1;
172          }
173  
175 –        logmessage(LOG_DEBUG, "Sending FQDN");
174          reply=sock_comm(fm_fd_r, fm_fd_w, "FQDN");
175          if((reply== NULL) || (strncasecmp(reply, "ERROR", 5)==0)){
176                  logmessage(LOG_ERR, "Server error on FQDN (%m)");
# Line 183 | Line 181 | int ihost_configure(ihost_state_t *ihost_state){
181                  return -1;
182          }
183  
186 –        logmessage(LOG_DEBUG, "Sending FQDN");
184          reply=sock_comm(fm_fd_r, fm_fd_w, "UDPUpdateTime");
185          if(reply== NULL){
186                  logmessage(LOG_ERR, "Server error (%m)");
# Line 193 | Line 190 | int ihost_configure(ihost_state_t *ihost_state){
190                  ihost_state->udp_update_time=atoi(reply);
191          }
192          
196 –        logmessage(LOG_DEBUG, "Sending TCPUpdateTime");
193          reply=sock_comm(fm_fd_r, fm_fd_w, "TCPUpdateTime");
194          if(reply== NULL){
195                  logmessage(LOG_ERR, "Server error on TCPUpdateTime (%m)");
# Line 203 | Line 199 | int ihost_configure(ihost_state_t *ihost_state){
199                  ihost_state->tcp_update_time=atoi(reply);
200          }
201  
206 –        logmessage(LOG_DEBUG, "Sending ENDCONFIG");
202          reply=sock_comm(fm_fd_r, fm_fd_w, "ENDCONFIG");
203          if(reply== NULL){
204                  logmessage(LOG_ERR, "Server error on ENDCONFIG (%m)");
205                  return -1;
206          }
207  
213 –        logmessage(LOG_DEBUG, "Sending FILTER");
208          reply=sock_comm(fm_fd_r, fm_fd_w, "FILTER");
209          if((reply== NULL) || (strncasecmp(reply, "ERROR", 5)==0)){
210                  logmessage(LOG_ERR, "Server error FILTER failed (%m)");
# Line 241 | Line 235 | int ihost_configure(ihost_state_t *ihost_state){
235                  return -1;
236          }
237  
244 –        logmessage(LOG_DEBUG, "Sending END");
238          reply=sock_comm(fm_fd_r, fm_fd_w, "END");
239          if((reply== NULL) || (strncasecmp(reply, "ERROR", 5) ==0 )){
240                  logmessage(LOG_ERR, "Server error on END (%m)");
# Line 300 | Line 293 | int heartbeat(ihost_state_t *ihost_state){
293                  return -1;
294          }
295  
303 –        logmessage(LOG_DEBUG, "Sending HEARTBEAT");
296          reply=sock_comm(fm_fd_r, fm_fd_w, "HEARTBEAT");
297          if ((reply==NULL) || (strncasecmp(reply, "ERROR", 5) == 0) ) {
298                  logmessage(LOG_ERR, "Server error on HEARTBEAT");
299                  return -1;
300          }
301  
310 –        logmessage(LOG_DEBUG, "Sending CONFIG");
302          reply=sock_comm(fm_fd_r, fm_fd_w, "CONFIG");
303          if ((reply==NULL) || (strncasecmp(reply, "ERROR", 5) == 0) ) {
304                  logmessage(LOG_ERR, "Server error on CONFIG");
305                  return -1;
306          }
307  
317 –        logmessage(LOG_DEBUG, "Sending %s", ihost_state->files_list);
308          reply=sock_comm(fm_fd_r, fm_fd_w, ihost_state->files_list);
309          if ((reply==NULL) || (strncasecmp(reply, "OK", 2) != 0) ) {
310                  logmessage(LOG_ERR, "Server error on fileslist");
311                  return -1;
312          }
313  
324 –        logmessage(LOG_DEBUG, "Sending %s", ihost_state->last_modified);
314          reply=sock_comm(fm_fd_r, fm_fd_w, ihost_state->last_modified);
315          if (reply==NULL) {
316                  logmessage(LOG_ERR, "Server error NULL recieved on lastmodified");
# Line 333 | Line 322 | int heartbeat(ihost_state_t *ihost_state){
322                  exitcode=RECONFIGURE_RETURN_CODE;
323          }
324  
336 –        logmessage(LOG_DEBUG,"Sending KEY");
325          reply=sock_comm(fm_fd_r, fm_fd_w, "KEY");
326          if ((reply==NULL) || (strncasecmp(reply, "ERROR", 5) == 0) ) {
327                  logmessage(LOG_ERR, "Server error on KEY");
# Line 346 | Line 334 | int heartbeat(ihost_state_t *ihost_state){
334                  return -1;
335          }
336  
349 –        logmessage(LOG_DEBUG,"Sending ENDHEARTBEAT");
337          reply=sock_comm(fm_fd_r, fm_fd_w, "ENDHEARTBEAT");
338          if((reply== NULL) || (strncasecmp(reply, "ERROR", 5) ==0 )){
339                  logmessage(LOG_ERR, "Server error on ENDHEARTBEAT (%m)");
# Line 404 | 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 436 | 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 522 | 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 591 | 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 627 | 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