Merge pull request #11843 from ARShreenidhi/ecmp_testcase

[mirror_frr.git] / zebra / zebra_pw.h

diff --git a/zebra/zebra_pw.h b/zebra/zebra_pw.h
index 417d26fe6568628bfb0c694df3fe94f2df71ed6d..9800c5853a5456186e18883fed718fb27496d17b 100644 (file)
--- a/zebra/zebra_pw.h
+++ b/zebra/zebra_pw.h
@@ -23,15 +23,22 @@
 #include <net/if.h>
 #include <netinet/in.h>
 
-#include "hook.h"
-#include "qobj.h"
+#include "lib/hook.h"
+#include "lib/qobj.h"
+#include "lib/pw.h"
+
+#include "zebra/zebra_vrf.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #define PW_INSTALL_RETRY_INTERVAL      30
 
 struct zebra_pw {
        RB_ENTRY(zebra_pw) pw_entry, static_pw_entry;
        vrf_id_t vrf_id;
-       char ifname[IF_NAMESIZE];
+       char ifname[INTERFACE_NAMSIZ];
        ifindex_t ifindex;
        int type;
        int af;
@@ -46,9 +53,9 @@ struct zebra_pw {
        struct zserv *client;
        struct rnh *rnh;
        struct thread *install_retry_timer;
-       QOBJ_FIELDS
+       QOBJ_FIELDS;
 };
-DECLARE_QOBJ_TYPE(zebra_pw)
+DECLARE_QOBJ_TYPE(zebra_pw);
 
 RB_HEAD(zebra_pw_head, zebra_pw);
 RB_PROTOTYPE(zebra_pw_head, zebra_pw, pw_entry, zebra_pw_compare);
@@ -56,20 +63,23 @@ 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))
+DECLARE_HOOK(pw_install, (struct zebra_pw * pw), (pw));
+DECLARE_HOOK(pw_uninstall, (struct zebra_pw * pw), (pw));
 
-struct zebra_pw *zebra_pw_add(struct zebra_vrf *, const char *, uint8_t,
-                             struct zserv *);
+struct zebra_pw *zebra_pw_add(struct zebra_vrf *zvrf, const char *ifname,
+                             uint8_t protocol, struct zserv *client);
 void zebra_pw_del(struct zebra_vrf *, struct zebra_pw *);
 void zebra_pw_change(struct zebra_pw *, ifindex_t, int, int, union g_addr *,
                     uint32_t, uint32_t, uint8_t, union pw_protocol_fields *);
 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_install_failure(struct zebra_pw *pw, int pwstatus);
 void zebra_pw_init(struct zebra_vrf *);
 void zebra_pw_exit(struct zebra_vrf *);
 void zebra_pw_vty_init(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* ZEBRA_PW_H_ */