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.9 by pajs, Fri May 17 11:21:17 2002 UTC vs.
Revision 1.16 by pajs, Sun May 19 19:42:41 2002 UTC

# Line 1 | Line 1
1 + /*
2 + * i-scream central monitoring system
3 + * Copyright (C) 2000-2002 i-scream
4 + *
5 + * This program is free software; you can redistribute it and/or
6 + * modify it under the terms of the GNU General Public License
7 + * as published by the Free Software Foundation; either version 2
8 + * of the License, or (at your option) any later version.
9 + *
10 + * This program is distributed in the hope that it will be useful,
11 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13 + * GNU General Public License for more details.
14 + *
15 + * You should have received a copy of the GNU General Public License
16 + * along with this program; if not, write to the Free Software
17 + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
18 + */
19 +
20   #include <stdio.h>
2 – #include <sys/socket.h>
21   #include <stdlib.h>
22   #include <unistd.h>
23   #include <syslog.h>
24   #include <netinet/in.h>
25   #include "ukcprog.h"
26   #include <netdb.h>
27 < #include <strings.h>
27 > #include <string.h>
28   #include "statgrab.h"
29 + #include <time.h>
30 + #include <sys/socket.h>
31 + #include <netinet/in.h>
32 + #include <arpa/inet.h>
33  
34   #define RECONFIGURE_RETURN_CODE 2
35   #define UDP_MAX_PACKET_SIZE 8192
# Line 15 | Line 37
37   typedef struct{
38          int fm_port;
39          char *fm_host;
40 <        
40 >
41 >        char *my_ip;    
42          char *my_fqdn;
43          char *server_fqdn;
44          int server_udp_port;
# Line 40 | Line 63 | char* sock_comm(FILE *f_r, FILE *f_w, char *sendString
63   int ihost_configure(ihost_state_t *ihost_state){
64          struct sockaddr_in addr;
65          struct in_addr haddr;
66 +        struct sockaddr ip;
67 +        int ip_len;
68          int sd;
69          FILE *fm_fd_r, *fm_fd_w;
70          char *reply;
# Line 81 | Line 106 | int ihost_configure(ihost_state_t *ihost_state){
106                  errf("Failed to open write stream (%m)");
107                  return -1;
108          }
109 +        ip_len=sizeof ip;
110 +        memset(&ip, 0, ip_len);
111 +        if((getsockname(sd, &ip, &ip_len)) != 0){
112 +                errf("Failed to get IP address (%m)");
113 +                return -1;
114 +        }
115 +        if (ip.sa_family!=AF_INET){
116 +                errf("sa family is wrong type");
117 +                return -1;
118 +        }
119 +        
120 +        if((ihost_state->my_ip=inet_ntoa(((struct sockaddr_in *)&ip)->sin_addr))==NULL){
121 +                errf("Failed to get IP (%m)");
122 +                return -1;
123 +        }      
124  
125          reply=sock_comm(fm_fd_r, fm_fd_w, "STARTCONFIG");
126          if ((reply==NULL) || (strncasecmp(reply, "OK", 2) != 0) ) {
# Line 274 | Line 314 | int heartbeat(ihost_state_t *ihost_state){
314                  return -1;
315          }
316  
317 +        fflush(fm_fd_r);
318 +        fflush(fm_fd_w);
319 +
320          if(fclose(fm_fd_r) !=0){
321                  errf("Failed to close read FD (%m)");
322                  return -1;
# Line 323 | Line 366 | char *stat_grab(ihost_state_t *ihost_state, int counte
366                  free(stats[x]);
367          }
368          xml_data_p=xml_data;
369 <        xml_data=strf("<packet seq_no=\"%d\" machine_name=\"%s\" date=\"%ld\" type=\"data\" ip=\"%s\" key=\"%s\">%s</packet>", counter, ihost_state->my_fqdn, time(NULL), "127.0.0.1", ihost_state->key, xml_data);
369 >        xml_data=strf("<packet seq_no=\"%d\" machine_name=\"%s\" date=\"%ld\" type=\"data\" ip=\"%s\" key=\"%s\">%s</packet>", counter, ihost_state->my_fqdn, time(NULL), ihost_state->my_ip, ihost_state->key, xml_data);
370          free(xml_data_p);
371          
372          return xml_data;
# Line 362 | Line 405 | int send_stats(ihost_state_t *ihost_state, char *data_
405                  return -1;
406          }
407  
408 +        close(sd);
409 +
410          return 0;      
411   }
412  
# Line 369 | Line 414 | int main(int argc, char **argv){
414          ihost_state_t ihost_state;
415          int heartbeat_exit;
416          int counter=0;
417 <        long udp_time=0, tcp_time=0, cur_time=0;
417 >        long udp_time=0, tcp_time=0, stat_grab_time=0, cur_time=0;
418          int sleep_delay=0;
419          char *xml_stats;
420  
# Line 397 | Line 442 | int main(int argc, char **argv){
442                  exit(1);
443          }
444  
400 –        /* get starting stats */        
401 –        if((heartbeat(&ihost_state)) == -1){
402 –                errf("inital heartbeat failed (%m)");
403 –                exit(1);
404 –        }
405 –
406 –        
407 –        if((xml_stats=stat_grab(&ihost_state, counter)) == NULL){
408 –                errf("Failed to get stats (%m)");
409 –                exit(1);
410 –        }
411 –
412 –
445          for(;;){
446                  cur_time=time(NULL);
447                  if(cur_time>=tcp_time){
448 +                        /*printf("sending TCP\n");*/
449                          heartbeat_exit=heartbeat(&ihost_state);
450                          if(heartbeat_exit==RECONFIGURE_RETURN_CODE){
451 <                                errf("heartbeat needs to be reconfigured");
451 >                                /*errf("heartbeat needs to be reconfigured");*/
452                                  ihost_configure(&ihost_state);
453                                  /* So udp doesn't wait til next sending before updating */
454                                  udp_time=0;
# Line 426 | Line 459 | int main(int argc, char **argv){
459                          }
460                          tcp_time=time(NULL)+ihost_state.tcp_update_time;
461                  }
462 +
463                  if(cur_time>=udp_time){
464 <                        send_stats(&ihost_state, xml_stats);
465 <                        free(xml_stats);
466 <                        if((xml_stats=stat_grab(&ihost_state, counter)) == NULL){
464 >                        /*printf("sending UDP\n");*/
465 >                        stat_grab_time=time(NULL);
466 >                        if((xml_stats=stat_grab(&ihost_state, counter++)) == NULL){
467                                  errf("Failed to get stats (%m)");
468                                  exit(1);
469                          }
470 <                        udp_time=time(NULL)+ihost_state.udp_update_time;
470 >                        stat_grab_time=time(NULL)-stat_grab_time;
471 >                        send_stats(&ihost_state, xml_stats);
472 >                        free(xml_stats);
473 >                        udp_time=time(NULL)+ihost_state.udp_update_time-stat_grab_time;
474                  }
475 <                if(tcp_time>udp_time){
476 <                        sleep_delay=time(NULL)-tcp_time;
475 >
476 >                if(tcp_time<udp_time){
477 >                        sleep_delay=tcp_time-time(NULL);
478                  }else{
479 <                        sleep_delay=time(NULL)-udp_time;
479 >                        sleep_delay=udp_time-time(NULL);
480                  }
481 <                sleep(sleep_delay);
481 >
482 >                /*printf("tcp epoc: %ld \t udp epoc: %ld\ntime:%ld \tsleeping: %d\n", tcp_time, udp_time, time(NULL), sleep_delay);*/
483 >                if(sleep_delay>0) sleep(sleep_delay);
484          }
485          return 0;
486   }

Diff Legend

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