Hello,

On Fri, 1 Oct 2010, Simon Horman wrote:

quoted text
> ===================================================================
> --- lvs-test-2.6.orig/net/netfilter/ipvs/ip_vs_conn.c	2010-10-01 22:48:42.000000000 +0900
> +++ lvs-test-2.6/net/netfilter/ipvs/ip_vs_conn.c	2010-10-01 22:49:15.000000000 +0900
> @@ -148,6 +148,29 @@ static unsigned int ip_vs_conn_hashkey(i
> 		& ip_vs_conn_tab_mask;
> }
>
> +static unsigned int ip_vs_conn_hashkey_param(const struct ip_vs_conn_param *p)
> +{
> +	if (p->pe && p->pe->hashkey_raw)
> +		return p->pe->hashkey_raw(p, ip_vs_conn_rnd) &
> +			ip_vs_conn_tab_mask;
> +	return ip_vs_conn_hashkey(p->af, p->protocol, p->caddr, p->cport);
> +}
> +
> +static unsigned int ip_vs_conn_hashkey_conn(const struct ip_vs_conn *cp)
> +{
> +	struct ip_vs_conn_param p;
> +
> +	ip_vs_conn_fill_param(cp->af, cp->protocol, &cp->caddr, cp->cport,
> +			      NULL, 0, &p);
> +

 	cp->dest is optional, line should be
'if (cp->dest && cp->dest->svc->pe) {':

quoted text
> +	if (cp->dest->svc->pe) {
> +		p.pe = cp->dest->svc->pe;
> +		p.pe_data = cp->pe_data;
> +		p.pe_data_len = cp->pe_data_len;
> +	}
> +
> +	return ip_vs_conn_hashkey_param(&p);
> +}
>


quoted text
> @@ -359,7 +387,7 @@ struct ip_vs_conn *ip_vs_conn_out_get(co
> 	/*
> 	 *	Check for "full" addressed entries
> 	 */

 	Here ip_vs_conn_out_get expects client data in
p->vaddr and p->vport (was daddr before) but ip_vs_conn_hashkey_param 
hashes client data from p->caddr and p->cport:

quoted text
> -	hash = ip_vs_conn_hashkey(p->af, p->protocol, p->vaddr, p->vport);
> +	hash = ip_vs_conn_hashkey_param(p);
>
> 	ct_read_lock(hash);

Regards

--
Julian Anastasov <ja@ssi.bg>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html