← Back to branch summary

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

« back to all changes in this revision

Viewing changes to extensions/libxt_esp.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_esp.c
12
12
static void esp_help(void)
13
13
{
14
14
        printf(
15
 
"ESP v%s options:\n"
 
15
"esp match options:\n"
16
16
" --espspi [!] spi[:spi]\n"
17
 
"                               match spi (range)\n",
18
 
IPTABLES_VERSION);
 
17
"                               match spi (range)\n");
19
18
}
20
19
 
21
20
static const struct option esp_opts[] = {
22
21
        { "espspi", 1, NULL, '1' },
23
 
        { }
 
22
        { .name = NULL }
24
23
};
25
24
 
26
25
static u_int32_t
156
155
static struct xtables_match esp_match = {
157
156
        .family         = AF_INET,
158
157
        .name           = "esp",
159
 
        .version        = IPTABLES_VERSION,
 
158
        .version        = XTABLES_VERSION,
160
159
        .size           = XT_ALIGN(sizeof(struct xt_esp)),
161
160
        .userspacesize  = XT_ALIGN(sizeof(struct xt_esp)),
162
161
        .help           = esp_help,
170
169
static struct xtables_match esp_match6 = {
171
170
        .family         = AF_INET6,
172
171
        .name           = "esp",
173
 
        .version        = IPTABLES_VERSION,
 
172
        .version        = XTABLES_VERSION,
174
173
        .size           = XT_ALIGN(sizeof(struct xt_esp)),
175
174
        .userspacesize  = XT_ALIGN(sizeof(struct xt_esp)),
176
175
        .help           = esp_help,