Commit 7b5f689a authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Simon Horman
Browse files

ipvs: Pass ipvs into ip_vs_out_icmp and ip_vs_out_icmp_v6 



This removes the need to compute ipvs with the hack "net_ipvs(skb_net(skb))"

Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent 6f2bcea9

net/netfilter/ipvs/ip_vs_core.c

+7 −8
Original line number Diff line number Diff line
@@ -897,10 +897,9 @@ out: 
 *	Find any that might be relevant, check against existing connections.

 *	Currently handles error types - unreachable, quench, ttl exceeded.

 */

static int ip_vs_out_icmp(struct sk_buff *skb, int *related,

			  unsigned int hooknum)

static int ip_vs_out_icmp(struct netns_ipvs *ipvs, struct sk_buff *skb,

			  int *related, unsigned int hooknum)

{

	struct netns_ipvs *ipvs = net_ipvs(skb_net(skb));

	struct iphdr *iph;

	struct icmphdr	_icmph, *ic;

	struct iphdr	_ciph, *cih;	/* The ip header contained within the ICMP */
@@ -973,10 +972,10 @@ static int ip_vs_out_icmp(struct sk_buff *skb, int *related, 
}



#ifdef CONFIG_IP_VS_IPV6

static int ip_vs_out_icmp_v6(struct sk_buff *skb, int *related,

			     unsigned int hooknum, struct ip_vs_iphdr *ipvsh)

static int ip_vs_out_icmp_v6(struct netns_ipvs *ipvs, struct sk_buff *skb,

			     int *related,  unsigned int hooknum,

			     struct ip_vs_iphdr *ipvsh)

{

	struct netns_ipvs *ipvs = net_ipvs(skb_net(skb));

	struct icmp6hdr	_icmph, *ic;

	struct ip_vs_iphdr ciph = {.flags = 0, .fragoffs = 0};/*Contained IP */

	struct ip_vs_conn *cp;
@@ -1208,7 +1207,7 @@ ip_vs_out(struct netns_ipvs *ipvs, unsigned int hooknum, struct sk_buff *skb, in 
	if (af == AF_INET6) {

		if (unlikely(iph.protocol == IPPROTO_ICMPV6)) {

			int related;

			int verdict = ip_vs_out_icmp_v6(skb, &related,

			int verdict = ip_vs_out_icmp_v6(ipvs, skb, &related,

							hooknum, &iph);



			if (related)
@@ -1218,7 +1217,7 @@ ip_vs_out(struct netns_ipvs *ipvs, unsigned int hooknum, struct sk_buff *skb, in 
#endif

		if (unlikely(iph.protocol == IPPROTO_ICMP)) {

			int related;

			int verdict = ip_vs_out_icmp(skb, &related, hooknum);

			int verdict = ip_vs_out_icmp(ipvs, skb, &related, hooknum);



			if (related)

				return verdict;

CRA Git | Maintained and supported by SUSTech CRA and CCSE