[iptables] libxtables: general follow-up cleanup

Patrick McHardy netfilter-cvslog-bounces at lists.netfilter.org
Mon Feb 16 13:17:42 CET 2009 

Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=iptables.git;a=commit;h=5dd19de34380c91ad07bbe79a34726e59891cf54
commit 5dd19de34380c91ad07bbe79a34726e59891cf54
Author:     Jamal Hadi Salim <hadi at cyberus.ca>
AuthorDate: Fri Feb 13 10:42:24 2009 -0500
Commit:     Jan Engelhardt <jengelh at medozas.de>
CommitDate: Fri Feb 13 17:10:18 2009 +0100

    libxtables: general follow-up cleanup
    
    Kill program_name, program_version and xtables_program_name.
    
    Signed-off-by: Jamal Hadi Salim <hadi at cyberus.ca>

commit 7e4db2f50133007f549f222468bde4f3adcf41ac
Author:     Jamal Hadi Salim <hadi at cyberus.ca>
AuthorDate: Fri Feb 13 09:14:17 2009 -0500
Commit:     Jan Engelhardt <jengelh at medozas.de>
CommitDate: Fri Feb 13 15:46:52 2009 +0100

    libxtables: consolidate init calls into one function
    
    Introduce xtables_init_all() which hides three calls xtables_init(),
    xtables_set_nfproto(), and xtables_set_params(). Make
    ip[6]tables-restore, ip[6]tables-save and ip[6]tables-standalone use
    it.
    
    I moved xtables_set_params around for readability reasons.
    
    Signed-off-by: Jamal Hadi Salim <hadi at cyberus.ca>

commit 70581922f873a88306dd5b1cb83c5081ee239eb8
Author:     Jamal Hadi Salim <hadi at cyberus.ca>
AuthorDate: Fri Feb 13 08:36:44 2009 -0500
Commit:     Jan Engelhardt <jengelh at medozas.de>
CommitDate: Fri Feb 13 14:57:01 2009 +0100

    libxtables: consolidate merge_options into xtables_merge_options
    
    Introduce xtables_merge_options() for re-use reasons. Apps can use it
    instead of each defining their own merge_options(). Made iptables and
    ip6tables use the new shared interface.
    
    Signed-off-by: Jamal Hadi Salim <hadi at cyberus.ca>

commit ae19604fe1c4ab02dfbcd450e73826111f0f2b27
Author:     Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Thu Feb 12 19:27:49 2009 +0100
Commit:     Jan Engelhardt <jengelh at medozas.de>
CommitDate: Thu Feb 12 19:27:49 2009 +0100

    build: remove unneeded -ldl from iptables_xml_LDADD
    
    Addendum to commit 5c3e0767764bb7fa1db61ac326e8359161380e21.
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

commit 139b3fe4bd5121501e60fe07963ea527d7f0bd36
Author:     Jamal Hadi Salim <hadi at cyberus.ca>
AuthorDate: Thu Feb 12 11:43:01 2009 -0500
Commit:     Jan Engelhardt <jengelh at medozas.de>
CommitDate: Thu Feb 12 18:58:30 2009 +0100

    libxtables: make iptables and ip6tables use xtables_free_opts
    
    The patch modifies xtables_globals to introduce orig_opts and
    xtables_free_opts() to emulate what free_opts used to do. We also get
    rid of the copies of free_opts() that iptables and ip6tables keep.
    
    Signed-off-by: Jamal Hadi Salim <hadi at cyberus.ca>

commit 853322131026d62df3f8d77d67e5c63be496303c
Author:     Jamal Hadi Salim <hadi at cyberus.ca>
AuthorDate: Thu Feb 12 09:33:59 2009 -0500
Commit:     Jan Engelhardt <jengelh at medozas.de>
CommitDate: Thu Feb 12 18:56:45 2009 +0100

    libxtables: add xtables_set_revision
    
    Introduce xtables_set_revision() and make iptables and ip6tables use it.
    
    Signed-off-by: Jamal Hadi Salim <hadi at cyberus.ca>

commit 617d3d140f4739558dce2ef8ed01aef251cf5487
Author:     Jamal Hadi Salim <hadi at cyberus.ca>
AuthorDate: Wed Feb 11 16:28:31 2009 -0500
Commit:     Jan Engelhardt <jengelh at medozas.de>
CommitDate: Thu Feb 12 18:54:37 2009 +0100

    libxtables: set names of programs
    
    Set proper name of application.
    
    Signed-off-by: Jamal Hadi Salim <hadi at cyberus.ca>

