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.22 by pajs, Tue May 21 16:04:34 2002 UTC vs.
Revision 1.27 by tdb, Wed May 29 23:03:53 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 32 | Line 37
37   #include <arpa/inet.h>
38   #include <syslog.h>
39  
35 #define VERSION_NO "0.8"
40   #define RECONFIGURE_RETURN_CODE 2
37 #define UDP_MAX_PACKET_SIZE 8192
38 #define PID_FILE "/var/tmp/.ihost.pid"
41  
42   #define logmessage(level, ...) do { cur_level = level; errf(__VA_ARGS__); } while (0)
43  
# Line 138 | Line 140 | int ihost_configure(ihost_state_t *ihost_state){
140                  logmessage(LOG_ERR, "sa family is wrong type");
141                  return -1;
142          }
143 <        
143 >
144 >        if(ihost_state->my_ip!=NULL) free(ihost_state->my_ip);  
145          if((ihost_state->my_ip=strdup(inet_ntoa(((struct sockaddr_in *)&ip)->sin_addr)))==NULL){
146                  logmessage(LOG_ERR, "Failed to get IP (%m)");
147                  return -1;
# Line 484 | Line 487 | int main(int argc, char **argv){
487          ihost_state.last_modified=NULL;
488          ihost_state.files_list=NULL;
489          ihost_state.key=NULL;
490 +        ihost_state.my_ip=NULL;
491  
492          errf_set_progname(argv[0]);
493          
# Line 509 | Line 513 | int main(int argc, char **argv){
513                                  break;
514  
515                          case 'V':
516 <                                errf("%s version %s",argv[0], VERSION_NO);
516 >                                errf("%s version %s",argv[0], VERSION);
517                                  break;
518  
519                          default:
# Line 576 | Line 580 | int main(int argc, char **argv){
580          logmessage(LOG_DEBUG,"Writing PID FILE");
581          pid=getpid();
582          if((f=fopen(PID_FILE,"w")) == NULL){
583 <                logmessage(LOG_WARNING, "Failed to write PID file");
583 >                logmessage(LOG_WARNING, "Failed to write PID file (%m)");
584          }else{
585 <                if((fprintf(f,"%d",(int)pid)) > 0 ){
586 <                        logmessage(LOG_WARNING, "Failed to write PID file");
585 >                if((fprintf(f,"%d",(int)pid)) <= 0 ){
586 >                        logmessage(LOG_WARNING, "Failed to write PID file (%m)");
587                  }
588                  if((fclose(f))!=0){
589                          logmessage(LOG_ERR, "failed to close PID file");

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines