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/libipt_LOG.c | |
| parent | 9cfc59f71f83ee97c4513fd340acf1e45073562b (diff) | |
| parent | 1eb619f3a0508d62847c311e69a09f4a8534c4df (diff) | |
Merge branch 'master' of git://dev.medozas.de/iptables
Diffstat (limited to 'extensions/libipt_LOG.c')
| -rw-r--r-- | extensions/libipt_LOG.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/extensions/libipt_LOG.c b/extensions/libipt_LOG.c index 668b5654..bc7e8a4e 100644 --- a/extensions/libipt_LOG.c +++ b/extensions/libipt_LOG.c @@ -70,7 +70,7 @@ parse_level(const char *level) unsigned int lev = -1; unsigned int set = 0; - if (string_to_number(level, 0, 7, &lev) == -1) { + if (!xtables_strtoui(level, NULL, &lev, 0, 7)) { unsigned int i = 0; for (i = 0; @@ -91,7 +91,7 @@ parse_level(const char *level) "log-level `%s' unknown", level); } - return (u_int8_t)lev; + return lev; } #define IPT_LOG_OPT_LEVEL 0x01 @@ -112,7 +112,7 @@ static int LOG_parse(int c, char **argv, int invert, unsigned int *flags, exit_error(PARAMETER_PROBLEM, "Can't specify --log-level twice"); - if (check_inverse(optarg, &invert, NULL, 0)) + if (xtables_check_inverse(optarg, &invert, NULL, 0)) exit_error(PARAMETER_PROBLEM, "Unexpected `!' after --log-level"); @@ -125,7 +125,7 @@ static int LOG_parse(int c, char **argv, int invert, unsigned int *flags, exit_error(PARAMETER_PROBLEM, "Can't specify --log-prefix twice"); - if (check_inverse(optarg, &invert, NULL, 0)) + if (xtables_check_inverse(optarg, &invert, NULL, 0)) exit_error(PARAMETER_PROBLEM, "Unexpected `!' after --log-prefix"); @@ -235,7 +235,7 @@ static void LOG_save(const void *ip, const struct xt_entry_target *target) if (strcmp(loginfo->prefix, "") != 0) { printf("--log-prefix "); - save_string(loginfo->prefix); + xtables_save_string(loginfo->prefix); } if (loginfo->level != LOG_DEFAULT_LEVEL) |