Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Whitespace cleanup in OSPF.

Browse source
This commit is contained in:
Ondrej Zajicek 2014-07-19 17:28:38 +02:00
parent a7a7372aa7
commit 742029eb78
13 changed files with 104 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
proto/ospf/dbdes.c
View file

@ -397,7 +397,7 @@ ospf_receive_dbdes(struct ospf_packet *pkt, struct ospf_iface *ifa,
if (!(rcv_imms & DBDES_I) && if (!(rcv_imms & DBDES_I) &&
!(rcv_imms & DBDES_MS) && !(rcv_imms & DBDES_MS) &&
(n->rid < p->router_id) && (n->rid < p->router_id) &&
(n->dds == rcv_ddseq)) (n->dds == rcv_ddseq))
{ {
/* I'm master! */ /* I'm master! */

2
proto/ospf/hello.c
View file

@ -114,7 +114,7 @@ ospf_send_hello(struct ospf_iface *ifa, int kind, struct ospf_neighbor *dirn)
{ {
if (i == max) if (i == max)
{ {
log(L_WARN "%s: Too many neighbors on interface %s", p->p.name, ifa->ifname); log(L_WARN "%s: Too many neighbors on interface %s", p->p.name, ifa->ifname);
break; break;
} }
neighbors[i] = htonl(neigh->rid); neighbors[i] = htonl(neigh->rid);

7
proto/ospf/iface.c
View file

@ -129,7 +129,7 @@ ospf_sk_open(struct ospf_iface *ifa)
ifa->des_routers = IPA_NONE; ifa->des_routers = IPA_NONE;
if (sk_setup_broadcast(sk) < 0) if (sk_setup_broadcast(sk) < 0)
goto err; goto err;
} }
else else
{ {
@ -137,10 +137,10 @@ ospf_sk_open(struct ospf_iface *ifa)
ifa->des_routers = ospf_is_v2(p) ? IP4_OSPF_DES_ROUTERS : IP6_OSPF_DES_ROUTERS; ifa->des_routers = ospf_is_v2(p) ? IP4_OSPF_DES_ROUTERS : IP6_OSPF_DES_ROUTERS;
if (sk_setup_multicast(sk) < 0) if (sk_setup_multicast(sk) < 0)
goto err; goto err;
if (sk_join_group(sk, ifa->all_routers) < 0) if (sk_join_group(sk, ifa->all_routers) < 0)
goto err; goto err;
} }
} }
@ -1307,4 +1307,3 @@ ospf_iface_info(struct ospf_iface *ifa)
cli_msg(-1015, "\tBackup designed router (IP): %I", ifa->bdrip); cli_msg(-1015, "\tBackup designed router (IP): %I", ifa->bdrip);
} }
} }

1
proto/ospf/lsupd.c
View file

@ -631,4 +631,3 @@ ospf_receive_lsupd(struct ospf_packet *pkt, struct ospf_iface *ifa,
if ((n->state == NEIGHBOR_LOADING) && n->want_lsreq && !skip_lsreq) if ((n->state == NEIGHBOR_LOADING) && n->want_lsreq && !skip_lsreq)
ospf_send_lsreq(p, n); ospf_send_lsreq(p, n);
} }

15
proto/ospf/ospf.c
View file

