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

Cleanup mx_names table 

use C99 initialization to match rtnetlink.h
This commit is contained in:
Stephen Hemminger 2006-08-04 10:49:51 -07:00
parent f649f5925a
commit f38c733409
1 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ip/iproute.c
View File

@ -39,6 +39,19 @@
#endif #endif
static const char *mx_names[RTAX_MAX+1] = {
[RTAX_MTU] = "mtu",
[RTAX_WINDOW] = "window",
[RTAX_RTT] = "rtt",
[RTAX_RTTVAR] = "rttvar",
[RTAX_SSTHRESH] = "ssthresh",
[RTAX_CWND] = "cwnd",
[RTAX_ADVMSS] = "advmss",
[RTAX_REORDERING]="reordering",
[RTAX_HOPLIMIT] = "hoplimit",
[RTAX_INITCWND] = "initcwnd",
[RTAX_FEATURES] = "features",
};
static void usage(void) __attribute__((noreturn)); static void usage(void) __attribute__((noreturn));
static void usage(void) static void usage(void)
@ -486,30 +499,7 @@ int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
if (mxrta[RTAX_LOCK]) if (mxrta[RTAX_LOCK])
mxlock = *(unsigned*)RTA_DATA(mxrta[RTAX_LOCK]); mxlock = *(unsigned*)RTA_DATA(mxrta[RTAX_LOCK]);
for (i=2; i<=RTAX_MAX; i++) { for (i=2; i<= RTAX_MAX; i++) {
/*
* "hoplimit" and "features" are not supported in
* userspace yet, but they are present in kernel's
* RTM_METRICS array in include/linux/rtnetlink.h,
* so putting placeholders in here for now so we
* can match the position of initcwnd in this
* structure: */
static char *mx_names[] =
{
"mtu",
"window",
"rtt",
"rttvar",
"ssthresh",
"cwnd",
"advmss",
"reordering",
"hoplimit",
"initcwnd",
"features",
};
static int hz; static int hz;
if (mxrta[i] == NULL) if (mxrta[i] == NULL)
continue; continue;