- Bird-users - Mailing Lists

[PATCH] ospf: improve nexthop_calc
by Joakim Tjernlund 17 Dec '10

17 Dec '10

Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund(a)transmode.se> --- proto/ospf/iface.c | 4 +++- proto/ospf/ospf.h | 21 +++++++++++++++++++++ proto/ospf/rt.c | 38 ++++++++++++++++++++------------------ proto/ospf/topology.c | 5 +++-- 4 files changed, 47 insertions(+), 21 deletions(-) diff --git a/proto/ospf/iface.c b/proto/ospf/iface.c index 8b21f94..53de2f4 100644 --- a/proto/ospf/iface.c +++ b/proto/ospf/iface.c @@ -203,6 +203,8 @@ ospf_iface_down(struct ospf_iface *ifa) ifa->cost = 0; ifa->vip = IPA_NONE; } + /* delete position in router LSA */ + ospf_lsa_pos_set(0, 0, ifa); } @@ -422,7 +424,7 @@ ospf_iface_new(struct proto_ospf *po, struct iface *iface, struct ifa *addr, ifa->iface = iface; ifa->addr = addr; ifa->pool = pool; - + ospf_lsa_pos_set(0, 0, ifa); ifa->cost = ip->cost; ifa->rxmtint = ip->rxmtint; ifa->inftransdelay = ip->inftransdelay; diff --git a/proto/ospf/ospf.h b/proto/ospf/ospf.h index 2ef0180..62e71e2 100644 --- a/proto/ospf/ospf.h +++ b/proto/ospf/ospf.h @@ -189,6 +189,8 @@ struct ospf_iface u32 csn; /* Last used crypt seq number */ bird_clock_t csn_use; /* Last time when packet with that CSN was sent */ #endif + u32 lsa_pos_beg; /* inclusive, >= */ + u32 lsa_pos_end; /* exclusive, < */ ip_addr drip; /* Designated router */ ip_addr bdrip; /* Backup DR */ @@ -821,6 +823,25 @@ void ospf_sh_iface(struct proto *p, char *iff); void ospf_sh_state(struct proto *p, int verbose, int reachable); void ospf_sh_lsadb(struct proto *p); +static inline struct ospf_iface * +ospf_pos_to_ifa (struct ospf_area *oa, int lsa_pos) +{ + struct proto_ospf *po = oa->po; + struct ospf_iface *ifa; + + WALK_LIST(ifa, po->iface_list) + if (lsa_pos >= ifa->lsa_pos_beg && lsa_pos < ifa->lsa_pos_end) + return ifa; + return NULL; +} + +static inline void +ospf_lsa_pos_set(int beg, int end, + struct ospf_iface * ifa) +{ + ifa->lsa_pos_beg = beg; + ifa->lsa_pos_end = end; +} #define EA_OSPF_METRIC1 EA_CODE(EAP_OSPF, 0) #define EA_OSPF_METRIC2 EA_CODE(EAP_OSPF, 1) diff --git a/proto/ospf/rt.c b/proto/ospf/rt.c index 6b8886b..e410603 100644 --- a/proto/ospf/rt.c +++ b/proto/ospf/rt.c @@ -10,7 +10,7 @@ static void add_cand(list * l, struct top_hash_entry *en, struct top_hash_entry *par, u32 dist, - struct ospf_area *oa, struct ospf_lsa_rt_link *rtl); + struct ospf_area *oa, struct ospf_lsa_rt_link *rtl, u32 pos); static void rt_sync(struct proto_ospf *po); /* In ospf_area->rtr we store paths to routers, but we use RID (and not IP address) @@ -396,7 +396,7 @@ ospf_rt_spfa_rtlinks(struct ospf_area *oa, struct top_hash_entry *act, struct to if (tmp) DBG("Going to add cand, Mydist: %u, Req: %u\n", tmp->dist, act->dist + rtl->metric); - add_cand(&oa->cand, tmp, act, act->dist + rtl->metric, oa, rtl); + add_cand(&oa->cand, tmp, act, act->dist + rtl->metric, oa, rtl, i); } } @@ -494,7 +494,7 @@ ospf_rt_spfa(struct ospf_area *oa) DBG("Found :-)\n"); else DBG("Not found!\n"); - add_cand(&oa->cand, tmp, act, act->dist, oa, NULL); + add_cand(&oa->cand, tmp, act, act->dist, oa, NULL, i); } break; } @@ -1351,7 +1351,7 @@ inherit_nexthops(struct mpnh *pn) static struct mpnh * calc_next_hop(struct ospf_area *oa, struct top_hash_entry *en, - struct top_hash_entry *par, struct ospf_lsa_rt_link *rtl) + struct top_hash_entry *par, struct ospf_lsa_rt_link *rtl, u32 pos) { // struct proto *p = &oa->po->proto; struct proto_ospf *po = oa->po; @@ -1377,9 +1377,12 @@ calc_next_hop(struct ospf_area *oa, struct top_hash_entry *en, /* The first case - local network */ if ((en->lsa.type == LSA_T_NET) && (par == oa->rt)) { - WALK_LIST(ifa, po->iface_list) - if (match_dr(ifa, en)) - return new_nexthop(po, IPA_NONE, ifa->iface, ifa->ecmp_weight); + ifa = ospf_pos_to_ifa(oa, pos); + if (!ifa) + return NULL; + + if (match_dr(ifa, en)) + return new_nexthop(po, IPA_NONE, ifa->iface, ifa->ecmp_weight); return NULL; } @@ -1389,15 +1392,14 @@ calc_next_hop(struct ospf_area *oa, struct top_hash_entry *en, { if (rtl->type == LSART_VLNK) return new_nexthop(po, IPA_NONE, NULL, 0); - - WALK_LIST(ifa, po->iface_list) - if (match_rtlink(ifa, rtl)) - { - struct ospf_neighbor *m = find_neigh(ifa, rid); - if (m && (m->state == NEIGHBOR_FULL)) - return new_nexthop(po, m->ip, ifa->iface, ifa->ecmp_weight); - } - + ifa = ospf_pos_to_ifa(oa, pos); + if (!ifa) + return NULL; + { + struct ospf_neighbor *m = find_neigh(ifa, rid); + if (m && (m->state == NEIGHBOR_FULL)) + return new_nexthop(po, m->ip, ifa->iface, ifa->ecmp_weight); + } return NULL; } @@ -1523,7 +1525,7 @@ merge_nexthops(struct proto_ospf *po, struct top_hash_entry *en, /* Add LSA into list of candidates in Dijkstra's algorithm */ static void add_cand(list * l, struct top_hash_entry *en, struct top_hash_entry *par, - u32 dist, struct ospf_area *oa, struct ospf_lsa_rt_link *rtl) + u32 dist, struct ospf_area *oa, struct ospf_lsa_rt_link *rtl, u32 pos) { struct proto_ospf *po = oa->po; node *prev, *n; @@ -1557,7 +1559,7 @@ add_cand(list * l, struct top_hash_entry *en, struct top_hash_entry *par, if (!link_back(oa, en, par)) return; - struct mpnh *nhs = calc_next_hop(oa, en, par, rtl); + struct mpnh *nhs = calc_next_hop(oa, en, par, rtl, pos); if (!nhs) { log(L_WARN "Cannot find next hop for LSA (Type: %04x, Id: %R, Rt: %R)", diff --git a/proto/ospf/topology.c b/proto/ospf/topology.c index e604bf8..0d333bf 100644 --- a/proto/ospf/topology.c +++ b/proto/ospf/topology.c @@ -228,8 +228,9 @@ originate_rt_lsa_body(struct ospf_area *oa, u16 *length) WALK_LIST(ifa, po->iface_list) { - int net_lsa = 0; + int net_lsa = 0, beg_pos; + beg_pos = i; if ((ifa->type == OSPF_IT_VLINK) && (ifa->voa == oa) && (!EMPTY_LIST(ifa->neigh_list))) { @@ -291,7 +292,7 @@ originate_rt_lsa_body(struct ospf_area *oa, u16 *length) log("Unknown interface type %s", ifa->iface->name); break; } - + ospf_lsa_pos_set(beg_pos, i, ifa); /* Now we will originate stub area if there is no primary */ if (net_lsa || (ifa->type == OSPF_IT_VLINK) || -- 1.7.2.2

1 0

[PATCH 1/2] ospf: improve nexthop_calc
by Joakim Tjernlund 17 Dec '10

17 Dec '10

Record the lsa position in the router LSA and use that to find the right interface in calc_next_hop() Remove match_rtlink and match_dr too as these are not needed anymore Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund(a)transmode.se> --- proto/ospf/iface.c | 4 ++- proto/ospf/ospf.h | 21 ++++++++++++++++ proto/ospf/rt.c | 63 ++++++++++++++----------------------------------- proto/ospf/topology.c | 5 ++- 4 files changed, 45 insertions(+), 48 deletions(-) diff --git a/proto/ospf/iface.c b/proto/ospf/iface.c index 05442df..6fc0136 100644 --- a/proto/ospf/iface.c +++ b/proto/ospf/iface.c @@ -197,6 +197,8 @@ ospf_iface_down(struct ospf_iface *ifa) ifa->cost = 0; ifa->vip = IPA_NONE; } + /* delete position in router LSA */ + ospf_lsa_pos_set(0, 0, ifa); } @@ -412,7 +414,7 @@ ospf_iface_new(struct proto_ospf *po, struct iface *iface, struct ifa *addr, ifa->iface = iface; ifa->addr = addr; ifa->pool = pool; - + ospf_lsa_pos_set(0, 0, ifa); ifa->cost = ip->cost; ifa->rxmtint = ip->rxmtint; ifa->inftransdelay = ip->inftransdelay; diff --git a/proto/ospf/ospf.h b/proto/ospf/ospf.h index e260dc0..71071cd 100644 --- a/proto/ospf/ospf.h +++ b/proto/ospf/ospf.h @@ -190,6 +190,8 @@ struct ospf_iface u32 csn; /* Last used crypt seq number */ bird_clock_t csn_use; /* Last time when packet with that CSN was sent */ #endif + u32 lsa_pos_beg; /* inclusive, >= */ + u32 lsa_pos_end; /* exclusive, < */ ip_addr drip; /* Designated router */ ip_addr bdrip; /* Backup DR */ @@ -823,6 +825,25 @@ void ospf_sh_iface(struct proto *p, char *iff); void ospf_sh_state(struct proto *p, int verbose, int reachable); void ospf_sh_lsadb(struct proto *p); +static inline struct ospf_iface * +ospf_pos_to_ifa (struct ospf_area *oa, int lsa_pos) +{ + struct proto_ospf *po = oa->po; + struct ospf_iface *ifa; + + WALK_LIST(ifa, po->iface_list) + if (lsa_pos >= ifa->lsa_pos_beg && lsa_pos < ifa->lsa_pos_end) + return ifa; + return NULL; +} + +static inline void +ospf_lsa_pos_set(int beg, int end, + struct ospf_iface * ifa) +{ + ifa->lsa_pos_beg = beg; + ifa->lsa_pos_end = end; +} #define EA_OSPF_METRIC1 EA_CODE(EAP_OSPF, 0) #define EA_OSPF_METRIC2 EA_CODE(EAP_OSPF, 1) diff --git a/proto/ospf/rt.c b/proto/ospf/rt.c index 953a679..84fea16 100644 --- a/proto/ospf/rt.c +++ b/proto/ospf/rt.c @@ -10,7 +10,7 @@ static void add_cand(list * l, struct top_hash_entry *en, struct top_hash_entry *par, u32 dist, - struct ospf_area *oa, struct ospf_lsa_rt_link *rtl); + struct ospf_area *oa, struct ospf_lsa_rt_link *rtl, u32 pos); static void rt_sync(struct proto_ospf *po); /* In ospf_area->rtr we store paths to routers, but we use RID (and not IP address) @@ -396,7 +396,7 @@ ospf_rt_spfa_rtlinks(struct ospf_area *oa, struct top_hash_entry *act, struct to if (tmp) DBG("Going to add cand, Mydist: %u, Req: %u\n", tmp->dist, act->dist + rtl->metric); - add_cand(&oa->cand, tmp, act, act->dist + rtl->metric, oa, rtl); + add_cand(&oa->cand, tmp, act, act->dist + rtl->metric, oa, rtl, i); } } @@ -494,7 +494,7 @@ ospf_rt_spfa(struct ospf_area *oa) DBG("Found :-)\n"); else DBG("Not found!\n"); - add_cand(&oa->cand, tmp, act, act->dist, oa, NULL); + add_cand(&oa->cand, tmp, act, act->dist, oa, NULL, i); } break; } @@ -1325,32 +1325,6 @@ ospf_rt_spf(struct proto_ospf *po) po->calcrt = 0; } - -static inline int -match_dr(struct ospf_iface *ifa, struct top_hash_entry *en) -{ -#ifdef OSPFv2 - return (ifa->drid == en->lsa.rt) && (ipa_to_u32(ifa->drip) == en->lsa.id); -#else /* OSPFv3 */ - return (ifa->drid == en->lsa.rt) && (ifa->dr_iface_id == en->lsa.id); -#endif -} - - -static inline int -match_rtlink(struct ospf_iface *ifa, struct ospf_lsa_rt_link *rtl) -{ -#ifdef OSPFv2 - return ((ifa->type == OSPF_IT_PTP) || (ifa->type == OSPF_IT_PTMP)) && - (ifa->cost == rtl->metric) && - (((ifa->addr->flags & IA_UNNUMBERED) ? ifa->iface->index : - ipa_to_u32(ifa->addr->ip)) == rtl->data); -#else /* OSPFv3 */ - return ((ifa->type == OSPF_IT_PTP) || (ifa->type == OSPF_IT_PTMP)) && - (ifa->cost == rtl->metric) && (ifa->iface->index == rtl->lif); -#endif -} - static inline int inherit_nexthops(struct mpnh *pn) { @@ -1360,7 +1334,7 @@ inherit_nexthops(struct mpnh *pn) static struct mpnh * calc_next_hop(struct ospf_area *oa, struct top_hash_entry *en, - struct top_hash_entry *par, struct ospf_lsa_rt_link *rtl) + struct top_hash_entry *par, struct ospf_lsa_rt_link *rtl, u32 pos) { // struct proto *p = &oa->po->proto; struct proto_ospf *po = oa->po; @@ -1386,11 +1360,11 @@ calc_next_hop(struct ospf_area *oa, struct top_hash_entry *en, /* The first case - local network */ if ((en->lsa.type == LSA_T_NET) && (par == oa->rt)) { - WALK_LIST(ifa, po->iface_list) - if (match_dr(ifa, en)) - return new_nexthop(po, IPA_NONE, ifa->iface, ifa->ecmp_weight); + ifa = ospf_pos_to_ifa(oa, pos); + if (!ifa) + return NULL; - return NULL; + return new_nexthop(po, IPA_NONE, ifa->iface, ifa->ecmp_weight); } /* The second case - ptp or ptmp neighbor */ @@ -1398,15 +1372,14 @@ calc_next_hop(struct ospf_area *oa, struct top_hash_entry *en, { if (rtl->type == LSART_VLNK) return new_nexthop(po, IPA_NONE, NULL, 0); - - WALK_LIST(ifa, po->iface_list) - if (match_rtlink(ifa, rtl)) - { - struct ospf_neighbor *m = find_neigh(ifa, rid); - if (m && (m->state == NEIGHBOR_FULL)) - return new_nexthop(po, m->ip, ifa->iface, ifa->ecmp_weight); - } - + ifa = ospf_pos_to_ifa(oa, pos); + if (!ifa) + return NULL; + { + struct ospf_neighbor *m = find_neigh(ifa, rid); + if (m && (m->state == NEIGHBOR_FULL)) + return new_nexthop(po, m->ip, ifa->iface, ifa->ecmp_weight); + } return NULL; } @@ -1532,7 +1505,7 @@ merge_nexthops(struct proto_ospf *po, struct top_hash_entry *en, /* Add LSA into list of candidates in Dijkstra's algorithm */ static void add_cand(list * l, struct top_hash_entry *en, struct top_hash_entry *par, - u32 dist, struct ospf_area *oa, struct ospf_lsa_rt_link *rtl) + u32 dist, struct ospf_area *oa, struct ospf_lsa_rt_link *rtl, u32 pos) { struct proto_ospf *po = oa->po; node *prev, *n; @@ -1566,7 +1539,7 @@ add_cand(list * l, struct top_hash_entry *en, struct top_hash_entry *par, if (!link_back(oa, en, par)) return; - struct mpnh *nhs = calc_next_hop(oa, en, par, rtl); + struct mpnh *nhs = calc_next_hop(oa, en, par, rtl, pos); if (!nhs) { log(L_WARN "Cannot find next hop for LSA (Type: %04x, Id: %R, Rt: %R)", diff --git a/proto/ospf/topology.c b/proto/ospf/topology.c index dc6cd1d..08badef 100644 --- a/proto/ospf/topology.c +++ b/proto/ospf/topology.c @@ -228,8 +228,9 @@ originate_rt_lsa_body(struct ospf_area *oa, u16 *length) WALK_LIST(ifa, po->iface_list) { - int net_lsa = 0; + int net_lsa = 0, beg_pos; + beg_pos = i; if ((ifa->type == OSPF_IT_VLINK) && (ifa->voa == oa) && (!EMPTY_LIST(ifa->neigh_list))) { @@ -293,7 +294,7 @@ originate_rt_lsa_body(struct ospf_area *oa, u16 *length) log("Unknown interface type %s", ifa->iface->name); break; } - + ospf_lsa_pos_set(beg_pos, i, ifa); /* Now we will originate stub area if there is no primary */ if (net_lsa || (ifa->type == OSPF_IT_VLINK) || -- 1.7.2.5

1 0

[PATCH] ospf: improve nexthop_calc, v2
by Joakim Tjernlund 17 Dec '10

17 Dec '10

This could be made more efficient if one added an OSPF_IT_PTMP interface type. Then you don't have to look for a neighbour in calc_next_hop() Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund(a)transmode.se> --- proto/ospf/iface.c | 4 +++- proto/ospf/ospf.h | 18 ++++++++++++++++++ proto/ospf/rt.c | 38 ++++++++++++++++++-------------------- proto/ospf/topology.c | 2 +- 4 files changed, 40 insertions(+), 22 deletions(-) diff --git a/proto/ospf/iface.c b/proto/ospf/iface.c index 8b21f94..b74418d 100644 --- a/proto/ospf/iface.c +++ b/proto/ospf/iface.c @@ -203,6 +203,8 @@ ospf_iface_down(struct ospf_iface *ifa) ifa->cost = 0; ifa->vip = IPA_NONE; } + /* delete position in router LSA */ + ospf_lsa_pos_set(~0, ifa); } @@ -422,7 +424,7 @@ ospf_iface_new(struct proto_ospf *po, struct iface *iface, struct ifa *addr, ifa->iface = iface; ifa->addr = addr; ifa->pool = pool; - + ospf_lsa_pos_set(~0, ifa); ifa->cost = ip->cost; ifa->rxmtint = ip->rxmtint; ifa->inftransdelay = ip->inftransdelay; diff --git a/proto/ospf/ospf.h b/proto/ospf/ospf.h index 2ef0180..f785ee0 100644 --- a/proto/ospf/ospf.h +++ b/proto/ospf/ospf.h @@ -189,6 +189,7 @@ struct ospf_iface u32 csn; /* Last used crypt seq number */ bird_clock_t csn_use; /* Last time when packet with that CSN was sent */ #endif + u32 rt_lsa_pos; /* position in router lsa */ ip_addr drip; /* Designated router */ ip_addr bdrip; /* Backup DR */ @@ -821,6 +822,23 @@ void ospf_sh_iface(struct proto *p, char *iff); void ospf_sh_state(struct proto *p, int verbose, int reachable); void ospf_sh_lsadb(struct proto *p); +static inline struct ospf_iface * +ospf_pos_to_ifa (struct ospf_area *oa, int lsa_pos) +{ + struct proto_ospf *po = oa->po; + struct ospf_iface *ifa; + + WALK_LIST(ifa, po->iface_list) + if (lsa_pos == ifa->rt_lsa_pos) + return ifa; + return NULL; +} + +static inline void +ospf_lsa_pos_set(u32 rt_pos, struct ospf_iface * ifa) +{ + ifa->rt_lsa_pos = rt_pos; +} #define EA_OSPF_METRIC1 EA_CODE(EAP_OSPF, 0) #define EA_OSPF_METRIC2 EA_CODE(EAP_OSPF, 1) diff --git a/proto/ospf/rt.c b/proto/ospf/rt.c index 6b8886b..d2857dc 100644 --- a/proto/ospf/rt.c +++ b/proto/ospf/rt.c @@ -10,7 +10,7 @@ static void add_cand(list * l, struct top_hash_entry *en, struct top_hash_entry *par, u32 dist, - struct ospf_area *oa, struct ospf_lsa_rt_link *rtl); + struct ospf_area *oa, struct ospf_lsa_rt_link *rtl, u32 pos); static void rt_sync(struct proto_ospf *po); /* In ospf_area->rtr we store paths to routers, but we use RID (and not IP address) @@ -396,7 +396,7 @@ ospf_rt_spfa_rtlinks(struct ospf_area *oa, struct top_hash_entry *act, struct to if (tmp) DBG("Going to add cand, Mydist: %u, Req: %u\n", tmp->dist, act->dist + rtl->metric); - add_cand(&oa->cand, tmp, act, act->dist + rtl->metric, oa, rtl); + add_cand(&oa->cand, tmp, act, act->dist + rtl->metric, oa, rtl, i); } } @@ -494,7 +494,7 @@ ospf_rt_spfa(struct ospf_area *oa) DBG("Found :-)\n"); else DBG("Not found!\n"); - add_cand(&oa->cand, tmp, act, act->dist, oa, NULL); + add_cand(&oa->cand, tmp, act, act->dist, oa, NULL, i); } break; } @@ -1351,7 +1351,7 @@ inherit_nexthops(struct mpnh *pn) static struct mpnh * calc_next_hop(struct ospf_area *oa, struct top_hash_entry *en, - struct top_hash_entry *par, struct ospf_lsa_rt_link *rtl) + struct top_hash_entry *par, struct ospf_lsa_rt_link *rtl, u32 pos) { // struct proto *p = &oa->po->proto; struct proto_ospf *po = oa->po; @@ -1377,11 +1377,10 @@ calc_next_hop(struct ospf_area *oa, struct top_hash_entry *en, /* The first case - local network */ if ((en->lsa.type == LSA_T_NET) && (par == oa->rt)) { - WALK_LIST(ifa, po->iface_list) - if (match_dr(ifa, en)) - return new_nexthop(po, IPA_NONE, ifa->iface, ifa->ecmp_weight); - - return NULL; + ifa = ospf_pos_to_ifa(oa, pos); + if (!ifa) + return NULL; + return new_nexthop(po, IPA_NONE, ifa->iface, ifa->ecmp_weight); } /* The second case - ptp or ptmp neighbor */ @@ -1389,15 +1388,14 @@ calc_next_hop(struct ospf_area *oa, struct top_hash_entry *en, { if (rtl->type == LSART_VLNK) return new_nexthop(po, IPA_NONE, NULL, 0); - - WALK_LIST(ifa, po->iface_list) - if (match_rtlink(ifa, rtl)) - { - struct ospf_neighbor *m = find_neigh(ifa, rid); - if (m && (m->state == NEIGHBOR_FULL)) - return new_nexthop(po, m->ip, ifa->iface, ifa->ecmp_weight); - } - + ifa = ospf_pos_to_ifa(oa, pos); + if (!ifa) + return NULL; + { + struct ospf_neighbor *m = find_neigh(ifa, rid); + if (m && (m->state == NEIGHBOR_FULL)) + return new_nexthop(po, m->ip, ifa->iface, ifa->ecmp_weight); + } return NULL; } @@ -1523,7 +1521,7 @@ merge_nexthops(struct proto_ospf *po, struct top_hash_entry *en, /* Add LSA into list of candidates in Dijkstra's algorithm */ static void add_cand(list * l, struct top_hash_entry *en, struct top_hash_entry *par, - u32 dist, struct ospf_area *oa, struct ospf_lsa_rt_link *rtl) + u32 dist, struct ospf_area *oa, struct ospf_lsa_rt_link *rtl, u32 pos) { struct proto_ospf *po = oa->po; node *prev, *n; @@ -1557,7 +1555,7 @@ add_cand(list * l, struct top_hash_entry *en, struct top_hash_entry *par, if (!link_back(oa, en, par)) return; - struct mpnh *nhs = calc_next_hop(oa, en, par, rtl); + struct mpnh *nhs = calc_next_hop(oa, en, par, rtl, pos); if (!nhs) { log(L_WARN "Cannot find next hop for LSA (Type: %04x, Id: %R, Rt: %R)", diff --git a/proto/ospf/topology.c b/proto/ospf/topology.c index e604bf8..32fcc5e 100644 --- a/proto/ospf/topology.c +++ b/proto/ospf/topology.c @@ -291,7 +291,7 @@ originate_rt_lsa_body(struct ospf_area *oa, u16 *length) log("Unknown interface type %s", ifa->iface->name); break; } - + ospf_lsa_pos_set(i, ifa); /* Now we will originate stub area if there is no primary */ if (net_lsa || (ifa->type == OSPF_IT_VLINK) || -- 1.7.2.2

1 0

Using BIRD at an internet service provider
by Juliano NS 15 Dec '10

15 Dec '10

Hi, We are a webhosting company and are moving from single to dual-homed, with two internet transit providers. Each internet connection will receive full BGP tables and will handle around 500 Mbps (300 Mbps out, 200 Mbps in). We have been hearing pretty good thing about BIRD and are considering it as our routing daemon. The idea is to setup two boxes with BIRD as edge routers, one for each connection to the transit operators. These boxes will announce routes to our core router via iBGP. Do you reckon BIRD is suitable for this job? Thanks in advance. Juliano

2 1

bird6 crashed
by Arnold Nipper 14 Dec '10

14 Dec '10

A couple of hours ago bird6 crashed. Core dump may be found at http://download.de-cix.net/rs6-l_1292066402_bird6_11.gz MD5sum is 9509d3ac560da9588ac36c763547227c Arnold btw: is there a mailing list for developers only as well? -- Arnold Nipper / nIPper consulting, Sandhausen, Germany email: arnold(a)nipper.de phone: +49 6224 9259 299 mobile: +49 152 53717690 fax: +49 6224 9259 333

2 2

Netlink: Cannot allocate memory
by Petr Šťastný 13 Dec '10

13 Dec '10

Hello, I have bird6 (1.2.5) running OSPF and BGP. Everything works perfectly until I enable BGP protocol: bird> enable XXX 10-12-2010 14:37:52 <INFO> Enabling protocol XXX 10-12-2010 14:37:54 <WARN> Netlink: Cannot allocate memory 10-12-2010 14:37:54 <WARN> Netlink: Cannot allocate memory 10-12-2010 14:37:54 <WARN> Netlink: Cannot allocate memory 10-12-2010 14:37:54 <WARN> Netlink: Cannot allocate memory 10-12-2010 14:37:54 <WARN> Netlink: Cannot allocate memory 10-12-2010 14:37:54 <WARN> ... 10-12-2010 14:38:02 <ERR> OSPF: Socket error: Network is unreachable 10-12-2010 14:38:12 <ERR> OSPF: Socket error: Network is unreachable 10-12-2010 14:38:12 <WARN> Netlink: Cannot allocate memory 10-12-2010 14:38:12 <WARN> Netlink: Cannot allocate memory 10-12-2010 14:38:12 <WARN> Netlink: Cannot allocate memory 10-12-2010 14:38:12 <WARN> Netlink: Cannot allocate memory 10-12-2010 14:38:12 <WARN> Netlink: Cannot allocate memory 10-12-2010 14:38:12 <WARN> ... 10-12-2010 14:38:22 <ERR> OSPF: Socket error: Network is unreachable 10-12-2010 14:38:25 <WARN> Netlink: No such process 10-12-2010 14:38:25 <WARN> Netlink: Cannot allocate memory 10-12-2010 14:38:25 <WARN> Netlink: No such process 10-12-2010 14:38:25 <WARN> Netlink: Cannot allocate memory 10-12-2010 14:38:25 <WARN> Netlink: No such process It is interesting that I also have another router with bird6 running OSPF (the same network) and BGP peer without any problem. The router has 5 GB of free memory. bird> show memory BIRD memory usage Routing tables: 46 kB Route attributes: 4952 B Protocols: 72 kB Total: 151 kB Any idea? Thanks Petr Stastny

2 2

bug or feature?
by Arnold Nipper 13 Dec '10

13 Dec '10

birdc show route 65.52.0.0/15 BIRD 1.2.2 ready. IP address expected birdc BIRD 1.2.2 ready. bird> show route 65.52.0.0/15 Network not in table -- Arnold Nipper / nIPper consulting, Sandhausen, Germany email: arnold(a)nipper.de phone: +49 6224 9259 299 mobile: +49 152 53717690 fax: +49 6224 9259 333

6 13

bird6.conf & Router ID
by Matthias Waehlisch 25 Nov '10

25 Nov '10

Hi all, just a quite stupid question but I'm struggling with the bird6 configuration. I want to configure the router ID as follows: --snip-- router id 2a00:cd0:1000:47::2; --snap-- But the error message "Router IDs must be entered as hexadecimal numbers or IPv4 addresses in IPv6 version" appears. Using an embedded IPv4 address does not work, as well. It is BIRD 1.2.3. Thanks matthias

3 3

rfc1583compat
by Petr Šťastný 25 Nov '10

25 Nov '10

Hello, what is the exact meaning of rfc1583compat switch in OSPF protocol a what is the appropriate difference in route table calculation? Thanks Petr Stastny

2 3

Problem with bgp_local_pref on peer and filter
by Przemysław Knycz 21 Nov '10

21 Nov '10

Hello! I have wird problems with settings bgp_local_pref to routes imported from peer. Version 1.2.4 and 1.2.5. My conf: filter bgp_import_prefix { if (net ~ [ 0.0.0.0/0 ]) then reject; bgp_local_pref=150; accept; } filter bgp_export_prefix { if (net ~ [ 213.5.248.0/21, 88.135.160.0/19 ]) && (source = RTS_STATIC) then accept; reject; } protocol bgp EPIX_RS1 { description "EPIX"; local as 50188; neighbor 195.191.170.1 as 50607; default bgp_local_pref 100; import filter bgp_import_prefix; export filter bgp_export_prefix; } I've checked, filter works when i add "quitbird". Wird was that once it works i've local_pref for this feed 150, but when i've restarted, it sets to 100... I don't know why it doesnt work. I've also changed "default bgp_local_pref" to 150, but it still sets to 100 ;-/ Unfortunatly at doc there isnt any sample with using bgp_local_pref at all :( Please help! Regards. -- . Przemyslaw Stanislaw Knycz, xmpp:djrzulf@kol.net.pl . | Wireless & IT specialist --- Mobile : +48 601391681 | | KIKE Founder & Member [GRAP] -- http://www.kike.pl/ | `- Futurama -- you can't prove it won't happen -'

1 1