proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-09 05:58:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

When a route-map configuration is used to set the nexthop to a value, make

Browse Source 
sure that the value is acceptable. For example, if the route-map is setting
the IPv6 link-local nexthop, make sure the value is an IPv6 link-local
address.
This commit is contained in:
Donald Sharp 2015-06-11 09:19:59 -07:00
parent 3dd320810e
commit bf8b3d2762
3 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
bgpd/bgp_routemap.c
View File

@ -3633,7 +3633,14 @@ DEFUN (set_ip_nexthop,
ret = str2sockunion (argv[0], &su); ret = str2sockunion (argv[0], &su);
if (ret < 0) if (ret < 0)
{ {
vty_out (vty, "%% Malformed Next-hop address%s", VTY_NEWLINE); vty_out (vty, "%% Malformed nexthop address%s", VTY_NEWLINE);
return CMD_WARNING;
}
if (su.sin.sin_addr.s_addr == 0 ||
IPV4_CLASS_DE(su.sin.sin_addr.s_addr))
{
vty_out (vty, "%% nexthop address cannot be 0.0.0.0, multicast "
"or reserved%s", VTY_NEWLINE);
return CMD_WARNING; return CMD_WARNING;
} }
@ -4413,6 +4420,24 @@ DEFUN (set_ipv6_nexthop_global,
"IPv6 global address\n" "IPv6 global address\n"
"IPv6 address of next hop\n") "IPv6 address of next hop\n")
{ {
struct in6_addr addr;
int ret;
ret = inet_pton (AF_INET6, argv[0], &addr);
if (!ret)
{
vty_out (vty, "%% Malformed nexthop address%s", VTY_NEWLINE);
return CMD_WARNING;
}
if (IN6_IS_ADDR_UNSPECIFIED(&addr) ||
IN6_IS_ADDR_LOOPBACK(&addr) ||
IN6_IS_ADDR_MULTICAST(&addr) ||
IN6_IS_ADDR_LINKLOCAL(&addr))
{
vty_out (vty, "%% Invalid global nexthop address%s", VTY_NEWLINE);
return CMD_WARNING;
}
return bgp_route_set_add (vty, vty->index, "ipv6 next-hop global", argv[0]); return bgp_route_set_add (vty, vty->index, "ipv6 next-hop global", argv[0]);
} }
@ -4450,6 +4475,21 @@ DEFUN (set_ipv6_nexthop_local,
"IPv6 local address\n" "IPv6 local address\n"
"IPv6 address of next hop\n") "IPv6 address of next hop\n")
{ {
struct in6_addr addr;
int ret;
ret = inet_pton (AF_INET6, argv[0], &addr);
if (!ret)
{
vty_out (vty, "%% Malformed nexthop address%s", VTY_NEWLINE);
return CMD_WARNING;
}
if (!IN6_IS_ADDR_LINKLOCAL(&addr))
{
vty_out (vty, "%% Invalid link-local nexthop address%s", VTY_NEWLINE);
return CMD_WARNING;
}
return bgp_route_set_add (vty, vty->index, "ipv6 next-hop local", argv[0]); return bgp_route_set_add (vty, vty->index, "ipv6 next-hop local", argv[0]);
} }

7
ripd/rip_routemap.c
View File

@ -1044,6 +1044,13 @@ DEFUN (set_ip_nexthop,
vty_out (vty, "%% Malformed next-hop address%s", VTY_NEWLINE); vty_out (vty, "%% Malformed next-hop address%s", VTY_NEWLINE);
return CMD_WARNING; return CMD_WARNING;
} }
if (su.sin.sin_addr.s_addr == 0 ||
IPV4_CLASS_DE(su.sin.sin_addr.s_addr))
{
vty_out (vty, "%% nexthop address cannot be 0.0.0.0, multicast "
"or reserved%s", VTY_NEWLINE);
return CMD_WARNING;
}
return rip_route_set_add (vty, vty->index, "ip next-hop", argv[0]); return rip_route_set_add (vty, vty->index, "ip next-hop", argv[0]);
} }

6
ripngd/ripng_routemap.c
View File

@ -645,6 +645,12 @@ DEFUN (set_ipv6_nexthop_local,
return CMD_WARNING; return CMD_WARNING;
} }
if (!IN6_IS_ADDR_LINKLOCAL(&su.sin6.sin6_addr))
{
vty_out (vty, "%% Invalid link-local nexthop address%s", VTY_NEWLINE);
return CMD_WARNING;
}
return ripng_route_set_add (vty, vty->index, "ipv6 next-hop local", argv[0]); return ripng_route_set_add (vty, vty->index, "ipv6 next-hop local", argv[0]);
} }