summaryrefslogtreecommitdiffstats
path: root/ospfd
diff options
context:
space:
mode:
authorDenis Ovsienko <infrastation@yandex.ru>2011-08-23 09:36:27 +0200
committerDenis Ovsienko <infrastation@yandex.ru>2011-09-27 19:41:00 +0200
commit05b7709dad416146376cc4f41db0c866b3738f5b (patch)
treebf17ceea5864f3bd4d6beb0a5dff4ba5b718b339 /ospfd
parentlib: use "protocol-independed API" from RFC3678, if that is available (diff)
downloadfrr-05b7709dad416146376cc4f41db0c866b3738f5b.tar.xz
frr-05b7709dad416146376cc4f41db0c866b3738f5b.zip
ospfd: sizing macros cleanup
* ospf_spf.c * ROUTER_LSA_TOS_SIZE: prepend OSPF_ and move to ospf_lsa.h * ROUTER_LSA_MIN_SIZE: replace with existing OSPF_ROUTER_LSA_LINK_SIZE
Diffstat (limited to 'ospfd')
-rw-r--r--ospfd/ospf_lsa.h1
-rw-r--r--ospfd/ospf_spf.c17
2 files changed, 8 insertions, 10 deletions
diff --git a/ospfd/ospf_lsa.h b/ospfd/ospf_lsa.h
index 72e2f8a50..bf3b083c4 100644
--- a/ospfd/ospf_lsa.h
+++ b/ospfd/ospf_lsa.h
@@ -49,6 +49,7 @@
#define OSPF_LSA_HEADER_SIZE 20U
#define OSPF_ROUTER_LSA_LINK_SIZE 12U
+#define OSPF_ROUTER_LSA_TOS_SIZE 4U
#define OSPF_MAX_LSA_SIZE 1500U
/* AS-external-LSA refresh method. */
diff --git a/ospfd/ospf_spf.c b/ospfd/ospf_spf.c
index ca2002224..6dcf0b188 100644
--- a/ospfd/ospf_spf.c
+++ b/ospfd/ospf_spf.c
@@ -356,9 +356,6 @@ ospf_lsa_has_link (struct lsa_header *w, struct lsa_header *v)
return -1;
}
-#define ROUTER_LSA_MIN_SIZE 12
-#define ROUTER_LSA_TOS_SIZE 4
-
/* Find the next link after prev_link from v to w. If prev_link is
* NULL, return the first link from v to w. Ignore stub and virtual links;
* these link types will never be returned.
@@ -380,8 +377,8 @@ ospf_get_next_link (struct vertex *v, struct vertex *w,
else
{
p = (u_char *) prev_link;
- p += (ROUTER_LSA_MIN_SIZE +
- (prev_link->m[0].tos_count * ROUTER_LSA_TOS_SIZE));
+ p += (OSPF_ROUTER_LSA_LINK_SIZE +
+ (prev_link->m[0].tos_count * OSPF_ROUTER_LSA_TOS_SIZE));
}
lim = ((u_char *) v->lsa) + ntohs (v->lsa->length);
@@ -390,7 +387,7 @@ ospf_get_next_link (struct vertex *v, struct vertex *w,
{
l = (struct router_lsa_link *) p;
- p += (ROUTER_LSA_MIN_SIZE + (l->m[0].tos_count * ROUTER_LSA_TOS_SIZE));
+ p += (OSPF_ROUTER_LSA_LINK_SIZE + (l->m[0].tos_count * OSPF_ROUTER_LSA_TOS_SIZE));
if (l->m[0].type != lsa_type)
continue;
@@ -755,8 +752,8 @@ ospf_spf_next (struct vertex *v, struct ospf_area *area,
{
l = (struct router_lsa_link *) p;
- p += (ROUTER_LSA_MIN_SIZE +
- (l->m[0].tos_count * ROUTER_LSA_TOS_SIZE));
+ p += (OSPF_ROUTER_LSA_LINK_SIZE +
+ (l->m[0].tos_count * OSPF_ROUTER_LSA_TOS_SIZE));
/* (a) If this is a link to a stub network, examine the next
link in V's LSA. Links to stub networks will be
@@ -989,8 +986,8 @@ ospf_spf_process_stubs (struct ospf_area *area, struct vertex *v,
{
l = (struct router_lsa_link *) p;
- p += (ROUTER_LSA_MIN_SIZE +
- (l->m[0].tos_count * ROUTER_LSA_TOS_SIZE));
+ p += (OSPF_ROUTER_LSA_LINK_SIZE +
+ (l->m[0].tos_count * OSPF_ROUTER_LSA_TOS_SIZE));
if (l->m[0].type == LSA_LINK_TYPE_STUB)
ospf_intra_add_stub (rt, l, v, area, parent_is_root);