ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/libstatgrab/src/libstatgrab/network_stats.c
(Generate patch)

Comparing projects/libstatgrab/src/libstatgrab/network_stats.c (file contents):
Revision 1.7 by pajs, Tue Mar 11 14:30:39 2003 UTC vs.
Revision 1.17 by pajs, Tue Aug 26 22:34:49 2003 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
3 > * http://www.i-scream.org
4 > * Copyright (C) 2000-2003 i-scream
5   *
6   * This program is free software; you can redistribute it and/or
7   * modify it under the terms of the GNU General Public License
# Line 25 | Line 25
25   #include <stdlib.h>
26   #include <string.h>
27   #include "statgrab.h"
28 < #include "time.h"
28 > #include <time.h>
29   #ifdef SOLARIS
30   #include <kstat.h>
31   #include <sys/sysinfo.h>
# Line 36 | Line 36
36   #include <regex.h>
37   #include "tools.h"
38   #endif
39 + #ifdef FREEBSD
40 + #include <sys/types.h>
41 + #include <sys/socket.h>
42 + #include <ifaddrs.h>
43 + #include <net/if.h>
44 + #endif
45  
46   static network_stat_t *network_stats=NULL;
47   static int interfaces=0;
# Line 90 | Line 96 | network_stat_t *get_network_stats(int *entries){
96  
97   #ifdef LINUX
98          FILE *f;
99 <        /* Horrible big enough, but it should be quite easily */
99 >        /* Horrible big enough, but it should be easily big enough */
100          char line[8096];
101          regex_t regex;
102          regmatch_t line_match[4];
103   #endif
104 + #ifdef FREEBSD
105 +        struct ifaddrs *net, *net_ptr;
106 +        struct if_data *net_data;
107 + #endif
108  
109 + #ifdef FREEBSD
110 +        if(getifaddrs(&net) != 0){
111 +                return NULL;
112 +        }
113 +
114 +        interfaces=0;
115 +        
116 +        for(net_ptr=net;net_ptr!=NULL;net_ptr=net_ptr->ifa_next){
117 +                if(net_ptr->ifa_addr->sa_family != AF_LINK) continue;
118 +                network_stats=network_stat_malloc((interfaces+1), &sizeof_network_stats, network_stats);
119 +                if(network_stats==NULL){
120 +                        return NULL;
121 +                }
122 +                network_stat_ptr=network_stats+interfaces;
123 +                
124 +                if(network_stat_ptr->interface_name!=NULL) free(network_stat_ptr->interface_name);
125 +                network_stat_ptr->interface_name=strdup(net_ptr->ifa_name);
126 +                if(network_stat_ptr->interface_name==NULL) return NULL;
127 +                net_data=(struct if_data *)net_ptr->ifa_data;
128 +                network_stat_ptr->rx=net_data->ifi_ibytes;
129 +                network_stat_ptr->tx=net_data->ifi_obytes;                      
130 +                network_stat_ptr->systime=time(NULL);
131 +                interfaces++;
132 +        }
133 +        freeifaddrs(net);      
134 + #endif
135 +
136   #ifdef SOLARIS
137          if ((kc = kstat_open()) == NULL) {
138                  return NULL;
# Line 183 | Line 220 | network_stat_t *get_network_stats(int *entries){
220  
221                  interfaces++;
222          }
223 +        fclose(f);
224 +        regfree(&regex);
225  
226   #endif
227          *entries=interfaces;
# Line 190 | Line 229 | network_stat_t *get_network_stats(int *entries){
229          return network_stats;  
230   }
231  
232 + long long transfer_diff(long long new, long long old){
233 + #if defined(SOL7) || defined(LINUX) || defined(FREEBSD)
234 + #define MAXVAL 4294967296
235 + #else
236 + #define MAXVAL 18446744073709551616
237 + #endif
238 +        long long result;
239 +        if(new>=old){
240 +                result = (new-old);
241 +        }else{
242 +                result = (MAXVAL+(new-old));
243 +        }
244 +
245 +        return result;
246 +
247 + }
248 +
249   network_stat_t *get_network_stats_diff(int *entries){
250          static network_stat_t *network_stats_diff=NULL;
251          static int sizeof_net_stats_diff=0;
# Line 228 | Line 284 | network_stat_t *get_network_stats_diff(int *entries){
284          for(x=0;x<sizeof_net_stats_diff;x++){
285  
286                  if((strcmp(network_stats_diff_ptr->interface_name, network_stats_ptr->interface_name))==0){
287 <                        network_stats_diff_ptr->tx = network_stats_ptr->tx - network_stats_diff_ptr->tx;
288 <                        network_stats_diff_ptr->rx = network_stats_ptr->rx - network_stats_diff_ptr->rx;        
287 >                        network_stats_diff_ptr->tx = transfer_diff(network_stats_ptr->tx, network_stats_diff_ptr->tx);
288 >                        network_stats_diff_ptr->rx = transfer_diff(network_stats_ptr->rx, network_stats_diff_ptr->rx);
289                          network_stats_diff_ptr->systime = network_stats_ptr->systime - network_stats_diff_ptr->systime;
290                  }else{
291                          
292                          network_stats_ptr=network_stats;
293                          for(y=0;y<ifaces;y++){
294                                  if((strcmp(network_stats_diff_ptr->interface_name, network_stats_ptr->interface_name))==0){
295 <                                        network_stats_diff_ptr->tx = network_stats_ptr->tx - network_stats_diff_ptr->tx;
296 <                                        network_stats_diff_ptr->rx = network_stats_ptr->rx - network_stats_diff_ptr->rx;        
295 >                                        network_stats_diff_ptr->tx = transfer_diff(network_stats_ptr->tx, network_stats_diff_ptr->tx);
296 >                                        network_stats_diff_ptr->rx = transfer_diff(network_stats_ptr->rx, network_stats_diff_ptr->rx);  
297                                          network_stats_diff_ptr->systime = network_stats_ptr->systime - network_stats_diff_ptr->systime;
298                                          break;
299                                  }

Diff Legend

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