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

IpV6 now actually compiles.

Browse source 
Mj, could you provide example of static config for ipv6 that is _not_
rejected by checks? I tried this and got rejected.

	route 62:168::/32 via 62:169::;
	route 1:2::/32 via 1:3::;
This commit is contained in:
Pavel Machek 2000-04-29 15:45:30 +00:00
parent 46cdc7e20f
commit 9c1a55deee
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
proto/rip/rip.c
View file

@ -58,10 +58,10 @@ static int
rip_tx_prepare(struct proto *p, ip_addr daddr, struct rip_block *b, struct rip_entry *e, struct rip_interface *rif, int pos ) rip_tx_prepare(struct proto *p, ip_addr daddr, struct rip_block *b, struct rip_entry *e, struct rip_interface *rif, int pos )
{ {
DBG( "." ); DBG( "." );
b->family = htons( 2 ); /* AF_INET */
b->tag = htons( e->tag ); b->tag = htons( e->tag );
b->network = e->n.prefix; b->network = e->n.prefix;
#ifndef IPV6 #ifndef IPV6
b->family = htons( 2 ); /* AF_INET */
b->netmask = ipa_mkmask( e->n.pxlen ); b->netmask = ipa_mkmask( e->n.pxlen );
ipa_hton( b->netmask ); ipa_hton( b->netmask );
@ -339,6 +339,8 @@ rip_process_packet( struct proto *p, struct rip_packet *packet, int num, ip_addr
for (i=0; i<num; i++) { for (i=0; i<num; i++) {
struct rip_block *block = &packet->block[i]; struct rip_block *block = &packet->block[i];
#ifndef IPV6
/* Authentication is not defined for v6 */
if (block->family == 0xffff) { if (block->family == 0xffff) {
if (i) if (i)
continue; /* md5 tail has this family */ continue; /* md5 tail has this family */
@ -347,6 +349,7 @@ rip_process_packet( struct proto *p, struct rip_packet *packet, int num, ip_addr
authenticated = 1; authenticated = 1;
continue; continue;
} }
#endif
if ((!authenticated) && (P_CF->authtype != AT_NONE)) if ((!authenticated) && (P_CF->authtype != AT_NONE))
BAD( "Packet is not authenticated and it should be" ); BAD( "Packet is not authenticated and it should be" );
ipa_ntoh( block->network ); ipa_ntoh( block->network );
@ -597,8 +600,8 @@ new_iface(struct proto *p, struct iface *new, unsigned long flags, struct iface_
rif->sock->daddr = ipa_from_u32(0xe0000009); rif->sock->daddr = ipa_from_u32(0xe0000009);
rif->sock->saddr = ipa_from_u32(0xe0000009); rif->sock->saddr = ipa_from_u32(0xe0000009);
#else #else
p_pton("FF02::9", &rif->sock->daddr); ip_pton("FF02::9", &rif->sock->daddr);
p_pton("FF02::9", &rif->sock->saddr); ip_pton("FF02::9", &rif->sock->saddr);
#endif #endif
} else } else
rif->sock->daddr = new->addr->brd; rif->sock->daddr = new->addr->brd;
@ -657,12 +660,16 @@ rip_if_notify(struct proto *p, unsigned c, struct iface *iface)
if (!k) return; /* We are not interested in this interface */ if (!k) return; /* We are not interested in this interface */
lock = olock_new( p->pool ); lock = olock_new( p->pool );
#ifndef IPV6
lock->addr = ipa_from_u32(0xe0000009); /* This is okay: we lock->addr = ipa_from_u32(0xe0000009); /* This is okay: we
may actually use may actually use
other address, but other address, but
we do not want two we do not want two
rips at one time, rips at one time,
anyway. */ anyway. */
#else
ip_pton("FF02::9", &lock->addr);
#endif
lock->port = P_CF->port; lock->port = P_CF->port;
lock->iface = iface; lock->iface = iface;
lock->hook = rip_real_if_add; lock->hook = rip_real_if_add;