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

« back to all changes in this revision

Viewing changes to extensions/libxt_CONNSECMARK.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
* 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:
69
69
                           "or --restore is allowed");
70
70
}
71
71
 
72
 
static void print_connsecmark(struct xt_connsecmark_target_info *info)
 
72
static void print_connsecmark(const struct xt_connsecmark_target_info *info)
73
73
{
74
74
        switch (info->mode) {
75
75
        case CONNSECMARK_SAVE:
89
89
CONNSECMARK_print(const void *ip, const struct xt_entry_target *target,
90
90
                  int numeric)
91
91
{
92
 
        struct xt_connsecmark_target_info *info =
 
92
        const struct xt_connsecmark_target_info *info =
93
93
                (struct xt_connsecmark_target_info*)(target)->data;
94
94
 
95
95
        printf("CONNSECMARK ");
99
99
static void
100
100
CONNSECMARK_save(const void *ip, const struct xt_entry_target *target)
101
101
{
102
 
        struct xt_connsecmark_target_info *info =
 
102
        const struct xt_connsecmark_target_info *info =
103
103
                (struct xt_connsecmark_target_info*)target->data;
104
104
 
105
105
        printf("--");