diff options
Diffstat (limited to 'net/netfilter/ipvs/ip_vs_ftp.c')
-rw-r--r-- | net/netfilter/ipvs/ip_vs_ftp.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/net/netfilter/ipvs/ip_vs_ftp.c b/net/netfilter/ipvs/ip_vs_ftp.c index 77b0036dcb7..6a04f9ab9d0 100644 --- a/net/netfilter/ipvs/ip_vs_ftp.c +++ b/net/netfilter/ipvs/ip_vs_ftp.c | |||
@@ -198,13 +198,15 @@ static int ip_vs_ftp_out(struct ip_vs_app *app, struct ip_vs_conn *cp, | |||
198 | */ | 198 | */ |
199 | { | 199 | { |
200 | struct ip_vs_conn_param p; | 200 | struct ip_vs_conn_param p; |
201 | ip_vs_conn_fill_param(AF_INET, iph->protocol, | 201 | ip_vs_conn_fill_param(ip_vs_conn_net(cp), AF_INET, |
202 | &from, port, &cp->caddr, 0, &p); | 202 | iph->protocol, &from, port, |
203 | &cp->caddr, 0, &p); | ||
203 | n_cp = ip_vs_conn_out_get(&p); | 204 | n_cp = ip_vs_conn_out_get(&p); |
204 | } | 205 | } |
205 | if (!n_cp) { | 206 | if (!n_cp) { |
206 | struct ip_vs_conn_param p; | 207 | struct ip_vs_conn_param p; |
207 | ip_vs_conn_fill_param(AF_INET, IPPROTO_TCP, &cp->caddr, | 208 | ip_vs_conn_fill_param(ip_vs_conn_net(cp), |
209 | AF_INET, IPPROTO_TCP, &cp->caddr, | ||
208 | 0, &cp->vaddr, port, &p); | 210 | 0, &cp->vaddr, port, &p); |
209 | n_cp = ip_vs_conn_new(&p, &from, port, | 211 | n_cp = ip_vs_conn_new(&p, &from, port, |
210 | IP_VS_CONN_F_NO_CPORT | | 212 | IP_VS_CONN_F_NO_CPORT | |
@@ -361,9 +363,9 @@ static int ip_vs_ftp_in(struct ip_vs_app *app, struct ip_vs_conn *cp, | |||
361 | 363 | ||
362 | { | 364 | { |
363 | struct ip_vs_conn_param p; | 365 | struct ip_vs_conn_param p; |
364 | ip_vs_conn_fill_param(AF_INET, iph->protocol, &to, port, | 366 | ip_vs_conn_fill_param(ip_vs_conn_net(cp), AF_INET, |
365 | &cp->vaddr, htons(ntohs(cp->vport)-1), | 367 | iph->protocol, &to, port, &cp->vaddr, |
366 | &p); | 368 | htons(ntohs(cp->vport)-1), &p); |
367 | n_cp = ip_vs_conn_in_get(&p); | 369 | n_cp = ip_vs_conn_in_get(&p); |
368 | if (!n_cp) { | 370 | if (!n_cp) { |
369 | n_cp = ip_vs_conn_new(&p, &cp->daddr, | 371 | n_cp = ip_vs_conn_new(&p, &cp->daddr, |