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.8 by pajs, Tue Mar 11 16:16:20 2003 UTC vs.
Revision 1.23 by tdb, Mon Jan 19 16:49:21 2004 UTC

# Line 1 | Line 1
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-2004 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
8 < * as published by the Free Software Foundation; either version 2
9 < * of the License, or (at your option) any later version.
6 > * This library is free software; you can redistribute it and/or
7 > * modify it under the terms of the GNU Lesser General Public
8 > * License as published by the Free Software Foundation; either
9 > * version 2.1 of the License, or (at your option) any later version.
10   *
11 < * This program is distributed in the hope that it will be useful,
11 > * This library is distributed in the hope that it will be useful,
12   * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 < * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14 < * GNU General Public License for more details.
13 > * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
14 > * Lesser General Public License for more details.
15   *
16 < * You should have received a copy of the GNU General Public License
17 < * along with this program; if not, write to the Free Software
18 < * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
16 > * You should have received a copy of the GNU Lesser General Public
17 > * License along with this library; if not, write to the Free Software
18 > * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
19 > * 02111-1307 USA
20 > *
21 > * $Id$
22   */
23  
24   #ifdef HAVE_CONFIG_H
# Line 25 | Line 28
28   #include <stdlib.h>
29   #include <string.h>
30   #include "statgrab.h"
31 < #include "time.h"
31 > #include <time.h>
32   #ifdef SOLARIS
33   #include <kstat.h>
34   #include <sys/sysinfo.h>
# Line 36 | Line 39
39   #include <regex.h>
40   #include "tools.h"
41   #endif
42 + #ifdef ALLBSD
43 + #include <sys/types.h>
44 + #include <sys/socket.h>
45 + #include <ifaddrs.h>
46 + #include <net/if.h>
47 + #endif
48  
49   static network_stat_t *network_stats=NULL;
50   static int interfaces=0;
# Line 90 | Line 99 | network_stat_t *get_network_stats(int *entries){
99  
100   #ifdef LINUX
101          FILE *f;
102 <        /* Horrible big enough, but it should be quite easily */
102 >        /* Horrible big enough, but it should be easily big enough */
103          char line[8096];
104          regex_t regex;
105          regmatch_t line_match[4];
106   #endif
107 + #ifdef ALLBSD
108 +        struct ifaddrs *net, *net_ptr;
109 +        struct if_data *net_data;
110 + #endif
111  
112 + #ifdef ALLBSD
113 +        if(getifaddrs(&net) != 0){
114 +                return NULL;
115 +        }
116 +
117 +        interfaces=0;
118 +        
119 +        for(net_ptr=net;net_ptr!=NULL;net_ptr=net_ptr->ifa_next){
120 +                if(net_ptr->ifa_addr->sa_family != AF_LINK) continue;
121 +                network_stats=network_stat_malloc((interfaces+1), &sizeof_network_stats, network_stats);
122 +                if(network_stats==NULL){
123 +                        return NULL;
124 +                }
125 +                network_stat_ptr=network_stats+interfaces;
126 +                
127 +                if(network_stat_ptr->interface_name!=NULL) free(network_stat_ptr->interface_name);
128 +                network_stat_ptr->interface_name=strdup(net_ptr->ifa_name);
129 +                if(network_stat_ptr->interface_name==NULL) return NULL;
130 +                net_data=(struct if_data *)net_ptr->ifa_data;
131 +                network_stat_ptr->rx=net_data->ifi_ibytes;
132 +                network_stat_ptr->tx=net_data->ifi_obytes;                      
133 +                network_stat_ptr->systime=time(NULL);
134 +                interfaces++;
135 +        }
136 +        freeifaddrs(net);      
137 + #endif
138 +
139   #ifdef SOLARIS
140          if ((kc = kstat_open()) == NULL) {
141                  return NULL;
# Line 183 | Line 223 | network_stat_t *get_network_stats(int *entries){
223  
224                  interfaces++;
225          }
226 +        fclose(f);
227 +        regfree(&regex);
228  
229   #endif
230 +
231 + #ifdef CYGWIN
232 +        return NULL;
233 + #endif
234 +
235          *entries=interfaces;
236  
237          return network_stats;  
238   }
239  
240   long long transfer_diff(long long new, long long old){
241 < #ifdef SOL7
242 < #define MAXVAL 4294967296
241 > #if defined(SOL7) || defined(LINUX) || defined(FREEBSD)
242 > #define MAXVAL 4294967296LL
243   #else
244 < #define MAXVAL 18446744073709551616
244 > #define MAXVAL 18446744073709551616LL
245   #endif
246          long long result;
247 <        if(new>old){
247 >        if(new>=old){
248                  result = (new-old);
249          }else{
250                  result = (MAXVAL+(new-old));
# Line 240 | Line 287 | network_stat_t *get_network_stats_diff(int *entries){
287                  network_stats_diff_ptr++;
288          }
289          network_stats_ptr=get_network_stats(&ifaces);          
290 +        if (network_stats_ptr == NULL) {
291 +                return NULL;
292 +        }
293          network_stats_diff_ptr=network_stats_diff;
294  
295          for(x=0;x<sizeof_net_stats_diff;x++){
296  
297                  if((strcmp(network_stats_diff_ptr->interface_name, network_stats_ptr->interface_name))==0){
298 <                        network_stats_diff_ptr->tx = network_stats_ptr->tx - network_stats_diff_ptr->tx;
299 <                        network_stats_diff_ptr->rx = network_stats_ptr->rx - network_stats_diff_ptr->rx;        
298 >                        network_stats_diff_ptr->tx = transfer_diff(network_stats_ptr->tx, network_stats_diff_ptr->tx);
299 >                        network_stats_diff_ptr->rx = transfer_diff(network_stats_ptr->rx, network_stats_diff_ptr->rx);
300                          network_stats_diff_ptr->systime = network_stats_ptr->systime - network_stats_diff_ptr->systime;
301                  }else{
302                          
303                          network_stats_ptr=network_stats;
304                          for(y=0;y<ifaces;y++){
305                                  if((strcmp(network_stats_diff_ptr->interface_name, network_stats_ptr->interface_name))==0){
306 <                                        network_stats_diff_ptr->tx = network_stats_ptr->tx - network_stats_diff_ptr->tx;
307 <                                        network_stats_diff_ptr->rx = network_stats_ptr->rx - network_stats_diff_ptr->rx;        
306 >                                        network_stats_diff_ptr->tx = transfer_diff(network_stats_ptr->tx, network_stats_diff_ptr->tx);
307 >                                        network_stats_diff_ptr->rx = transfer_diff(network_stats_ptr->rx, network_stats_diff_ptr->rx);  
308                                          network_stats_diff_ptr->systime = network_stats_ptr->systime - network_stats_diff_ptr->systime;
309                                          break;
310                                  }

Diff Legend

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