diff options
author | Patrick McHardy <kaber@trash.net> | 2009-02-09 18:58:45 +0100 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2009-02-09 18:58:45 +0100 |
commit | 300e2909ba4714abc6093cba0ed860708282bd3e (patch) | |
tree | 545c79c9fcbe036db503e50a3643acb3d5ff088d /extensions/libxt_CONNMARK.c | |
parent | 9cfc59f71f83ee97c4513fd340acf1e45073562b (diff) | |
parent | 1eb619f3a0508d62847c311e69a09f4a8534c4df (diff) |
Merge branch 'master' of git://dev.medozas.de/iptables
Diffstat (limited to 'extensions/libxt_CONNMARK.c')
-rw-r--r-- | extensions/libxt_CONNMARK.c | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/extensions/libxt_CONNMARK.c b/extensions/libxt_CONNMARK.c index 2ad27591..e426e4f1 100644 --- a/extensions/libxt_CONNMARK.c +++ b/extensions/libxt_CONNMARK.c @@ -90,8 +90,8 @@ static void connmark_tg_init(struct xt_entry_target *target) * Need these defaults for --save-mark/--restore-mark if no * --ctmark or --nfmask is given. */ - info->ctmask = ~0U; - info->nfmask = ~0U; + info->ctmask = UINT32_MAX; + info->nfmask = UINT32_MAX; } static int @@ -152,20 +152,20 @@ static int connmark_tg_parse(int c, char **argv, int invert, struct xt_entry_target **target) { struct xt_connmark_tginfo1 *info = (void *)(*target)->data; - unsigned int value, mask = ~0U; + unsigned int value, mask = UINT32_MAX; char *end; switch (c) { case '=': /* --set-xmark */ case '-': /* --set-mark */ - param_act(P_ONE_ACTION, "CONNMARK", *flags & F_MARK); - if (!strtonum(optarg, &end, &value, 0, ~0U)) - param_act(P_BAD_VALUE, "CONNMARK", "--set-xmark/--set-mark", optarg); + xtables_param_act(XTF_ONE_ACTION, "CONNMARK", *flags & F_MARK); + if (!xtables_strtoui(optarg, &end, &value, 0, UINT32_MAX)) + xtables_param_act(XTF_BAD_VALUE, "CONNMARK", "--set-xmark/--set-mark", optarg); if (*end == '/') - if (!strtonum(end + 1, &end, &mask, 0, ~0U)) - param_act(P_BAD_VALUE, "CONNMARK", "--set-xmark/--set-mark", optarg); + if (!xtables_strtoui(end + 1, &end, &mask, 0, UINT32_MAX)) + xtables_param_act(XTF_BAD_VALUE, "CONNMARK", "--set-xmark/--set-mark", optarg); if (*end != '\0') - param_act(P_BAD_VALUE, "CONNMARK", "--set-xmark/--set-mark", optarg); + xtables_param_act(XTF_BAD_VALUE, "CONNMARK", "--set-xmark/--set-mark", optarg); info->mode = XT_CONNMARK_SET; info->ctmark = value; info->ctmask = mask; @@ -175,9 +175,9 @@ static int connmark_tg_parse(int c, char **argv, int invert, return true; case '&': /* --and-mark */ - param_act(P_ONE_ACTION, "CONNMARK", *flags & F_MARK); - if (!strtonum(optarg, NULL, &mask, 0, ~0U)) - param_act(P_BAD_VALUE, "CONNMARK", "--and-mark", optarg); + xtables_param_act(XTF_ONE_ACTION, "CONNMARK", *flags & F_MARK); + if (!xtables_strtoui(optarg, NULL, &mask, 0, UINT32_MAX)) + xtables_param_act(XTF_BAD_VALUE, "CONNMARK", "--and-mark", optarg); info->mode = XT_CONNMARK_SET; info->ctmark = 0; info->ctmask = ~mask; @@ -185,9 +185,9 @@ static int connmark_tg_parse(int c, char **argv, int invert, return true; case '|': /* --or-mark */ - param_act(P_ONE_ACTION, "CONNMARK", *flags & F_MARK); - if (!strtonum(optarg, NULL, &value, 0, ~0U)) - param_act(P_BAD_VALUE, "CONNMARK", "--or-mark", optarg); + xtables_param_act(XTF_ONE_ACTION, "CONNMARK", *flags & F_MARK); + if (!xtables_strtoui(optarg, NULL, &value, 0, UINT32_MAX)) + xtables_param_act(XTF_BAD_VALUE, "CONNMARK", "--or-mark", optarg); info->mode = XT_CONNMARK_SET; info->ctmark = value; info->ctmask = value; @@ -195,9 +195,9 @@ static int connmark_tg_parse(int c, char **argv, int invert, return true; case '^': /* --xor-mark */ - param_act(P_ONE_ACTION, "CONNMARK", *flags & F_MARK); - if (!strtonum(optarg, NULL, &value, 0, ~0U)) - param_act(P_BAD_VALUE, "CONNMARK", "--xor-mark", optarg); + xtables_param_act(XTF_ONE_ACTION, "CONNMARK", *flags & F_MARK); + if (!xtables_strtoui(optarg, NULL, &value, 0, UINT32_MAX)) + xtables_param_act(XTF_BAD_VALUE, "CONNMARK", "--xor-mark", optarg); info->mode = XT_CONNMARK_SET; info->ctmark = value; info->ctmask = 0; @@ -205,13 +205,13 @@ static int connmark_tg_parse(int c, char **argv, int invert, return true; case 'S': /* --save-mark */ - param_act(P_ONE_ACTION, "CONNMARK", *flags & F_MARK); + xtables_param_act(XTF_ONE_ACTION, "CONNMARK", *flags & F_MARK); info->mode = XT_CONNMARK_SAVE; *flags |= F_MARK | F_SR_MARK; return true; case 'R': /* --restore-mark */ - param_act(P_ONE_ACTION, "CONNMARK", *flags & F_MARK); + xtables_param_act(XTF_ONE_ACTION, "CONNMARK", *flags & F_MARK); info->mode = XT_CONNMARK_RESTORE; *flags |= F_MARK | F_SR_MARK; return true; @@ -221,8 +221,8 @@ static int connmark_tg_parse(int c, char **argv, int invert, exit_error(PARAMETER_PROBLEM, "CONNMARK: --save-mark " "or --restore-mark is required for " "--nfmask"); - if (!strtonum(optarg, NULL, &value, 0, ~0U)) - param_act(P_BAD_VALUE, "CONNMARK", "--nfmask", optarg); + if (!xtables_strtoui(optarg, NULL, &value, 0, UINT32_MAX)) + xtables_param_act(XTF_BAD_VALUE, "CONNMARK", "--nfmask", optarg); info->nfmask = value; return true; @@ -231,8 +231,8 @@ static int connmark_tg_parse(int c, char **argv, int invert, exit_error(PARAMETER_PROBLEM, "CONNMARK: --save-mark " "or --restore-mark is required for " "--ctmask"); - if (!strtonum(optarg, NULL, &value, 0, ~0U)) - param_act(P_BAD_VALUE, "CONNMARK", "--ctmask", optarg); + if (!xtables_strtoui(optarg, NULL, &value, 0, UINT32_MAX)) + xtables_param_act(XTF_BAD_VALUE, "CONNMARK", "--ctmask", optarg); info->ctmask = value; return true; @@ -241,8 +241,8 @@ static int connmark_tg_parse(int c, char **argv, int invert, exit_error(PARAMETER_PROBLEM, "CONNMARK: --save-mark " "or --restore-mark is required for " "--mask"); - if (!strtonum(optarg, NULL, &value, 0, ~0U)) - param_act(P_BAD_VALUE, "CONNMARK", "--mask", optarg); + if (!xtables_strtoui(optarg, NULL, &value, 0, UINT32_MAX)) + xtables_param_act(XTF_BAD_VALUE, "CONNMARK", "--mask", optarg); info->nfmask = info->ctmask = value; return true; } @@ -317,7 +317,7 @@ connmark_tg_print(const void *ip, const struct xt_entry_target *target, info->ctmark, info->ctmask); break; case XT_CONNMARK_SAVE: - if (info->nfmask == ~0U && info->ctmask == ~0U) + if (info->nfmask == UINT32_MAX && info->ctmask == UINT32_MAX) printf("CONNMARK save "); else if (info->nfmask == info->ctmask) printf("CONNMARK save mask 0x%x ", info->nfmask); @@ -326,7 +326,7 @@ connmark_tg_print(const void *ip, const struct xt_entry_target *target, info->nfmask, info->ctmask); break; case XT_CONNMARK_RESTORE: - if (info->ctmask == ~0U && info->nfmask == ~0U) + if (info->ctmask == UINT32_MAX && info->nfmask == UINT32_MAX) printf("CONNMARK restore "); else if (info->ctmask == info->nfmask) printf("CONNMARK restore mask 0x%x ", info->ctmask); |