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

Updated RIP to new neighbor cache semantics. When presented with next hop

Browse source 
equal to a local address, just ignore the route (as it is usually just an
external route exported by us echoed by some RIP peer), when given an
invalid next hop, moan to the log.
This commit is contained in:
Martin Mares 2000-06-01 12:59:50 +00:00
parent 4a91150175
commit 491cd43b77
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
proto/rip/rip.c
View file

@ -282,15 +282,17 @@ advertise_entry( struct proto *p, struct rip_block *b, ip_addr whotoldme )
log( L_REMOTE "%s: %I asked me to route %I/%d using not-neighbor %I.", p->name, A.from, b->network, pxlen, A.gw ); log( L_REMOTE "%s: %I asked me to route %I/%d using not-neighbor %I.", p->name, A.from, b->network, pxlen, A.gw );
return; return;
} }
if (neighbor->scope == SCOPE_HOST) {
DBG("Self-destined route, ignoring.\n");
return;
}
A.iface = neighbor->iface; A.iface = neighbor->iface;
if (!(rif = neighbor->data)) { if (!(rif = neighbor->data)) {
rif = neighbor->data = find_interface(p, A.iface); rif = neighbor->data = find_interface(p, A.iface);
} }
if (!rif) { if (!rif)
bug("Route packet using unknown interface? No."); bug("Route packet using unknown interface? No.");
return;
}
/* set to: interface of nexthop */ /* set to: interface of nexthop */
a = rta_lookup(&A); a = rta_lookup(&A);
@ -338,6 +340,7 @@ rip_process_packet( struct proto *p, struct rip_packet *packet, int num, ip_addr
{ {
int i; int i;
int native_class = 0, authenticated = 0; int native_class = 0, authenticated = 0;
neighbor *neighbor;
switch( packet->heading.version ) { switch( packet->heading.version ) {
case RIP_V1: DBG( "Rip1: " ); break; case RIP_V1: DBG( "Rip1: " ); break;
@ -360,7 +363,7 @@ rip_process_packet( struct proto *p, struct rip_packet *packet, int num, ip_addr
return 1; return 1;
} }
if (!neigh_find( p, &whotoldme, 0 )) { if (!(neighbor = neigh_find( p, &whotoldme, 0 )) || neighbor->scope == SCOPE_HOST) {
log( L_REMOTE "%s: %I send me routing info but he is not my neighbor", P_NAME, whotoldme ); log( L_REMOTE "%s: %I send me routing info but he is not my neighbor", P_NAME, whotoldme );
return 0; return 0;
} }