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.12 by pajs, Sun May 19 12:03:43 2002 UTC vs.
Revision 1.16 by pajs, Sun May 19 19:42:41 2002 UTC

# Line 18 | Line 18
18   */
19  
20   #include <stdio.h>
21 – #include <sys/socket.h>
21   #include <stdlib.h>
22   #include <unistd.h>
23   #include <syslog.h>
# Line 28 | Line 27
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 35 | 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 60 | 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 101 | 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 346 | 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 443 | Line 463 | int main(int argc, char **argv){
463                  if(cur_time>=udp_time){
464                          /*printf("sending UDP\n");*/
465                          stat_grab_time=time(NULL);
466 <                        if((xml_stats=stat_grab(&ihost_state, counter)) == NULL){
466 >                        if((xml_stats=stat_grab(&ihost_state, counter++)) == NULL){
467                                  errf("Failed to get stats (%m)");
468                                  exit(1);
469                          }

Diff Legend

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