Commit a4ea5d43 authored by David Ahern's avatar David Ahern Committed by David S. Miller

ipv4: Add support to fib_config for IPv6 gateway

Add support for an IPv6 gateway to fib_config. Since a gateway is either
IPv4 or IPv6, make it a union with fc_gw4 where fc_gw_family decides
which address is in use. Update current checks on family and gw4 to
handle ipv6 as well.
Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Reviewed-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0f5f7d7b
...@@ -36,7 +36,10 @@ struct fib_config { ...@@ -36,7 +36,10 @@ struct fib_config {
/* 2 bytes unused */ /* 2 bytes unused */
u32 fc_table; u32 fc_table;
__be32 fc_dst; __be32 fc_dst;
__be32 fc_gw4; union {
__be32 fc_gw4;
struct in6_addr fc_gw6;
};
int fc_oif; int fc_oif;
u32 fc_flags; u32 fc_flags;
u32 fc_priority; u32 fc_priority;
......
...@@ -276,7 +276,7 @@ static inline int nh_comp(const struct fib_info *fi, const struct fib_info *ofi) ...@@ -276,7 +276,7 @@ static inline int nh_comp(const struct fib_info *fi, const struct fib_info *ofi)
for_nexthops(fi) { for_nexthops(fi) {
if (nh->fib_nh_oif != onh->fib_nh_oif || if (nh->fib_nh_oif != onh->fib_nh_oif ||
nh->fib_nh_gw4 != onh->fib_nh_gw4 || nh->fib_nh_gw_family != onh->fib_nh_gw_family ||
nh->fib_nh_scope != onh->fib_nh_scope || nh->fib_nh_scope != onh->fib_nh_scope ||
#ifdef CONFIG_IP_ROUTE_MULTIPATH #ifdef CONFIG_IP_ROUTE_MULTIPATH
nh->fib_nh_weight != onh->fib_nh_weight || nh->fib_nh_weight != onh->fib_nh_weight ||
...@@ -287,6 +287,15 @@ static inline int nh_comp(const struct fib_info *fi, const struct fib_info *ofi) ...@@ -287,6 +287,15 @@ static inline int nh_comp(const struct fib_info *fi, const struct fib_info *ofi)
lwtunnel_cmp_encap(nh->fib_nh_lws, onh->fib_nh_lws) || lwtunnel_cmp_encap(nh->fib_nh_lws, onh->fib_nh_lws) ||
((nh->fib_nh_flags ^ onh->fib_nh_flags) & ~RTNH_COMPARE_MASK)) ((nh->fib_nh_flags ^ onh->fib_nh_flags) & ~RTNH_COMPARE_MASK))
return -1; return -1;
if (nh->fib_nh_gw_family == AF_INET &&
nh->fib_nh_gw4 != onh->fib_nh_gw4)
return -1;
if (nh->fib_nh_gw_family == AF_INET6 &&
ipv6_addr_cmp(&nh->fib_nh_gw6, &onh->fib_nh_gw6))
return -1;
onh++; onh++;
} endfor_nexthops(fi); } endfor_nexthops(fi);
return 0; return 0;
...@@ -511,10 +520,12 @@ int fib_nh_init(struct net *net, struct fib_nh *nh, ...@@ -511,10 +520,12 @@ int fib_nh_init(struct net *net, struct fib_nh *nh,
goto init_failure; goto init_failure;
nh->fib_nh_oif = cfg->fc_oif; nh->fib_nh_oif = cfg->fc_oif;
if (cfg->fc_gw_family == AF_INET) { nh->fib_nh_gw_family = cfg->fc_gw_family;
if (cfg->fc_gw_family == AF_INET)
nh->fib_nh_gw4 = cfg->fc_gw4; nh->fib_nh_gw4 = cfg->fc_gw4;
nh->fib_nh_gw_family = AF_INET; else if (cfg->fc_gw_family == AF_INET6)
} nh->fib_nh_gw6 = cfg->fc_gw6;
nh->fib_nh_flags = cfg->fc_flags; nh->fib_nh_flags = cfg->fc_flags;
#ifdef CONFIG_IP_ROUTE_CLASSID #ifdef CONFIG_IP_ROUTE_CLASSID
...@@ -621,9 +632,11 @@ static int fib_get_nhs(struct fib_info *fi, struct rtnexthop *rtnh, ...@@ -621,9 +632,11 @@ static int fib_get_nhs(struct fib_info *fi, struct rtnexthop *rtnh,
if (cfg->fc_gw_family) { if (cfg->fc_gw_family) {
if (cfg->fc_gw_family != fi->fib_nh->fib_nh_gw_family || if (cfg->fc_gw_family != fi->fib_nh->fib_nh_gw_family ||
(cfg->fc_gw_family == AF_INET && (cfg->fc_gw_family == AF_INET &&
fi->fib_nh->fib_nh_gw4 != cfg->fc_gw4)) { fi->fib_nh->fib_nh_gw4 != cfg->fc_gw4) ||
(cfg->fc_gw_family == AF_INET6 &&
ipv6_addr_cmp(&fi->fib_nh->fib_nh_gw6, &cfg->fc_gw6))) {
NL_SET_ERR_MSG(extack, NL_SET_ERR_MSG(extack,
"Nexthop gateway does not match RTA_GATEWAY"); "Nexthop gateway does not match RTA_GATEWAY or RTA_VIA");
goto errout; goto errout;
} }
} }
...@@ -745,6 +758,10 @@ int fib_nh_match(struct fib_config *cfg, struct fib_info *fi, ...@@ -745,6 +758,10 @@ int fib_nh_match(struct fib_config *cfg, struct fib_info *fi,
cfg->fc_gw4 != fi->fib_nh->fib_nh_gw4) cfg->fc_gw4 != fi->fib_nh->fib_nh_gw4)
return 1; return 1;
if (cfg->fc_gw_family == AF_INET6 &&
ipv6_addr_cmp(&cfg->fc_gw6, &fi->fib_nh->fib_nh_gw6))
return 1;
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment