Merge pull request #5473 from yasuhiro-ohara-ntt/ospf6d-self-orig-maxage-fix

[mirror_frr.git] / lib / mlag.h

diff --git a/lib/mlag.h b/lib/mlag.h
index a88db8b35e97f680b52d1e3635206a7610f58665..c531fb5b68772f87d26c257f5403c7b9a577dd8b 100644 (file)
--- a/lib/mlag.h
+++ b/lib/mlag.h
@@ -99,9 +99,9 @@ struct mlag_mroute_add {
        uint32_t group_ip;
        uint32_t cost_to_rp;
        enum mlag_owner owner_id;
-       uint8_t am_i_dr;
-       uint8_t am_i_dual_active;
-       uint32_t vrf_id;
+       bool am_i_dr;
+       bool am_i_dual_active;
+       vrf_id_t vrf_id;
        char intf_name[INTERFACE_NAMSIZ];
 };
 
@@ -110,7 +110,7 @@ struct mlag_mroute_del {
        uint32_t source_ip;
        uint32_t group_ip;
        enum mlag_owner owner_id;
-       uint32_t vrf_id;
+       vrf_id_t vrf_id;
        char intf_name[INTERFACE_NAMSIZ];
 };
 
@@ -119,26 +119,23 @@ struct mlag_msg {
        uint16_t data_len;
        uint16_t msg_cnt;
        uint8_t data[0];
-};
+} __attribute__((packed));
 
 
 extern char *mlag_role2str(enum mlag_role role, char *buf, size_t size);
-extern char *zebra_mlag_lib_msgid_to_str(enum mlag_msg_type msg_type, char *buf,
-                                        size_t size);
-extern int zebra_mlag_lib_decode_mlag_hdr(struct stream *s,
-                                         struct mlag_msg *msg);
-extern int zebra_mlag_lib_decode_mroute_add(struct stream *s,
-                                           struct mlag_mroute_add *msg);
-extern int zebra_mlag_lib_decode_mroute_del(struct stream *s,
-                                           struct mlag_mroute_del *msg);
-extern int zebra_mlag_lib_decode_mlag_status(struct stream *s,
-                                            struct mlag_status *msg);
-extern int zebra_mlag_lib_decode_vxlan_update(struct stream *s,
-                                             struct mlag_vxlan *msg);
-
-extern int zebra_mlag_lib_decode_frr_status(struct stream *s,
-                                           struct mlag_frr_status *msg);
-
+extern char *mlag_lib_msgid_to_str(enum mlag_msg_type msg_type, char *buf,
+                                  size_t size);
+extern int mlag_lib_decode_mlag_hdr(struct stream *s, struct mlag_msg *msg);
+extern int mlag_lib_decode_mroute_add(struct stream *s,
+                                     struct mlag_mroute_add *msg);
+extern int mlag_lib_decode_mroute_del(struct stream *s,
+                                     struct mlag_mroute_del *msg);
+extern int mlag_lib_decode_mlag_status(struct stream *s,
+                                      struct mlag_status *msg);
+extern int mlag_lib_decode_vxlan_update(struct stream *s,
+                                       struct mlag_vxlan *msg);
+extern int mlag_lib_decode_frr_status(struct stream *s,
+                                     struct mlag_frr_status *msg);
 #ifdef __cplusplus
 }
 #endif