aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/lb/lb.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/lb/lb.h')
-rw-r--r--src/plugins/lb/lb.h77
1 files changed, 8 insertions, 69 deletions
diff --git a/src/plugins/lb/lb.h b/src/plugins/lb/lb.h
index fa1cfaadc25..46da40970c9 100644
--- a/src/plugins/lb/lb.h
+++ b/src/plugins/lb/lb.h
@@ -353,94 +353,41 @@ typedef struct {
/* clang-format off */
#define lb_vip_is_gre4(vip) (((vip)->type == LB_VIP_TYPE_IP6_GRE4 \
|| (vip)->type == LB_VIP_TYPE_IP4_GRE4) \
- && ((vip)->port == 0) \
- && !lb_vip_is_src_ip_sticky (vip))
+ && ((vip)->port == 0))
#define lb_vip_is_gre6(vip) (((vip)->type == LB_VIP_TYPE_IP6_GRE6 \
|| (vip)->type == LB_VIP_TYPE_IP4_GRE6) \
- && ((vip)->port == 0) \
- && !lb_vip_is_src_ip_sticky (vip))
+ && ((vip)->port == 0))
#define lb_vip_is_gre4_port(vip) (((vip)->type == LB_VIP_TYPE_IP6_GRE4 \
|| (vip)->type == LB_VIP_TYPE_IP4_GRE4) \
- && ((vip)->port != 0) \
- && !lb_vip_is_src_ip_sticky (vip))
+ && ((vip)->port != 0))
#define lb_vip_is_gre6_port(vip) (((vip)->type == LB_VIP_TYPE_IP6_GRE6 \
|| (vip)->type == LB_VIP_TYPE_IP4_GRE6) \
- && ((vip)->port != 0) \
- && !lb_vip_is_src_ip_sticky (vip))
+ && ((vip)->port != 0))
/* clang-format on */
-#define lb_vip_is_gre4_sticky(vip) \
- (((vip)->type == LB_VIP_TYPE_IP6_GRE4 || \
- (vip)->type == LB_VIP_TYPE_IP4_GRE4) && \
- ((vip)->port == 0) && lb_vip_is_src_ip_sticky (vip))
-
-#define lb_vip_is_gre6_sticky(vip) \
- (((vip)->type == LB_VIP_TYPE_IP6_GRE6 || \
- (vip)->type == LB_VIP_TYPE_IP4_GRE6) && \
- ((vip)->port == 0) && lb_vip_is_src_ip_sticky (vip))
-
-#define lb_vip_is_gre4_port_sticky(vip) \
- (((vip)->type == LB_VIP_TYPE_IP6_GRE4 || \
- (vip)->type == LB_VIP_TYPE_IP4_GRE4) && \
- ((vip)->port != 0) && lb_vip_is_src_ip_sticky (vip))
-
-#define lb_vip_is_gre6_port_sticky(vip) \
- (((vip)->type == LB_VIP_TYPE_IP6_GRE6 || \
- (vip)->type == LB_VIP_TYPE_IP4_GRE6) && \
- ((vip)->port != 0) && lb_vip_is_src_ip_sticky (vip))
-
always_inline bool
lb_vip_is_l3dsr(const lb_vip_t *vip)
{
- return (vip->type == LB_VIP_TYPE_IP4_L3DSR && vip->port == 0 &&
- !lb_vip_is_src_ip_sticky (vip));
+ return (vip->type == LB_VIP_TYPE_IP4_L3DSR && vip->port == 0);
}
always_inline bool
lb_vip_is_l3dsr_port(const lb_vip_t *vip)
{
- return (vip->type == LB_VIP_TYPE_IP4_L3DSR && vip->port != 0 &&
- !lb_vip_is_src_ip_sticky (vip));
+ return (vip->type == LB_VIP_TYPE_IP4_L3DSR && vip->port != 0);
}
always_inline bool
lb_vip_is_nat4_port(const lb_vip_t *vip)
{
- return (vip->type == LB_VIP_TYPE_IP4_NAT4 && vip->port != 0 &&
- !lb_vip_is_src_ip_sticky (vip));
+ return (vip->type == LB_VIP_TYPE_IP4_NAT4 && vip->port != 0);
}
always_inline bool
lb_vip_is_nat6_port(const lb_vip_t *vip)
{
- return (vip->type == LB_VIP_TYPE_IP6_NAT6 && vip->port != 0 &&
- !lb_vip_is_src_ip_sticky (vip));
-}
-
-always_inline bool
-lb_vip_is_l3dsr_sticky (const lb_vip_t *vip)
-{
- return (vip->type == LB_VIP_TYPE_IP4_L3DSR && vip->port == 0 &&
- lb_vip_is_src_ip_sticky (vip));
-}
-always_inline bool
-lb_vip_is_l3dsr_port_sticky (const lb_vip_t *vip)
-{
- return (vip->type == LB_VIP_TYPE_IP4_L3DSR && vip->port != 0 &&
- lb_vip_is_src_ip_sticky (vip));
-}
-always_inline bool
-lb_vip_is_nat4_port_sticky (const lb_vip_t *vip)
-{
- return (vip->type == LB_VIP_TYPE_IP4_NAT4 && vip->port != 0 &&
- lb_vip_is_src_ip_sticky (vip));
-}
-always_inline bool
-lb_vip_is_nat6_port_sticky (const lb_vip_t *vip)
-{
- return (vip->type == LB_VIP_TYPE_IP6_NAT6 && vip->port != 0 &&
- lb_vip_is_src_ip_sticky (vip));
+ return (vip->type == LB_VIP_TYPE_IP6_NAT6 && vip->port != 0);
}
format_function_t format_lb_vip;
@@ -600,14 +547,6 @@ typedef struct {
dpo_type_t dpo_l3dsr_port_type;
dpo_type_t dpo_nat4_port_type;
dpo_type_t dpo_nat6_port_type;
- dpo_type_t dpo_gre4_sticky_type;
- dpo_type_t dpo_gre6_sticky_type;
- dpo_type_t dpo_gre4_port_sticky_type;
- dpo_type_t dpo_gre6_port_sticky_type;
- dpo_type_t dpo_l3dsr_sticky_type;
- dpo_type_t dpo_l3dsr_port_sticky_type;
- dpo_type_t dpo_nat4_port_sticky_type;
- dpo_type_t dpo_nat6_port_sticky_type;
/**
* Node type for registering to fib changes.
*/