diff options
| author | /C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net </C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net> | 2008-04-06 15:43:13 +0000 |
|---|---|---|
| committer | /C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net </C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net> | 2008-04-06 15:43:13 +0000 |
| commit | adb20edec60a28e79ad68bdb744b5be5aaf1a695 (patch) | |
| tree | 52cdf11fded05c39431fc612891253044d0ee9f2 /extensions/libxt_conntrack.c | |
| parent | 138c7cf7f8614051e83bec82535b0b31881082ed (diff) | |
[PATCH 05/24] Fix -Wshadow warnings and clean up xt_sctp.h
Note: xt_sctp.h is still not merged upstream in the kernel as of
this commit. But a refactoring was really needed.
Diffstat (limited to 'extensions/libxt_conntrack.c')
| -rw-r--r-- | extensions/libxt_conntrack.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/extensions/libxt_conntrack.c b/extensions/libxt_conntrack.c index d1c0aa0..e3e29f0 100644 --- a/extensions/libxt_conntrack.c +++ b/extensions/libxt_conntrack.c @@ -78,21 +78,21 @@ static const struct option conntrack_mt_opts[] = { }; static int -parse_state(const char *state, size_t strlen, struct xt_conntrack_info *sinfo) +parse_state(const char *state, size_t len, struct xt_conntrack_info *sinfo) { - if (strncasecmp(state, "INVALID", strlen) == 0) + if (strncasecmp(state, "INVALID", len) == 0) sinfo->statemask |= XT_CONNTRACK_STATE_INVALID; - else if (strncasecmp(state, "NEW", strlen) == 0) + else if (strncasecmp(state, "NEW", len) == 0) sinfo->statemask |= XT_CONNTRACK_STATE_BIT(IP_CT_NEW); - else if (strncasecmp(state, "ESTABLISHED", strlen) == 0) + else if (strncasecmp(state, "ESTABLISHED", len) == 0) sinfo->statemask |= XT_CONNTRACK_STATE_BIT(IP_CT_ESTABLISHED); - else if (strncasecmp(state, "RELATED", strlen) == 0) + else if (strncasecmp(state, "RELATED", len) == 0) sinfo->statemask |= XT_CONNTRACK_STATE_BIT(IP_CT_RELATED); - else if (strncasecmp(state, "UNTRACKED", strlen) == 0) + else if (strncasecmp(state, "UNTRACKED", len) == 0) sinfo->statemask |= XT_CONNTRACK_STATE_UNTRACKED; - else if (strncasecmp(state, "SNAT", strlen) == 0) + else if (strncasecmp(state, "SNAT", len) == 0) sinfo->statemask |= XT_CONNTRACK_STATE_SNAT; - else if (strncasecmp(state, "DNAT", strlen) == 0) + else if (strncasecmp(state, "DNAT", len) == 0) sinfo->statemask |= XT_CONNTRACK_STATE_DNAT; else return 0; @@ -154,18 +154,18 @@ conntrack_ps_states(struct xt_conntrack_mtinfo1 *info, const char *arg) } static int -parse_status(const char *status, size_t strlen, struct xt_conntrack_info *sinfo) +parse_status(const char *status, size_t len, struct xt_conntrack_info *sinfo) { - if (strncasecmp(status, "NONE", strlen) == 0) + if (strncasecmp(status, "NONE", len) == 0) sinfo->statusmask |= 0; - else if (strncasecmp(status, "EXPECTED", strlen) == 0) + else if (strncasecmp(status, "EXPECTED", len) == 0) sinfo->statusmask |= IPS_EXPECTED; - else if (strncasecmp(status, "SEEN_REPLY", strlen) == 0) + else if (strncasecmp(status, "SEEN_REPLY", len) == 0) sinfo->statusmask |= IPS_SEEN_REPLY; - else if (strncasecmp(status, "ASSURED", strlen) == 0) + else if (strncasecmp(status, "ASSURED", len) == 0) sinfo->statusmask |= IPS_ASSURED; #ifdef IPS_CONFIRMED - else if (strncasecmp(status, "CONFIRMED", strlen) == 0) + else if (strncasecmp(status, "CONFIRMED", len) == 0) sinfo->statusmask |= IPS_CONFIRMED; #endif else |