--- projects/libstatgrab/src/libstatgrab/network_stats.c 2004/03/06 21:49:13 1.47 +++ projects/libstatgrab/src/libstatgrab/network_stats.c 2004/03/06 21:56:23 1.48 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA * 02111-1307 USA * - * $Id: network_stats.c,v 1.47 2004/03/06 21:49:13 tdb Exp $ + * $Id: network_stats.c,v 1.48 2004/03/06 21:56:23 tdb Exp $ */ #ifdef HAVE_CONFIG_H @@ -230,7 +230,7 @@ network_stat_t *get_network_stats(int *entries){ fgets(line, sizeof(line), f); - if((regcomp(®ex, "^[[:space:]]*([^:]+):[[:space:]]*([[:digit:]]+)[[:space:]]+[[:digit:]]+[[:space:]]+[[:digit:]]+[[:space:]]+[[:digit:]]+[[:space:]]+[[:digit:]]+[[:space:]]+[[:digit:]]+[[:space:]]+[[:digit:]]+[[:space:]]+[[:digit:]]+[[:space:]]+([[:digit:]]+)", REG_EXTENDED))!=0){ + if((regcomp(®ex, "^[[:space:]]*([^:]+):[[:space:]]*([[:digit:]]+)[[:space:]]+([[:digit:]]+)[[:space:]]+([[:digit:]]+)[[:space:]]+[[:digit:]]+[[:space:]]+[[:digit:]]+[[:space:]]+[[:digit:]]+[[:space:]]+[[:digit:]]+[[:space:]]+[[:digit:]]+[[:space:]]+([[:digit:]]+)[[:space:]]+([[:digit:]]+)[[:space:]]+([[:digit:]]+)[[:space:]]+[[:digit:]]+[[:space:]]+[[:digit:]]+[[:space:]]+([[:digit:]]+)", REG_EXTENDED))!=0){ return NULL; } @@ -252,7 +252,12 @@ network_stat_t *get_network_stats(int *entries){ network_stat_ptr->interface_name=get_string_match(line, &line_match[1]); network_stat_ptr->rx=get_ll_match(line, &line_match[2]); - network_stat_ptr->tx=get_ll_match(line, &line_match[3]); + network_stat_ptr->tx=get_ll_match(line, &line_match[5]); + network_stat_ptr->ipackets=get_ll_match(line, &line_match[3]); + network_stat_ptr->opackets=get_ll_match(line, &line_match[6]); + network_stat_ptr->ierrors=get_ll_match(line, &line_match[4]); + network_stat_ptr->oerrors=get_ll_match(line, &line_match[7]); + network_stat_ptr->collisions=get_ll_match(line, &line_match[8]); network_stat_ptr->systime=time(NULL); interfaces++;