Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 120b9c14 authored by Jesper Dangaard Brouer's avatar Jesper Dangaard Brouer Committed by Simon Horman
Browse files

ipvs: Trivial changes, use compressed IPv6 address in output 



Have not converted the proc file output to compressed IPv6 addresses.

Signed-off-by: default avatarJesper Dangaard Brouer <brouer@redhat.com>
Acked-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent 82c93fcc

include/net/ip_vs.h

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static inline const char *ip_vs_dbg_addr(int af, char *buf, size_t buf_len, 
	int len;

#ifdef CONFIG_IP_VS_IPV6

	if (af == AF_INET6)

		len = snprintf(&buf[*idx], buf_len - *idx, "[%pI6]",

		len = snprintf(&buf[*idx], buf_len - *idx, "[%pI6c]",

			       &addr->in6) + 1;

	else

#endif

net/netfilter/ipvs/ip_vs_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1487,7 +1487,7 @@ ip_vs_in_icmp_v6(struct sk_buff *skb, int *related, unsigned int hooknum) 
	if (ic == NULL)

		return NF_DROP;



	IP_VS_DBG(12, "Incoming ICMPv6 (%d,%d) %pI6->%pI6\n",

	IP_VS_DBG(12, "Incoming ICMPv6 (%d,%d) %pI6c->%pI6c\n",

		  ic->icmp6_type, ntohs(icmpv6_id(ic)),

		  &iph->saddr, &iph->daddr);

net/netfilter/ipvs/ip_vs_proto.c

+3 −3
Original line number Diff line number Diff line
@@ -280,17 +280,17 @@ ip_vs_tcpudp_debug_packet_v6(struct ip_vs_protocol *pp, 
	if (ih == NULL)

		sprintf(buf, "TRUNCATED");

	else if (ih->nexthdr == IPPROTO_FRAGMENT)

		sprintf(buf, "%pI6->%pI6 frag",	&ih->saddr, &ih->daddr);

		sprintf(buf, "%pI6c->%pI6c frag", &ih->saddr, &ih->daddr);

	else {

		__be16 _ports[2], *pptr;



		pptr = skb_header_pointer(skb, offset + sizeof(struct ipv6hdr),

					  sizeof(_ports), _ports);

		if (pptr == NULL)

			sprintf(buf, "TRUNCATED %pI6->%pI6",

			sprintf(buf, "TRUNCATED %pI6c->%pI6c",

				&ih->saddr, &ih->daddr);

		else

			sprintf(buf, "%pI6:%u->%pI6:%u",

			sprintf(buf, "%pI6c:%u->%pI6c:%u",

				&ih->saddr, ntohs(pptr[0]),

				&ih->daddr, ntohs(pptr[1]));

	}

net/netfilter/ipvs/ip_vs_sched.c

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ void ip_vs_scheduler_err(struct ip_vs_service *svc, const char *msg) 
			     svc->fwmark, msg);

#ifdef CONFIG_IP_VS_IPV6

	} else if (svc->af == AF_INET6) {

		IP_VS_ERR_RL("%s: %s [%pI6]:%d - %s\n",

		IP_VS_ERR_RL("%s: %s [%pI6c]:%d - %s\n",

			     svc->scheduler->name,

			     ip_vs_proto_name(svc->protocol),

			     &svc->addr.in6, ntohs(svc->port), msg);

net/netfilter/ipvs/ip_vs_xmit.c

+5 −5
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ __ip_vs_get_out_rt_v6(struct sk_buff *skb, struct ip_vs_dest *dest, 
	local = __ip_vs_is_local_route6(rt);

	if (!((local ? IP_VS_RT_MODE_LOCAL : IP_VS_RT_MODE_NON_LOCAL) &

	      rt_mode)) {

		IP_VS_DBG_RL("Stopping traffic to %s address, dest: %pI6\n",

		IP_VS_DBG_RL("Stopping traffic to %s address, dest: %pI6c\n",

			     local ? "local":"non-local", daddr);

		dst_release(&rt->dst);

		return NULL;
@@ -343,8 +343,8 @@ __ip_vs_get_out_rt_v6(struct sk_buff *skb, struct ip_vs_dest *dest, 
	if (local && !(rt_mode & IP_VS_RT_MODE_RDR) &&

	    !((ort = (struct rt6_info *) skb_dst(skb)) &&

	      __ip_vs_is_local_route6(ort))) {

		IP_VS_DBG_RL("Redirect from non-local address %pI6 to local "

			     "requires NAT method, dest: %pI6\n",

		IP_VS_DBG_RL("Redirect from non-local address %pI6c to local "

			     "requires NAT method, dest: %pI6c\n",

			     &ipv6_hdr(skb)->daddr, daddr);

		dst_release(&rt->dst);

		return NULL;
@@ -352,8 +352,8 @@ __ip_vs_get_out_rt_v6(struct sk_buff *skb, struct ip_vs_dest *dest, 
	if (unlikely(!local && (!skb->dev || skb->dev->flags & IFF_LOOPBACK) &&

		     ipv6_addr_type(&ipv6_hdr(skb)->saddr) &

				    IPV6_ADDR_LOOPBACK)) {

		IP_VS_DBG_RL("Stopping traffic from loopback address %pI6 "

			     "to non-local address, dest: %pI6\n",

		IP_VS_DBG_RL("Stopping traffic from loopback address %pI6c "

			     "to non-local address, dest: %pI6c\n",

			     &ipv6_hdr(skb)->saddr, daddr);

		dst_release(&rt->dst);

		return NULL;