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

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

ipvs: Pass ipvs into .conn_schedule and ip_vs_try_to_schedule 



This moves the hack "net_ipvs(skb_net(skb))" up one level where it
will be easier to remove.

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 2f3edc6a

include/net/ip_vs.h

+2 −1
Original line number Diff line number Diff line
@@ -487,7 +487,8 @@ struct ip_vs_protocol { 


	void (*exit_netns)(struct netns_ipvs *ipvs, struct ip_vs_proto_data *pd);



	int (*conn_schedule)(int af, struct sk_buff *skb,

	int (*conn_schedule)(struct netns_ipvs *ipvs,

			     int af, struct sk_buff *skb,

			     struct ip_vs_proto_data *pd,

			     int *verdict, struct ip_vs_conn **cpp,

			     struct ip_vs_iphdr *iph);

net/netfilter/ipvs/ip_vs_core.c

+6 −5
Original line number Diff line number Diff line
@@ -1360,7 +1360,8 @@ ip_vs_local_reply6(void *priv, struct sk_buff *skb, 
#endif



static unsigned int

ip_vs_try_to_schedule(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd,

ip_vs_try_to_schedule(struct netns_ipvs *ipvs, int af, struct sk_buff *skb,

		      struct ip_vs_proto_data *pd,

		      int *verdict, struct ip_vs_conn **cpp,

		      struct ip_vs_iphdr *iph)

{
@@ -1372,7 +1373,7 @@ ip_vs_try_to_schedule(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd, 
		 */



		/* Schedule and create new connection entry into cpp */

		if (!pp->conn_schedule(af, skb, pd, verdict, cpp, iph))

		if (!pp->conn_schedule(ipvs, af, skb, pd, verdict, cpp, iph))

			return 0;

	}
@@ -1500,7 +1501,7 @@ ip_vs_in_icmp(struct sk_buff *skb, int *related, unsigned int hooknum) 
		if (!sysctl_schedule_icmp(ipvs))

			return NF_ACCEPT;



		if (!ip_vs_try_to_schedule(AF_INET, skb, pd, &v, &cp, &ciph))

		if (!ip_vs_try_to_schedule(ipvs, AF_INET, skb, pd, &v, &cp, &ciph))

			return v;

		new_cp = true;

	}
@@ -1658,7 +1659,7 @@ static int ip_vs_in_icmp_v6(struct sk_buff *skb, int *related, 
		if (!sysctl_schedule_icmp(ipvs))

			return NF_ACCEPT;



		if (!ip_vs_try_to_schedule(AF_INET6, skb, pd, &v, &cp, &ciph))

		if (!ip_vs_try_to_schedule(ipvs, AF_INET6, skb, pd, &v, &cp, &ciph))

			return v;



		new_cp = true;
@@ -1799,7 +1800,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af) 
	if (unlikely(!cp)) {

		int v;



		if (!ip_vs_try_to_schedule(af, skb, pd, &v, &cp, &iph))

		if (!ip_vs_try_to_schedule(ipvs, af, skb, pd, &v, &cp, &iph))

			return v;

	}

net/netfilter/ipvs/ip_vs_proto_ah_esp.c

+2 −1
Original line number Diff line number Diff line
@@ -104,7 +104,8 @@ ah_esp_conn_out_get(struct netns_ipvs *ipvs, int af, const struct sk_buff *skb, 




static int

ah_esp_conn_schedule(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd,

ah_esp_conn_schedule(struct netns_ipvs *ipvs, int af, struct sk_buff *skb,

		     struct ip_vs_proto_data *pd,

		     int *verdict, struct ip_vs_conn **cpp,

		     struct ip_vs_iphdr *iph)

{

net/netfilter/ipvs/ip_vs_proto_sctp.c

+2 −6
Original line number Diff line number Diff line
@@ -9,20 +9,16 @@ 
#include <net/ip_vs.h>



static int

sctp_conn_schedule(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd,

sctp_conn_schedule(struct netns_ipvs *ipvs, int af, struct sk_buff *skb,

		   struct ip_vs_proto_data *pd,

		   int *verdict, struct ip_vs_conn **cpp,

		   struct ip_vs_iphdr *iph)

{

	struct net *net;

	struct ip_vs_service *svc;

	struct netns_ipvs *ipvs;

	sctp_chunkhdr_t _schunkh, *sch;

	sctp_sctphdr_t *sh, _sctph;

	__be16 _ports[2], *ports = NULL;



	net = skb_net(skb);

	ipvs = net_ipvs(net);



	if (likely(!ip_vs_iph_icmp(iph))) {

		sh = skb_header_pointer(skb, iph->len, sizeof(_sctph), &_sctph);

		if (sh) {

net/netfilter/ipvs/ip_vs_proto_tcp.c

+2 −6
Original line number Diff line number Diff line
@@ -32,19 +32,15 @@ 
#include <net/ip_vs.h>



static int

tcp_conn_schedule(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd,

tcp_conn_schedule(struct netns_ipvs *ipvs, int af, struct sk_buff *skb,

		  struct ip_vs_proto_data *pd,

		  int *verdict, struct ip_vs_conn **cpp,

		  struct ip_vs_iphdr *iph)

{

	struct net *net;

	struct ip_vs_service *svc;

	struct tcphdr _tcph, *th;

	struct netns_ipvs *ipvs;

	__be16 _ports[2], *ports = NULL;



	net = skb_net(skb);

	ipvs = net_ipvs(net);



	/* In the event of icmp, we're only guaranteed to have the first 8

	 * bytes of the transport header, so we only check the rest of the

	 * TCP packet for non-ICMP packets