zebra: delay default vrf name after vrf initialization

[mirror_frr.git] / zebra / zebra_pw.h

diff --git a/zebra/zebra_pw.h b/zebra/zebra_pw.h
index 62f45db5cd92ed16616a02fd3c6cf3afe739c6d7..e6e0a22c214ae7b1bb512d3525af6f1d7d893113 100644 (file)
--- a/zebra/zebra_pw.h
+++ b/zebra/zebra_pw.h
@@ -23,12 +23,16 @@
 #include <net/if.h>
 #include <netinet/in.h>
 
-#include "hook.h"
+#include "lib/hook.h"
+#include "lib/qobj.h"
+#include "lib/pw.h"
+
+#include "zebra/zebra_vrf.h"
 
 #define PW_INSTALL_RETRY_INTERVAL      30
 
 struct zebra_pw {
-       RB_ENTRY(zebra_pw) entry;
+       RB_ENTRY(zebra_pw) pw_entry, static_pw_entry;
        vrf_id_t vrf_id;
        char ifname[IF_NAMESIZE];
        ifindex_t ifindex;
@@ -43,11 +47,17 @@ struct zebra_pw {
        int status;
        uint8_t protocol;
        struct zserv *client;
+       struct rnh *rnh;
        struct thread *install_retry_timer;
+       QOBJ_FIELDS
 };
+DECLARE_QOBJ_TYPE(zebra_pw)
 
 RB_HEAD(zebra_pw_head, zebra_pw);
-RB_PROTOTYPE(zebra_pw_head, zebra_pw, entry, zebra_pw_compare);
+RB_PROTOTYPE(zebra_pw_head, zebra_pw, pw_entry, zebra_pw_compare);
+
+RB_HEAD(zebra_static_pw_head, zebra_pw);
+RB_PROTOTYPE(zebra_static_pw_head, zebra_pw, static_pw_entry, zebra_pw_compare);
 
 DECLARE_HOOK(pw_install, (struct zebra_pw * pw), (pw))
 DECLARE_HOOK(pw_uninstall, (struct zebra_pw * pw), (pw))
@@ -60,8 +70,8 @@ void zebra_pw_change(struct zebra_pw *, ifindex_t, int, int, union g_addr *,
 struct zebra_pw *zebra_pw_find(struct zebra_vrf *, const char *);
 void zebra_pw_update(struct zebra_pw *);
 void zebra_pw_install_failure(struct zebra_pw *);
-void zebra_pw_client_close(struct zserv *);
 void zebra_pw_init(struct zebra_vrf *);
 void zebra_pw_exit(struct zebra_vrf *);
+void zebra_pw_vty_init(void);
 
 #endif /* ZEBRA_PW_H_ */