← Back to branch summary

~ubuntu-branches/ubuntu/lucid/iptables/lucid

« back to all changes in this revision

Viewing changes to extensions/libxt_NFQUEUE.c

  • Committer: Bazaar Package Importer
  • Author(s): Soren Hansen, Iain Lane, Soren Hansen
  • Date: 2008-11-15 01:27:37 UTC
  • mfrom: (5.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20081115012737-o3kdn2z1o9ercq10
Tags: 1.4.1.1-4ubuntu1
https://launchpad.net/bugs/294220
[ Iain Lane ]
* Merge from debian unstable (LP: #294220), remaining changes:
  - debian/patches/0901-build-libipq_pic.a.patch - Build libipq_pic.a with
    -fPIC. Upstream changed build system and patch modified accordingly.

[ Soren Hansen ]
* Revert changes between 1.4.1.1-3 and 1.4.1.1-4, thus bringing back
  the howtos.

Show diffs side-by-side

added added

removed removed

Lines of Context:
extensions/libxt_NFQUEUE.c
25
25
 
26
26
static const struct option NFQUEUE_opts[] = {
27
27
        { "queue-num", 1, NULL, 'F' },
28
 
        { }
 
28
        { .name = NULL }
29
29
};
30
30
 
31
31
static void
83
83
static struct xtables_target nfqueue_target = {
84
84
        .family         = AF_INET,
85
85
        .name           = "NFQUEUE",
86
 
        .version        = IPTABLES_VERSION,
 
86
        .version        = XTABLES_VERSION,
87
87
        .size           = XT_ALIGN(sizeof(struct xt_NFQ_info)),
88
88
        .userspacesize  = XT_ALIGN(sizeof(struct xt_NFQ_info)),
89
89
        .help           = NFQUEUE_help,
96
96
static struct xtables_target nfqueue_target6 = {
97
97
        .family         = AF_INET6,
98
98
        .name           = "NFQUEUE",
99
 
        .version        = IPTABLES_VERSION,
 
99
        .version        = XTABLES_VERSION,
100
100
        .size           = XT_ALIGN(sizeof(struct xt_NFQ_info)),
101
101
        .userspacesize  = XT_ALIGN(sizeof(struct xt_NFQ_info)),
102
102
        .help           = NFQUEUE_help,