summaryrefslogtreecommitdiffstats
path: root/ospf6d
diff options
context:
space:
mode:
authorQuentin Young <qlyoung@users.noreply.github.com>2020-07-29 20:29:34 +0200
committerGitHub <noreply@github.com>2020-07-29 20:29:34 +0200
commit25ee44b52278c86fda27f76e932f6a12c375bf10 (patch)
treebea9a0e54e73dafb08400f7e2e435d5be7fa1e93 /ospf6d
parentMerge pull request #6769 from opensourcerouting/acl-regress (diff)
parenttools: improve cocci.h (diff)
downloadfrr-25ee44b52278c86fda27f76e932f6a12c375bf10.tar.xz
frr-25ee44b52278c86fda27f76e932f6a12c375bf10.zip
Merge pull request #6732 from opensourcerouting/printfrr-prep
*: preparations for printfrr coccinelle run
Diffstat (limited to 'ospf6d')
-rw-r--r--ospf6d/ospf6_abr.c27
-rw-r--r--ospf6d/ospf6_area.h2
-rw-r--r--ospf6d/ospf6_asbr.c55
-rw-r--r--ospf6d/ospf6_interface.h8
-rw-r--r--ospf6d/ospf6_intra.c18
-rw-r--r--ospf6d/ospf6_intra.h10
-rw-r--r--ospf6d/ospf6_lsa.h4
-rw-r--r--ospf6d/ospf6_message.h12
-rw-r--r--ospf6d/ospf6_neighbor.h10
-rw-r--r--ospf6d/ospf6_route.h6
-rw-r--r--ospf6d/ospf6_top.h6
11 files changed, 64 insertions, 94 deletions
diff --git a/ospf6d/ospf6_abr.c b/ospf6d/ospf6_abr.c
index 1f6cc9d52..b33979049 100644
--- a/ospf6d/ospf6_abr.c
+++ b/ospf6d/ospf6_abr.c
@@ -875,7 +875,6 @@ void ospf6_abr_examin_summary(struct ospf6_lsa *lsa, struct ospf6_area *oa)
bool old_entry_updated = false;
struct ospf6_path *path, *o_path, *ecmp_path;
struct listnode *anode;
- char adv_router[16];
memset(&prefix, 0, sizeof(prefix));
@@ -940,10 +939,6 @@ void ospf6_abr_examin_summary(struct ospf6_lsa *lsa, struct ospf6_area *oa)
if (listcount(route->paths) > 1) {
for (ALL_LIST_ELEMENTS_RO(route->paths, anode,
o_path)) {
- inet_ntop(AF_INET,
- &o_path->origin.adv_router,
- adv_router,
- sizeof(adv_router));
if (o_path->origin.id == lsa->header->id
&& o_path->origin.adv_router ==
lsa->header->adv_router) {
@@ -951,9 +946,9 @@ void ospf6_abr_examin_summary(struct ospf6_lsa *lsa, struct ospf6_area *oa)
if (is_debug)
zlog_debug(
- "%s: old entry found in paths, adv_router %s",
+ "%s: old entry found in paths, adv_router %pI4",
__func__,
- adv_router);
+ &o_path->origin.adv_router);
break;
}
@@ -1185,14 +1180,11 @@ void ospf6_abr_examin_summary(struct ospf6_lsa *lsa, struct ospf6_area *oa)
listnode_add_sort(old_route->paths, ecmp_path);
if (is_debug) {
- prefix2str(&route->prefix, buf, sizeof(buf));
- inet_ntop(AF_INET,
- &ecmp_path->origin.adv_router,
- adv_router, sizeof(adv_router));
zlog_debug(
- "%s: route %s cost %u another path %s added with nh %u, effective paths %u nh %u",
- __func__, buf, old_route->path.cost,
- adv_router,
+ "%s: route %pFX cost %u another path %pI4 added with nh %u, effective paths %u nh %u",
+ __func__, &route->prefix,
+ old_route->path.cost,
+ &ecmp_path->origin.adv_router,
listcount(ecmp_path->nh_list),
old_route->paths
? listcount(old_route->paths)
@@ -1239,12 +1231,11 @@ void ospf6_abr_examin_summary(struct ospf6_lsa *lsa, struct ospf6_area *oa)
if (old_entry_updated == false) {
if (is_debug) {
- inet_ntop(AF_INET, &route->path.origin.adv_router,
- adv_router, sizeof(adv_router));
zlog_debug(
- "%s: Install route: %s cost %u nh %u adv_router %s ",
+ "%s: Install route: %s cost %u nh %u adv_router %pI4",
__func__, buf, route->path.cost,
- listcount(route->nh_list), adv_router);
+ listcount(route->nh_list),
+ &route->path.origin.adv_router);
}
path = ospf6_path_dup(&route->path);
diff --git a/ospf6d/ospf6_area.h b/ospf6d/ospf6_area.h
index 7ce6717fc..f6287660d 100644
--- a/ospf6d/ospf6_area.h
+++ b/ospf6d/ospf6_area.h
@@ -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
diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c
index cea4dd93e..5562529ea 100644
--- a/ospf6d/ospf6_asbr.c
+++ b/ospf6d/ospf6_asbr.c
@@ -244,11 +244,9 @@ void ospf6_asbr_update_route_ecmp_path(struct ospf6_route *old,
continue;
if (IS_OSPF6_DEBUG_EXAMIN(AS_EXTERNAL)) {
- prefix2str(&old_route->prefix, buf,
- sizeof(buf));
zlog_debug(
- "%s: route %s cost old %u new %u is not same, replace route",
- __func__, buf, o_path->cost,
+ "%s: route %pFX cost old %u new %u is not same, replace route",
+ __func__, &old_route->prefix, o_path->cost,
route->path.cost);
}
@@ -308,11 +306,9 @@ void ospf6_asbr_update_route_ecmp_path(struct ospf6_route *old,
}
} else {
if (IS_OSPF6_DEBUG_EXAMIN(AS_EXTERNAL)) {
- prefix2str(&old_route->prefix, buf,
- sizeof(buf));
zlog_debug(
- "%s: route %s old cost %u new cost %u, delete old entry.",
- __func__, buf,
+ "%s: route %pFX old cost %u new cost %u, delete old entry.",
+ __func__, &old_route->prefix,
old_route->path.cost,
route->path.cost);
}
@@ -339,11 +335,10 @@ void ospf6_asbr_update_route_ecmp_path(struct ospf6_route *old,
&& (old_route->path.u.cost_e2 == route->path.u.cost_e2)) {
if (IS_OSPF6_DEBUG_EXAMIN(AS_EXTERNAL)) {
- prefix2str(&old_route->prefix, buf,
- sizeof(buf));
zlog_debug(
- "%s: old route %s path cost %u e2 %u",
- __func__, buf, old_route->path.cost,
+ "%s: old route %pFX path cost %u e2 %u",
+ __func__, &old_route->prefix,
+ old_route->path.cost,
old_route->path.u.cost_e2);
}
route_found = true;
@@ -562,7 +557,6 @@ void ospf6_asbr_lsa_remove(struct ospf6_lsa *lsa,
struct ospf6_as_external_lsa *external;
struct prefix prefix;
struct ospf6_route *route, *nroute, *route_to_del;
- char buf[PREFIX2STR_BUFFER];
external = (struct ospf6_as_external_lsa *)OSPF6_LSA_HEADER_END(
lsa->header);
@@ -612,8 +606,7 @@ void ospf6_asbr_lsa_remove(struct ospf6_lsa *lsa,
route = ospf6_route_lookup(&prefix, ospf6->route_table);
if (route == NULL) {
if (IS_OSPF6_DEBUG_EXAMIN(AS_EXTERNAL)) {
- prefix2str(&prefix, buf, sizeof(buf));
- zlog_debug("AS-External route %s not found", buf);
+ zlog_debug("AS-External route %pFX not found", &prefix);
}
ospf6_route_delete(route_to_del);
@@ -621,10 +614,9 @@ void ospf6_asbr_lsa_remove(struct ospf6_lsa *lsa,
}
if (IS_OSPF6_DEBUG_EXAMIN(AS_EXTERNAL)) {
- prefix2str(&prefix, buf, sizeof(buf));
zlog_debug(
- "%s: Current route %s cost %u e2 %u, route to del cost %u e2 %u",
- __func__, buf, route->path.cost, route->path.u.cost_e2,
+ "%s: Current route %pFX cost %u e2 %u, route to del cost %u e2 %u",
+ __func__, &prefix, route->path.cost, route->path.u.cost_e2,
route_to_del->path.cost, route_to_del->path.u.cost_e2);
}
@@ -668,11 +660,9 @@ void ospf6_asbr_lsa_remove(struct ospf6_lsa *lsa,
.cost_e2)) {
if (IS_OSPF6_DEBUG_EXAMIN(
AS_EXTERNAL)) {
- prefix2str(&prefix, buf,
- sizeof(buf));
zlog_debug(
- "%s: route %s to delete is not same, cost %u del cost %u. skip",
- __func__, buf,
+ "%s: route %pFX to delete is not same, cost %u del cost %u. skip",
+ __func__, &prefix,
route->path.cost,
route_to_del->path
.cost);
@@ -681,10 +671,9 @@ void ospf6_asbr_lsa_remove(struct ospf6_lsa *lsa,
}
if (IS_OSPF6_DEBUG_EXAMIN(AS_EXTERNAL)) {
- prefix2str(&prefix, buf, sizeof(buf));
zlog_debug(
- "%s: route %s path found with cost %u nh %u to remove.",
- __func__, buf, route->path.cost,
+ "%s: route %pFX path found with cost %u nh %u to remove.",
+ __func__, &prefix, route->path.cost,
listcount(o_path->nh_list));
}
@@ -723,16 +712,14 @@ void ospf6_asbr_lsa_remove(struct ospf6_lsa *lsa,
}
if (IS_OSPF6_DEBUG_EXAMIN(AS_EXTERNAL)) {
- prefix2str(&route->prefix, buf,
- sizeof(buf));
zlog_debug(
- "%s: AS-External %u route %s update paths %u nh %u",
+ "%s: AS-External %u route %pFX update paths %u nh %u",
__func__,
(route->path.type
== OSPF6_PATH_TYPE_EXTERNAL1)
? 1
: 2,
- buf, listcount(route->paths),
+ &route->prefix, listcount(route->paths),
route->nh_list ? listcount(
route->nh_list)
: 0);
@@ -784,10 +771,9 @@ void ospf6_asbr_lsa_remove(struct ospf6_lsa *lsa,
|| (route->path.u.cost_e2
!= route_to_del->path.u.cost_e2))) {
if (IS_OSPF6_DEBUG_EXAMIN(AS_EXTERNAL)) {
- prefix2str(&prefix, buf, sizeof(buf));
zlog_debug(
- "%s: route %s to delete is not same, cost %u del cost %u. skip",
- __func__, buf, route->path.cost,
+ "%s: route %pFX to delete is not same, cost %u del cost %u. skip",
+ __func__, &prefix, route->path.cost,
route_to_del->path.cost);
}
continue;
@@ -800,14 +786,13 @@ void ospf6_asbr_lsa_remove(struct ospf6_lsa *lsa,
continue;
}
if (IS_OSPF6_DEBUG_EXAMIN(AS_EXTERNAL)) {
- prefix2str(&route->prefix, buf, sizeof(buf));
zlog_debug(
- "%s: AS-External %u route remove %s cost %u(%u) nh %u",
+ "%s: AS-External %u route remove %pFX cost %u(%u) nh %u",
__func__,
route->path.type == OSPF6_PATH_TYPE_EXTERNAL1
? 1
: 2,
- buf, route->path.cost, route->path.u.cost_e2,
+ &route->prefix, route->path.cost, route->path.u.cost_e2,
listcount(route->nh_list));
}
ospf6_route_remove(route, ospf6->route_table);
diff --git a/ospf6d/ospf6_interface.h b/ospf6d/ospf6_interface.h
index 05ba698a1..6cbfe04c4 100644
--- a/ospf6d/ospf6_interface.h
+++ b/ospf6d/ospf6_interface.h
@@ -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;
diff --git a/ospf6d/ospf6_intra.c b/ospf6d/ospf6_intra.c
index b700899cc..ef5d1d058 100644
--- a/ospf6d/ospf6_intra.c
+++ b/ospf6d/ospf6_intra.c
@@ -1400,11 +1400,9 @@ void ospf6_intra_prefix_route_ecmp_path(struct ospf6_area *oa,
continue;
if (IS_OSPF6_DEBUG_EXAMIN(INTRA_PREFIX)) {
- prefix2str(&old_route->prefix, buf,
- sizeof(buf));
zlog_debug(
- "%s: route %s cost old %u new %u is not same, replace route",
- __func__, buf, o_path->cost,
+ "%s: route %pFX cost old %u new %u is not same, replace route",
+ __func__, &old_route->prefix, o_path->cost,
route->path.cost);
}
@@ -1458,11 +1456,9 @@ void ospf6_intra_prefix_route_ecmp_path(struct ospf6_area *oa,
}
} else {
if (IS_OSPF6_DEBUG_EXAMIN(INTRA_PREFIX)) {
- prefix2str(&old_route->prefix, buf,
- sizeof(buf));
zlog_debug(
- "%s: route %s old cost %u new cost %u, delete old entry.",
- __func__, buf,
+ "%s: route %pFX old cost %u new cost %u, delete old entry.",
+ __func__, &old_route->prefix,
old_route->path.cost,
route->path.cost);
}
@@ -1515,11 +1511,9 @@ void ospf6_intra_prefix_route_ecmp_path(struct ospf6_area *oa,
listnode_add_sort(old_route->paths, ecmp_path);
if (IS_OSPF6_DEBUG_EXAMIN(INTRA_PREFIX)) {
- prefix2str(&route->prefix, buf,
- sizeof(buf));
zlog_debug(
- "%s: route %s %p another path added with nh %u, effective paths %u nh %u",
- __func__, buf,
+ "%s: route %pFX %p another path added with nh %u, effective paths %u nh %u",
+ __func__, &route->prefix,
(void *)old_route,
listcount(ecmp_path->nh_list),
old_route->paths ? listcount(
diff --git a/ospf6d/ospf6_intra.h b/ospf6d/ospf6_intra.h
index 672e288bf..9c29681de 100644
--- a/ospf6d/ospf6_intra.h
+++ b/ospf6d/ospf6_intra.h
@@ -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) */
};
diff --git a/ospf6d/ospf6_lsa.h b/ospf6d/ospf6_lsa.h
index 5519dd1b8..a85d7b060 100644
--- a/ospf6d/ospf6_lsa.h
+++ b/ospf6d/ospf6_lsa.h
@@ -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 */
diff --git a/ospf6d/ospf6_message.h b/ospf6d/ospf6_message.h
index d24b7f894..7ec8cb785 100644
--- a/ospf6d/ospf6_message.h
+++ b/ospf6d/ospf6_message.h
@@ -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 */
diff --git a/ospf6d/ospf6_neighbor.h b/ospf6d/ospf6_neighbor.h
index e221e9d82..1a45a1966 100644
--- a/ospf6d/ospf6_neighbor.h
+++ b/ospf6d/ospf6_neighbor.h
@@ -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];
diff --git a/ospf6d/ospf6_route.h b/ospf6d/ospf6_route.h
index 13b01a348..95ba983e6 100644
--- a/ospf6d/ospf6_route.h
+++ b/ospf6d/ospf6_route.h
@@ -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;
diff --git a/ospf6d/ospf6_top.h b/ospf6d/ospf6_top.h
index 18c069702..806b4da1c 100644
--- a/ospf6d/ospf6_top.h
+++ b/ospf6d/ospf6_top.h
@@ -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;