diff options
| author | Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com> | 2011-10-31 11:33:48 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-10-31 10:50:31 +0100 |
| commit | 7fb2ea5945d8b5d0e5daeabc38d09ac188b0e8b8 (patch) | |
| tree | e9a02eeeb6ee4851066767a63f99ae4aff140462 /src/iptables.c | |
| parent | 7559d1e90f9a607cb83525af1c95b581adae0c0f (diff) | |
| download | connman-7fb2ea5945d8b5d0e5daeabc38d09ac188b0e8b8.tar.gz connman-7fb2ea5945d8b5d0e5daeabc38d09ac188b0e8b8.tar.bz2 connman-7fb2ea5945d8b5d0e5daeabc38d09ac188b0e8b8.zip | |
iptables: Fix xtables API version issues
Diffstat (limited to 'src/iptables.c')
| -rw-r--r-- | src/iptables.c | 39 |
1 files changed, 35 insertions, 4 deletions
diff --git a/src/iptables.c b/src/iptables.c index 2ea8e1c3..f562f325 100644 --- a/src/iptables.c +++ b/src/iptables.c @@ -1333,16 +1333,16 @@ static struct xtables_target *prepare_target(struct connman_iptables *table, xt_t->init(xt_t->t); } +#if XTABLES_VERSION_CODE > 5 if (xt_t->x6_options != NULL) iptables_globals.opts = xtables_options_xfrm( -#if XTABLES_VERSION_CODE > 5 iptables_globals.orig_opts, -#endif iptables_globals.opts, xt_t->x6_options, &xt_t->option_offset); else +#endif iptables_globals.opts = xtables_merge_options( #if XTABLES_VERSION_CODE > 5 @@ -1386,16 +1386,16 @@ static struct xtables_match *prepare_matches(struct connman_iptables *table, if (xt_m == xt_m->next) goto done; +#if XTABLES_VERSION_CODE > 5 if (xt_m->x6_options != NULL) iptables_globals.opts = xtables_options_xfrm( -#if XTABLES_VERSION_CODE > 5 iptables_globals.orig_opts, -#endif iptables_globals.opts, xt_m->x6_options, &xt_m->option_offset); else +#endif iptables_globals.opts = xtables_merge_options( #if XTABLES_VERSION_CODE > 5 @@ -1587,6 +1587,7 @@ static int iptables_command(int argc, char *argv[]) goto out; default: +#if XTABLES_VERSION_CODE > 5 if (xt_t != NULL && (xt_t->x6_parse != NULL || xt_t->parse != NULL) && (c >= (int) xt_t->option_offset && @@ -1617,19 +1618,49 @@ static int iptables_command(int argc, char *argv[]) break; } +#else + if (xt_t == NULL || xt_t->parse == NULL || + !xt_t->parse(c - xt_t->option_offset, + argv, invert, &xt_t->tflags, NULL, &xt_t->t)) { + for (tmp_xt_rm = xt_rm; tmp_xt_rm != NULL; + tmp_xt_rm = tmp_xt_rm->next) { + xt_m_t = tmp_xt_rm->match; + + if (tmp_xt_rm->completed || + xt_m_t->parse == NULL) + continue; + + if (xt_m->parse(c - xt_m->option_offset, + argv, invert, &xt_m->mflags, + NULL, &xt_m->m)) + break; + } + } +#endif break; } invert = FALSE; } +#if XTABLES_VERSION_CODE > 5 for (tmp_xt_rm = xt_rm; tmp_xt_rm != NULL; tmp_xt_rm = tmp_xt_rm->next) xtables_option_mfcall(tmp_xt_rm->match); if (xt_t != NULL) xtables_option_tfcall(xt_t); +#else + for (tmp_xt_rm = xt_rm; tmp_xt_rm != NULL; + tmp_xt_rm = tmp_xt_rm->next) + if (tmp_xt_rm->match->final_check != NULL) + tmp_xt_rm->match->final_check( + tmp_xt_rm->match->mflags); + + if (xt_t != NULL && xt_t->final_check != NULL) + xt_t->final_check(xt_t->tflags); +#endif if (table_name == NULL) table_name = "filter"; |