diff options
| author | Hans Schillstrom <hans.schillstrom@ericsson.com> | 2010-11-19 14:25:07 +0100 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2010-11-25 10:42:58 +0900 |
| commit | 0e051e683ba4acb4e67c272c6a89707d974099d1 (patch) | |
| tree | c834c362a50e68573256b813bcfcd86c6cc41db8 /net/netfilter/ipvs/ip_vs_ftp.c | |
| parent | 2c2bf086146c7e4ff526247e9fd1db23dada88c3 (diff) | |
| download | op-kernel-dev-0e051e683ba4acb4e67c272c6a89707d974099d1.zip op-kernel-dev-0e051e683ba4acb4e67c272c6a89707d974099d1.tar.gz | |
IPVS: Backup, Prepare for transferring firewall marks (fwmark) to the backup daemon.
One struct will have fwmark added:
* ip_vs_conn
ip_vs_conn_new() and ip_vs_find_dest()
will have an extra param - fwmark
The effects of that, is in this patch.
Signed-off-by: Hans Schillstrom <hans.schillstrom@ericsson.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'net/netfilter/ipvs/ip_vs_ftp.c')
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_ftp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/netfilter/ipvs/ip_vs_ftp.c b/net/netfilter/ipvs/ip_vs_ftp.c index 7545500..84aef65 100644 --- a/net/netfilter/ipvs/ip_vs_ftp.c +++ b/net/netfilter/ipvs/ip_vs_ftp.c @@ -208,7 +208,7 @@ static int ip_vs_ftp_out(struct ip_vs_app *app, struct ip_vs_conn *cp, n_cp = ip_vs_conn_new(&p, &from, port, IP_VS_CONN_F_NO_CPORT | IP_VS_CONN_F_NFCT, - cp->dest); + cp->dest, skb->mark); if (!n_cp) return 0; @@ -365,7 +365,8 @@ static int ip_vs_ftp_in(struct ip_vs_app *app, struct ip_vs_conn *cp, if (!n_cp) { n_cp = ip_vs_conn_new(&p, &cp->daddr, htons(ntohs(cp->dport)-1), - IP_VS_CONN_F_NFCT, cp->dest); + IP_VS_CONN_F_NFCT, cp->dest, + skb->mark); if (!n_cp) return 0; |
