On Thu, Jul 24, 2008 at 12:14:49PM +0200, Julius Volz wrote:
> Current versions of ipvsadm include "/usr/src/linux/include/net/ip_vs.h"
> directly. This file also contains kernel-only definitions. Normally, public
> definitions should live in include/linux, so this patch moves the
> definitions shared with userspace to a new file, "include/linux/ip_vs.h".
>
> To make old ipvsadms still compile with this, the old header file includes
> the new one.
>
> Thanks to Dave Miller and Horms for noting/adding the missing Kbuild entry
> for the new header file.
>
> Signed-off-by: Julius Volz <juliusv@xxxxxxxxxx>
Acked-by: Simon Horman <horms@xxxxxxxxxxxx>
> ---
> include/linux/Kbuild | 1 +
> include/linux/ip_vs.h | 248 ++++++++++++++++++++++++++++++++++++++++++++++++
> include/net/ip_vs.h | 253 ++-----------------------------------------------
> 3 files changed, 257 insertions(+), 245 deletions(-)
> create mode 100644 include/linux/ip_vs.h
>
> diff --git a/include/linux/Kbuild b/include/linux/Kbuild
> index 71d70d1..3273039 100644
> --- a/include/linux/Kbuild
> +++ b/include/linux/Kbuild
> @@ -97,6 +97,7 @@ header-y += ioctl.h
> header-y += ip6_tunnel.h
> header-y += ipmi_msgdefs.h
> header-y += ipsec.h
> +header-y += ip_vs.h
> header-y += ipx.h
> header-y += irda.h
> header-y += iso_fs.h
> diff --git a/include/linux/ip_vs.h b/include/linux/ip_vs.h
> new file mode 100644
> index 0000000..2d4eb68
> --- /dev/null
> +++ b/include/linux/ip_vs.h
> @@ -0,0 +1,248 @@
> +/*
> + * IP Virtual Server
> + * data structure and functionality definitions
> + */
> +
> +#ifndef _IP_VS_H
> +#define _IP_VS_H
> +
> +#include <linux/types.h> /* For __beXX types in userland */
> +
> +#define IP_VS_VERSION_CODE 0x010201
> +#define NVERSION(version) \
> + (version >> 16) & 0xFF, \
> + (version >> 8) & 0xFF, \
> + version & 0xFF
> +
> +/*
> + * Virtual Service Flags
> + */
> +#define IP_VS_SVC_F_PERSISTENT 0x0001 /* persistent port */
> +#define IP_VS_SVC_F_HASHED 0x0002 /* hashed entry */
> +
> +/*
> + * Destination Server Flags
> + */
> +#define IP_VS_DEST_F_AVAILABLE 0x0001 /* server is available */
> +#define IP_VS_DEST_F_OVERLOAD 0x0002 /* server is overloaded */
> +
> +/*
> + * IPVS sync daemon states
> + */
> +#define IP_VS_STATE_NONE 0x0000 /* daemon is stopped */
> +#define IP_VS_STATE_MASTER 0x0001 /* started as master */
> +#define IP_VS_STATE_BACKUP 0x0002 /* started as backup */
> +
> +/*
> + * IPVS socket options
> + */
> +#define IP_VS_BASE_CTL (64+1024+64) /* base */
> +
> +#define IP_VS_SO_SET_NONE IP_VS_BASE_CTL /* just peek */
> +#define IP_VS_SO_SET_INSERT (IP_VS_BASE_CTL+1)
> +#define IP_VS_SO_SET_ADD (IP_VS_BASE_CTL+2)
> +#define IP_VS_SO_SET_EDIT (IP_VS_BASE_CTL+3)
> +#define IP_VS_SO_SET_DEL (IP_VS_BASE_CTL+4)
> +#define IP_VS_SO_SET_FLUSH (IP_VS_BASE_CTL+5)
> +#define IP_VS_SO_SET_LIST (IP_VS_BASE_CTL+6)
> +#define IP_VS_SO_SET_ADDDEST (IP_VS_BASE_CTL+7)
> +#define IP_VS_SO_SET_DELDEST (IP_VS_BASE_CTL+8)
> +#define IP_VS_SO_SET_EDITDEST (IP_VS_BASE_CTL+9)
> +#define IP_VS_SO_SET_TIMEOUT (IP_VS_BASE_CTL+10)
> +#define IP_VS_SO_SET_STARTDAEMON (IP_VS_BASE_CTL+11)
> +#define IP_VS_SO_SET_STOPDAEMON (IP_VS_BASE_CTL+12)
> +#define IP_VS_SO_SET_RESTORE (IP_VS_BASE_CTL+13)
> +#define IP_VS_SO_SET_SAVE (IP_VS_BASE_CTL+14)
> +#define IP_VS_SO_SET_ZERO (IP_VS_BASE_CTL+15)
> +#define IP_VS_SO_SET_MAX IP_VS_SO_SET_ZERO
> +
> +#define IP_VS_SO_GET_VERSION IP_VS_BASE_CTL
> +#define IP_VS_SO_GET_INFO (IP_VS_BASE_CTL+1)
> +#define IP_VS_SO_GET_SERVICES (IP_VS_BASE_CTL+2)
> +#define IP_VS_SO_GET_SERVICE (IP_VS_BASE_CTL+3)
> +#define IP_VS_SO_GET_DESTS (IP_VS_BASE_CTL+4)
> +#define IP_VS_SO_GET_DEST (IP_VS_BASE_CTL+5) /* not used now */
> +#define IP_VS_SO_GET_TIMEOUT (IP_VS_BASE_CTL+6)
> +#define IP_VS_SO_GET_DAEMON (IP_VS_BASE_CTL+7)
> +#define IP_VS_SO_GET_MAX IP_VS_SO_GET_DAEMON
> +
> +
> +/*
> + * IPVS Connection Flags
> + */
> +#define IP_VS_CONN_F_FWD_MASK 0x0007 /* mask for the fwd methods */
> +#define IP_VS_CONN_F_MASQ 0x0000 /* masquerading/NAT */
> +#define IP_VS_CONN_F_LOCALNODE 0x0001 /* local node */
> +#define IP_VS_CONN_F_TUNNEL 0x0002 /* tunneling */
> +#define IP_VS_CONN_F_DROUTE 0x0003 /* direct routing */
> +#define IP_VS_CONN_F_BYPASS 0x0004 /* cache bypass */
> +#define IP_VS_CONN_F_SYNC 0x0020 /* entry created by sync */
> +#define IP_VS_CONN_F_HASHED 0x0040 /* hashed entry */
> +#define IP_VS_CONN_F_NOOUTPUT 0x0080 /* no output packets */
> +#define IP_VS_CONN_F_INACTIVE 0x0100 /* not established */
> +#define IP_VS_CONN_F_OUT_SEQ 0x0200 /* must do output seq adjust */
> +#define IP_VS_CONN_F_IN_SEQ 0x0400 /* must do input seq adjust */
> +#define IP_VS_CONN_F_SEQ_MASK 0x0600 /* in/out sequence mask */
> +#define IP_VS_CONN_F_NO_CPORT 0x0800 /* no client port set yet */
> +#define IP_VS_CONN_F_TEMPLATE 0x1000 /* template, not connection */
> +
> +/* Move it to better place one day, for now keep it unique */
> +#define NFC_IPVS_PROPERTY 0x10000
> +
> +#define IP_VS_SCHEDNAME_MAXLEN 16
> +#define IP_VS_IFNAME_MAXLEN 16
> +
> +
> +/*
> + * The struct ip_vs_service_user and struct ip_vs_dest_user are
> + * used to set IPVS rules through setsockopt.
> + */
> +struct ip_vs_service_user {
> + /* virtual service addresses */
> + u_int16_t protocol;
> + __be32 addr; /* virtual ip address */
> + __be16 port;
> + u_int32_t fwmark; /* firwall mark of service */
> +
> + /* virtual service options */
> + char sched_name[IP_VS_SCHEDNAME_MAXLEN];
> + unsigned flags; /* virtual service flags */
> + unsigned timeout; /* persistent timeout in sec */
> + __be32 netmask; /* persistent netmask */
> +};
> +
> +
> +struct ip_vs_dest_user {
> + /* destination server address */
> + __be32 addr;
> + __be16 port;
> +
> + /* real server options */
> + unsigned conn_flags; /* connection flags */
> + int weight; /* destination weight */
> +
> + /* thresholds for active connections */
> + u_int32_t u_threshold; /* upper threshold */
> + u_int32_t l_threshold; /* lower threshold */
> +};
> +
> +
> +/*
> + * IPVS statistics object (for user space)
> + */
> +struct ip_vs_stats_user
> +{
> + __u32 conns; /* connections scheduled */
> + __u32 inpkts; /* incoming packets */
> + __u32 outpkts; /* outgoing packets */
> + __u64 inbytes; /* incoming bytes */
> + __u64 outbytes; /* outgoing bytes */
> +
> + __u32 cps; /* current connection rate */
> + __u32 inpps; /* current in packet rate */
> + __u32 outpps; /* current out packet rate */
> + __u32 inbps; /* current in byte rate */
> + __u32 outbps; /* current out byte rate */
> +};
> +
> +
> +/* The argument to IP_VS_SO_GET_INFO */
> +struct ip_vs_getinfo {
> + /* version number */
> + unsigned int version;
> +
> + /* size of connection hash table */
> + unsigned int size;
> +
> + /* number of virtual services */
> + unsigned int num_services;
> +};
> +
> +
> +/* The argument to IP_VS_SO_GET_SERVICE */
> +struct ip_vs_service_entry {
> + /* which service: user fills in these */
> + u_int16_t protocol;
> + __be32 addr; /* virtual address */
> + __be16 port;
> + u_int32_t fwmark; /* firwall mark of service */
> +
> + /* service options */
> + char sched_name[IP_VS_SCHEDNAME_MAXLEN];
> + unsigned flags; /* virtual service flags */
> + unsigned timeout; /* persistent timeout */
> + __be32 netmask; /* persistent netmask */
> +
> + /* number of real servers */
> + unsigned int num_dests;
> +
> + /* statistics */
> + struct ip_vs_stats_user stats;
> +};
> +
> +
> +struct ip_vs_dest_entry {
> + __be32 addr; /* destination address */
> + __be16 port;
> + unsigned conn_flags; /* connection flags */
> + int weight; /* destination weight */
> +
> + u_int32_t u_threshold; /* upper threshold */
> + u_int32_t l_threshold; /* lower threshold */
> +
> + u_int32_t activeconns; /* active connections */
> + u_int32_t inactconns; /* inactive connections */
> + u_int32_t persistconns; /* persistent connections */
> +
> + /* statistics */
> + struct ip_vs_stats_user stats;
> +};
> +
> +
> +/* The argument to IP_VS_SO_GET_DESTS */
> +struct ip_vs_get_dests {
> + /* which service: user fills in these */
> + u_int16_t protocol;
> + __be32 addr; /* virtual address */
> + __be16 port;
> + u_int32_t fwmark; /* firwall mark of service */
> +
> + /* number of real servers */
> + unsigned int num_dests;
> +
> + /* the real servers */
> + struct ip_vs_dest_entry entrytable[0];
> +};
> +
> +
> +/* The argument to IP_VS_SO_GET_SERVICES */
> +struct ip_vs_get_services {
> + /* number of virtual services */
> + unsigned int num_services;
> +
> + /* service table */
> + struct ip_vs_service_entry entrytable[0];
> +};
> +
> +
> +/* The argument to IP_VS_SO_GET_TIMEOUT */
> +struct ip_vs_timeout_user {
> + int tcp_timeout;
> + int tcp_fin_timeout;
> + int udp_timeout;
> +};
> +
> +
> +/* The argument to IP_VS_SO_GET_DAEMON */
> +struct ip_vs_daemon_user {
> + /* sync daemon state (master/backup) */
> + int state;
> +
> + /* multicast interface name */
> + char mcast_ifn[IP_VS_IFNAME_MAXLEN];
> +
> + /* SyncID we belong to */
> + int syncid;
> +};
> +
> +#endif /* _IP_VS_H */
> diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
> index 9a51eba..cbb59eb 100644
> --- a/include/net/ip_vs.h
> +++ b/include/net/ip_vs.h
> @@ -3,254 +3,17 @@
> * data structure and functionality definitions
> */
>
> -#ifndef _IP_VS_H
> -#define _IP_VS_H
> -
> -#include <asm/types.h> /* For __uXX types */
> -#include <linux/types.h> /* For __beXX types in userland */
> -
> -#include <linux/sysctl.h> /* For ctl_path */
> -
> -#define IP_VS_VERSION_CODE 0x010201
> -#define NVERSION(version) \
> - (version >> 16) & 0xFF, \
> - (version >> 8) & 0xFF, \
> - version & 0xFF
> -
> -/*
> - * Virtual Service Flags
> - */
> -#define IP_VS_SVC_F_PERSISTENT 0x0001 /* persistent port */
> -#define IP_VS_SVC_F_HASHED 0x0002 /* hashed entry */
> -
> -/*
> - * Destination Server Flags
> - */
> -#define IP_VS_DEST_F_AVAILABLE 0x0001 /* server is available */
> -#define IP_VS_DEST_F_OVERLOAD 0x0002 /* server is overloaded */
> -
> -/*
> - * IPVS sync daemon states
> - */
> -#define IP_VS_STATE_NONE 0x0000 /* daemon is stopped */
> -#define IP_VS_STATE_MASTER 0x0001 /* started as master */
> -#define IP_VS_STATE_BACKUP 0x0002 /* started as backup */
> -
> -/*
> - * IPVS socket options
> - */
> -#define IP_VS_BASE_CTL (64+1024+64) /* base */
> -
> -#define IP_VS_SO_SET_NONE IP_VS_BASE_CTL /* just peek */
> -#define IP_VS_SO_SET_INSERT (IP_VS_BASE_CTL+1)
> -#define IP_VS_SO_SET_ADD (IP_VS_BASE_CTL+2)
> -#define IP_VS_SO_SET_EDIT (IP_VS_BASE_CTL+3)
> -#define IP_VS_SO_SET_DEL (IP_VS_BASE_CTL+4)
> -#define IP_VS_SO_SET_FLUSH (IP_VS_BASE_CTL+5)
> -#define IP_VS_SO_SET_LIST (IP_VS_BASE_CTL+6)
> -#define IP_VS_SO_SET_ADDDEST (IP_VS_BASE_CTL+7)
> -#define IP_VS_SO_SET_DELDEST (IP_VS_BASE_CTL+8)
> -#define IP_VS_SO_SET_EDITDEST (IP_VS_BASE_CTL+9)
> -#define IP_VS_SO_SET_TIMEOUT (IP_VS_BASE_CTL+10)
> -#define IP_VS_SO_SET_STARTDAEMON (IP_VS_BASE_CTL+11)
> -#define IP_VS_SO_SET_STOPDAEMON (IP_VS_BASE_CTL+12)
> -#define IP_VS_SO_SET_RESTORE (IP_VS_BASE_CTL+13)
> -#define IP_VS_SO_SET_SAVE (IP_VS_BASE_CTL+14)
> -#define IP_VS_SO_SET_ZERO (IP_VS_BASE_CTL+15)
> -#define IP_VS_SO_SET_MAX IP_VS_SO_SET_ZERO
> -
> -#define IP_VS_SO_GET_VERSION IP_VS_BASE_CTL
> -#define IP_VS_SO_GET_INFO (IP_VS_BASE_CTL+1)
> -#define IP_VS_SO_GET_SERVICES (IP_VS_BASE_CTL+2)
> -#define IP_VS_SO_GET_SERVICE (IP_VS_BASE_CTL+3)
> -#define IP_VS_SO_GET_DESTS (IP_VS_BASE_CTL+4)
> -#define IP_VS_SO_GET_DEST (IP_VS_BASE_CTL+5) /* not used now */
> -#define IP_VS_SO_GET_TIMEOUT (IP_VS_BASE_CTL+6)
> -#define IP_VS_SO_GET_DAEMON (IP_VS_BASE_CTL+7)
> -#define IP_VS_SO_GET_MAX IP_VS_SO_GET_DAEMON
> -
> -
> -/*
> - * IPVS Connection Flags
> - */
> -#define IP_VS_CONN_F_FWD_MASK 0x0007 /* mask for the fwd methods */
> -#define IP_VS_CONN_F_MASQ 0x0000 /* masquerading/NAT */
> -#define IP_VS_CONN_F_LOCALNODE 0x0001 /* local node */
> -#define IP_VS_CONN_F_TUNNEL 0x0002 /* tunneling */
> -#define IP_VS_CONN_F_DROUTE 0x0003 /* direct routing */
> -#define IP_VS_CONN_F_BYPASS 0x0004 /* cache bypass */
> -#define IP_VS_CONN_F_SYNC 0x0020 /* entry created by sync */
> -#define IP_VS_CONN_F_HASHED 0x0040 /* hashed entry */
> -#define IP_VS_CONN_F_NOOUTPUT 0x0080 /* no output packets */
> -#define IP_VS_CONN_F_INACTIVE 0x0100 /* not established */
> -#define IP_VS_CONN_F_OUT_SEQ 0x0200 /* must do output seq adjust */
> -#define IP_VS_CONN_F_IN_SEQ 0x0400 /* must do input seq adjust */
> -#define IP_VS_CONN_F_SEQ_MASK 0x0600 /* in/out sequence mask */
> -#define IP_VS_CONN_F_NO_CPORT 0x0800 /* no client port set yet */
> -#define IP_VS_CONN_F_TEMPLATE 0x1000 /* template, not connection */
> -
> -/* Move it to better place one day, for now keep it unique */
> -#define NFC_IPVS_PROPERTY 0x10000
> -
> -#define IP_VS_SCHEDNAME_MAXLEN 16
> -#define IP_VS_IFNAME_MAXLEN 16
> -
> -
> -/*
> - * The struct ip_vs_service_user and struct ip_vs_dest_user are
> - * used to set IPVS rules through setsockopt.
> - */
> -struct ip_vs_service_user {
> - /* virtual service addresses */
> - u_int16_t protocol;
> - __be32 addr; /* virtual ip address */
> - __be16 port;
> - u_int32_t fwmark; /* firwall mark of service */
> -
> - /* virtual service options */
> - char sched_name[IP_VS_SCHEDNAME_MAXLEN];
> - unsigned flags; /* virtual service flags */
> - unsigned timeout; /* persistent timeout in sec */
> - __be32 netmask; /* persistent netmask */
> -};
> -
> -
> -struct ip_vs_dest_user {
> - /* destination server address */
> - __be32 addr;
> - __be16 port;
> -
> - /* real server options */
> - unsigned conn_flags; /* connection flags */
> - int weight; /* destination weight */
> -
> - /* thresholds for active connections */
> - u_int32_t u_threshold; /* upper threshold */
> - u_int32_t l_threshold; /* lower threshold */
> -};
> -
> -
> -/*
> - * IPVS statistics object (for user space)
> - */
> -struct ip_vs_stats_user
> -{
> - __u32 conns; /* connections scheduled */
> - __u32 inpkts; /* incoming packets */
> - __u32 outpkts; /* outgoing packets */
> - __u64 inbytes; /* incoming bytes */
> - __u64 outbytes; /* outgoing bytes */
> -
> - __u32 cps; /* current connection rate */
> - __u32 inpps; /* current in packet rate */
> - __u32 outpps; /* current out packet rate */
> - __u32 inbps; /* current in byte rate */
> - __u32 outbps; /* current out byte rate */
> -};
> -
> -
> -/* The argument to IP_VS_SO_GET_INFO */
> -struct ip_vs_getinfo {
> - /* version number */
> - unsigned int version;
> -
> - /* size of connection hash table */
> - unsigned int size;
> -
> - /* number of virtual services */
> - unsigned int num_services;
> -};
> -
> -
> -/* The argument to IP_VS_SO_GET_SERVICE */
> -struct ip_vs_service_entry {
> - /* which service: user fills in these */
> - u_int16_t protocol;
> - __be32 addr; /* virtual address */
> - __be16 port;
> - u_int32_t fwmark; /* firwall mark of service */
> -
> - /* service options */
> - char sched_name[IP_VS_SCHEDNAME_MAXLEN];
> - unsigned flags; /* virtual service flags */
> - unsigned timeout; /* persistent timeout */
> - __be32 netmask; /* persistent netmask */
> -
> - /* number of real servers */
> - unsigned int num_dests;
> -
> - /* statistics */
> - struct ip_vs_stats_user stats;
> -};
> -
> -
> -struct ip_vs_dest_entry {
> - __be32 addr; /* destination address */
> - __be16 port;
> - unsigned conn_flags; /* connection flags */
> - int weight; /* destination weight */
> -
> - u_int32_t u_threshold; /* upper threshold */
> - u_int32_t l_threshold; /* lower threshold */
> -
> - u_int32_t activeconns; /* active connections */
> - u_int32_t inactconns; /* inactive connections */
> - u_int32_t persistconns; /* persistent connections */
> -
> - /* statistics */
> - struct ip_vs_stats_user stats;
> -};
> -
> -
> -/* The argument to IP_VS_SO_GET_DESTS */
> -struct ip_vs_get_dests {
> - /* which service: user fills in these */
> - u_int16_t protocol;
> - __be32 addr; /* virtual address */
> - __be16 port;
> - u_int32_t fwmark; /* firwall mark of service */
> -
> - /* number of real servers */
> - unsigned int num_dests;
> -
> - /* the real servers */
> - struct ip_vs_dest_entry entrytable[0];
> -};
> -
> -
> -/* The argument to IP_VS_SO_GET_SERVICES */
> -struct ip_vs_get_services {
> - /* number of virtual services */
> - unsigned int num_services;
> -
> - /* service table */
> - struct ip_vs_service_entry entrytable[0];
> -};
> -
> -
> -/* The argument to IP_VS_SO_GET_TIMEOUT */
> -struct ip_vs_timeout_user {
> - int tcp_timeout;
> - int tcp_fin_timeout;
> - int udp_timeout;
> -};
> -
> -
> -/* The argument to IP_VS_SO_GET_DAEMON */
> -struct ip_vs_daemon_user {
> - /* sync daemon state (master/backup) */
> - int state;
> -
> - /* multicast interface name */
> - char mcast_ifn[IP_VS_IFNAME_MAXLEN];
> -
> - /* SyncID we belong to */
> - int syncid;
> -};
> +#ifndef _NET_IP_VS_H
> +#define _NET_IP_VS_H
>
> +#include <linux/ip_vs.h> /* definitions shared with userland */
>
> +/* old ipvsadm versions still include this file directly */
> #ifdef __KERNEL__
>
> +#include <asm/types.h> /* for __uXX types */
> +
> +#include <linux/sysctl.h> /* for ctl_path */
> #include <linux/list.h> /* for struct list_head */
> #include <linux/spinlock.h> /* for struct rwlock_t */
> #include <asm/atomic.h> /* for struct atomic_t */
> @@ -981,4 +744,4 @@ static inline __wsum ip_vs_check_diff2(__be16 old, __be16 new, __wsum oldsum)
>
> #endif /* __KERNEL__ */
>
> -#endif /* _IP_VS_H */
> +#endif /* _NET_IP_VS_H */
> --
> 1.5.4.5
--
Horms
--
To unsubscribe from this list: send the line "unsubscribe lvs-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
