summaryrefslogtreecommitdiff
path: root/zebra/interface.h
diff options
context:
space:
mode:
authorAvneesh Sachdev <avneesh@opensourcerouting.org>2012-04-09 00:25:15 -0700
committerAvneesh Sachdev <avneesh@opensourcerouting.org>2012-04-09 00:25:15 -0700
commit3cf6c2b4e43f44a977d218c96c26250654ae333e (patch)
treee017cde2015fbf3ef6c250327428d7c6152aa8f7 /zebra/interface.h
parent01d7ff0a2166a422c56bd26f04fc22832a9e690b (diff)
parente96b312150d8e376c1ef463793d1929eca3618d5 (diff)
Merge branch 'quagga' into google-bgp-multipath
Conflicts: bgpd/bgp_route.c
Diffstat (limited to 'zebra/interface.h')
-rw-r--r--zebra/interface.h17
1 files changed, 8 insertions, 9 deletions
diff --git a/zebra/interface.h b/zebra/interface.h
index 0cf66403..0777a2fa 100644
--- a/zebra/interface.h
+++ b/zebra/interface.h
@@ -46,7 +46,7 @@
#endif
#ifdef RTADV
-/* Router advertisement parameter. From RFC2461, RFC3775 and RFC4191. */
+/* Router advertisement parameter. From RFC4861, RFC6275 and RFC4191. */
struct rtadvconf
{
/* A flag indicating whether or not the router sends periodic Router
@@ -56,8 +56,8 @@ struct rtadvconf
/* The maximum time allowed between sending unsolicited multicast
Router Advertisements from the interface, in milliseconds.
- MUST be no less than 70 ms (RFC3775, section 7.4) and no greater
- than 1800000 ms (See RFC2461).
+ MUST be no less than 70 ms [RFC6275 7.5] and no greater
+ than 1800000 ms [RFC4861 6.2.1].
Default: 600000 milliseconds */
int MaxRtrAdvInterval;
@@ -65,11 +65,11 @@ struct rtadvconf
/* The minimum time allowed between sending unsolicited multicast
Router Advertisements from the interface, in milliseconds.
- MUST be no less than 30 ms (See RFC3775, section 7.4).
+ MUST be no less than 30 ms [RFC6275 7.5].
MUST be no greater than .75 * MaxRtrAdvInterval.
Default: 0.33 * MaxRtrAdvInterval */
- int MinRtrAdvInterval;
+ int MinRtrAdvInterval; /* This field is currently unused. */
#define RTADV_MIN_RTR_ADV_INTERVAL (0.33 * RTADV_MAX_RTR_ADV_INTERVAL)
/* Unsolicited Router Advertisements' interval timer. */
@@ -131,8 +131,7 @@ struct rtadvconf
Default: 3 * MaxRtrAdvInterval */
int AdvDefaultLifetime;
-#define RTADV_ADV_DEFAULT_LIFETIME (3 * RTADV_MAX_RTR_ADV_INTERVAL)
-
+#define RTADV_MAX_RTRLIFETIME 9000 /* 2.5 hours */
/* A list of prefixes to be placed in Prefix Information options in
Router Advertisement messages sent from the interface.
@@ -144,7 +143,7 @@ struct rtadvconf
struct list *AdvPrefixList;
/* The TRUE/FALSE value to be placed in the "Home agent"
- flag field in the Router Advertisement. See [RFC3775 7.1].
+ flag field in the Router Advertisement. See [RFC6275 7.1].
Default: FALSE */
int AdvHomeAgentFlag;
@@ -167,7 +166,7 @@ struct rtadvconf
#define RTADV_MAX_HALIFETIME 65520 /* 18.2 hours */
/* The TRUE/FALSE value to insert or not an Advertisement Interval
- option. See [RFC 3775 7.3]
+ option. See [RFC 6275 7.3]
Default: FALSE */
int AdvIntervalOption;