ipvs: allow tunneling with gue encapsulation
Subsystems (4)
PATCH 1/1 ipvs: allow tunneling with gue encapsulation
ipip packets are blocked in some public cloud environments, this patch allows gue encapsulation with the tunneling method, which would make tunneling working in those environments.
Signed-off-by Jacky Hu <[email protected]>
--- include/uapi/linux/ip_vs.h | 17 +++++++- net/netfilter/ipvs/ip_vs_ctl.c | 4 +- net/netfilter/ipvs/ip_vs_xmit.c | 71 ++++++++++++++++++++++++++++++++- 3 files changed, 87 insertions(+), 5 deletions(-)
include/uapi/linux/ip_vs.h +16 -1
@@ -96,13 +96,25 @@#define IP_VS_CONN_F_TEMPLATE 0x1000/* template, not connection */ #define IP_VS_CONN_F_ONE_PACKET 0x2000/* forward only one packet */ +/* tunneling with gue */ +#define IP_VS_CONN_F_GUE 0x0008 + +/* gue destination port bit 0 */ +#define IP_VS_CONN_F_GUE_PORT_LSB 0x4000 + +/* gue destination port bit 1-15 */ +#define IP_VS_CONN_F_GUE_PORT_MSB 0xFFFFE0000 +/* Initial bits allowed in backup server */ #define IP_VS_CONN_F_BACKUP_MASK (IP_VS_CONN_F_FWD_MASK | \ IP_VS_CONN_F_NOOUTPUT | \ IP_VS_CONN_F_INACTIVE | \ IP_VS_CONN_F_SEQ_MASK | \ IP_VS_CONN_F_NO_CPORT | \ - IP_VS_CONN_F_TEMPLATE \ + IP_VS_CONN_F_TEMPLATE | \ + IP_VS_CONN_F_GUE | \ + IP_VS_CONN_F_GUE_PORT_MSB | \ + IP_VS_CONN_F_GUE_PORT_LSB \ )/* Bits allowed to update in backup server */
@@ -116,6 +128,9 @@#define IP_VS_CONN_F_DEST_MASK (IP_VS_CONN_F_FWD_MASK | \ IP_VS_CONN_F_ONE_PACKET | \ IP_VS_CONN_F_NFCT | \ + IP_VS_CONN_F_GUE | \ + IP_VS_CONN_F_GUE_PORT_MSB | \ + IP_VS_CONN_F_GUE_PORT_LSB | \ 0)#define IP_VS_SCHEDNAME_MAXLEN 16
net/netfilter/ipvs/ip_vs_ctl.c +2 -2
@@ -3169,7 +3169,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)nla_put_be16 (skb,IPVS_DEST_ATTR_PORT , dest->port) ||nla_put_u32 (skb,IPVS_DEST_ATTR_FWD_METHOD , (atomic_read (&dest->conn_flags) & -IP_VS_CONN_F_FWD_MASK )) || +IP_VS_CONN_F_DEST_MASK )) ||nla_put_u32 (skb,IPVS_DEST_ATTR_WEIGHT ,atomic_read (&dest->weight)) || nla_put_u32(skb, IPVS_DEST_ATTR_U_THRESH, dest->u_threshold) ||
@@ -3305,7 +3305,7 @@ static int ip_vs_genl_parse_dest(struct ip_vs_dest_user_kern *udest,return -EINVAL ; udest->conn_flags =nla_get_u32 (nla_fwd) - &IP_VS_CONN_F_FWD_MASK ; + &IP_VS_CONN_F_DEST_MASK ; udest->weight =nla_get_u32 (nla_weight); udest->u_threshold =nla_get_u32 (nla_u_thresh); udest->l_threshold =nla_get_u32 (nla_l_thresh);
net/netfilter/ipvs/ip_vs_xmit.c +69 -2
137 lines not on this page · raw message
Signature · 1 line
2.21.0