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.26 by tdb, Wed May 29 19:41: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 17 | Line 18
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>
# Line 29 | Line 34
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"
# Line 73 | Line 76 | void log_errors(const char *message){
76  
77   char* sock_comm(FILE *f_r, FILE *f_w, char *sendString){
78          char *reply;
79 +        logmessage(LOG_DEBUG, "Sending %s",sendString);
80          fprintf(f_w, "%s\n", sendString);
81          fflush(f_w);
82          reply=fpgetline(f_r);
83 +        if (reply!=NULL) logmessage(LOG_DEBUG, "Received %s", reply);
84          /* Returns pointer to static buffer */
85          return reply;
86   }      
# Line 137 | Line 142 | int ihost_configure(ihost_state_t *ihost_state){
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          }      
151          
146 –        logmessage(LOG_DEBUG, "Sending STARTCONIG");
152          reply=sock_comm(fm_fd_r, fm_fd_w, "STARTCONFIG");
153          if ((reply==NULL) || (strncasecmp(reply, "OK", 2) != 0) ) {
154                  logmessage(LOG_ERR, "Server error on STARTCONFIG");    
155                  return -1;
156          }
157  
153 –        logmessage(LOG_DEBUG, "Sending LASTMODIFIED");
158          reply=sock_comm(fm_fd_r, fm_fd_w, "LASTMODIFIED");
159          if((reply== NULL) || (strncasecmp(reply, "ERROR", 5) ==0)){
160                  logmessage(LOG_ERR, "Server error on LASTMODIFIED (%m)");
# Line 161 | Line 165 | int ihost_configure(ihost_state_t *ihost_state){
165                  return -1;
166          }
167  
164 –        logmessage(LOG_DEBUG, "Sending FILELIST");
168          reply=sock_comm(fm_fd_r, fm_fd_w, "FILELIST");
169          if((reply== NULL) || (strncasecmp(reply, "ERROR", 5) ==0)){
170                  logmessage(LOG_ERR, "Server error on FILELIST (%m)");
# Line 172 | Line 175 | int ihost_configure(ihost_state_t *ihost_state){
175                  return -1;
176          }
177  
175 –        logmessage(LOG_DEBUG, "Sending FQDN");
178          reply=sock_comm(fm_fd_r, fm_fd_w, "FQDN");
179          if((reply== NULL) || (strncasecmp(reply, "ERROR", 5)==0)){
180                  logmessage(LOG_ERR, "Server error on FQDN (%m)");
# Line 183 | Line 185 | int ihost_configure(ihost_state_t *ihost_state){
185                  return -1;
186          }
187  
186 –        logmessage(LOG_DEBUG, "Sending FQDN");
188          reply=sock_comm(fm_fd_r, fm_fd_w, "UDPUpdateTime");
189          if(reply== NULL){
190                  logmessage(LOG_ERR, "Server error (%m)");
# Line 193 | Line 194 | int ihost_configure(ihost_state_t *ihost_state){
194                  ihost_state->udp_update_time=atoi(reply);
195          }
196          
196 –        logmessage(LOG_DEBUG, "Sending TCPUpdateTime");
197          reply=sock_comm(fm_fd_r, fm_fd_w, "TCPUpdateTime");
198          if(reply== NULL){
199                  logmessage(LOG_ERR, "Server error on TCPUpdateTime (%m)");
# Line 203 | Line 203 | int ihost_configure(ihost_state_t *ihost_state){
203                  ihost_state->tcp_update_time=atoi(reply);
204          }
205  
206 –        logmessage(LOG_DEBUG, "Sending ENDCONFIG");
206          reply=sock_comm(fm_fd_r, fm_fd_w, "ENDCONFIG");
207          if(reply== NULL){
208                  logmessage(LOG_ERR, "Server error on ENDCONFIG (%m)");
209                  return -1;
210          }
211  
213 –        logmessage(LOG_DEBUG, "Sending FILTER");
212          reply=sock_comm(fm_fd_r, fm_fd_w, "FILTER");
213          if((reply== NULL) || (strncasecmp(reply, "ERROR", 5)==0)){
214                  logmessage(LOG_ERR, "Server error FILTER failed (%m)");
# Line 241 | Line 239 | int ihost_configure(ihost_state_t *ihost_state){
239                  return -1;
240          }
241  
244 –        logmessage(LOG_DEBUG, "Sending END");
242          reply=sock_comm(fm_fd_r, fm_fd_w, "END");
243          if((reply== NULL) || (strncasecmp(reply, "ERROR", 5) ==0 )){
244                  logmessage(LOG_ERR, "Server error on END (%m)");
# Line 300 | Line 297 | int heartbeat(ihost_state_t *ihost_state){
297                  return -1;
298          }
299  
303 –        logmessage(LOG_DEBUG, "Sending HEARTBEAT");
300          reply=sock_comm(fm_fd_r, fm_fd_w, "HEARTBEAT");
301          if ((reply==NULL) || (strncasecmp(reply, "ERROR", 5) == 0) ) {
302                  logmessage(LOG_ERR, "Server error on HEARTBEAT");
303                  return -1;
304          }
305  
310 –        logmessage(LOG_DEBUG, "Sending CONFIG");
306          reply=sock_comm(fm_fd_r, fm_fd_w, "CONFIG");
307          if ((reply==NULL) || (strncasecmp(reply, "ERROR", 5) == 0) ) {
308                  logmessage(LOG_ERR, "Server error on CONFIG");
309                  return -1;
310          }
311  
317 –        logmessage(LOG_DEBUG, "Sending %s", ihost_state->files_list);
312          reply=sock_comm(fm_fd_r, fm_fd_w, ihost_state->files_list);
313          if ((reply==NULL) || (strncasecmp(reply, "OK", 2) != 0) ) {
314                  logmessage(LOG_ERR, "Server error on fileslist");
315                  return -1;
316          }
317  
324 –        logmessage(LOG_DEBUG, "Sending %s", ihost_state->last_modified);
318          reply=sock_comm(fm_fd_r, fm_fd_w, ihost_state->last_modified);
319          if (reply==NULL) {
320                  logmessage(LOG_ERR, "Server error NULL recieved on lastmodified");
# Line 333 | Line 326 | int heartbeat(ihost_state_t *ihost_state){
326                  exitcode=RECONFIGURE_RETURN_CODE;
327          }
328  
336 –        logmessage(LOG_DEBUG,"Sending KEY");
329          reply=sock_comm(fm_fd_r, fm_fd_w, "KEY");
330          if ((reply==NULL) || (strncasecmp(reply, "ERROR", 5) == 0) ) {
331                  logmessage(LOG_ERR, "Server error on KEY");
# Line 346 | Line 338 | int heartbeat(ihost_state_t *ihost_state){
338                  return -1;
339          }
340  
349 –        logmessage(LOG_DEBUG,"Sending ENDHEARTBEAT");
341          reply=sock_comm(fm_fd_r, fm_fd_w, "ENDHEARTBEAT");
342          if((reply== NULL) || (strncasecmp(reply, "ERROR", 5) ==0 )){
343                  logmessage(LOG_ERR, "Server error on ENDHEARTBEAT (%m)");
# Line 404 | Line 395 | char *stat_grab(ihost_state_t *ihost_state, int counte
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;
# Line 436 | Line 428 | int send_stats(ihost_state_t *ihost_state, char *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;
# Line 497 | Line 489 | int main(int argc, char **argv){
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          
# Line 522 | Line 515 | int main(int argc, char **argv){
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:
# Line 589 | Line 582 | int main(int argc, char **argv){
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");
# Line 627 | Line 620 | int main(int argc, char **argv){
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)");

Diff Legend

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