@ -753,12 +753,12 @@ ospf_sh(struct proto *P)
if (oa == ifa->oa) if (oa == ifa->oa)
{ {
ifano++; ifano++;
WALK_LIST(n, ifa->neigh_list) WALK_LIST(n, ifa->neigh_list)
{ {
nno++; nno++;
if (n->state == NEIGHBOR_FULL) if (n->state == NEIGHBOR_FULL)
adjno++; adjno++;
} }
} }
} }
@ -779,8 +779,8 @@ ospf_sh(struct proto *P)
anet = (struct area_net *) nftmp; anet = (struct area_net *) nftmp;
if(firstfib) if(firstfib)
{ {
cli_msg(-1014, "\t\tArea networks:"); cli_msg(-1014, "\t\tArea networks:");
firstfib = 0; firstfib = 0;
} }
cli_msg(-1014, "\t\t\t%1I/%u\t%s\t%s", anet->fn.prefix, anet->fn.pxlen, cli_msg(-1014, "\t\t\t%1I/%u\t%s\t%s", anet->fn.prefix, anet->fn.pxlen,
anet->hidden ? "Hidden" : "Advertise", anet->active ? "Active" : ""); anet->hidden ? "Hidden" : "Advertise", anet->active ? "Active" : "");
@ -793,8 +793,8 @@ ospf_sh(struct proto *P)
anet = (struct area_net *) nftmp; anet = (struct area_net *) nftmp;
if(firstfib) if(firstfib)
{ {
cli_msg(-1014, "\t\tArea external networks:"); cli_msg(-1014, "\t\tArea external networks:");
firstfib = 0; firstfib = 0;
} }
cli_msg(-1014, "\t\t\t%1I/%u\t%s\t%s", anet->fn.prefix, anet->fn.pxlen, cli_msg(-1014, "\t\t\t%1I/%u\t%s\t%s", anet->fn.prefix, anet->fn.pxlen,
anet->hidden ? "Hidden" : "Advertise", anet->active ? "Active" : ""); anet->hidden ? "Hidden" : "Advertise", anet->active ? "Active" : "");
@ -1456,4 +1456,3 @@ struct protocol proto_ospf = {
.get_attr = ospf_get_attr, .get_attr = ospf_get_attr,
.get_route_info = ospf_get_route_info .get_route_info = ospf_get_route_info
}; };

6
proto/ospf/ospf.h
View file

@ -127,8 +127,8 @@ struct ospf_area_config
u8 translator; /* Translator role, for NSSA ABR */ u8 translator; /* Translator role, for NSSA ABR */
u32 transint; /* Translator stability interval */ u32 transint; /* Translator stability interval */
list patt_list; /* List of iface configs (struct ospf_iface_patt) */ list patt_list; /* List of iface configs (struct ospf_iface_patt) */
list net_list; /* List of aggregate networks for that area */ list net_list; /* List of aggregate networks for that area */
list enet_list; /* List of aggregate external (NSSA) networks */ list enet_list; /* List of aggregate external (NSSA) networks */
list stubnet_list; /* List of stub networks added to Router LSA */ list stubnet_list; /* List of stub networks added to Router LSA */
}; };
@ -334,7 +334,7 @@ struct ospf_iface
#define OSPF_I_OK 0 /* Everything OK */ #define OSPF_I_OK 0 /* Everything OK */
#define OSPF_I_SK 1 /* Socket open failed */ #define OSPF_I_SK 1 /* Socket open failed */
#define OSPF_I_LL 2 /* Missing link-local address (OSPFv3) */ #define OSPF_I_LL 2 /* Missing link-local address (OSPFv3) */
u8 sk_dr; /* Socket is a member of designated routers group */ u8 sk_dr; /* Socket is a member of designated routers group */
u8 marked; /* Used in OSPF reconfigure, 2 for force restart */ u8 marked; /* Used in OSPF reconfigure, 2 for force restart */
u16 rxbuf; /* Buffer size */ u16 rxbuf; /* Buffer size */
u16 tx_length; /* Soft TX packet length limit, usually MTU */ u16 tx_length; /* Soft TX packet length limit, usually MTU */

22
proto/ospf/rt.c
View file

