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

Commit 0d79641a authored by Julian Anastasov's avatar Julian Anastasov Committed by Simon Horman
Browse files

ipvs: provide address family for debugging 



 	As skb->protocol is not valid in LOCAL_OUT add
parameter for address family in packet debugging functions.
Even if ports are not present in AH and ESP change them to
use ip_vs_tcpudp_debug_packet to show at least valid addresses
as before. This patch removes the last user of skb->protocol
in IPVS.

Signed-off-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent 3233759b

include/net/ip_vs.h

+9 −8
Original line number Diff line number Diff line
@@ -136,24 +136,24 @@ static inline const char *ip_vs_dbg_addr(int af, char *buf, size_t buf_len, 
		if (net_ratelimit())					\

			printk(KERN_DEBUG pr_fmt(msg), ##__VA_ARGS__);	\

	} while (0)

#define IP_VS_DBG_PKT(level, pp, skb, ofs, msg)				\

#define IP_VS_DBG_PKT(level, af, pp, skb, ofs, msg)			\

	do {								\

		if (level <= ip_vs_get_debug_level())			\

			pp->debug_packet(pp, skb, ofs, msg);		\

			pp->debug_packet(af, pp, skb, ofs, msg);	\

	} while (0)

#define IP_VS_DBG_RL_PKT(level, pp, skb, ofs, msg)			\

#define IP_VS_DBG_RL_PKT(level, af, pp, skb, ofs, msg)			\

	do {								\

		if (level <= ip_vs_get_debug_level() &&			\

		    net_ratelimit())					\

			pp->debug_packet(pp, skb, ofs, msg);		\

			pp->debug_packet(af, pp, skb, ofs, msg);	\

	} while (0)

#else	/* NO DEBUGGING at ALL */

#define IP_VS_DBG_BUF(level, msg...)  do {} while (0)

#define IP_VS_ERR_BUF(msg...)  do {} while (0)

#define IP_VS_DBG(level, msg...)  do {} while (0)

#define IP_VS_DBG_RL(msg...)  do {} while (0)

#define IP_VS_DBG_PKT(level, pp, skb, ofs, msg)		do {} while (0)

#define IP_VS_DBG_RL_PKT(level, pp, skb, ofs, msg)	do {} while (0)

#define IP_VS_DBG_PKT(level, af, pp, skb, ofs, msg)	do {} while (0)

#define IP_VS_DBG_RL_PKT(level, af, pp, skb, ofs, msg)	do {} while (0)

#endif



#define IP_VS_BUG() BUG()
@@ -345,7 +345,7 @@ struct ip_vs_protocol { 


	int (*app_conn_bind)(struct ip_vs_conn *cp);



	void (*debug_packet)(struct ip_vs_protocol *pp,

	void (*debug_packet)(int af, struct ip_vs_protocol *pp,

			     const struct sk_buff *skb,

			     int offset,

			     const char *msg);
@@ -828,7 +828,8 @@ extern int 
ip_vs_set_state_timeout(int *table, int num, const char *const *names,

			const char *name, int to);

extern void

ip_vs_tcpudp_debug_packet(struct ip_vs_protocol *pp, const struct sk_buff *skb,

ip_vs_tcpudp_debug_packet(int af, struct ip_vs_protocol *pp,

			  const struct sk_buff *skb,

			  int offset, const char *msg);



extern struct ip_vs_protocol ip_vs_protocol_tcp;

net/netfilter/ipvs/ip_vs_core.c

+24 −17
Original line number Diff line number Diff line
@@ -365,7 +365,8 @@ ip_vs_schedule(struct ip_vs_service *svc, struct sk_buff *skb, 
	 * with persistence the connection is created on SYN+ACK.

	 */

	if (pptr[0] == FTPDATA) {

		IP_VS_DBG_PKT(12, pp, skb, 0, "Not scheduling FTPDATA");

		IP_VS_DBG_PKT(12, svc->af, pp, skb, 0,

			      "Not scheduling FTPDATA");

		return NULL;

	}
@@ -376,7 +377,7 @@ ip_vs_schedule(struct ip_vs_service *svc, struct sk_buff *skb, 
	if ((!skb->dev || skb->dev->flags & IFF_LOOPBACK) &&

	    (svc->flags & IP_VS_SVC_F_PERSISTENT || svc->fwmark) &&

	    (cp = pp->conn_in_get(svc->af, skb, pp, &iph, iph.len, 1))) {

		IP_VS_DBG_PKT(12, pp, skb, 0,

		IP_VS_DBG_PKT(12, svc->af, pp, skb, 0,

			      "Not scheduling reply for existing connection");

		__ip_vs_conn_put(cp);

		return NULL;
@@ -617,10 +618,10 @@ void ip_vs_nat_icmp(struct sk_buff *skb, struct ip_vs_protocol *pp, 
	skb->ip_summed = CHECKSUM_UNNECESSARY;



	if (inout)

		IP_VS_DBG_PKT(11, pp, skb, (void *)ciph - (void *)iph,

		IP_VS_DBG_PKT(11, AF_INET, pp, skb, (void *)ciph - (void *)iph,

			"Forwarding altered outgoing ICMP");

	else

		IP_VS_DBG_PKT(11, pp, skb, (void *)ciph - (void *)iph,

		IP_VS_DBG_PKT(11, AF_INET, pp, skb, (void *)ciph - (void *)iph,

			"Forwarding altered incoming ICMP");

}
@@ -662,10 +663,12 @@ void ip_vs_nat_icmp_v6(struct sk_buff *skb, struct ip_vs_protocol *pp, 
	skb->ip_summed = CHECKSUM_PARTIAL;



	if (inout)

		IP_VS_DBG_PKT(11, pp, skb, (void *)ciph - (void *)iph,

		IP_VS_DBG_PKT(11, AF_INET6, pp, skb,

			      (void *)ciph - (void *)iph,

			      "Forwarding altered outgoing ICMPv6");

	else

		IP_VS_DBG_PKT(11, pp, skb, (void *)ciph - (void *)iph,

		IP_VS_DBG_PKT(11, AF_INET6, pp, skb,

			      (void *)ciph - (void *)iph,

			      "Forwarding altered incoming ICMPv6");

}

#endif
@@ -798,7 +801,8 @@ static int ip_vs_out_icmp(struct sk_buff *skb, int *related, 
		     pp->dont_defrag))

		return NF_ACCEPT;



	IP_VS_DBG_PKT(11, pp, skb, offset, "Checking outgoing ICMP for");

	IP_VS_DBG_PKT(11, AF_INET, pp, skb, offset,

		      "Checking outgoing ICMP for");



	offset += cih->ihl * 4;
@@ -874,7 +878,8 @@ static int ip_vs_out_icmp_v6(struct sk_buff *skb, int *related, 
	if (unlikely(cih->nexthdr == IPPROTO_FRAGMENT && pp->dont_defrag))

		return NF_ACCEPT;



	IP_VS_DBG_PKT(11, pp, skb, offset, "Checking outgoing ICMPv6 for");

	IP_VS_DBG_PKT(11, AF_INET6, pp, skb, offset,

		      "Checking outgoing ICMPv6 for");



	offset += sizeof(struct ipv6hdr);
@@ -922,7 +927,7 @@ static unsigned int 
handle_response(int af, struct sk_buff *skb, struct ip_vs_protocol *pp,

		struct ip_vs_conn *cp, int ihl)

{

	IP_VS_DBG_PKT(11, pp, skb, 0, "Outgoing packet");

	IP_VS_DBG_PKT(11, af, pp, skb, 0, "Outgoing packet");



	if (!skb_make_writable(skb, ihl))

		goto drop;
@@ -967,7 +972,7 @@ handle_response(int af, struct sk_buff *skb, struct ip_vs_protocol *pp, 
		    ip_route_me_harder(skb, RTN_LOCAL) != 0)

			goto drop;



	IP_VS_DBG_PKT(10, pp, skb, 0, "After SNAT");

	IP_VS_DBG_PKT(10, af, pp, skb, 0, "After SNAT");



	ip_vs_out_stats(cp, skb);

	ip_vs_set_state(cp, IP_VS_DIR_OUTPUT, skb, pp);
@@ -1117,7 +1122,7 @@ ip_vs_out(unsigned int hooknum, struct sk_buff *skb, int af) 
			}

		}

	}

	IP_VS_DBG_PKT(12, pp, skb, 0,

	IP_VS_DBG_PKT(12, af, pp, skb, 0,

		      "ip_vs_out: packet continues traversal as normal");

	return NF_ACCEPT;

}
@@ -1253,7 +1258,8 @@ ip_vs_in_icmp(struct sk_buff *skb, int *related, unsigned int hooknum) 
		     pp->dont_defrag))

		return NF_ACCEPT;



	IP_VS_DBG_PKT(11, pp, skb, offset, "Checking incoming ICMP for");

	IP_VS_DBG_PKT(11, AF_INET, pp, skb, offset,

		      "Checking incoming ICMP for");



	offset += cih->ihl * 4;
@@ -1364,7 +1370,8 @@ ip_vs_in_icmp_v6(struct sk_buff *skb, int *related, unsigned int hooknum) 
	if (unlikely(cih->nexthdr == IPPROTO_FRAGMENT && pp->dont_defrag))

		return NF_ACCEPT;



	IP_VS_DBG_PKT(11, pp, skb, offset, "Checking incoming ICMPv6 for");

	IP_VS_DBG_PKT(11, AF_INET6, pp, skb, offset,

		      "Checking incoming ICMPv6 for");



	offset += sizeof(struct ipv6hdr);
@@ -1492,12 +1499,12 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af) 


	if (unlikely(!cp)) {

		/* sorry, all this trouble for a no-hit :) */

		IP_VS_DBG_PKT(12, pp, skb, 0,

		IP_VS_DBG_PKT(12, af, pp, skb, 0,

			      "ip_vs_in: packet continues traversal as normal");

		return NF_ACCEPT;

	}



	IP_VS_DBG_PKT(11, pp, skb, 0, "Incoming packet");

	IP_VS_DBG_PKT(11, af, pp, skb, 0, "Incoming packet");



	/* Check the server status */

	if (cp->dest && !(cp->dest->flags & IP_VS_DEST_F_AVAILABLE)) {

net/netfilter/ipvs/ip_vs_proto.c

+4 −4
Original line number Diff line number Diff line
@@ -172,8 +172,8 @@ ip_vs_tcpudp_debug_packet_v4(struct ip_vs_protocol *pp, 
	else if (ih->frag_off & htons(IP_OFFSET))

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

	else {

		__be16 _ports[2], *pptr

;

		__be16 _ports[2], *pptr;



		pptr = skb_header_pointer(skb, offset + ih->ihl*4,

					  sizeof(_ports), _ports);

		if (pptr == NULL)
@@ -223,13 +223,13 @@ ip_vs_tcpudp_debug_packet_v6(struct ip_vs_protocol *pp, 




void

ip_vs_tcpudp_debug_packet(struct ip_vs_protocol *pp,

ip_vs_tcpudp_debug_packet(int af, struct ip_vs_protocol *pp,

			  const struct sk_buff *skb,

			  int offset,

			  const char *msg)

{

#ifdef CONFIG_IP_VS_IPV6

	if (skb->protocol == htons(ETH_P_IPV6))

	if (af == AF_INET6)

		ip_vs_tcpudp_debug_packet_v6(pp, skb, offset, msg);

	else

#endif

net/netfilter/ipvs/ip_vs_proto_ah_esp.c

+2 −50
Original line number Diff line number Diff line
@@ -117,54 +117,6 @@ ah_esp_conn_schedule(int af, struct sk_buff *skb, struct ip_vs_protocol *pp, 
	return 0;

}





static void

ah_esp_debug_packet_v4(struct ip_vs_protocol *pp, const struct sk_buff *skb,

		       int offset, const char *msg)

{

	char buf[256];

	struct iphdr _iph, *ih;



	ih = skb_header_pointer(skb, offset, sizeof(_iph), &_iph);

	if (ih == NULL)

		sprintf(buf, "TRUNCATED");

	else

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



	pr_debug("%s: %s %s\n", msg, pp->name, buf);

}



#ifdef CONFIG_IP_VS_IPV6

static void

ah_esp_debug_packet_v6(struct ip_vs_protocol *pp, const struct sk_buff *skb,

		       int offset, const char *msg)

{

	char buf[256];

	struct ipv6hdr _iph, *ih;



	ih = skb_header_pointer(skb, offset, sizeof(_iph), &_iph);

	if (ih == NULL)

		sprintf(buf, "TRUNCATED");

	else

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



	pr_debug("%s: %s %s\n", msg, pp->name, buf);

}

#endif



static void

ah_esp_debug_packet(struct ip_vs_protocol *pp, const struct sk_buff *skb,

		    int offset, const char *msg)

{

#ifdef CONFIG_IP_VS_IPV6

	if (skb->protocol == htons(ETH_P_IPV6))

		ah_esp_debug_packet_v6(pp, skb, offset, msg);

	else

#endif

		ah_esp_debug_packet_v4(pp, skb, offset, msg);

}





static void ah_esp_init(struct ip_vs_protocol *pp)

{

	/* nothing to do now */
@@ -195,7 +147,7 @@ struct ip_vs_protocol ip_vs_protocol_ah = { 
	.register_app =		NULL,

	.unregister_app =	NULL,

	.app_conn_bind =	NULL,

	.debug_packet =		ah_esp_debug_packet,

	.debug_packet =		ip_vs_tcpudp_debug_packet,

	.timeout_change =	NULL,		/* ISAKMP */

	.set_state_timeout =	NULL,

};
@@ -219,7 +171,7 @@ struct ip_vs_protocol ip_vs_protocol_esp = { 
	.register_app =		NULL,

	.unregister_app =	NULL,

	.app_conn_bind =	NULL,

	.debug_packet =		ah_esp_debug_packet,

	.debug_packet =		ip_vs_tcpudp_debug_packet,

	.timeout_change =	NULL,		/* ISAKMP */

};

#endif

net/netfilter/ipvs/ip_vs_proto_sctp.c

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ sctp_csum_check(int af, struct sk_buff *skb, struct ip_vs_protocol *pp) 


	if (val != cmp) {

		/* CRC failure, dump it. */

		IP_VS_DBG_RL_PKT(0, pp, skb, 0,

		IP_VS_DBG_RL_PKT(0, af, pp, skb, 0,

				"Failed checksum for");

		return 0;

	}