Commit b181f444 authored by Ondřej Filip's avatar Ondřej Filip

Small changes to reduce number of warnings.

parent 75c1c585
......@@ -100,7 +100,7 @@ ospf_vlink_item:
| AUTHENTICATION NONE { OSPF_PATT->autype = OSPF_AUTH_NONE ; }
| AUTHENTICATION SIMPLE { OSPF_PATT->autype = OSPF_AUTH_SIMPLE ; }
| AUTHENTICATION CRYPTOGRAPHIC { OSPF_PATT->autype = OSPF_AUTH_CRYPT ; }
| password_list {OSPF_PATT->passwords = $1; }
| password_list {OSPF_PATT->passwords = (list *) $1; }
;
ospf_vlink_start: VIRTUAL LINK idval
......@@ -139,7 +139,7 @@ ospf_iface_item:
| AUTHENTICATION NONE { OSPF_PATT->autype = OSPF_AUTH_NONE ; }
| AUTHENTICATION SIMPLE { OSPF_PATT->autype = OSPF_AUTH_SIMPLE ; }
| AUTHENTICATION CRYPTOGRAPHIC { OSPF_PATT->autype = OSPF_AUTH_CRYPT ; }
| password_list {OSPF_PATT->passwords = $1; }
| password_list {OSPF_PATT->passwords = (list *) $1; }
;
pref_list:
......
......@@ -33,7 +33,7 @@ ospf_lsupd_flood(struct ospf_neighbor *n, struct ospf_lsa_header *hn,
int ret, retval = 0;
/* pg 148 */
WALK_LIST(NODE ifa, po->iface_list)
WALK_LIST(ifa, po->iface_list)
{
if (ifa->stub)
continue;
......@@ -51,7 +51,7 @@ ospf_lsupd_flood(struct ospf_neighbor *n, struct ospf_lsa_header *hn,
continue;
}
ret = 0;
WALK_LIST(NODE nn, ifa->neigh_list)
WALK_LIST(nn, ifa->neigh_list)
{
if (nn->state < NEIGHBOR_EXCHANGE)
continue;
......@@ -456,8 +456,8 @@ ospf_lsupd_receive(struct ospf_lsupd_packet *ps,
/* Remove old from all ret lists */
/* pg 144 (5c) */
if (lsadb)
WALK_LIST(NODE ift, po->iface_list)
WALK_LIST(NODE ntmp, ift->neigh_list)
WALK_LIST(ift, po->iface_list)
WALK_LIST(ntmp, ift->neigh_list)
{
struct top_hash_entry *en;
if (ntmp->state > NEIGHBOR_EXSTART)
......
......@@ -532,7 +532,7 @@ struct ospf_area *
ospf_find_area(struct proto_ospf *po, u32 aid)
{
struct ospf_area *oa;
WALK_LIST(NODE oa, po->area_list)
WALK_LIST(oa, po->area_list)
if (((struct ospf_area *) oa)->areaid == aid)
return oa;
return NULL;
......@@ -630,7 +630,7 @@ rxmt_timer_hook(timer * timer)
init_list(&uplist);
upslab = sl_new(n->pool, sizeof(struct l_lsr_head));
WALK_SLIST(SNODE en, n->lsrtl)
WALK_SLIST(en, n->lsrtl)
{
if ((SNODE en)->next == (SNODE en))
bug("RTList is cycled");
......
......@@ -776,8 +776,8 @@ ospf_reconfigure(struct proto *p, struct proto_config *c)
}
}
NODE ac1 = (NODE(ac1))->next;
NODE ac2 = (NODE(ac2))->next;
ac1 = (struct ospf_area_config *)(NODE(ac1))->next;
ac2 = (struct ospf_area_config *)(NODE(ac2))->next;
}
if (((NODE(ac1))->next) != ((NODE(ac2))->next))
......
......@@ -373,7 +373,7 @@ ospf_send_to_agt(sock * sk, struct ospf_iface *ifa, u8 state)
{
struct ospf_neighbor *n;
WALK_LIST(NODE n, ifa->neigh_list) if (n->state >= state)
WALK_LIST(n, ifa->neigh_list) if (n->state >= state)
ospf_send_to(sk, n->ip, ifa);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment