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

Small typos fixed.

Browse source
This commit is contained in:
Ondrej Filip 2013-02-26 14:29:53 +01:00
parent de41dcd13d
commit a9fc659b84
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
proto/rip/rip.c
View file

@ -6,10 +6,10 @@
* *
* Can be freely distributed and used under the terms of the GNU GPL. * Can be freely distributed and used under the terms of the GNU GPL.
* *
FIXME: IpV6 support: packet size FIXME: IPv6 support: packet size
FIXME: (nonurgent) IPv6 support: receive "route using" blocks FIXME: (nonurgent) IPv6 support: receive "route using" blocks
FIXME: (nonurgent) IPv6 support: generate "nexthop" blocks FIXME: (nonurgent) IPv6 support: generate "nexthop" blocks
next hops are only advisory, and they are pretty ugly in IpV6. next hops are only advisory, and they are pretty ugly in IPv6.
I suggest just forgetting about them. I suggest just forgetting about them.
FIXME: (nonurgent): fold rip_connection into rip_interface? FIXME: (nonurgent): fold rip_connection into rip_interface?
@ -46,6 +46,7 @@
*/ */
#undef LOCAL_DEBUG #undef LOCAL_DEBUG
#define LOCAL_DEBUG 1
#include "nest/bird.h" #include "nest/bird.h"
#include "nest/iface.h" #include "nest/iface.h"
@ -357,26 +358,26 @@ advertise_entry( struct proto *p, struct rip_block *b, ip_addr whotoldme, struct
static void static void
process_block( struct proto *p, struct rip_block *block, ip_addr whotoldme, struct iface *iface ) process_block( struct proto *p, struct rip_block *block, ip_addr whotoldme, struct iface *iface )
{ {
int metric, pxlen;
#ifndef IPV6 #ifndef IPV6
int metric = ntohl( block->metric ); metric = ntohl( block->metric );
pxlen = ipa_mklen(block->netmask);
#else #else
int metric = block->metric; metric = block->metric;
pxlen = block->pxlen;
#endif #endif
ip_addr network = block->network; ip_addr network = block->network;
CHK_MAGIC; CHK_MAGIC;
#ifdef IPV6
TRACE(D_ROUTES, "block: %I tells me: %I/%d available, metric %d... ", TRACE(D_ROUTES, "block: %I tells me: %I/%d available, metric %d... ",
whotoldme, network, block->pxlen, metric ); whotoldme, network, pxlen, metric );
#else
TRACE(D_ROUTES, "block: %I tells me: %I/%d available, metric %d... ",
whotoldme, network, ipa_mklen(block->netmask), metric );
#endif
if ((!metric) || (metric > P_CF->infinity)) { if ((!metric) || (metric > P_CF->infinity)) {
#ifdef IPV6 /* Someone is sedning us nexthop and we are ignoring it */ #ifdef IPV6 /* Someone is sending us nexthop and we are ignoring it */
if (metric == 0xff) if (metric == 0xff)
{ DBG( "IpV6 nexthop ignored" ); return; } { DBG( "IPv6 nexthop ignored" ); return; }
#endif #endif
log( L_WARN "%s: Got metric %d from %I", p->name, metric, whotoldme ); log( L_WARN "%s: Got metric %d from %I", p->name, metric, whotoldme );
return; return;