| Message ID | 20140129145437.69F56E916F@unicorn.suse.cz |
|---|---|
| State | Superseded |
| Headers | show |
Hello, On Wed, 29 Jan 2014, Michal Kubecek wrote: > If a fwmark is passed to ip_vs_conn_new(), it is passed in > vaddr, not daddr. Therefore we should set AF to AF_UNSPEC in > vaddr assignment (like we do in ip_vs_ct_in_get()). > > Signed-off-by: Bogdano Arendartchuk <barendartchuk@suse.com> > Signed-off-by: Michal Kubecek <mkubecek@suse.cz> > --- > (first time it didn't reach all recipients due to a malformed header) > --- > net/netfilter/ipvs/ip_vs_conn.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c > index 59a1a85..282b39b 100644 > --- a/net/netfilter/ipvs/ip_vs_conn.c > +++ b/net/netfilter/ipvs/ip_vs_conn.c > @@ -871,11 +871,11 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p, > cp->protocol = p->protocol; > ip_vs_addr_set(p->af, &cp->caddr, p->caddr); > cp->cport = p->cport; > - ip_vs_addr_set(p->af, &cp->vaddr, p->vaddr); > - cp->vport = p->vport; > - /* proto should only be IPPROTO_IP if d_addr is a fwmark */ > + /* proto should only be IPPROTO_IP if p->vaddr is a fwmark */ > ip_vs_addr_set(p->protocol == IPPROTO_IP ? AF_UNSPEC : p->af, > - &cp->daddr, daddr); > + &cp->vaddr, vaddr); Patch does not compile due to vaddr and p->daddr usage but you are in the right direction. Such change should fix a problem where connection templates don't get full IPv6 address for the real server, only the first 4 bytes are copied and as result it works only for IPv4. > + cp->vport = p->vport; > + ip_vs_addr_set(p->af, &cp->daddr, p->daddr); > cp->dport = dport; > cp->flags = flags; > cp->fwmark = fwmark; > -- > 1.8.1.4 Regards -- Julian Anastasov <ja@ssi.bg> -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Jan 29, 2014 at 11:24:17PM +0200, Julian Anastasov wrote: > > diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c > > index 59a1a85..282b39b 100644 > > --- a/net/netfilter/ipvs/ip_vs_conn.c > > +++ b/net/netfilter/ipvs/ip_vs_conn.c > > @@ -871,11 +871,11 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p, > > cp->protocol = p->protocol; > > ip_vs_addr_set(p->af, &cp->caddr, p->caddr); > > cp->cport = p->cport; > > - ip_vs_addr_set(p->af, &cp->vaddr, p->vaddr); > > - cp->vport = p->vport; > > - /* proto should only be IPPROTO_IP if d_addr is a fwmark */ > > + /* proto should only be IPPROTO_IP if p->vaddr is a fwmark */ > > ip_vs_addr_set(p->protocol == IPPROTO_IP ? AF_UNSPEC : p->af, > > - &cp->daddr, daddr); > > + &cp->vaddr, vaddr); > > Patch does not compile due to vaddr and p->daddr > usage but you are in the right direction. Such change should > fix a problem where connection templates don't get full > IPv6 address for the real server, only the first 4 bytes > are copied and as result it works only for IPv4. Sorry for that, looks like I ran the test build after adapting to current code with a config which didn't actually compile this file. I'll send a v2 after testing a fixed version and I'll also extend the commit message to describe the outcome. Michal Kubecek -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c index 59a1a85..282b39b 100644 --- a/net/netfilter/ipvs/ip_vs_conn.c +++ b/net/netfilter/ipvs/ip_vs_conn.c @@ -871,11 +871,11 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p, cp->protocol = p->protocol; ip_vs_addr_set(p->af, &cp->caddr, p->caddr); cp->cport = p->cport; - ip_vs_addr_set(p->af, &cp->vaddr, p->vaddr); - cp->vport = p->vport; - /* proto should only be IPPROTO_IP if d_addr is a fwmark */ + /* proto should only be IPPROTO_IP if p->vaddr is a fwmark */ ip_vs_addr_set(p->protocol == IPPROTO_IP ? AF_UNSPEC : p->af, - &cp->daddr, daddr); + &cp->vaddr, vaddr); + cp->vport = p->vport; + ip_vs_addr_set(p->af, &cp->daddr, p->daddr); cp->dport = dport; cp->flags = flags; cp->fwmark = fwmark;