commit e37c2d0b2cca00f4dfa77b52df065aad304da59b
Author:     Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Thu Feb 12 15:07:15 2009 +0100
Commit:     Jan Engelhardt <jengelh at medozas.de>
CommitDate: Thu Feb 12 15:13:18 2009 +0100

    libipq: fix compile error
    
    libipq.c: In function `ipq_create_handle':
    libipq.c:220: error: `NFPROTO_IPV4' undeclared (first use in this function)
    libipq.c:220: error: (Each undeclared identifier is reported only once
    libipq.c:220: error: for each function it appears in.)
    libipq.c:222: error: `NFPROTO_IPV6' undeclared (first use in this function)
    
    Add the required includes.
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

commit f567ac9193bc421992e572ec3196a73dc6ed59c0
Author:     Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Thu Feb 12 15:01:37 2009 +0100
Commit:     Jan Engelhardt <jengelh at medozas.de>
CommitDate: Thu Feb 12 15:13:18 2009 +0100

    build: restructure Makefile for include/ directory
    
    This patch will support adding libiptc to the headers list in future.
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

commit 228b4bda8f21f8730b10c156822bc988d77e891b
Author:     Shaul Karl <shaulkarl at yahoo.com>
AuthorDate: Mon Jan 19 02:09:36 2009 -0800
Commit:     Jan Engelhardt <jengelh at medozas.de>
CommitDate: Thu Feb 12 15:12:58 2009 +0100

    doc: fix one layout issue in iptables-restore.8
    
    Reference: http://bugs.debian.org/512281
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

commit ae6f9b978aded200def693dcba80f7b97de7f7c6
Author:     Marc Fournier <marc.fournier at camptocamp.com>
AuthorDate: Thu Jan 15 13:57:53 2009 +0100
Commit:     Jan Engelhardt <jengelh at medozas.de>
CommitDate: Thu Feb 12 15:12:20 2009 +0100

    doc: fix option typo in libxt_multiport
    
    Reference: http://bugs.debian.org/511891
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

commit 7e6fe43421003499b4ac6316f1c6d3ad4a8fc8ec
Author:     Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Thu Feb 12 14:48:59 2009 +0100
Commit:     Jan Engelhardt <jengelh at medozas.de>
CommitDate: Thu Feb 12 14:48:59 2009 +0100

    libipq: add missing doc for NF_ values
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
       via  5dd19de34380c91ad07bbe79a34726e59891cf54 (commit)
       via  7e4db2f50133007f549f222468bde4f3adcf41ac (commit)
       via  70581922f873a88306dd5b1cb83c5081ee239eb8 (commit)
       via  ae19604fe1c4ab02dfbcd450e73826111f0f2b27 (commit)
       via  139b3fe4bd5121501e60fe07963ea527d7f0bd36 (commit)
       via  853322131026d62df3f8d77d67e5c63be496303c (commit)
       via  617d3d140f4739558dce2ef8ed01aef251cf5487 (commit)
       via  e37c2d0b2cca00f4dfa77b52df065aad304da59b (commit)
       via  f567ac9193bc421992e572ec3196a73dc6ed59c0 (commit)
       via  228b4bda8f21f8730b10c156822bc988d77e891b (commit)
       via  ae6f9b978aded200def693dcba80f7b97de7f7c6 (commit)
       via  7e6fe43421003499b4ac6316f1c6d3ad4a8fc8ec (commit)
      from  c19f880d8aac7c0372381e29d7cea09accd0db26 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5dd19de34380c91ad07bbe79a34726e59891cf54
Author: Jamal Hadi Salim <hadi at cyberus.ca>
Date:   Fri Feb 13 10:42:24 2009 -0500

    libxtables: general follow-up cleanup
    
    Kill program_name, program_version and xtables_program_name.
    
    Signed-off-by: Jamal Hadi Salim <hadi at cyberus.ca>

commit 7e4db2f50133007f549f222468bde4f3adcf41ac
Author: Jamal Hadi Salim <hadi at cyberus.ca>
Date:   Fri Feb 13 09:14:17 2009 -0500

    libxtables: consolidate init calls into one function
    
    Introduce xtables_init_all() which hides three calls xtables_init(),
    xtables_set_nfproto(), and xtables_set_params(). Make
    ip[6]tables-restore, ip[6]tables-save and ip[6]tables-standalone use
    it.
    
    I moved xtables_set_params around for readability reasons.
    
    Signed-off-by: Jamal Hadi Salim <hadi at cyberus.ca>

commit 70581922f873a88306dd5b1cb83c5081ee239eb8
Author: Jamal Hadi Salim <hadi at cyberus.ca>
Date:   Fri Feb 13 08:36:44 2009 -0500

    libxtables: consolidate merge_options into xtables_merge_options
    
    Introduce xtables_merge_options() for re-use reasons. Apps can use it
    instead of each defining their own merge_options(). Made iptables and
    ip6tables use the new shared interface.
    
    Signed-off-by: Jamal Hadi Salim <hadi at cyberus.ca>

commit ae19604fe1c4ab02dfbcd450e73826111f0f2b27
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Thu Feb 12 19:27:49 2009 +0100

    build: remove unneeded -ldl from iptables_xml_LDADD
    
    Addendum to commit 5c3e0767764bb7fa1db61ac326e8359161380e21.
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

commit 139b3fe4bd5121501e60fe07963ea527d7f0bd36
Author: Jamal Hadi Salim <hadi at cyberus.ca>
Date:   Thu Feb 12 11:43:01 2009 -0500

    libxtables: make iptables and ip6tables use xtables_free_opts
    
    The patch modifies xtables_globals to introduce orig_opts and
    xtables_free_opts() to emulate what free_opts used to do. We also get
    rid of the copies of free_opts() that iptables and ip6tables keep.
    
    Signed-off-by: Jamal Hadi Salim <hadi at cyberus.ca>

commit 853322131026d62df3f8d77d67e5c63be496303c
Author: Jamal Hadi Salim <hadi at cyberus.ca>
Date:   Thu Feb 12 09:33:59 2009 -0500

    libxtables: add xtables_set_revision
    
    Introduce xtables_set_revision() and make iptables and ip6tables use it.
    
    Signed-off-by: Jamal Hadi Salim <hadi at cyberus.ca>

commit 617d3d140f4739558dce2ef8ed01aef251cf5487
Author: Jamal Hadi Salim <hadi at cyberus.ca>
Date:   Wed Feb 11 16:28:31 2009 -0500

    libxtables: set names of programs
    
    Set proper name of application.
    
    Signed-off-by: Jamal Hadi Salim <hadi at cyberus.ca>

commit e37c2d0b2cca00f4dfa77b52df065aad304da59b
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Thu Feb 12 15:07:15 2009 +0100

    libipq: fix compile error
    
    libipq.c: In function `ipq_create_handle':
    libipq.c:220: error: `NFPROTO_IPV4' undeclared (first use in this function)
    libipq.c:220: error: (Each undeclared identifier is reported only once
    libipq.c:220: error: for each function it appears in.)
    libipq.c:222: error: `NFPROTO_IPV6' undeclared (first use in this function)
    
    Add the required includes.
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

