From patchwork Thu Sep 25 00:57:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vadym Kochan X-Patchwork-Id: 393148 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B93161400D6 for ; Thu, 25 Sep 2014 11:05:34 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751391AbaIYBFd (ORCPT ); Wed, 24 Sep 2014 21:05:33 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:42722 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751259AbaIYBFc (ORCPT ); Wed, 24 Sep 2014 21:05:32 -0400 Received: by mail-wi0-f175.google.com with SMTP id r20so7984280wiv.8 for ; Wed, 24 Sep 2014 18:05:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=c7yG/7lCxLYFJduYsKhbbNyqsHkTRPPLq/XZ5mwvA7M=; b=b9MmRGdHn/1vFXRfviG4UlZLzAkc2Vpy5VpzQNkYNdy7k8xm/QlKcvrkqXzgzPXumH K8D2OMzSxEaKhLIKarW16El/erLzbrDuGd8T5QXUGUZtOm4I6pEa9euFGcx3StUS+/rK I2vtnOBbeN6m3Rs0eTa84oy40rDM/iTn7+peBAxcZRYL0gDdLUsM7jJmk9C4Rtt60ATy PyU8XER7BetDAfTb+7nIQg610oju7iWZx+Rj3jxbFdwFUT/upipYLGlKteLq/ide0G5k 0jDI8TmHtZ8K9/Y9ovWXS6yAnzy6CN8xl5qJAleWICuwZxA2jYmm0oFSwHcRoE6rzR2B uz6A== X-Received: by 10.180.76.209 with SMTP id m17mr15135484wiw.78.1411607131417; Wed, 24 Sep 2014 18:05:31 -0700 (PDT) Received: from localhost.localdomain (77-123-172-44-ptr.volia-lviv.com. [77.123.172.44]) by mx.google.com with ESMTPSA id pn5sm922806wjc.4.2014.09.24.18.05.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 24 Sep 2014 18:05:30 -0700 (PDT) From: Vadim Kochan To: netfilter-devel@vger.kernel.org Cc: Vadim Kochan Subject: [PATCH] Allow to compile for < 3.17 kernel version Date: Thu, 25 Sep 2014 03:57:04 +0300 Message-Id: <1411606624-8411-1-git-send-email-vadim4j@gmail.com> X-Mailer: git-send-email 2.1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Added declaration checking for NFT_EXPR_LOG_LEVEL enum which was added for 3.17 kernel version. Signed-off-by: Vadim Kochan --- configure.ac | 2 ++ src/netlink_delinearize.c | 2 ++ src/netlink_linearize.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac index 3a7647f..d3971c7 100644 --- a/configure.ac +++ b/configure.ac @@ -99,6 +99,8 @@ AC_TYPE_UINT16_T AC_TYPE_UINT32_T AC_TYPE_UINT64_T +AC_CHECK_DECLS([NFT_EXPR_LOG_LEVEL],[],[],[[#include ]]) + # Checks for library functions. AC_CHECK_FUNCS([memmove memset strchr strdup strerror strtoull]) diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c index 796b632..cf2ec00 100644 --- a/src/netlink_delinearize.c +++ b/src/netlink_delinearize.c @@ -447,11 +447,13 @@ static void netlink_parse_log(struct netlink_parse_ctx *ctx, nft_rule_expr_get_u16(nle, NFT_EXPR_LOG_QTHRESHOLD); stmt->log.flags |= STMT_LOG_QTHRESHOLD; } +#if HAVE_DECL_NFT_EXPR_LOG_LEVEL if (nft_rule_expr_is_set(nle, NFT_EXPR_LOG_LEVEL)) { stmt->log.level = nft_rule_expr_get_u32(nle, NFT_EXPR_LOG_LEVEL); stmt->log.flags |= STMT_LOG_LEVEL; } +#endif list_add_tail(&stmt->list, &ctx->rule->stmts); } diff --git a/src/netlink_linearize.c b/src/netlink_linearize.c index c46b6d4..2b116f9 100644 --- a/src/netlink_linearize.c +++ b/src/netlink_linearize.c @@ -586,10 +586,12 @@ static void netlink_gen_log_stmt(struct netlink_linearize_ctx *ctx, nft_rule_expr_set_u16(nle, NFT_EXPR_LOG_QTHRESHOLD, stmt->log.qthreshold); } else { +#if HAVE_DECL_NFT_EXPR_LOG_LEVEL if (stmt->log.flags & STMT_LOG_LEVEL) { nft_rule_expr_set_u32(nle, NFT_EXPR_LOG_LEVEL, stmt->log.level); } +#endif } nft_rule_add_expr(ctx->nlr, nle); }