From patchwork Wed Sep 19 14:25:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Sutter X-Patchwork-Id: 971720 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 42Fhxx5X19z9sDL for ; Thu, 20 Sep 2018 00:26:45 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732080AbeISUEx (ORCPT ); Wed, 19 Sep 2018 16:04:53 -0400 Received: from orbyte.nwl.cc ([151.80.46.58]:53758 "EHLO orbyte.nwl.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732380AbeISUEf (ORCPT ); Wed, 19 Sep 2018 16:04:35 -0400 Received: from localhost ([::1]:33060 helo=tatos) by orbyte.nwl.cc with esmtp (Exim 4.90_1) (envelope-from ) id 1g2dQu-0002Zf-Tv; Wed, 19 Sep 2018 16:26:24 +0200 From: Phil Sutter To: Pablo Neira Ayuso Cc: netfilter-devel@vger.kernel.org Subject: [iptables PATCH 0/3] Merge legacy save and restore implementations Date: Wed, 19 Sep 2018 16:25:55 +0200 Message-Id: <20180919142558.29207-1-phil@nwl.cc> X-Mailer: git-send-email 2.18.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org This series merges legacy ip6tables-save with iptables-save and ip6tables-restore with iptables-restore. For convenience, struct xtc_ops from libiptc is extended by a few more callbacks. Note: This series is based on my recent 28 patches covscan fixes series. Phil Sutter (3): libiptc: Extend struct xtc_ops ip6tables-restore: Merge into iptables-restore.c ip6tables-save: Merge into iptables-save.c include/libiptc/xtcshared.h | 5 + iptables/Makefile.am | 8 +- iptables/ip6tables-restore.c | 391 ----------------------------------- iptables/ip6tables-save.c | 203 ------------------ iptables/iptables-restore.c | 154 ++++++++++---- iptables/iptables-save.c | 179 +++++++++++----- libiptc/Makefile.am | 4 +- libiptc/libiptc.c | 4 + 8 files changed, 250 insertions(+), 698 deletions(-) delete mode 100644 iptables/ip6tables-restore.c delete mode 100644 iptables/ip6tables-save.c