Merge pull request #3405 from LabNConsulting/working/master/fix-vrf

[mirror_frr.git] / ldpd / ldpd.h

diff --git a/ldpd/ldpd.h b/ldpd/ldpd.h
index 5580ea5d676db10a160a7b0cf9dd60c735718ee7..91135055817fa1cb8b477383b554bfe2ef1c1888 100644 (file)
--- a/ldpd/ldpd.h
+++ b/ldpd/ldpd.h
@@ -159,7 +159,7 @@ struct ldpd_init {
        char             group[256];
        char             ctl_sock_path[MAXPATHLEN];
        char             zclient_serv_path[MAXPATHLEN];
-       u_short          instance;
+       unsigned short instance;
 };
 
 union ldpd_addr {
@@ -409,6 +409,7 @@ struct l2vpn_pw {
        uint32_t                 pwid;
        char                     ifname[IF_NAMESIZE];
        unsigned int             ifindex;
+       bool                     enabled;
        uint32_t                 remote_group;
        uint16_t                 remote_mtu;
        uint32_t                 local_status;
@@ -690,7 +691,8 @@ void                 embedscope(struct sockaddr_in6 *);
 void            recoverscope(struct sockaddr_in6 *);
 void            addscope(struct sockaddr_in6 *, uint32_t);
 void            clearscope(struct in6_addr *);
-struct sockaddr        *addr2sa(int af, union ldpd_addr *, uint16_t);
+void            addr2sa(int af, const union ldpd_addr *, uint16_t,
+                   union sockunion *su);
 void            sa2addr(struct sockaddr *, int *, union ldpd_addr *,
                    in_port_t *);
 socklen_t       sockaddr_len(struct sockaddr *);