proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-16 06:53:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

2005-04-02 Andrew J. Schorr <ajschorr@alumni.princeton.edu>

Browse Source 
* ospf6_route.c: (ospf6_route_show, ospf6_route_show_detail) Protect
	  against the possibility that the string returned by if_indextoname
	  may not terminate with '\0'.
This commit is contained in:
ajs 2005-04-02 16:37:07 +00:00
parent 3cb98dee90
commit 3b7b814c83
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ospf6d/ChangeLog
View File

@ -1,3 +1,9 @@
2005-04-02 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* ospf6_route.c: (ospf6_route_show, ospf6_route_show_detail) Protect
against the possibility that the string returned by if_indextoname
may not terminate with '\0'.
2005-03-02 Vincent Jardin <Vincent.Jardin@6wind.com> 2005-03-02 Vincent Jardin <Vincent.Jardin@6wind.com>
* ospf6_zebra.c: Fix core dump when router-id is provided with * ospf6_zebra.c: Fix core dump when router-id is provided with

10
ospf6d/ospf6_route.c
View File

@ -647,11 +647,11 @@ ospf6_route_show (struct vty *vty, struct ospf6_route *route)
if (! if_indextoname (route->nexthop[0].ifindex, ifname)) if (! if_indextoname (route->nexthop[0].ifindex, ifname))
snprintf (ifname, sizeof (ifname), "%d", route->nexthop[0].ifindex); snprintf (ifname, sizeof (ifname), "%d", route->nexthop[0].ifindex);
vty_out (vty, "%c%1s %2s %-30s %-25s %6s %s%s", vty_out (vty, "%c%1s %2s %-30s %-25s %6.*s %s%s",
(ospf6_route_is_best (route) ? '*' : ' '), (ospf6_route_is_best (route) ? '*' : ' '),
OSPF6_DEST_TYPE_SUBSTR (route->type), OSPF6_DEST_TYPE_SUBSTR (route->type),
OSPF6_PATH_TYPE_SUBSTR (route->path.type), OSPF6_PATH_TYPE_SUBSTR (route->path.type),
destination, nexthop, ifname, duration, VNL); destination, nexthop, IFNAMSIZ, ifname, duration, VNL);
for (i = 1; ospf6_nexthop_is_set (&route->nexthop[i]) && for (i = 1; ospf6_nexthop_is_set (&route->nexthop[i]) &&
i < OSPF6_MULTI_PATH_LIMIT; i++) i < OSPF6_MULTI_PATH_LIMIT; i++)
@ -662,8 +662,8 @@ ospf6_route_show (struct vty *vty, struct ospf6_route *route)
if (! if_indextoname (route->nexthop[i].ifindex, ifname)) if (! if_indextoname (route->nexthop[i].ifindex, ifname))
snprintf (ifname, sizeof (ifname), "%d", route->nexthop[i].ifindex); snprintf (ifname, sizeof (ifname), "%d", route->nexthop[i].ifindex);
vty_out (vty, "%c%1s %2s %-30s %-25s %6s %s%s", vty_out (vty, "%c%1s %2s %-30s %-25s %6.*s %s%s",
' ', "", "", "", nexthop, ifname, "", VNL); ' ', "", "", "", nexthop, IFNAMSIZ, ifname, "", VNL);
} }
} }
@ -758,7 +758,7 @@ ospf6_route_show_detail (struct vty *vty, struct ospf6_route *route)
sizeof (nexthop)); sizeof (nexthop));
if (! if_indextoname (route->nexthop[i].ifindex, ifname)) if (! if_indextoname (route->nexthop[i].ifindex, ifname))
snprintf (ifname, sizeof (ifname), "%d", route->nexthop[i].ifindex); snprintf (ifname, sizeof (ifname), "%d", route->nexthop[i].ifindex);
vty_out (vty, " %s %s%s", nexthop, ifname, VNL); vty_out (vty, " %s %.*s%s", nexthop, IFNAMSIZ, ifname, VNL);
} }
vty_out (vty, "%s", VNL); vty_out (vty, "%s", VNL);
} }