matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use correct rt_link_statistics 

In recent kernels, net_device_stats is not exposed and the code
shoulf have used rt_link_statistics.  Also, fix use of sprintf
with user supplied value.
This commit is contained in:
Stephen Hemminger 2010-08-23 09:13:05 -07:00
parent b0373bfbbc
commit daf7bd5c73
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
misc/ifstat.c
View File

@ -29,7 +29,8 @@
#include <getopt.h> #include <getopt.h>
#include <libnetlink.h> #include <libnetlink.h>
#include <linux/netdevice.h> #include <linux/if.h>
#include <linux/if_link.h>
#include <SNAPSHOT.h> #include <SNAPSHOT.h>
@ -48,7 +49,7 @@ int npatterns;
char info_source[128]; char info_source[128];
int source_mismatch; int source_mismatch;
#define MAXS (sizeof(struct net_device_stats)/sizeof(unsigned long)) #define MAXS (sizeof(struct rtnl_link_stats)/sizeof(unsigned long))
struct ifstat_ent struct ifstat_ent
{ {
@ -677,9 +678,11 @@ int main(int argc, char *argv[])
npatterns = argc; npatterns = argc;
if (getenv("IFSTAT_HISTORY")) if (getenv("IFSTAT_HISTORY"))
snprintf(hist_name, sizeof(hist_name), getenv("IFSTAT_HISTORY")); snprintf(hist_name, sizeof(hist_name),
"%s", getenv("IFSTAT_HISTORY"));
else else
sprintf(hist_name, "%s/.ifstat.u%d", P_tmpdir, getuid()); snprintf(hist_name, sizeof(hist_name),
"%s/.ifstat.u%d", P_tmpdir, getuid());
if (reset_history) if (reset_history)
unlink(hist_name); unlink(hist_name);