proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2026-01-05 23:53:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ospf6d: use in_addr_t for area/router IDs

Browse Source 
Signed-off-by: David Lamparter <equinox@diac24.net>
This commit is contained in:
David Lamparter 2020-03-27 13:39:01 +01:00
parent bd0ab4d80a
commit 858f9c0822
8 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ospf6d/ospf6_area.h
View File

@ -28,7 +28,7 @@ struct ospf6_area {
struct ospf6 *ospf6;
/* Area-ID */
uint32_t area_id;
in_addr_t area_id;
#define OSPF6_AREA_FMT_DOTTEDQUAD 1
#define OSPF6_AREA_FMT_DECIMAL 2

8
ospf6d/ospf6_interface.h
View File

@ -90,10 +90,10 @@ struct ospf6_interface {
uint8_t mtu_ignore;
/* Decision of DR Election */
uint32_t drouter;
uint32_t bdrouter;
uint32_t prev_drouter;
uint32_t prev_bdrouter;
in_addr_t drouter;
in_addr_t bdrouter;
in_addr_t prev_drouter;
in_addr_t prev_bdrouter;
/* Linklocal LSA Database: includes Link-LSA */
struct ospf6_lsdb *lsdb;

10
ospf6d/ospf6_intra.h
View File

@ -23,8 +23,8 @@
/* Debug option */
extern unsigned char conf_debug_ospf6_brouter;
extern uint32_t conf_debug_ospf6_brouter_specific_router_id;
extern uint32_t conf_debug_ospf6_brouter_specific_area_id;
extern in_addr_t conf_debug_ospf6_brouter_specific_router_id;
extern in_addr_t conf_debug_ospf6_brouter_specific_area_id;
#define OSPF6_DEBUG_BROUTER_SUMMARY 0x01
#define OSPF6_DEBUG_BROUTER_SPECIFIC_ROUTER 0x02
#define OSPF6_DEBUG_BROUTER_SPECIFIC_AREA 0x04
@ -86,7 +86,7 @@ struct ospf6_router_lsdesc {
uint16_t metric; /* output cost */
uint32_t interface_id;
uint32_t neighbor_interface_id;
uint32_t neighbor_router_id;
in_addr_t neighbor_router_id;
};
#define OSPF6_ROUTER_LSDESC_POINTTOPOINT 1
@ -125,7 +125,7 @@ struct ospf6_network_lsa {
/* Link State Description in Router-LSA */
#define OSPF6_NETWORK_LSDESC_FIX_SIZE 4U
struct ospf6_network_lsdesc {
uint32_t router_id;
in_addr_t router_id;
};
#define NETWORK_LSDESC_GET_NBR_ROUTERID(x) \
(((struct ospf6_network_lsdesc *)(x))->router_id)
@ -146,7 +146,7 @@ struct ospf6_intra_prefix_lsa {
uint16_t prefix_num;
uint16_t ref_type;
uint32_t ref_id;
uint32_t ref_adv_router;
in_addr_t ref_adv_router;
/* followed by ospf6 prefix(es) */
};

4
ospf6d/ospf6_lsa.h
View File

@ -80,8 +80,8 @@
struct ospf6_lsa_header {
uint16_t age; /* LS age */
uint16_t type; /* LS type */
uint32_t id; /* Link State ID */
uint32_t adv_router; /* Advertising Router */
in_addr_t id; /* Link State ID */
in_addr_t adv_router; /* Advertising Router */
uint32_t seqnum; /* LS sequence number */
uint16_t checksum; /* LS checksum */
uint16_t length; /* LSA length */

12
ospf6d/ospf6_message.h
View File

@ -49,8 +49,8 @@ struct ospf6_header {
uint8_t version;
uint8_t type;
uint16_t length;
uint32_t router_id;
uint32_t area_id;
in_addr_t router_id;
in_addr_t area_id;
uint16_t checksum;
uint8_t instance_id;
uint8_t reserved;
@ -66,8 +66,8 @@ struct ospf6_hello {
uint8_t options[3];
uint16_t hello_interval;
uint16_t dead_interval;
uint32_t drouter;
uint32_t bdrouter;
in_addr_t drouter;
in_addr_t bdrouter;
/* Followed by Router-IDs */
};
@ -94,8 +94,8 @@ struct ospf6_dbdesc {
struct ospf6_lsreq_entry {
uint16_t reserved; /* Must Be Zero */
uint16_t type; /* LS type */
uint32_t id; /* Link State ID */
uint32_t adv_router; /* Advertising Router */
in_addr_t id; /* Link State ID */
in_addr_t adv_router; /* Advertising Router */
};
/* Link State Update */

10
ospf6d/ospf6_neighbor.h
View File

@ -48,7 +48,7 @@ struct ospf6_neighbor {
struct timeval last_changed;
/* Neighbor Router ID */
uint32_t router_id;
in_addr_t router_id;
/* Neighbor Interface ID */
ifindex_t ifindex;
@ -56,10 +56,10 @@ struct ospf6_neighbor {
/* Router Priority of this neighbor */
uint8_t priority;
uint32_t drouter;
uint32_t bdrouter;
uint32_t prev_drouter;
uint32_t prev_bdrouter;
in_addr_t drouter;
in_addr_t bdrouter;
in_addr_t prev_drouter;
in_addr_t prev_bdrouter;
/* Options field (Capability) */
char options[3];

6
ospf6d/ospf6_route.h
View File

@ -64,8 +64,8 @@ struct ospf6_nexthop {
/* Path */
struct ospf6_ls_origin {
uint16_t type;
uint32_t id;
uint32_t adv_router;
in_addr_t id;
in_addr_t adv_router;
};
struct ospf6_path {
@ -82,7 +82,7 @@ struct ospf6_path {
uint8_t prefix_options;
/* Associated Area */
uint32_t area_id;
in_addr_t area_id;
/* Path-type */
uint8_t type;

6
ospf6d/ospf6_top.h
View File

@ -26,7 +26,7 @@
struct ospf6_master {
uint32_t zebra_router_id;
in_addr_t zebra_router_id;
};
/* ospf6->config_flags */
@ -41,10 +41,10 @@ struct ospf6 {
vrf_id_t vrf_id;
/* my router id */
uint32_t router_id;
in_addr_t router_id;
/* static router id */
uint32_t router_id_static;
in_addr_t router_id_static;
struct in_addr router_id_zebra;