Page MenuHomeFreeBSD
Files F98021467

D46796.diff
No OneTemporary
Actions

D46796.diff
View Options

diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c
--- a/sys/netlink/route/rt.c
+++ b/sys/netlink/route/rt.c
@@ -468,6 +468,7 @@
struct nl_parsed_route {
struct sockaddr *rta_dst;
struct sockaddr *rta_gw;
+ struct sockaddr *rta_prefsrc;
struct ifnet *rta_oif;
struct rta_mpath *rta_multipath;
uint32_t rta_table;
@@ -494,6 +495,7 @@
{ .type = NL_RTA_DST, .off = _OUT(rta_dst), .cb = nlattr_get_ip },
{ .type = NL_RTA_OIF, .off = _OUT(rta_oif), .cb = nlattr_get_ifp },
{ .type = NL_RTA_GATEWAY, .off = _OUT(rta_gw), .cb = nlattr_get_ip },
+ { .type = NL_RTA_PREFSRC, .off = _OUT(rta_prefsrc), .cb = nlattr_get_ip },
{ .type = NL_RTA_METRICS, .arg = &metrics_parser, .cb = nlattr_get_nested },
{ .type = NL_RTA_MULTIPATH, .off = _OUT(rta_multipath), .cb = nlattr_get_multipath },
{ .type = NL_RTA_WEIGHT, .off = _OUT(rta_weight), .cb = nlattr_get_uint32 },
@@ -826,6 +828,15 @@
if (attrs->rtm_protocol > RTPROT_STATIC)
nhop_set_origin(nh, attrs->rtm_protocol);
+ if (attrs->rta_prefsrc != NULL) {
+ struct ifaddr *ifa = ifa_ifwithaddr(attrs->rta_prefsrc);
+ if (ifa == NULL) {
+ nhop_free(nh);
+ return (EINVAL);
+ }
+ nhop_set_src(nh, ifa);
+ }
+
*pnh = finalize_nhop(nh, attrs->rta_dst, &error);
return (error);
@@ -914,6 +925,15 @@
/* TODO: return ENOTSUP for other types if strict option is set */
}
+ if (attrs->rta_prefsrc != NULL) {
+ struct ifaddr *ifa = ifa_ifwithaddr(attrs->rta_prefsrc);
+ if (ifa == NULL) {
+ *perror = EINVAL;
+ return (NULL);
+ }
+ nhop_set_src(nh, ifa);
+ }
+
nh = finalize_nhop(nh, attrs->rta_dst, perror);
}
@@ -947,6 +967,11 @@
return (EINVAL);
}
+ if (attrs.rta_prefsrc != NULL && ifa_ifwithaddr(attrs.rta_prefsrc) == NULL) {
+ NLMSG_REPORT_ERR_MSG(npt, "RTA_PREFSRC is not valid");
+ return (EINVAL);
+ }
+
if (attrs.rta_nh_id != 0) {
/* Referenced uindex */
int pxflag = get_pxflag(&attrs);

File Metadata

Mime Type
text/plain
Expires
Thu, Oct 3, 1:23 AM (1 h, 34 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
13339282
Default Alt Text
D46796.diff (1 KB)

Event Timeline