Page MenuHomeFreeBSD

D55448.1795033796.diff
No OneTemporary

Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None

D55448.1795033796.diff

diff --git a/usr.sbin/rtadvd/config.c b/usr.sbin/rtadvd/config.c
--- a/usr.sbin/rtadvd/config.c
+++ b/usr.sbin/rtadvd/config.c
@@ -1021,12 +1021,15 @@
} else {
struct rdnss *rdn;
struct dnssl *dns;
+ struct rtinfo *rti;
rai_old->rai_lifetime = 0;
TAILQ_FOREACH(rdn, &rai_old->rai_rdnss, rd_next)
rdn->rd_ltime = 0;
TAILQ_FOREACH(dns, &rai_old->rai_dnssl, dn_next)
dns->dn_ltime = 0;
+ TAILQ_FOREACH(rti, &rai_old->rai_route, rti_next)
+ rti->rti_ltime = 0;
ifi->ifi_rainfo_trans = rai_old;
ifi->ifi_state = IFI_STATE_TRANSITIVE;
diff --git a/usr.sbin/rtadvd/rtadvd.c b/usr.sbin/rtadvd/rtadvd.c
--- a/usr.sbin/rtadvd/rtadvd.c
+++ b/usr.sbin/rtadvd/rtadvd.c
@@ -138,6 +138,7 @@
#define NDOPT_FLAG_RDNSS (1 << 5)
#define NDOPT_FLAG_DNSSL (1 << 6)
#define NDOPT_FLAG_PREF64 (1 << 7)
+#define NDOPT_FLAG_ROUTEINFO (1 << 8)
static uint32_t ndopt_flags[] = {
[ND_OPT_SOURCE_LINKADDR] = NDOPT_FLAG_SRCLINKADDR,
@@ -148,6 +149,7 @@
[ND_OPT_RDNSS] = NDOPT_FLAG_RDNSS,
[ND_OPT_DNSSL] = NDOPT_FLAG_DNSSL,
[ND_OPT_PREF64] = NDOPT_FLAG_PREF64,
+ [ND_OPT_ROUTE_INFO] = NDOPT_FLAG_ROUTEINFO,
};
static void rtadvd_shutdown(void);
@@ -372,6 +374,7 @@
struct rainfo *rai;
struct rdnss *rdn;
struct dnssl *dns;
+ struct rtinfo *rti;
if (wait_shutdown) {
syslog(LOG_INFO,
@@ -416,6 +419,8 @@
rdn->rd_ltime = 0;
TAILQ_FOREACH(dns, &rai->rai_dnssl, dn_next)
dns->dn_ltime = 0;
+ TAILQ_FOREACH(rti, &rai->rai_route, rti_next)
+ rti->rti_ltime = 0;
}
TAILQ_FOREACH(ifi, &ifilist, ifi_next) {
if (!ifi->ifi_persist)
@@ -1085,7 +1090,8 @@
error = nd6_options((struct nd_opt_hdr *)(nra + 1),
len - sizeof(struct nd_router_advert), &ndopts,
NDOPT_FLAG_SRCLINKADDR | NDOPT_FLAG_PREFIXINFO | NDOPT_FLAG_MTU |
- NDOPT_FLAG_RDNSS | NDOPT_FLAG_DNSSL | NDOPT_FLAG_PREF64);
+ NDOPT_FLAG_RDNSS | NDOPT_FLAG_DNSSL | NDOPT_FLAG_PREF64 |
+ NDOPT_FLAG_ROUTEINFO);
if (error) {
syslog(LOG_INFO,
"<%s> ND option check failed for an RA from %s on %s",
@@ -1418,7 +1424,8 @@
if (hdr->nd_opt_type > ND_OPT_MTU &&
hdr->nd_opt_type != ND_OPT_RDNSS &&
hdr->nd_opt_type != ND_OPT_DNSSL &&
- hdr->nd_opt_type != ND_OPT_PREF64) {
+ hdr->nd_opt_type != ND_OPT_PREF64 &&
+ hdr->nd_opt_type != ND_OPT_ROUTE_INFO) {
syslog(LOG_INFO, "<%s> unknown ND option(type %d)",
__func__, hdr->nd_opt_type);
continue;
@@ -1452,6 +1459,11 @@
case ND_OPT_PREFIX_INFORMATION:
if (optlen == sizeof(struct nd_opt_prefix_info))
break;
+ goto skip;
+ case ND_OPT_ROUTE_INFO:
+ if (optlen >= 8 && optlen <= 24 &&
+ (optlen - sizeof(struct nd_opt_route_info)) % 8 == 0)
+ break;
skip:
syslog(LOG_INFO, "<%s> invalid option length",
__func__);
@@ -1464,6 +1476,7 @@
case ND_OPT_RDNSS:
case ND_OPT_DNSSL:
case ND_OPT_PREF64:
+ case ND_OPT_ROUTE_INFO:
break; /* we don't care about these options */
case ND_OPT_SOURCE_LINKADDR:
case ND_OPT_MTU:

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 18, 8:29 PM (31 m, 18 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41829715
Default Alt Text
D55448.1795033796.diff (2 KB)

Event Timeline