keepalived: fix dpvs crash problem in issue #911

Signed-off-by: ywc689 <[email protected]>
iqiyi · Dec 8, 2023 · 6d8161e · 6d8161e
1 parent 6b23bdc
commit 6d8161e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 14 deletions.
diff --git a/include/conf/dest.h b/include/conf/dest.h
@@ -65,13 +65,6 @@ typedef struct dp_vs_dest_compat {
 
     /* statistics */
     struct dp_vs_stats stats;
-#ifdef _HAVE_IPVS_TUN_TYPE_
-    int                     tun_type;
-    int                     tun_port;
-#ifdef _HAVE_IPVS_TUN_CSUM_
-    int                     tun_flags;
-#endif
-#endif
 } dpvs_dest_compat_t;
 
 typedef struct dp_vs_dest_table {

diff --git a/tools/keepalived/keepalived/check/ipvswrapper.c b/tools/keepalived/keepalived/check/ipvswrapper.c
@@ -840,13 +840,6 @@ ipvs_set_drule(int cmd, dpvs_dest_compat_t *drule, real_server_t * rs)
     drule->fwdmode = rs->forwarding_method;
     drule->max_conn = rs->u_threshold;
     drule->min_conn = rs->l_threshold;
-#ifdef _HAVE_IPVS_TUN_TYPE_
-    drule->tun_type = rs->tun_type;
-    drule->tun_port = rs->tun_port;
-#ifdef _HAVE_IPVS_TUN_CSUM_
-    drule->tun_flags = rs->tun_flags;
-#endif
-#endif
 }
 
 /*check whitelist addr*/