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

Commit 71a8ab6c authored by Simon Horman's avatar Simon Horman
Browse files

IPVS: Add sysctl_expire_nodest_conn() 



In preparation for not including sysctl_expire_nodest_conn in
struct netns_ipvs when CONFIG_SYCTL is not defined.

Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent 7532e8d4

net/netfilter/ipvs/ip_vs_core.c

+7 −1
Original line number Diff line number Diff line
@@ -613,10 +613,16 @@ static int sysctl_nat_icmp_send(struct net *net) 
	return ipvs->sysctl_nat_icmp_send;

}



static int sysctl_expire_nodest_conn(struct netns_ipvs *ipvs)

{

	return ipvs->sysctl_expire_nodest_conn;

}



#else



static int sysctl_snat_reroute(struct sk_buff *skb) { return 0; }

static int sysctl_nat_icmp_send(struct net *net) { return 0; }

static int sysctl_expire_nodest_conn(struct netns_ipvs *ipvs) { return 0; }



#endif
@@ -1583,7 +1589,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af) 
	if (cp->dest && !(cp->dest->flags & IP_VS_DEST_F_AVAILABLE)) {

		/* the destination server is not available */



		if (ipvs->sysctl_expire_nodest_conn) {

		if (sysctl_expire_nodest_conn(ipvs)) {

			/* try to expire the connection immediately */

			ip_vs_conn_expire_now(cp);

		}