From: wenxu <we...@ucloud.cn>

Move mode validate common code to nft_tunnel_mode_validate
function.

Signed-off-by: wenxu <we...@ucloud.cn>
---
v4: new patch

 net/netfilter/nft_tunnel.c | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/net/netfilter/nft_tunnel.c b/net/netfilter/nft_tunnel.c
index 3d4c2ae..d374466 100644
--- a/net/netfilter/nft_tunnel.c
+++ b/net/netfilter/nft_tunnel.c
@@ -18,6 +18,18 @@ struct nft_tunnel {
        enum nft_tunnel_mode    mode:8;
 };
 
+bool nft_tunnel_mode_validate(enum nft_tunnel_mode priv_mode, u8 tun_mode)
+{
+       if (priv_mode == NFT_TUNNEL_MODE_NONE ||
+           (priv_mode == NFT_TUNNEL_MODE_RX &&
+            !(tun_mode & IP_TUNNEL_INFO_TX)) ||
+           (priv_mode == NFT_TUNNEL_MODE_TX &&
+            (tun_mode & IP_TUNNEL_INFO_TX)))
+               return true;
+
+       return false;
+}
+
 static void nft_tunnel_get_eval(const struct nft_expr *expr,
                                struct nft_regs *regs,
                                const struct nft_pktinfo *pkt)
@@ -34,11 +46,7 @@ static void nft_tunnel_get_eval(const struct nft_expr *expr,
                        nft_reg_store8(dest, false);
                        return;
                }
-               if (priv->mode == NFT_TUNNEL_MODE_NONE ||
-                   (priv->mode == NFT_TUNNEL_MODE_RX &&
-                    !(tun_info->mode & IP_TUNNEL_INFO_TX)) ||
-                   (priv->mode == NFT_TUNNEL_MODE_TX &&
-                    (tun_info->mode & IP_TUNNEL_INFO_TX)))
+               if (nft_tunnel_mode_validate(priv->mode, tun_info->mode))
                        nft_reg_store8(dest, true);
                else
                        nft_reg_store8(dest, false);
@@ -48,11 +56,7 @@ static void nft_tunnel_get_eval(const struct nft_expr *expr,
                        regs->verdict.code = NFT_BREAK;
                        return;
                }
-               if (priv->mode == NFT_TUNNEL_MODE_NONE ||
-                   (priv->mode == NFT_TUNNEL_MODE_RX &&
-                    !(tun_info->mode & IP_TUNNEL_INFO_TX)) ||
-                   (priv->mode == NFT_TUNNEL_MODE_TX &&
-                    (tun_info->mode & IP_TUNNEL_INFO_TX)))
+               if (nft_tunnel_mode_validate(priv->mode, tun_info->mode))
                        *dest = ntohl(tunnel_id_to_key32(tun_info->key.tun_id));
                else
                        regs->verdict.code = NFT_BREAK;
-- 
1.8.3.1

Reply via email to