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.13 by pajs, Mon Mar 31 13:24:12 2003 UTC vs.
Revision 1.22 by tdb, Fri Jan 16 15:54:54 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  
22   #ifdef HAVE_CONFIG_H
# Line 36 | Line 37
37   #include <regex.h>
38   #include "tools.h"
39   #endif
40 + #ifdef ALLBSD
41 + #include <sys/types.h>
42 + #include <sys/socket.h>
43 + #include <ifaddrs.h>
44 + #include <net/if.h>
45 + #endif
46  
47   static network_stat_t *network_stats=NULL;
48   static int interfaces=0;
# Line 95 | Line 102 | network_stat_t *get_network_stats(int *entries){
102          regex_t regex;
103          regmatch_t line_match[4];
104   #endif
105 + #ifdef ALLBSD
106 +        struct ifaddrs *net, *net_ptr;
107 +        struct if_data *net_data;
108 + #endif
109  
110 + #ifdef ALLBSD
111 +        if(getifaddrs(&net) != 0){
112 +                return NULL;
113 +        }
114 +
115 +        interfaces=0;
116 +        
117 +        for(net_ptr=net;net_ptr!=NULL;net_ptr=net_ptr->ifa_next){
118 +                if(net_ptr->ifa_addr->sa_family != AF_LINK) continue;
119 +                network_stats=network_stat_malloc((interfaces+1), &sizeof_network_stats, network_stats);
120 +                if(network_stats==NULL){
121 +                        return NULL;
122 +                }
123 +                network_stat_ptr=network_stats+interfaces;
124 +                
125 +                if(network_stat_ptr->interface_name!=NULL) free(network_stat_ptr->interface_name);
126 +                network_stat_ptr->interface_name=strdup(net_ptr->ifa_name);
127 +                if(network_stat_ptr->interface_name==NULL) return NULL;
128 +                net_data=(struct if_data *)net_ptr->ifa_data;
129 +                network_stat_ptr->rx=net_data->ifi_ibytes;
130 +                network_stat_ptr->tx=net_data->ifi_obytes;                      
131 +                network_stat_ptr->systime=time(NULL);
132 +                interfaces++;
133 +        }
134 +        freeifaddrs(net);      
135 + #endif
136 +
137   #ifdef SOLARIS
138          if ((kc = kstat_open()) == NULL) {
139                  return NULL;
# Line 187 | Line 225 | network_stat_t *get_network_stats(int *entries){
225          regfree(&regex);
226  
227   #endif
228 +
229 + #ifdef CYGWIN
230 +        return NULL;
231 + #endif
232 +
233          *entries=interfaces;
234  
235          return network_stats;  
236   }
237  
238   long long transfer_diff(long long new, long long old){
239 < #ifdef SOL7
240 < #define MAXVAL 4294967296
239 > #if defined(SOL7) || defined(LINUX) || defined(FREEBSD)
240 > #define MAXVAL 4294967296LL
241   #else
242 < #define MAXVAL 18446744073709551616
242 > #define MAXVAL 18446744073709551616LL
243   #endif
244          long long result;
245          if(new>=old){
# Line 242 | Line 285 | network_stat_t *get_network_stats_diff(int *entries){
285                  network_stats_diff_ptr++;
286          }
287          network_stats_ptr=get_network_stats(&ifaces);          
288 +        if (network_stats_ptr == NULL) {
289 +                return NULL;
290 +        }
291          network_stats_diff_ptr=network_stats_diff;
292  
293          for(x=0;x<sizeof_net_stats_diff;x++){

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines