← Back to branch summary

~ubuntu-branches/ubuntu/precise/iptables/precise-proposed

« back to all changes in this revision

Viewing changes to include/linux/netfilter/xt_u32.h

  • Committer: Package Import Robot
  • Author(s): Jamie Strandboge
  • Date: 2011-11-07 13:46:11 UTC
  • mfrom: (5.1.9) (2.1.15 sid)
  • Revision ID: package-import@ubuntu.com-20111107134611-kc82oc327fb9ctq6
Tags: 1.4.12-1ubuntu1
https://launchpad.net/bugs/887192
* Merge from Debian unstable (LP: #887192). Remaining changes:
  - 9000-howtos.patch: add howtos/ and install them
  - 9001-build-libipq_pic.la.patch: Build libipq_pic.la with -fPIC
  - debian/control: Build-Depends on linuxdoc-tools
  - debian/iptables.install: install NAT and packetfilter howtos into
    /usr/share/doc
  - debian/iptables-dev.install: install netfilter howto into /usr/share/doc
  - debian/iptables-dev.doc-base.netfilter-extensions,
    debian/iptables-dev.doc-base.netfilter-hacking,
    debian/iptables.doc-base.nat, debian/iptables.doc-base.packet-filter: add
    howtos
  - debian/iptables-dev.install: install lib/*.la in usr/lib
  - No longer apply the following:
    + 9002-xt_recent-reap.patch: this requires a rewrite of the patch. For
      now adjust series to not apply, file a bug, assigning to the kernel
      team. Once they have resubmitted upstream, we can take the new patch.
    + 9003-compilation-error.patch: no longer needed with newer iptables

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/linux/netfilter/xt_u32.h
9
9
};
10
10
 
11
11
struct xt_u32_location_element {
12
 
        u_int32_t number;
13
 
        u_int8_t nextop;
 
12
        __u32 number;
 
13
        __u8 nextop;
14
14
};
15
15
 
16
16
struct xt_u32_value_element {
17
 
        u_int32_t min;
18
 
        u_int32_t max;
 
17
        __u32 min;
 
18
        __u32 max;
19
19
};
20
20
 
21
21
/*
27
27
struct xt_u32_test {
28
28
        struct xt_u32_location_element location[XT_U32_MAXSIZE+1];
29
29
        struct xt_u32_value_element value[XT_U32_MAXSIZE+1];
30
 
        u_int8_t nnums;
31
 
        u_int8_t nvalues;
 
30
        __u8 nnums;
 
31
        __u8 nvalues;
32
32
};
33
33
 
34
34
struct xt_u32 {
35
35
        struct xt_u32_test tests[XT_U32_MAXSIZE+1];
36
 
        u_int8_t ntests;
37
 
        u_int8_t invert;
 
36
        __u8 ntests;
 
37
        __u8 invert;
38
38
};
39
39
 
40
40
#endif /* _XT_U32_H */