bgpd: [7.1] add addpath ID to adj_out tree sort (#5691)

[mirror_frr.git] / ospf6d / ospf6_lsdb.h

diff --git a/ospf6d/ospf6_lsdb.h b/ospf6d/ospf6_lsdb.h
index 4fdf36aef641ec5a428859459b73bf43cdac7c77..3b32e3ecf6d7138300ab8dc31d681e50cf2286a2 100644 (file)
--- a/ospf6d/ospf6_lsdb.h
+++ b/ospf6d/ospf6_lsdb.h
@@ -13,10 +13,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; see the file COPYING; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef OSPF6_LSDB_H
@@ -29,7 +28,7 @@
 struct ospf6_lsdb {
        void *data; /* data structure that holds this lsdb */
        struct route_table *table;
-       u_int32_t count;
+       uint32_t count;
        void (*hook_add)(struct ospf6_lsa *);
        void (*hook_remove)(struct ospf6_lsa *);
 };
@@ -38,30 +37,40 @@ struct ospf6_lsdb {
 extern struct ospf6_lsdb *ospf6_lsdb_create(void *data);
 extern void ospf6_lsdb_delete(struct ospf6_lsdb *lsdb);
 
-extern struct ospf6_lsa *ospf6_lsdb_lookup(u_int16_t type, u_int32_t id,
-                                          u_int32_t adv_router,
+extern struct ospf6_lsa *ospf6_lsdb_lookup(uint16_t type, uint32_t id,
+                                          uint32_t adv_router,
                                           struct ospf6_lsdb *lsdb);
-extern struct ospf6_lsa *ospf6_lsdb_lookup_next(u_int16_t type, u_int32_t id,
-                                               u_int32_t adv_router,
+extern struct ospf6_lsa *ospf6_lsdb_lookup_next(uint16_t type, uint32_t id,
+                                               uint32_t adv_router,
                                                struct ospf6_lsdb *lsdb);
 
 extern void ospf6_lsdb_add(struct ospf6_lsa *lsa, struct ospf6_lsdb *lsdb);
 extern void ospf6_lsdb_remove(struct ospf6_lsa *lsa, struct ospf6_lsdb *lsdb);
 
-extern struct ospf6_lsa *ospf6_lsdb_head(struct ospf6_lsdb *lsdb);
-extern struct ospf6_lsa *ospf6_lsdb_next(struct ospf6_lsa *lsa);
+extern const struct route_node *ospf6_lsdb_head(struct ospf6_lsdb *lsdb,
+                                               int argmode, uint16_t type,
+                                               uint32_t adv_router,
+                                               struct ospf6_lsa **lsa);
+extern struct ospf6_lsa *ospf6_lsdb_next(const struct route_node *iterend,
+                                        struct ospf6_lsa *lsa);
 
-extern struct ospf6_lsa *ospf6_lsdb_type_router_head(u_int16_t type,
-                                                    u_int32_t adv_router,
-                                                    struct ospf6_lsdb *lsdb);
-extern struct ospf6_lsa *ospf6_lsdb_type_router_next(u_int16_t type,
-                                                    u_int32_t adv_router,
-                                                    struct ospf6_lsa *lsa);
+#define ALL_LSDB_TYPED_ADVRTR(lsdb, type, adv_router, lsa)                     \
+       const struct route_node *iterend =                                     \
+               ospf6_lsdb_head(lsdb, 2, type, adv_router, &lsa);              \
+       lsa;                                                                   \
+       lsa = ospf6_lsdb_next(iterend, lsa)
 
-extern struct ospf6_lsa *ospf6_lsdb_type_head(u_int16_t type,
-                                             struct ospf6_lsdb *lsdb);
-extern struct ospf6_lsa *ospf6_lsdb_type_next(u_int16_t type,
-                                             struct ospf6_lsa *lsa);
+#define ALL_LSDB_TYPED(lsdb, type, lsa)                                        \
+       const struct route_node *iterend =                                     \
+               ospf6_lsdb_head(lsdb, 1, type, 0, &lsa);                       \
+       lsa;                                                                   \
+       lsa = ospf6_lsdb_next(iterend, lsa)
+
+#define ALL_LSDB(lsdb, lsa)                                                    \
+       const struct route_node *iterend =                                     \
+               ospf6_lsdb_head(lsdb, 0, 0, 0, &lsa);                          \
+       lsa;                                                                   \
+       lsa = ospf6_lsdb_next(iterend, lsa)
 
 extern void ospf6_lsdb_remove_all(struct ospf6_lsdb *lsdb);
 extern void ospf6_lsdb_lsa_unlock(struct ospf6_lsa *lsa);
@@ -74,14 +83,14 @@ enum ospf_lsdb_show_level {
 };
 
 extern void ospf6_lsdb_show(struct vty *vty, enum ospf_lsdb_show_level level,
-                           u_int16_t *type, u_int32_t *id,
-                           u_int32_t *adv_router, struct ospf6_lsdb *lsdb);
+                           uint16_t *type, uint32_t *id, uint32_t *adv_router,
+                           struct ospf6_lsdb *lsdb);
 
-extern u_int32_t ospf6_new_ls_id(u_int16_t type, u_int32_t adv_router,
-                                struct ospf6_lsdb *lsdb);
-extern u_int32_t ospf6_new_ls_seqnum(u_int16_t type, u_int32_t id,
-                                    u_int32_t adv_router,
-                                    struct ospf6_lsdb *lsdb);
+extern uint32_t ospf6_new_ls_id(uint16_t type, uint32_t adv_router,
+                               struct ospf6_lsdb *lsdb);
+extern uint32_t ospf6_new_ls_seqnum(uint16_t type, uint32_t id,
+                                   uint32_t adv_router,
+                                   struct ospf6_lsdb *lsdb);
 extern int ospf6_lsdb_maxage_remover(struct ospf6_lsdb *lsdb);
 
 #endif /* OSPF6_LSDB_H */