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.28 by pajs, Mon Mar 3 12:18:35 2003 UTC vs.
Revision 1.38 by pajs, Wed Mar 19 21:51:50 2003 UTC

# Line 32 | Line 32
32   #include <errno.h>
33   #include <netdb.h>
34  
35 < #include <ukcprog.h>
35 > #include "ukcprog.h"
36   #include "statgrab.h"
37  
38   #define LOG_CRIT 0
# Line 40 | Line 40
40   #define LOG_INFO 2
41   #define LOG_DEBUG 3
42  
43 – #define PID_FILE "/var/run/ihost.pid"
44 – #define LOGFILE_PATH "/var/log/ihost.log"
45 – #define VERSION ".03"
46 –
47 – #define MAX_UDP_PACKET_SIZE 8192
48 –
43   typedef struct{
44          int filtermanager_port;
45          char *filtermanager_host;
# Line 81 | Line 75 | typedef struct{
75  
76   ihost_config_t ihost_config;
77  
78 + extern int errno;
79 +
80 + /* Taken from the OpenSSH code. Its licence included in function.*/
81 + #ifndef HAVE_STRLCAT
82 +
83 + /*
84 + * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
85 + * All rights reserved.
86 + *
87 + * Redistribution and use in source and binary forms, with or without
88 + * modification, are permitted provided that the following conditions
89 + * are met:
90 + * 1. Redistributions of source code must retain the above copyright
91 + *    notice, this list of conditions and the following disclaimer.
92 + * 2. Redistributions in binary form must reproduce the above copyright
93 + *    notice, this list of conditions and the following disclaimer in the
94 + *    documentation and/or other materials provided with the distribution.
95 + * 3. The name of the author may not be used to endorse or promote products
96 + *    derived from this software without specific prior written permission.
97 + *
98 + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
99 + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
100 + * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
101 + * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
102 + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
103 + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
104 + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
105 + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
106 + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
107 + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
108 + */
109 +
110 + /*
111 + * Appends src to string dst of size siz (unlike strncat, siz is the
112 + * full size of dst, not space left).  At most siz-1 characters
113 + * will be copied.  Always NUL terminates (unless siz <= strlen(dst)).
114 + * Returns strlen(src) + MIN(siz, strlen(initial dst)).
115 + * If retval >= siz, truncation occurred.
116 + */
117 + size_t
118 + strlcat(dst, src, siz)
119 +        char *dst;
120 +        const char *src;
121 +        size_t siz;
122 + {
123 +        register char *d = dst;
124 +        register const char *s = src;
125 +        register size_t n = siz;
126 +        size_t dlen;
127 +
128 +        /* Find the end of dst and adjust bytes left but don't go past end */
129 +        while (n-- != 0 && *d != '\0')
130 +                d++;
131 +        dlen = d - dst;
132 +        n = siz - dlen;
133 +
134 +        if (n == 0)
135 +                return(dlen + strlen(s));
136 +        while (*s != '\0') {
137 +                if (n != 1) {
138 +                        *d++ = *s;
139 +                        n--;
140 +                }
141 +                s++;
142 +        }
143 +        *d = '\0';
144 +
145 +        return(dlen + (s - src));       /* count does not include NUL */
146 + }
147 +
148 + #endif
149 + /* End strlcat function taken from OpenSSH */
150 +
151   void log_msg(int level, char *format, ...){
85 –        extern int errno;
152          int cur_errno;
153          va_list ap;
154  
# Line 97 | Line 163 | void log_msg(int level, char *format, ...){
163                  }else{
164                          fprintf(ihost_config.log, "\n");
165                  }
166 +                fflush(ihost_config.log);
167          }
168   }
169  
# Line 156 | Line 223 | FILE *create_tcp_connection(char *hostname, int port){
223  
224          if((get_host_addr(hostname, &haddr))!=0){
225                  log_msg(LOG_CRIT, "Failed to lookup name for %s", hostname);
226 +                close(sock);
227                  return NULL;
228          }
229  
# Line 167 | Line 235 | FILE *create_tcp_connection(char *hostname, int port){
235          log_msg(LOG_DEBUG, "Creating a tcp connection");
236          if(connect(sock, (struct sockaddr *)&addr, sizeof(addr)) !=0){
237                  log_msg(LOG_CRIT, "Failed to connect to hostname %s on port %d", hostname, port);
238 +                close(sock);
239                  return NULL;
240          }
241  
# Line 226 | Line 295 | int ihost_getconfig(ihost_state_t *ihost_state){
295          int server_udp_port=0;
296          time_t config_ttl=0;
297  
298 <        tcp_con=create_tcp_connection(ihost_state->filtermanager_host, ihost_state->filtermanager_port);
298 >        if((tcp_con=create_tcp_connection(ihost_state->filtermanager_host, ihost_state->filtermanager_port))==NULL){
299 >                return -1;
300 >        }
301  
302          if(ihost_state->file_list!=NULL || ihost_state->last_modified!=NULL){
303                  if(tcp_con==NULL){
# Line 242 | Line 313 | int ihost_getconfig(ihost_state_t *ihost_state){
313                  }
314          
315                  if((tcp_comm(tcp_con, ihost_state->last_modified, &response, "OK"))==0){
316 <                        if((tcp_comm(tcp_con, "END", &response, "OK"))==0){
316 >                        if((tcp_comm(tcp_con, "END", &response, "OK"))!=0){
317                                  goto error;
318                          }
319                          fclose(tcp_con);
# Line 510 | Line 581 | int get_system_stats(int seq_no, ihost_state_t *ihost_
581                          y=page_stats->pages_pageout;
582                  }
583                  snprintf(tmp, size, \
584 <                        "<pages><swapins>%lld</swapins><swapouts>%lld</swapouts></pages>", \
584 >                        "<pages><pageins>%lld</pageins><pageouts>%lld</pageouts></pages>", \
585                          x, \
586                          y);
587          
# Line 682 | Line 753 | int main(int argc, char **argv){
753                                  break;
754  
755                          case 'V':
756 <                                fprintf(stderr, "%s version %s", argv[0], VERSION);
756 >                                fprintf(stderr, "%s version %s\n", argv[0], VERSION);
757                                  break;
758  
759                          default:
# Line 723 | Line 794 | int main(int argc, char **argv){
794                          exit(1);
795                  }
796          
797 <                if((ihost_config.log=fopen(LOGFILE_PATH, "a"))==NULL){
797 >                if((ihost_config.log=fopen(LOG_FILE, "a"))==NULL){
798                          ihost_config.log=stderr;
799 <                        log_msg(LOG_CRIT, "Failed to open Logfiles %s for writing", LOGFILE_PATH);
799 >                        log_msg(LOG_CRIT, "Failed to open Logfiles %s for writing", LOG_FILE);
800                          exit(1);
801                  }
802  

Diff Legend

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