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

Commit 52793dbe authored by Julian Anastasov's avatar Julian Anastasov Committed by Pablo Neira Ayuso
Browse files

ipvs: try also real server with port 0 in backup server 



	We should not forget to try for real server with port 0
in the backup server when processing the sync message. We should
do it in all cases because the backup server can use different
forwarding method.

Signed-off-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent fe3c8cc9

include/net/ip_vs.h

+1 −1
Original line number Diff line number Diff line
@@ -1207,7 +1207,7 @@ extern void ip_vs_control_cleanup(void); 
extern struct ip_vs_dest *

ip_vs_find_dest(struct net *net, int af, const union nf_inet_addr *daddr,

		__be16 dport, const union nf_inet_addr *vaddr, __be16 vport,

		__u16 protocol, __u32 fwmark);

		__u16 protocol, __u32 fwmark, __u32 flags);

extern struct ip_vs_dest *ip_vs_try_bind_dest(struct ip_vs_conn *cp);

net/netfilter/ipvs/ip_vs_conn.c

+1 −1
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ struct ip_vs_dest *ip_vs_try_bind_dest(struct ip_vs_conn *cp) 
	if ((cp) && (!cp->dest)) {

		dest = ip_vs_find_dest(ip_vs_conn_net(cp), cp->af, &cp->daddr,

				       cp->dport, &cp->vaddr, cp->vport,

				       cp->protocol, cp->fwmark);

				       cp->protocol, cp->fwmark, cp->flags);

		ip_vs_bind_dest(cp, dest);

		return dest;

	} else

net/netfilter/ipvs/ip_vs_ctl.c

+8 −2
Original line number Diff line number Diff line
@@ -619,15 +619,21 @@ struct ip_vs_dest *ip_vs_find_dest(struct net *net, int af, 
				   const union nf_inet_addr *daddr,

				   __be16 dport,

				   const union nf_inet_addr *vaddr,

				   __be16 vport, __u16 protocol, __u32 fwmark)

				   __be16 vport, __u16 protocol, __u32 fwmark,

				   __u32 flags)

{

	struct ip_vs_dest *dest;

	struct ip_vs_service *svc;

	__be16 port = dport;



	svc = ip_vs_service_get(net, af, fwmark, protocol, vaddr, vport);

	if (!svc)

		return NULL;

	dest = ip_vs_lookup_dest(svc, daddr, dport);

	if (fwmark && (flags & IP_VS_CONN_F_FWD_MASK) != IP_VS_CONN_F_MASQ)

		port = 0;

	dest = ip_vs_lookup_dest(svc, daddr, port);

	if (!dest)

		dest = ip_vs_lookup_dest(svc, daddr, port ^ dport);

	if (dest)

		atomic_inc(&dest->refcnt);

	ip_vs_service_put(svc);

net/netfilter/ipvs/ip_vs_sync.c

+1 −1
Original line number Diff line number Diff line
@@ -740,7 +740,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param, 
		 * but still handled.

		 */

		dest = ip_vs_find_dest(net, type, daddr, dport, param->vaddr,

				       param->vport, protocol, fwmark);

				       param->vport, protocol, fwmark, flags);



		/*  Set the approprite ativity flag */

		if (protocol == IPPROTO_TCP) {