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

ip route: Make name of protocol 0 consistent 

iproute2 can inconsistently show the name of protocol 0 if a route with
a custom protocol is added. For example:
  dsa@cartman:~$ ip -6 ro ls table all | egrep 'proto none|proto unspec'
  local ::1 dev lo  table local  proto none  metric 0  pref medium
  local fe80::225:90ff:fecb:1c18 dev lo  table local  proto none  metric 0  pref medium
  local fe80::92e2:baff:fe5c:da5d dev lo  table local  proto none  metric 0  pref medium

protocol 0 is pretty printed as "none". Add a route with a custom protocol:
  dsa@cartman:~$ sudo ip -6 ro add  2001:db8:200::1/128 dev eth0 proto 123

And now display has switched from "none" to "unspec":
  dsa@cartman:~$ ip -6 ro ls table all | egrep 'proto none|proto unspec'
  local ::1 dev lo  table local  proto unspec  metric 0  pref medium
  local fe80::225:90ff:fecb:1c18 dev lo  table local  proto unspec  metric 0  pref medium
  local fe80::92e2:baff:fe5c:da5d dev lo  table local  proto unspec  metric 0  pref medium

The rt_protos file has the id to name mapping as "unspec" while
rtnl_rtprot_tab[0] has "none". The presence of a custom protocol id
triggers reading the rt_protos file and overwriting the string in
rtnl_rtprot_tab. All of this is logic from 2004 and earlier.

Update rtnl_rtprot_tab to "unspec" to match the enum value.

Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
This commit is contained in:
David Ahern 2017-02-13 12:21:53 -08:00 committed by Stephen Hemminger
parent 3cef95926b
commit 1ca2e08bd0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/rt_names.c
View File

@ -119,7 +119,7 @@ static void rtnl_tab_initialize(const char *file, char **tab, int size)
} }
static char *rtnl_rtprot_tab[256] = { static char *rtnl_rtprot_tab[256] = {
[RTPROT_UNSPEC] = "none", [RTPROT_UNSPEC] = "unspec",
[RTPROT_REDIRECT] = "redirect", [RTPROT_REDIRECT] = "redirect",
[RTPROT_KERNEL] = "kernel", [RTPROT_KERNEL] = "kernel",
[RTPROT_BOOT] = "boot", [RTPROT_BOOT] = "boot",