diff options
| author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2015-12-21 17:17:21 +0100 |
|---|---|---|
| committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2015-12-21 17:17:21 +0100 |
| commit | 0bf95f99e6126b481a4dcac574ada59f9ad3662b (patch) | |
| tree | 8b8d229fbd4dbd21a9aa14d762ed0b11753437a8 /proto | |
| parent | 23c212e7f1e80a3c6b88b49918972bc28375bd51 (diff) | |
Follow-up work on integration
Contains some patches from Jan Moskyto Matejka
Diffstat (limited to 'proto')
| -rw-r--r-- | proto/ospf/config.Y | 1 | ||||
| -rw-r--r-- | proto/ospf/iface.c | 9 | ||||
| -rw-r--r-- | proto/ospf/ospf.h | 1 |
3 files changed, 0 insertions, 11 deletions
diff --git a/proto/ospf/config.Y b/proto/ospf/config.Y index 6d8fa755..5673ef60 100644 --- a/proto/ospf/config.Y +++ b/proto/ospf/config.Y @@ -316,7 +316,6 @@ ospf_iface_item: | TTL SECURITY bool { OSPF_PATT->ttl_security = $3; } | TTL SECURITY TX ONLY { OSPF_PATT->ttl_security = 2; } | BFD bool { OSPF_PATT->bfd = $2; cf_check_bfd($2); } - | SECONDARY bool { OSPF_PATT->bsd_secondary = $2; } | password_list { ospf_check_auth(); } ; diff --git a/proto/ospf/iface.c b/proto/ospf/iface.c index 91e22266..442cec3a 100644 --- a/proto/ospf/iface.c +++ b/proto/ospf/iface.c @@ -525,15 +525,6 @@ ospf_iface_stubby(struct ospf_iface_patt *ip, struct ifa *addr) if (addr->iface->flags & IF_LOOPBACK) return 1; - /* - * For compatibility reasons on BSD systems, we force OSPF - * interfaces with non-primary IP prefixes to be stub. - */ -#if defined(OSPFv2) && !defined(CONFIG_MC_PROPER_SRC) - if (!ip->bsd_secondary && !(addr->flags & IA_PRIMARY)) - return 1; -#endif - return ip->stub; } diff --git a/proto/ospf/ospf.h b/proto/ospf/ospf.h index f4f91de1..b1e02b24 100644 --- a/proto/ospf/ospf.h +++ b/proto/ospf/ospf.h @@ -185,7 +185,6 @@ struct ospf_iface_patt u8 ptp_netmask; /* bool + 2 for unspecified */ u8 ttl_security; /* bool + 2 for TX only */ u8 bfd; - u8 bsd_secondary; list *passwords; }; |