Merge pull request #3394 from karamalla0406/frr3360

[mirror_frr.git] / bgpd / bgp_advertise.h

diff --git a/bgpd/bgp_advertise.h b/bgpd/bgp_advertise.h
index 0242bd0dd48c96511fb7d8e934b210b1c7be191d..1912aec1bfa5b3941e39f31c7a2f6fc13e6472d1 100644 (file)
--- a/bgpd/bgp_advertise.h
+++ b/bgpd/bgp_advertise.h
@@ -1,22 +1,22 @@
 /* BGP advertisement and adjacency
-   Copyright (C) 1996, 97, 98, 99, 2000 Kunihiro Ishiguro
-
-This file is part of GNU Zebra.
-
-GNU Zebra is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-GNU Zebra is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-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.  */
+ * Copyright (C) 1996, 97, 98, 99, 2000 Kunihiro Ishiguro
+ *
+ * This file is part of GNU Zebra.
+ *
+ * GNU Zebra is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2, or (at your option) any
+ * later version.
+ *
+ * GNU Zebra is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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 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 _QUAGGA_BGP_ADVERTISE_H
 #define _QUAGGA_BGP_ADVERTISE_H
@@ -29,7 +29,7 @@ struct update_subgroup;
 struct bgp_advertise_fifo {
        struct bgp_advertise *next;
        struct bgp_advertise *prev;
-       u_int32_t count;
+       uint32_t count;
 };
 
 /* BGP advertise attribute.  */
@@ -62,7 +62,7 @@ struct bgp_advertise {
        struct bgp_advertise_attr *baa;
 
        /* BGP info.  */
-       struct bgp_info *binfo;
+       struct bgp_path_info *pathi;
 };
 
 /* BGP adjacency out.  */
@@ -80,7 +80,7 @@ struct bgp_adj_out {
        /* Prefix information.  */
        struct bgp_node *rn;
 
-       u_int32_t addpath_tx_id;
+       uint32_t addpath_tx_id;
 
        /* Advertised attribute.  */
        struct attr *attr;
@@ -102,7 +102,7 @@ struct bgp_adj_in {
        struct attr *attr;
 
        /* Addpath identifier */
-       u_int32_t addpath_rx_id;
+       uint32_t addpath_rx_id;
 };
 
 /* BGP advertisement list.  */
@@ -113,7 +113,7 @@ struct bgp_synchronize {
 };
 
 /* BGP adjacency linked list.  */
-#define BGP_INFO_ADD(N, A, TYPE)                                               \
+#define BGP_PATH_INFO_ADD(N, A, TYPE)                                          \
        do {                                                                   \
                (A)->prev = NULL;                                              \
                (A)->next = (N)->TYPE;                                         \
@@ -122,7 +122,7 @@ struct bgp_synchronize {
                (N)->TYPE = (A);                                               \
        } while (0)
 
-#define BGP_INFO_DEL(N, A, TYPE)                                               \
+#define BGP_PATH_INFO_DEL(N, A, TYPE)                                          \
        do {                                                                   \
                if ((A)->next)                                                 \
                        (A)->next->prev = (A)->prev;                           \
@@ -132,10 +132,10 @@ struct bgp_synchronize {
                        (N)->TYPE = (A)->next;                                 \
        } while (0)
 
-#define BGP_ADJ_IN_ADD(N,A)    BGP_INFO_ADD(N,A,adj_in)
-#define BGP_ADJ_IN_DEL(N,A)    BGP_INFO_DEL(N,A,adj_in)
-#define BGP_ADJ_OUT_ADD(N,A)   BGP_INFO_ADD(N,A,adj_out)
-#define BGP_ADJ_OUT_DEL(N,A)   BGP_INFO_DEL(N,A,adj_out)
+#define BGP_ADJ_IN_ADD(N, A) BGP_PATH_INFO_ADD(N, A, adj_in)
+#define BGP_ADJ_IN_DEL(N, A) BGP_PATH_INFO_DEL(N, A, adj_in)
+#define BGP_ADJ_OUT_ADD(N, A) BGP_PATH_INFO_ADD(N, A, adj_out)
+#define BGP_ADJ_OUT_DEL(N, A) BGP_PATH_INFO_DEL(N, A, adj_out)
 
 #define BGP_ADV_FIFO_ADD(F, N)                                                 \
        do {                                                                   \
@@ -168,16 +168,16 @@ struct bgp_synchronize {
                 : (F)->next)
 
 /* Prototypes.  */
-extern int bgp_adj_out_lookup(struct peer *, struct bgp_node *, u_int32_t);
+extern int bgp_adj_out_lookup(struct peer *, struct bgp_node *, uint32_t);
 extern void bgp_adj_in_set(struct bgp_node *, struct peer *, struct attr *,
-                          u_int32_t);
-extern int bgp_adj_in_unset(struct bgp_node *, struct peer *, u_int32_t);
+                          uint32_t);
+extern int bgp_adj_in_unset(struct bgp_node *, struct peer *, uint32_t);
 extern void bgp_adj_in_remove(struct bgp_node *, struct bgp_adj_in *);
 
 extern void bgp_sync_init(struct peer *);
 extern void bgp_sync_delete(struct peer *);
 extern unsigned int baa_hash_key(void *p);
-extern int baa_hash_cmp(const void *p1, const void *p2);
+extern bool baa_hash_cmp(const void *p1, const void *p2);
 extern void bgp_advertise_add(struct bgp_advertise_attr *baa,
                              struct bgp_advertise *adv);
 extern struct bgp_advertise *bgp_advertise_new(void);