@ -1200,18 +1200,18 @@ ospf_check_vlinks(struct ospf_proto *p)
{ {
struct ospf_iface *nhi = ospf_iface_find(p, tmp->nhs->iface); struct ospf_iface *nhi = ospf_iface_find(p, tmp->nhs->iface);
if ((ifa->state != OSPF_IS_PTP) if ((ifa->state != OSPF_IS_PTP)
|| (ifa->vifa != nhi) || (ifa->vifa != nhi)
|| !ipa_equal(ifa->vip, tmp->lb)) || !ipa_equal(ifa->vip, tmp->lb))
{ {
OSPF_TRACE(D_EVENTS, "Vlink peer %R found", tmp->lsa.id); OSPF_TRACE(D_EVENTS, "Vlink peer %R found", tmp->lsa.id);
ospf_iface_sm(ifa, ISM_DOWN); ospf_iface_sm(ifa, ISM_DOWN);
ifa->vifa = nhi; ifa->vifa = nhi;
ifa->addr = nhi->addr; ifa->addr = nhi->addr;
ifa->cost = tmp->dist; ifa->cost = tmp->dist;
ifa->vip = tmp->lb; ifa->vip = tmp->lb;
ospf_iface_sm(ifa, ISM_UP); ospf_iface_sm(ifa, ISM_UP);
} }
else if ((ifa->state == OSPF_IS_PTP) && (ifa->cost != tmp->dist)) else if ((ifa->state == OSPF_IS_PTP) && (ifa->cost != tmp->dist))
{ {
ifa->cost = tmp->dist; ifa->cost = tmp->dist;
@ -1222,11 +1222,11 @@ ospf_check_vlinks(struct ospf_proto *p)
} }
else else
{ {
if (ifa->state > OSPF_IS_DOWN) if (ifa->state > OSPF_IS_DOWN)
{ {
OSPF_TRACE(D_EVENTS, "Vlink peer %R lost", ifa->vid); OSPF_TRACE(D_EVENTS, "Vlink peer %R lost", ifa->vid);
ospf_iface_sm(ifa, ISM_DOWN); ospf_iface_sm(ifa, ISM_DOWN);
} }
} }
} }
} }

6
proto/ospf/topology.c
View file

@ -1583,7 +1583,7 @@ prepare_prefix_net_lsa_body(struct ospf_proto *p, struct ospf_iface *ifa)
WALK_LIST(n, ifa->neigh_list) WALK_LIST(n, ifa->neigh_list)
if ((n->state == NEIGHBOR_FULL) && if ((n->state == NEIGHBOR_FULL) &&
(en = ospf_hash_find(p->gr, ifa->iface_id, n->iface_id, n->rid, LSA_T_LINK))) (en = ospf_hash_find(p->gr, ifa->iface_id, n->iface_id, n->rid, LSA_T_LINK)))
add_link_lsa(p, en->lsa_body, offset, &pxc); add_link_lsa(p, en->lsa_body, offset, &pxc);
lp = p->lsab; lp = p->lsab;
@ -1955,7 +1955,7 @@ ospf_dump_lsa(struct top_hash_entry *he, struct proto *p)
rr = (struct ospf_lsa_rt_link *) (rt + 1); rr = (struct ospf_lsa_rt_link *) (rt + 1);
for (i = 0; i < lsa_rt_items(&he->lsa); i++) for (i = 0; i < lsa_rt_items(&he->lsa); i++)
OSPF_TRACE(D_EVENTS, " - %1x %-1R %-1R %5u", OSPF_TRACE(D_EVENTS, " - %1x %-1R %-1R %5u",
rr[i].type, rr[i].id, rr[i].data, rr[i].metric); rr[i].type, rr[i].id, rr[i].data, rr[i].metric);
break; break;
@ -1964,7 +1964,7 @@ ospf_dump_lsa(struct top_hash_entry *he, struct proto *p)
rts = (u32 *) (ln + 1); rts = (u32 *) (ln + 1);
for (i = 0; i < lsa_net_items(&he->lsa); i++) for (i = 0; i < lsa_net_items(&he->lsa); i++)
OSPF_TRACE(D_EVENTS, " - %-1R", rts[i]); OSPF_TRACE(D_EVENTS, " - %-1R", rts[i]);
break; break;
default: default: