zebra, lib: fix the ZEBRA_INTERFACE_VRF_UPDATE zapi message

[mirror_frr.git] / ospfd / ospf_abr.h

diff --git a/ospfd/ospf_abr.h b/ospfd/ospf_abr.h
index 130146197c92dc92c42ce81e9435ed8b2fadf3ec..b3007622c4e1b8f869c179ae786785fd3a3c8bc3 100644 (file)
--- a/ospfd/ospf_abr.h
+++ b/ospfd/ospf_abr.h
@@ -14,10 +14,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 _ZEBRA_OSPF_ABR_H
@@ -34,23 +33,23 @@ struct ospf_area_range {
        struct in_addr addr;
 
        /* Area range masklen. */
-       u_char masklen;
+       uint8_t masklen;
 
        /* Flags. */
-       u_char flags;
+       uint8_t flags;
 
        /* Number of more specific prefixes. */
        int specifics;
 
        /* Addr and masklen to substitute. */
        struct in_addr subst_addr;
-       u_char subst_masklen;
+       uint8_t subst_masklen;
 
        /* Range cost. */
-       u_int32_t cost;
+       uint32_t cost;
 
        /* Configured range cost. */
-       u_int32_t cost_config;
+       uint32_t cost_config;
 };
 
 /* Prototypes. */
@@ -65,7 +64,7 @@ ospf_area_range_lookup_next(struct ospf_area *, struct in_addr *, int);
 extern int ospf_area_range_set(struct ospf *, struct in_addr,
                               struct prefix_ipv4 *, int);
 extern int ospf_area_range_cost_set(struct ospf *, struct in_addr,
-                                   struct prefix_ipv4 *, u_int32_t);
+                                   struct prefix_ipv4 *, uint32_t);
 extern int ospf_area_range_unset(struct ospf *, struct in_addr,
                                 struct prefix_ipv4 *);
 extern int ospf_area_range_substitute_set(struct ospf *, struct in_addr,
@@ -82,6 +81,6 @@ extern void ospf_check_abr_status(struct ospf *);
 extern void ospf_abr_task(struct ospf *);
 extern void ospf_schedule_abr_task(struct ospf *);
 
-extern void ospf_abr_announce_network_to_area(struct prefix_ipv4 *, u_int32_t,
+extern void ospf_abr_announce_network_to_area(struct prefix_ipv4 *, uint32_t,
                                              struct ospf_area *);
 #endif /* _ZEBRA_OSPF_ABR_H */