Loading proto/rip/rip.c +13 −12 Original line number Original line Diff line number Diff line Loading @@ -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? Loading Loading @@ -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" Loading Loading @@ -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... ", whotoldme, network, block->pxlen, metric ); #else 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, ipa_mklen(block->netmask), metric ); whotoldme, network, pxlen, 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; Loading Loading
proto/rip/rip.c +13 −12 Original line number Original line Diff line number Diff line Loading @@ -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? Loading Loading @@ -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" Loading Loading @@ -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... ", whotoldme, network, block->pxlen, metric ); #else 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, ipa_mklen(block->netmask), metric ); whotoldme, network, pxlen, 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; Loading
