diff options
author | Hans Schillstrom <hans.schillstrom@ericsson.com> | 2010-11-19 08:25:07 -0500 |
---|---|---|
committer | Simon Horman <horms@verge.net.au> | 2010-11-24 20:42:58 -0500 |
commit | 0e051e683ba4acb4e67c272c6a89707d974099d1 (patch) | |
tree | c834c362a50e68573256b813bcfcd86c6cc41db8 /include/net/ip_vs.h | |
parent | 2c2bf086146c7e4ff526247e9fd1db23dada88c3 (diff) |
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 'include/net/ip_vs.h')
-rw-r--r-- | include/net/ip_vs.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index d5a32e47f9d9..890f01c215e9 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h | |||
@@ -382,6 +382,7 @@ struct ip_vs_conn { | |||
382 | union nf_inet_addr vaddr; /* virtual address */ | 382 | union nf_inet_addr vaddr; /* virtual address */ |
383 | union nf_inet_addr daddr; /* destination address */ | 383 | union nf_inet_addr daddr; /* destination address */ |
384 | volatile __u32 flags; /* status flags */ | 384 | volatile __u32 flags; /* status flags */ |
385 | __u32 fwmark; /* Fire wall mark from skb */ | ||
385 | __be16 cport; | 386 | __be16 cport; |
386 | __be16 vport; | 387 | __be16 vport; |
387 | __be16 dport; | 388 | __be16 dport; |
@@ -720,7 +721,7 @@ extern void ip_vs_conn_fill_cport(struct ip_vs_conn *cp, __be16 cport); | |||
720 | struct ip_vs_conn *ip_vs_conn_new(const struct ip_vs_conn_param *p, | 721 | struct ip_vs_conn *ip_vs_conn_new(const struct ip_vs_conn_param *p, |
721 | const union nf_inet_addr *daddr, | 722 | const union nf_inet_addr *daddr, |
722 | __be16 dport, unsigned flags, | 723 | __be16 dport, unsigned flags, |
723 | struct ip_vs_dest *dest); | 724 | struct ip_vs_dest *dest, __u32 fwmark); |
724 | extern void ip_vs_conn_expire_now(struct ip_vs_conn *cp); | 725 | extern void ip_vs_conn_expire_now(struct ip_vs_conn *cp); |
725 | 726 | ||
726 | extern const char * ip_vs_state_name(__u16 proto, int state); | 727 | extern const char * ip_vs_state_name(__u16 proto, int state); |
@@ -901,7 +902,8 @@ extern int ip_vs_control_init(void); | |||
901 | extern void ip_vs_control_cleanup(void); | 902 | extern void ip_vs_control_cleanup(void); |
902 | extern struct ip_vs_dest * | 903 | extern struct ip_vs_dest * |
903 | ip_vs_find_dest(int af, const union nf_inet_addr *daddr, __be16 dport, | 904 | ip_vs_find_dest(int af, const union nf_inet_addr *daddr, __be16 dport, |
904 | const union nf_inet_addr *vaddr, __be16 vport, __u16 protocol); | 905 | const union nf_inet_addr *vaddr, __be16 vport, __u16 protocol, |
906 | __u32 fwmark); | ||
905 | extern struct ip_vs_dest *ip_vs_try_bind_dest(struct ip_vs_conn *cp); | 907 | extern struct ip_vs_dest *ip_vs_try_bind_dest(struct ip_vs_conn *cp); |
906 | 908 | ||
907 | 909 | ||