summaryrefslogtreecommitdiffstats
path: root/ldpd/ldpd.h
diff options
context:
space:
mode:
authorRenato Westphal <renato@opensourcerouting.org>2017-05-01 01:16:15 +0200
committerRenato Westphal <renato@opensourcerouting.org>2017-05-01 16:33:23 +0200
commit988ded8d1258174e2b13e5f1a50ef7279ffe4b65 (patch)
treef5c4e416c9305881d6afff6c41673c104833ea5b /ldpd/ldpd.h
parentMerge pull request #430 from opensourcerouting/zebra-vrfdel-fix (diff)
downloadfrr-988ded8d1258174e2b13e5f1a50ef7279ffe4b65.tar.xz
frr-988ded8d1258174e2b13e5f1a50ef7279ffe4b65.zip
ldpd: respect link-detect configuration
We shouldn't check the operational status of an interface in ldpd if it's configured with "no link-detect" in zebra. That's what all the other routing daemons do. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Diffstat (limited to 'ldpd/ldpd.h')
-rw-r--r--ldpd/ldpd.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/ldpd/ldpd.h b/ldpd/ldpd.h
index d2fc5aa3a..47188c6be 100644
--- a/ldpd/ldpd.h
+++ b/ldpd/ldpd.h
@@ -298,7 +298,7 @@ struct iface {
struct if_addr_head addr_list;
struct in6_addr linklocal;
enum iface_type type;
- uint16_t flags;
+ int operative;
struct iface_af ipv4;
struct iface_af ipv6;
QOBJ_FIELDS
@@ -380,7 +380,7 @@ struct l2vpn_if {
struct l2vpn *l2vpn;
char ifname[IF_NAMESIZE];
unsigned int ifindex;
- uint16_t flags;
+ int operative;
uint8_t mac[ETHER_ADDR_LEN];
QOBJ_FIELDS
};
@@ -552,6 +552,7 @@ struct kif {
char ifname[IF_NAMESIZE];
unsigned short ifindex;
int flags;
+ int operative;
uint8_t mac[ETHER_ADDR_LEN];
int mtu;
};
@@ -569,7 +570,6 @@ struct ctl_iface {
char name[IF_NAMESIZE];
unsigned int ifindex;
int state;
- uint16_t flags;
enum iface_type type;
uint16_t hello_holdtime;
uint16_t hello_interval;