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

Use neigh_connected_to in rip, and behave more correctly

Browse source 
w.r.t. whotoldme and nexthop.
This commit is contained in:
Pavel Machek 2000-03-27 12:21:11 +00:00
parent 200accf396
commit d0031c5ee9
1 changed files with 15 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
proto/rip/rip.c
View file

@ -74,34 +74,17 @@ rip_tx_prepare(struct proto *p, ip_addr daddr, struct rip_block *b, struct rip_e
#ifndef IPV6 #ifndef IPV6
b->netmask = ipa_mkmask( e->n.pxlen ); b->netmask = ipa_mkmask( e->n.pxlen );
ipa_hton( b->netmask ); ipa_hton( b->netmask );
b->nexthop = IPA_NONE;
{
/*
* FIXME: This DOESN'T work. The s->daddr will be typically
* a broadcast or multicast address which will be of course
* rejected by the neighbor cache. I've #ifdef'd out the whole
* test to avoid dereferencing NULL pointer. --mj
*/
#if 0
/* IS this really neccessary?
If nexthop and destination of this packet are on same interface, split horizont applies and *nothing* should be sent....
*/
neighbor *n1, *n2; if (neigh_connected_to(p, &e->nexthop, rif->iface))
n1 = neigh_find( p, &daddr, 0 ); /* FIXME, mj: this is neccessary for responses, still it is too complicated for common case */
n2 = neigh_find( p, &e->nexthop, 0 );
if (n1->iface == n2->iface)
b->nexthop = e->nexthop; b->nexthop = e->nexthop;
else else
#endif
b->nexthop = IPA_NONE; b->nexthop = IPA_NONE;
}
ipa_hton( b->nexthop ); ipa_hton( b->nexthop );
#else #else
b->pxlen = e->n.pxlen; b->pxlen = e->n.pxlen;
#endif #endif
b->metric = htonl( e->metric ); b->metric = htonl( e->metric );
if (if_connected(&e->whotoldme, rif->iface)) { if (neigh_connected_to(p, &e->whotoldme, rif->iface)) {
DBG( "(split horizon)" ); DBG( "(split horizon)" );
b->metric = htonl( P_CF->infinity ); b->metric = htonl( P_CF->infinity );
} }
@ -719,13 +702,18 @@ rip_rt_notify(struct proto *p, struct network *net, struct rte *new, struct rte
e = fib_get( &P->rtable, &net->n.prefix, net->n.pxlen ); e = fib_get( &P->rtable, &net->n.prefix, net->n.pxlen );
e->nexthop = new->attrs->gw; e->nexthop = new->attrs->gw;
e->metric = 0;
e->whotoldme = IPA_NONE;
if (new->attrs->proto == p) {
e->tag = ea_find(attrs, EA_RIP_TAG)->u.data; e->tag = ea_find(attrs, EA_RIP_TAG)->u.data;
e->metric = ea_find(attrs, EA_RIP_METRIC)->u.data; e->metric = ea_find(attrs, EA_RIP_METRIC)->u.data;
if (e->metric > P_CF->infinity) if (e->metric > P_CF->infinity)
e->metric = P_CF->infinity; e->metric = P_CF->infinity;
e->whotoldme = new->attrs->from;
}
if (!e->metric) /* FIXME: this is metric for external routes. Should it be configurable? */ if (!e->metric) /* FIXME: this is metric for external routes. Should it be configurable? */
e->metric = 5; e->metric = 5;
e->whotoldme = new->attrs->from;
e->updated = e->changed = now; e->updated = e->changed = now;
e->flags = 0; e->flags = 0;
} }