proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-12 12:32:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* prefix.[hc]: Pass argument to the inet6_ntoa by value making it more

Browse Source 
inet_ntoa alike.
	* ripngd.[hc], ripng_interface.c, ripng_peer.c: inet6_ntoa() takes
	  argument now by value.
This commit is contained in:
hasso 2005-04-08 01:30:51 +00:00
parent 528bed4a9a
commit 3a2ce6a14e
7 changed files with 59 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ChangeLog
View File

@ -1,3 +1,8 @@
2005-04-08 Hasso Tepper <hasso at quagga.net>
* prefix.[hc]: Pass argument to the inet6_ntoa by value making it more
inet_ntoa alike.
2005-04-07 Paul Jakma <paul.jakma@sun.com> 2005-04-07 Paul Jakma <paul.jakma@sun.com>
* linklist.h: Add usage comments. * linklist.h: Add usage comments.

4
lib/prefix.c
View File

@ -738,11 +738,11 @@ netmask_str2prefix_str (const char *net_str, const char *mask_str,
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
/* Utility function for making IPv6 address string. */ /* Utility function for making IPv6 address string. */
const char * const char *
inet6_ntoa (struct in6_addr *addr) inet6_ntoa (struct in6_addr addr)
{ {
static char buf[INET6_ADDRSTRLEN]; static char buf[INET6_ADDRSTRLEN];
inet_ntop (AF_INET6, addr, buf, INET6_ADDRSTRLEN); inet_ntop (AF_INET6, &addr, buf, INET6_ADDRSTRLEN);
return buf; return buf;
} }
#endif /* HAVE_IPV6 */ #endif /* HAVE_IPV6 */

2
lib/prefix.h
View File

@ -173,7 +173,7 @@ int ip6_masklen (struct in6_addr);
void masklen2ip6 (int, struct in6_addr *); void masklen2ip6 (int, struct in6_addr *);
void str2in6_addr (const char *, struct in6_addr *); void str2in6_addr (const char *, struct in6_addr *);
const char *inet6_ntoa (struct in6_addr *); const char *inet6_ntoa (struct in6_addr);
#endif /* HAVE_IPV6 */ #endif /* HAVE_IPV6 */

5
ripngd/ChangeLog
View File

@ -1,3 +1,8 @@
2005-04-08 Hasso Tepper <hasso at quagga.net>
* ripngd.[hc], ripng_interface.c, ripng_peer.c: inet6_ntoa() takes
argument now by value.
2005-04-05 Hasso Tepper <hasso at quagga.net> 2005-04-05 Hasso Tepper <hasso at quagga.net>
* ripngd.[hc]: Remove inet6_ntop() and any usage of it. inet6_ntoa() * ripngd.[hc]: Remove inet6_ntop() and any usage of it. inet6_ntoa()

2
ripngd/ripng_interface.c
View File

@ -437,7 +437,7 @@ ripng_interface_address_add (int command, struct zclient *zclient,
{ {
if (IS_RIPNG_DEBUG_ZEBRA) if (IS_RIPNG_DEBUG_ZEBRA)
zlog_debug ("RIPng connected address %s/%d add", zlog_debug ("RIPng connected address %s/%d add",
inet6_ntoa(&p->u.prefix6), inet6_ntoa(p->u.prefix6),
p->prefixlen); p->prefixlen);
/* Check is this prefix needs to be redistributed. */ /* Check is this prefix needs to be redistributed. */

2
ripngd/ripng_peer.c
View File

@ -197,7 +197,7 @@ ripng_peer_display (struct vty *vty)
for (ALL_LIST_ELEMENTS (peer_list, node, nnode, peer)) for (ALL_LIST_ELEMENTS (peer_list, node, nnode, peer))
{ {
vty_out (vty, " %s %s%14s %10d %10d %10d %s%s", inet6_ntoa (&peer->addr), vty_out (vty, " %s %s%14s %10d %10d %10d %s%s", inet6_ntoa (peer->addr),
VTY_NEWLINE, " ", VTY_NEWLINE, " ",
peer->recv_badpackets, peer->recv_badroutes, peer->recv_badpackets, peer->recv_badroutes,
ZEBRA_RIPNG_DISTANCE_DEFAULT, ZEBRA_RIPNG_DISTANCE_DEFAULT,

88
ripngd/ripngd.c
View File

@ -165,7 +165,7 @@ ripng_send_packet (caddr_t buf, int bufsize, struct sockaddr_in6 *to,
if (IS_RIPNG_DEBUG_SEND) { if (IS_RIPNG_DEBUG_SEND) {
if (to) if (to)
zlog_debug ("send to %s", inet6_ntoa (&to->sin6_addr)); zlog_debug ("send to %s", inet6_ntoa (to->sin6_addr));
zlog_debug (" send interface %s", ifp->name); zlog_debug (" send interface %s", ifp->name);
zlog_debug (" send packet size %d", bufsize); zlog_debug (" send packet size %d", bufsize);
} }
@ -213,7 +213,7 @@ ripng_send_packet (caddr_t buf, int bufsize, struct sockaddr_in6 *to,
if (ret < 0) { if (ret < 0) {
if (to) if (to)
zlog_err ("RIPng send fail on %s to %s: %s", ifp->name, zlog_err ("RIPng send fail on %s to %s: %s", ifp->name,
inet6_ntoa (&to->sin6_addr), safe_strerror (errno)); inet6_ntoa (to->sin6_addr), safe_strerror (errno));
else else
zlog_err ("RIPng send fail on %s: %s", ifp->name, safe_strerror (errno)); zlog_err ("RIPng send fail on %s: %s", ifp->name, safe_strerror (errno));
} }
@ -309,10 +309,10 @@ ripng_packet_dump (struct ripng_packet *packet, int size, const char *sndrcv)
for (lim = (caddr_t) packet + size; (caddr_t) rte < lim; rte++) for (lim = (caddr_t) packet + size; (caddr_t) rte < lim; rte++)
{ {
if (rte->metric == RIPNG_METRIC_NEXTHOP) if (rte->metric == RIPNG_METRIC_NEXTHOP)
zlog_debug (" nexthop %s/%d", inet6_ntoa (&rte->addr), rte->prefixlen); zlog_debug (" nexthop %s/%d", inet6_ntoa (rte->addr), rte->prefixlen);
else else
zlog_debug (" %s/%d metric %d tag %d", zlog_debug (" %s/%d metric %d tag %d",
inet6_ntoa (&rte->addr), rte->prefixlen, inet6_ntoa (rte->addr), rte->prefixlen,
rte->metric, ntohs (rte->tag)); rte->metric, ntohs (rte->tag));
} }
} }
@ -328,18 +328,18 @@ ripng_nexthop_rte (struct rte *rte,
/* Logging before checking RTE. */ /* Logging before checking RTE. */
if (IS_RIPNG_DEBUG_RECV) if (IS_RIPNG_DEBUG_RECV)
zlog_debug ("RIPng nexthop RTE address %s tag %d prefixlen %d", zlog_debug ("RIPng nexthop RTE address %s tag %d prefixlen %d",
inet6_ntoa (&rte->addr), ntohs (rte->tag), rte->prefixlen); inet6_ntoa (rte->addr), ntohs (rte->tag), rte->prefixlen);
/* RFC2080 2.1.1 Next Hop: /* RFC2080 2.1.1 Next Hop:
The route tag and prefix length in the next hop RTE must be The route tag and prefix length in the next hop RTE must be
set to zero on sending and ignored on receiption. */ set to zero on sending and ignored on receiption. */
if (ntohs (rte->tag) != 0) if (ntohs (rte->tag) != 0)
zlog_warn ("RIPng nexthop RTE with non zero tag value %d from %s", zlog_warn ("RIPng nexthop RTE with non zero tag value %d from %s",
ntohs (rte->tag), inet6_ntoa (&from->sin6_addr)); ntohs (rte->tag), inet6_ntoa (from->sin6_addr));
if (rte->prefixlen != 0) if (rte->prefixlen != 0)
zlog_warn ("RIPng nexthop RTE with non zero prefixlen value %d from %s", zlog_warn ("RIPng nexthop RTE with non zero prefixlen value %d from %s",
rte->prefixlen, inet6_ntoa (&from->sin6_addr)); rte->prefixlen, inet6_ntoa (from->sin6_addr));
/* Specifying a value of 0:0:0:0:0:0:0:0 in the prefix field of a /* Specifying a value of 0:0:0:0:0:0:0:0 in the prefix field of a
next hop RTE indicates that the next hop address should be the next hop RTE indicates that the next hop address should be the
@ -367,7 +367,7 @@ ripng_nexthop_rte (struct rte *rte,
valid, route may be taken. If the received next hop address is not valid, route may be taken. If the received next hop address is not
a link-local address, it should be treated as 0:0:0:0:0:0:0:0. */ a link-local address, it should be treated as 0:0:0:0:0:0:0:0. */
zlog_warn ("RIPng nexthop RTE with non link-local address %s from %s", zlog_warn ("RIPng nexthop RTE with non link-local address %s from %s",
inet6_ntoa (&rte->addr), inet6_ntoa (rte->addr),
inet_ntop (AF_INET6, &from->sin6_addr, buf, INET6_BUFSIZ)); inet_ntop (AF_INET6, &from->sin6_addr, buf, INET6_BUFSIZ));
nexthop->flag = RIPNG_NEXTHOP_UNSPEC; nexthop->flag = RIPNG_NEXTHOP_UNSPEC;
@ -485,7 +485,7 @@ ripng_incoming_filter (struct prefix_ipv6 *p, struct ripng_interface *ri)
{ {
if (IS_RIPNG_DEBUG_PACKET) if (IS_RIPNG_DEBUG_PACKET)
zlog_debug ("%s/%d filtered by distribute in", zlog_debug ("%s/%d filtered by distribute in",
inet6_ntoa (&p->prefix), p->prefixlen); inet6_ntoa (p->prefix), p->prefixlen);
return -1; return -1;
} }
} }
@ -496,7 +496,7 @@ ripng_incoming_filter (struct prefix_ipv6 *p, struct ripng_interface *ri)
{ {
if (IS_RIPNG_DEBUG_PACKET) if (IS_RIPNG_DEBUG_PACKET)
zlog_debug ("%s/%d filtered by prefix-list in", zlog_debug ("%s/%d filtered by prefix-list in",
inet6_ntoa (&p->prefix), p->prefixlen); inet6_ntoa (p->prefix), p->prefixlen);
return -1; return -1;
} }
} }
@ -516,7 +516,7 @@ ripng_incoming_filter (struct prefix_ipv6 *p, struct ripng_interface *ri)
{ {
if (IS_RIPNG_DEBUG_PACKET) if (IS_RIPNG_DEBUG_PACKET)
zlog_debug ("%s/%d filtered by distribute in", zlog_debug ("%s/%d filtered by distribute in",
inet6_ntoa (&p->prefix), p->prefixlen); inet6_ntoa (p->prefix), p->prefixlen);
return -1; return -1;
} }
} }
@ -532,7 +532,7 @@ ripng_incoming_filter (struct prefix_ipv6 *p, struct ripng_interface *ri)
{ {
if (IS_RIPNG_DEBUG_PACKET) if (IS_RIPNG_DEBUG_PACKET)
zlog_debug ("%s/%d filtered by prefix-list in", zlog_debug ("%s/%d filtered by prefix-list in",
inet6_ntoa (&p->prefix), p->prefixlen); inet6_ntoa (p->prefix), p->prefixlen);
return -1; return -1;
} }
} }
@ -555,7 +555,7 @@ ripng_outgoing_filter (struct prefix_ipv6 *p, struct ripng_interface *ri)
{ {
if (IS_RIPNG_DEBUG_PACKET) if (IS_RIPNG_DEBUG_PACKET)
zlog_debug ("%s/%d is filtered by distribute out", zlog_debug ("%s/%d is filtered by distribute out",
inet6_ntoa (&p->prefix), p->prefixlen); inet6_ntoa (p->prefix), p->prefixlen);
return -1; return -1;
} }
} }
@ -566,7 +566,7 @@ ripng_outgoing_filter (struct prefix_ipv6 *p, struct ripng_interface *ri)
{ {
if (IS_RIPNG_DEBUG_PACKET) if (IS_RIPNG_DEBUG_PACKET)
zlog_debug ("%s/%d is filtered by prefix-list out", zlog_debug ("%s/%d is filtered by prefix-list out",
inet6_ntoa (&p->prefix), p->prefixlen); inet6_ntoa (p->prefix), p->prefixlen);
return -1; return -1;
} }
} }
@ -586,7 +586,7 @@ ripng_outgoing_filter (struct prefix_ipv6 *p, struct ripng_interface *ri)
{ {
if (IS_RIPNG_DEBUG_PACKET) if (IS_RIPNG_DEBUG_PACKET)
zlog_debug ("%s/%d filtered by distribute out", zlog_debug ("%s/%d filtered by distribute out",
inet6_ntoa (&p->prefix), p->prefixlen); inet6_ntoa (p->prefix), p->prefixlen);
return -1; return -1;
} }
} }
@ -602,7 +602,7 @@ ripng_outgoing_filter (struct prefix_ipv6 *p, struct ripng_interface *ri)
{ {
if (IS_RIPNG_DEBUG_PACKET) if (IS_RIPNG_DEBUG_PACKET)
zlog_debug ("%s/%d filtered by prefix-list out", zlog_debug ("%s/%d filtered by prefix-list out",
inet6_ntoa (&p->prefix), p->prefixlen); inet6_ntoa (p->prefix), p->prefixlen);
return -1; return -1;
} }
} }
@ -671,7 +671,7 @@ ripng_route_process (struct rte *rte, struct sockaddr_in6 *from,
{ {
if (IS_RIPNG_DEBUG_PACKET) if (IS_RIPNG_DEBUG_PACKET)
zlog_debug ("RIPng %s/%d is filtered by route-map in", zlog_debug ("RIPng %s/%d is filtered by route-map in",
inet6_ntoa (&p.prefix), p.prefixlen); inet6_ntoa (p.prefix), p.prefixlen);
return; return;
} }
@ -993,11 +993,11 @@ ripng_redistribute_add (int type, int sub_type, struct prefix_ipv6 *p,
if (IS_RIPNG_DEBUG_EVENT) { if (IS_RIPNG_DEBUG_EVENT) {
if (!nexthop) if (!nexthop)
zlog_debug ("Redistribute new prefix %s/%d on the interface %s", zlog_debug ("Redistribute new prefix %s/%d on the interface %s",
inet6_ntoa(&p->prefix), p->prefixlen, inet6_ntoa(p->prefix), p->prefixlen,
ifindex2ifname(ifindex)); ifindex2ifname(ifindex));
else else
zlog_debug ("Redistribute new prefix %s/%d with nexthop %s on the interface %s", zlog_debug ("Redistribute new prefix %s/%d with nexthop %s on the interface %s",
inet6_ntoa(&p->prefix), p->prefixlen, inet6_ntoa(nexthop), inet6_ntoa(p->prefix), p->prefixlen, inet6_ntoa(*nexthop),
ifindex2ifname(ifindex)); ifindex2ifname(ifindex));
} }
@ -1050,7 +1050,7 @@ ripng_redistribute_delete (int type, int sub_type, struct prefix_ipv6 *p,
if (IS_RIPNG_DEBUG_EVENT) if (IS_RIPNG_DEBUG_EVENT)
zlog_debug ("Poisone %s/%d on the interface %s with an infinity metric [delete]", zlog_debug ("Poisone %s/%d on the interface %s with an infinity metric [delete]",
inet6_ntoa(&p->prefix), p->prefixlen, inet6_ntoa(p->prefix), p->prefixlen,
ifindex2ifname(ifindex)); ifindex2ifname(ifindex));
ripng_event (RIPNG_TRIGGERED_UPDATE, 0); ripng_event (RIPNG_TRIGGERED_UPDATE, 0);
@ -1089,7 +1089,7 @@ ripng_redistribute_withdraw (int type)
struct prefix_ipv6 *p = (struct prefix_ipv6 *) &rp->p; struct prefix_ipv6 *p = (struct prefix_ipv6 *) &rp->p;
zlog_debug ("Poisone %s/%d on the interface %s [withdraw]", zlog_debug ("Poisone %s/%d on the interface %s [withdraw]",
inet6_ntoa(&p->prefix), p->prefixlen, inet6_ntoa(p->prefix), p->prefixlen,
ifindex2ifname(rinfo->ifindex)); ifindex2ifname(rinfo->ifindex));
} }
@ -1113,7 +1113,7 @@ ripng_response_process (struct ripng_packet *packet, int size,
if (ntohs (from->sin6_port) != RIPNG_PORT_DEFAULT) if (ntohs (from->sin6_port) != RIPNG_PORT_DEFAULT)
{ {
zlog_warn ("RIPng packet comes from non RIPng port %d from %s", zlog_warn ("RIPng packet comes from non RIPng port %d from %s",
ntohs (from->sin6_port), inet6_ntoa (&from->sin6_addr)); ntohs (from->sin6_port), inet6_ntoa (from->sin6_addr));
ripng_peer_bad_packet (from); ripng_peer_bad_packet (from);
return; return;
} }
@ -1124,7 +1124,7 @@ ripng_response_process (struct ripng_packet *packet, int size,
if (! IN6_IS_ADDR_LINKLOCAL(&from->sin6_addr)) if (! IN6_IS_ADDR_LINKLOCAL(&from->sin6_addr))
{ {
zlog_warn ("RIPng packet comes from non link local address %s", zlog_warn ("RIPng packet comes from non link local address %s",
inet6_ntoa (&from->sin6_addr)); inet6_ntoa (from->sin6_addr));
ripng_peer_bad_packet (from); ripng_peer_bad_packet (from);
return; return;
} }
@ -1137,7 +1137,7 @@ ripng_response_process (struct ripng_packet *packet, int size,
if (ripng_lladdr_check (ifp, &from->sin6_addr)) if (ripng_lladdr_check (ifp, &from->sin6_addr))
{ {
zlog_warn ("RIPng packet comes from my own link local address %s", zlog_warn ("RIPng packet comes from my own link local address %s",
inet6_ntoa (&from->sin6_addr)); inet6_ntoa (from->sin6_addr));
ripng_peer_bad_packet (from); ripng_peer_bad_packet (from);
return; return;
} }
@ -1149,7 +1149,7 @@ ripng_response_process (struct ripng_packet *packet, int size,
if (hoplimit >= 0 && hoplimit != 255) if (hoplimit >= 0 && hoplimit != 255)
{ {
zlog_warn ("RIPng packet comes with non 255 hop count %d from %s", zlog_warn ("RIPng packet comes with non 255 hop count %d from %s",
hoplimit, inet6_ntoa (&from->sin6_addr)); hoplimit, inet6_ntoa (from->sin6_addr));
ripng_peer_bad_packet (from); ripng_peer_bad_packet (from);
return; return;
} }
@ -1183,21 +1183,21 @@ ripng_response_process (struct ripng_packet *packet, int size,
if (IN6_IS_ADDR_MULTICAST (&rte->addr)) if (IN6_IS_ADDR_MULTICAST (&rte->addr))
{ {
zlog_warn ("Destination prefix is a multicast address %s/%d [%d]", zlog_warn ("Destination prefix is a multicast address %s/%d [%d]",
inet6_ntoa (&rte->addr), rte->prefixlen, rte->metric); inet6_ntoa (rte->addr), rte->prefixlen, rte->metric);
ripng_peer_bad_route (from); ripng_peer_bad_route (from);
continue; continue;
} }
if (IN6_IS_ADDR_LINKLOCAL (&rte->addr)) if (IN6_IS_ADDR_LINKLOCAL (&rte->addr))
{ {
zlog_warn ("Destination prefix is a link-local address %s/%d [%d]", zlog_warn ("Destination prefix is a link-local address %s/%d [%d]",
inet6_ntoa (&rte->addr), rte->prefixlen, rte->metric); inet6_ntoa (rte->addr), rte->prefixlen, rte->metric);
ripng_peer_bad_route (from); ripng_peer_bad_route (from);
continue; continue;
} }
if (IN6_IS_ADDR_LOOPBACK (&rte->addr)) if (IN6_IS_ADDR_LOOPBACK (&rte->addr))
{ {
zlog_warn ("Destination prefix is a loopback address %s/%d [%d]", zlog_warn ("Destination prefix is a loopback address %s/%d [%d]",
inet6_ntoa (&rte->addr), rte->prefixlen, rte->metric); inet6_ntoa (rte->addr), rte->prefixlen, rte->metric);
ripng_peer_bad_route (from); ripng_peer_bad_route (from);
continue; continue;
} }
@ -1207,8 +1207,8 @@ ripng_response_process (struct ripng_packet *packet, int size,
if (rte->prefixlen > 128) if (rte->prefixlen > 128)
{ {
zlog_warn ("Invalid prefix length %s/%d from %s%%%s", zlog_warn ("Invalid prefix length %s/%d from %s%%%s",
inet6_ntoa (&rte->addr), rte->prefixlen, inet6_ntoa (rte->addr), rte->prefixlen,
inet6_ntoa (&from->sin6_addr), ifp->name); inet6_ntoa (from->sin6_addr), ifp->name);
ripng_peer_bad_route (from); ripng_peer_bad_route (from);
continue; continue;
} }
@ -1217,7 +1217,7 @@ ripng_response_process (struct ripng_packet *packet, int size,
if (! (rte->metric >= 1 && rte->metric <= 16)) if (! (rte->metric >= 1 && rte->metric <= 16))
{ {
zlog_warn ("Invalid metric %d from %s%%%s", rte->metric, zlog_warn ("Invalid metric %d from %s%%%s", rte->metric,
inet6_ntoa (&from->sin6_addr), ifp->name); inet6_ntoa (from->sin6_addr), ifp->name);
ripng_peer_bad_route (from); ripng_peer_bad_route (from);
continue; continue;
} }
@ -1357,7 +1357,7 @@ ripng_read (struct thread *thread)
if (((len - 4) % 20) != 0) if (((len - 4) % 20) != 0)
{ {
zlog_warn ("RIPng invalid packet size %d from %s", len, zlog_warn ("RIPng invalid packet size %d from %s", len,
inet6_ntoa (&from.sin6_addr)); inet6_ntoa (from.sin6_addr));
ripng_peer_bad_packet (&from); ripng_peer_bad_packet (&from);
return 0; return 0;
} }
@ -1368,7 +1368,7 @@ ripng_read (struct thread *thread)
/* RIPng packet received. */ /* RIPng packet received. */
if (IS_RIPNG_DEBUG_EVENT) if (IS_RIPNG_DEBUG_EVENT)
zlog_debug ("RIPng packet received from %s port %d on %s", zlog_debug ("RIPng packet received from %s port %d on %s",
inet6_ntoa (&from.sin6_addr), ntohs (from.sin6_port), inet6_ntoa (from.sin6_addr), ntohs (from.sin6_port),
ifp ? ifp->name : "unknown"); ifp ? ifp->name : "unknown");
/* Logging before packet checking. */ /* Logging before packet checking. */
@ -1600,7 +1600,7 @@ ripng_output_process (struct interface *ifp, struct sockaddr_in6 *to,
if (IS_RIPNG_DEBUG_EVENT) { if (IS_RIPNG_DEBUG_EVENT) {
if (to) if (to)
zlog_debug ("RIPng update routes to neighbor %s", zlog_debug ("RIPng update routes to neighbor %s",
inet6_ntoa(&to->sin6_addr)); inet6_ntoa(to->sin6_addr));
else else
zlog_debug ("RIPng update routes on interface %s", ifp->name); zlog_debug ("RIPng update routes on interface %s", ifp->name);
} }
@ -1669,7 +1669,7 @@ ripng_output_process (struct interface *ifp, struct sockaddr_in6 *to,
{ {
if (IS_RIPNG_DEBUG_PACKET) if (IS_RIPNG_DEBUG_PACKET)
zlog_debug ("RIPng %s/%d is filtered by route-map out", zlog_debug ("RIPng %s/%d is filtered by route-map out",
inet6_ntoa (&p->prefix), p->prefixlen); inet6_ntoa (p->prefix), p->prefixlen);
continue; continue;
} }
@ -1688,7 +1688,7 @@ ripng_output_process (struct interface *ifp, struct sockaddr_in6 *to,
{ {
if (IS_RIPNG_DEBUG_PACKET) if (IS_RIPNG_DEBUG_PACKET)
zlog_debug ("RIPng %s/%d is filtered by route-map", zlog_debug ("RIPng %s/%d is filtered by route-map",
inet6_ntoa (&p->prefix), p->prefixlen); inet6_ntoa (p->prefix), p->prefixlen);
continue; continue;
} }
} }
@ -1774,7 +1774,7 @@ ripng_output_process (struct interface *ifp, struct sockaddr_in6 *to,
{ {
if (IS_RIPNG_DEBUG_PACKET) if (IS_RIPNG_DEBUG_PACKET)
zlog_debug ("RIPng %s/%d is filtered by route-map out", zlog_debug ("RIPng %s/%d is filtered by route-map out",
inet6_ntoa (&p->prefix), p->prefixlen); inet6_ntoa (p->prefix), p->prefixlen);
continue; continue;
} }
@ -2039,10 +2039,10 @@ DEFUN (show_ipv6_ripng,
#ifdef DEBUG #ifdef DEBUG
len = vty_out (vty, "R(a) %d/%d %s/%d ", len = vty_out (vty, "R(a) %d/%d %s/%d ",
aggregate->count, aggregate->suppress, aggregate->count, aggregate->suppress,
inet6_ntoa (&p->prefix), p->prefixlen); inet6_ntoa (p->prefix), p->prefixlen);
#else #else
len = vty_out (vty, "R(a) %s/%d ", len = vty_out (vty, "R(a) %s/%d ",
inet6_ntoa (&p->prefix), p->prefixlen); inet6_ntoa (p->prefix), p->prefixlen);
#endif /* DEBUG */ #endif /* DEBUG */
vty_out (vty, "%s", VTY_NEWLINE); vty_out (vty, "%s", VTY_NEWLINE);
vty_out (vty, "%*s", 18, " "); vty_out (vty, "%*s", 18, " ");
@ -2062,16 +2062,16 @@ DEFUN (show_ipv6_ripng,
route_info[rinfo->type].str, route_info[rinfo->type].str,
ripng_route_subtype_print(rinfo), ripng_route_subtype_print(rinfo),
rinfo->suppress, rinfo->suppress,
inet6_ntoa (&p->prefix), p->prefixlen); inet6_ntoa (p->prefix), p->prefixlen);
#else #else
len = vty_out (vty, "%s(%s) %s/%d ", len = vty_out (vty, "%s(%s) %s/%d ",
route_info[rinfo->type].str, route_info[rinfo->type].str,
ripng_route_subtype_print(rinfo), ripng_route_subtype_print(rinfo),
inet6_ntoa (&p->prefix), p->prefixlen); inet6_ntoa (p->prefix), p->prefixlen);
#endif /* DEBUG */ #endif /* DEBUG */
vty_out (vty, "%s", VTY_NEWLINE); vty_out (vty, "%s", VTY_NEWLINE);
vty_out (vty, "%*s", 18, " "); vty_out (vty, "%*s", 18, " ");
len = vty_out (vty, "%s", inet6_ntoa (&rinfo->nexthop)); len = vty_out (vty, "%s", inet6_ntoa (rinfo->nexthop));
len = 28 - len; len = 28 - len;
if (len > 0) if (len > 0)
@ -2673,7 +2673,7 @@ ripng_config_write (struct vty *vty)
for (rp = route_top (ripng->aggregate); rp; rp = route_next (rp)) for (rp = route_top (ripng->aggregate); rp; rp = route_next (rp))
if (rp->info != NULL) if (rp->info != NULL)
vty_out (vty, " aggregate-address %s/%d%s", vty_out (vty, " aggregate-address %s/%d%s",
inet6_ntoa (&rp->p.u.prefix6), inet6_ntoa (rp->p.u.prefix6),
rp->p.prefixlen, rp->p.prefixlen,
VTY_NEWLINE); VTY_NEWLINE);
@ -2681,7 +2681,7 @@ ripng_config_write (struct vty *vty)
/* RIPng static routes. */ /* RIPng static routes. */
for (rp = route_top (ripng->route); rp; rp = route_next (rp)) for (rp = route_top (ripng->route); rp; rp = route_next (rp))
if (rp->info != NULL) if (rp->info != NULL)
vty_out (vty, " route %s/%d%s", inet6_ntoa (&rp->p.u.prefix6), vty_out (vty, " route %s/%d%s", inet6_ntoa (rp->p.u.prefix6),
rp->p.prefixlen, rp->p.prefixlen,
VTY_NEWLINE); VTY_NEWLINE);