← Back to branch summary

~ubuntu-branches/ubuntu/precise/iptables/precise-updates

« back to all changes in this revision

Viewing changes to extensions/libxt_connmark.c

  • Committer: Bazaar Package Importer
  • Author(s): Bhavani Shankar
  • Date: 2009-07-14 15:59:54 UTC
  • mfrom: (5.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20090714155954-9039kro8cnh6lb1q
Tags: 1.4.4-1ubuntu1
https://launchpad.net/bugs/399211
* Merge from debian unstable, remaining changes: LP: #399211
  - Don't fail to run iptables-save if iptables module isn't loaded.
  - debian/patches/0901-build-libipq_pic.a.patch - Build libipq_pic.a with
    -fPIC. Upstream changed build system and patch modified accordingly.
  - Revert changes between 1.4.1.1-3 and 1.4.1.1-4, thus bringing back
    the howtos.
  - Added linuxdoc-tools to Build-Depends
  - Modified debian/iptables{,-dev}.install to match DM syntax
    (removed debian/tmp)

Show diffs side-by-side

added added

removed removed

Lines of Context:
extensions/libxt_connmark.c
121
121
static void
122
122
connmark_print(const void *ip, const struct xt_entry_match *match, int numeric)
123
123
{
124
 
        struct xt_connmark_info *info = (struct xt_connmark_info *)match->data;
 
124
        const struct xt_connmark_info *info = (const void *)match->data;
125
125
 
126
126
        printf("CONNMARK match ");
127
127
        if (info->invert)
142
142
 
143
143
static void connmark_save(const void *ip, const struct xt_entry_match *match)
144
144
{
145
 
        struct xt_connmark_info *info = (struct xt_connmark_info *)match->data;
 
145
        const struct xt_connmark_info *info = (const void *)match->data;
146
146
 
147
147
        if (info->invert)
148
148
                printf("! ");