commit f567ac9193bc421992e572ec3196a73dc6ed59c0
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Thu Feb 12 15:01:37 2009 +0100

    build: restructure Makefile for include/ directory
    
    This patch will support adding libiptc to the headers list in future.
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

commit 228b4bda8f21f8730b10c156822bc988d77e891b
Author: Shaul Karl <shaulkarl at yahoo.com>
Date:   Mon Jan 19 02:09:36 2009 -0800

    doc: fix one layout issue in iptables-restore.8
    
    Reference: http://bugs.debian.org/512281
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

commit ae6f9b978aded200def693dcba80f7b97de7f7c6
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Thu Jan 15 13:57:53 2009 +0100

    doc: fix option typo in libxt_multiport
    
    Reference: http://bugs.debian.org/511891
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

commit 7e6fe43421003499b4ac6316f1c6d3ad4a8fc8ec
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Thu Feb 12 14:48:59 2009 +0100

    libipq: add missing doc for NF_ values
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

-----------------------------------------------------------------------

 Makefile.am                    |    8 +-
 configure.ac                   |    3 +-
 extensions/libxt_multiport.man |    4 +-
 include/Makefile.am            |    8 +++
 include/ip6tables.h            |    2 +
 include/iptables.h             |    2 +
 include/xtables.h.in           |   10 +++-
 ip6tables-restore.c            |   31 +++++++----
 ip6tables-save.c               |   14 +++--
 ip6tables-standalone.c         |   13 +++--
 ip6tables.c                    |   89 ++++++----------------------
 iptables-restore.8             |    1 -
 iptables-restore.c             |   27 +++++----
 iptables-save.c                |   14 +++--
 iptables-standalone.c          |   14 +++--
 iptables-xml.c                 |   32 +++++------
 iptables.c                     |   94 +++++++-----------------------
 libipq/Makefile.am             |    1 -
 libipq/ipq_set_verdict.3       |    7 ++
 libipq/libipq.c                |    2 +
 xtables.c                      |  124 +++++++++++++++++++++++++++-------------
 21 files changed, 242 insertions(+), 258 deletions(-)
 create mode 100644 include/Makefile.am
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

diff --git a/libipq/ipq_set_verdict.3 b/libipq/ipq_set_verdict.3
index 84a9411..002e9fb 100644
--- a/libipq/ipq_set_verdict.3
+++ b/libipq/ipq_set_verdict.3
@@ -56,6 +56,13 @@ Accept the packet and continue traversal within the kernel.
 .TP
 .B NF_DROP
 Drop the packet.
+.TP
+\fBNF_QUEUE\fP
+Requeue the packet.
+.PP
+\fBNF_STOLEN\fP and \fBNF_REPEAT\fP are kernel-internal constants and should
+not be used from userspace as their exact side effects have not been
+investigated.
 .PP
 The
 .I data_len

More information about the netfilter-cvslog mailing list