diff --git a/proto/ospf/config.Y b/proto/ospf/config.Y index 177c926f..5b4f1acc 100644 --- a/proto/ospf/config.Y +++ b/proto/ospf/config.Y @@ -37,7 +37,7 @@ ospf_proto_start: proto_start OSPF { this_proto = proto_config_new(&proto_ospf, sizeof(struct ospf_config)); this_proto->preference = DEF_PREF_OSPF; init_list(&OSPF_CFG->area_list); - OSPF_CFG->rfc1583=1; + OSPF_CFG->rfc1583 = DEFAULT_RFC1583; } ; @@ -56,7 +56,7 @@ ospf_area_start: AREA idval '{' { this_area = cfg_allocz(sizeof(struct ospf_area_config)); add_tail(&OSPF_CFG->area_list, NODE this_area); this_area->areaid = $2; - this_area->tick = DISPTICK; + this_area->tick = DEFAULT_DISPTICK; this_area->stub = 0; init_list(&this_area->patt_list); init_list(&this_area->net_list); diff --git a/proto/ospf/ospf.h b/proto/ospf/ospf.h index cf984aaa..29e1af50 100644 --- a/proto/ospf/ospf.h +++ b/proto/ospf/ospf.h @@ -43,7 +43,7 @@ #define AllDRouters ipa_from_u32(0xe0000006) /* 224.0.0.6 */ #define DEFAULTDES ipa_from_u32(0) #else -#error Multicast address not defined in IPv6 +#error OSPF for IPv6 is not implemented (mail to Feela ) #endif @@ -51,7 +51,11 @@ #define MINLSINTERVAL 5 #define MINLSARRIVAL 1 #define LSINFINITY 0xffff /* RFC says 0xffffff ??? */ -#define DISPTICK 7 + +#define DEFAULT_DISPTICK 4 +#define DEFAULT_OSPFTICK 5 +#define DEFAULT_RFC1583 1 /* compatibility with rfc1583 */ + struct ospf_config {