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

Handle default hoplimit 

Default for hoplimit is -1 which should be displayed as zero.
This commit is contained in:
Stephen Hemminger 2009-03-23 10:49:21 -07:00
parent ace9c96121
commit ced61d7dc4
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ip/iproute.c
View File

@ -493,6 +493,8 @@ int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
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++) {
unsigned val;
if (mxrta[i] == NULL) if (mxrta[i] == NULL)
continue; continue;
if (!hz) if (!hz)
@ -505,21 +507,31 @@ int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
if (mxlock & (1<<i)) if (mxlock & (1<<i))
fprintf(fp, " lock"); fprintf(fp, " lock");
if (i != RTAX_RTT && i != RTAX_RTTVAR && val = *(unsigned*)RTA_DATA(mxrta[i]);
i != RTAX_RTO_MIN) switch (i) {
fprintf(fp, " %u", *(unsigned*)RTA_DATA(mxrta[i])); case RTAX_HOPLIMIT:
else { if ((long)val == -1)
unsigned long long val = *(unsigned*)RTA_DATA(mxrta[i]); val = 0;
/* fall through */
default:
fprintf(fp, " %u", val);
break;
case RTAX_RTT:
case RTAX_RTTVAR:
case RTAX_RTO_MIN:
val *= 1000; val *= 1000;
if (i == RTAX_RTT) if (i == RTAX_RTT)
val /= 8; val /= 8;
else if (i == RTAX_RTTVAR) else if (i == RTAX_RTTVAR)
val /= 4; val /= 4;
if (val >= hz) if (val >= hz)
fprintf(fp, " %llums", val/hz); fprintf(fp, " %llums",
(unsigned long long) val / hz);
else else
fprintf(fp, " %.2fms", (float)val/hz); fprintf(fp, " %.2fms",
(double)val / hz);
} }
} }
} }