From patchwork Wed Oct 24 10:35:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Sutter X-Patchwork-Id: 988562 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=nwl.cc Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42g68z4xPkz9sCt for ; Wed, 24 Oct 2018 21:35:31 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727149AbeJXTDE (ORCPT ); Wed, 24 Oct 2018 15:03:04 -0400 Received: from orbyte.nwl.cc ([151.80.46.58]:51280 "EHLO orbyte.nwl.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726428AbeJXTDE (ORCPT ); Wed, 24 Oct 2018 15:03:04 -0400 Received: from localhost ([::1]:58814 helo=tatos) by orbyte.nwl.cc with esmtp (Exim 4.91) (envelope-from ) id 1gFGVe-0003av-D1; Wed, 24 Oct 2018 12:35:30 +0200 From: Phil Sutter To: Pablo Neira Ayuso Cc: netfilter-devel@vger.kernel.org Subject: [nft PATCH 0/3] Fix JSON API after recent other changes Date: Wed, 24 Oct 2018 12:35:01 +0200 Message-Id: <20181024103504.23615-1-phil@nwl.cc> X-Mailer: git-send-email 2.19.0 MIME-Version: 1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Recent changes to context structs broke compiling with JSON support enabled, patch 3 fixes this. While doing so, I noticed that struct eval_ctx's comment wasn't updated - fixed by patch 1. Finally, I didn't like how osf ttl support was implemented in JSON. Patch 2 resolves this. Phil Sutter (3): include: Fix comment for struct eval_ctx json: Fix osf ttl support json: Fix for recent changes to context structs doc/libnftables-json.adoc | 24 ++++++++++++ include/rule.h | 2 +- src/json.c | 82 +++++++++++++++++++++++---------------- src/parser_json.c | 24 ++++++++---- tests/py/inet/osf.t.json | 35 +++++++++++++++-- 5 files changed, 121 insertions(+), 46 deletions(-)