diff options
| author | Felix Janda <felix.janda@posteo.de> | 2015-05-16 13:31:38 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-05-25 21:01:14 +0200 |
| commit | ec02e05cf4d1bbb66ee31223f9e96c28bf3ae6f1 (patch) | |
| tree | 571beaf3b2b81398d7eb8d7c84bf3eceaf58cb07 /src/expect/parse.c | |
| parent | 32098096e759a2de36f104ac4ef79a14a328d8bf (diff) | |
src: Use stdint types everywhere
Signed-off-by: Felix Janda <felix.janda@posteo.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/expect/parse.c')
| -rw-r--r-- | src/expect/parse.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/expect/parse.c b/src/expect/parse.c index e71118b..9b944a6 100644 --- a/src/expect/parse.c +++ b/src/expect/parse.c @@ -11,8 +11,8 @@ int __parse_expect_message_type(const struct nlmsghdr *nlh) { - u_int16_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); - u_int16_t flags = nlh->nlmsg_flags; + uint16_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); + uint16_t flags = nlh->nlmsg_flags; int ret = NFCT_T_UNKNOWN; if (type == IPCTNL_MSG_EXP_NEW) { @@ -65,18 +65,18 @@ void __parse_expect(const struct nlmsghdr *nlh, } if (cda[CTA_EXPECT_TIMEOUT-1]) { exp->timeout = - ntohl(*(u_int32_t *)NFA_DATA(cda[CTA_EXPECT_TIMEOUT-1])); + ntohl(*(uint32_t *)NFA_DATA(cda[CTA_EXPECT_TIMEOUT-1])); set_bit(ATTR_EXP_TIMEOUT, exp->set); } if (cda[CTA_EXPECT_ZONE-1]) { exp->zone = - ntohs(*(u_int16_t *)NFA_DATA(cda[CTA_EXPECT_ZONE-1])); + ntohs(*(uint16_t *)NFA_DATA(cda[CTA_EXPECT_ZONE-1])); set_bit(ATTR_EXP_ZONE, exp->set); } if (cda[CTA_EXPECT_FLAGS-1]) { exp->flags = - ntohl(*(u_int32_t *)NFA_DATA(cda[CTA_EXPECT_FLAGS-1])); + ntohl(*(uint32_t *)NFA_DATA(cda[CTA_EXPECT_FLAGS-1])); set_bit(ATTR_EXP_FLAGS, exp->set); } if (cda[CTA_EXPECT_HELP_NAME-1]) { @@ -86,7 +86,7 @@ void __parse_expect(const struct nlmsghdr *nlh, } if (cda[CTA_EXPECT_CLASS-1]) { exp->class = - ntohl(*(u_int32_t *)NFA_DATA(cda[CTA_EXPECT_CLASS-1])); + ntohl(*(uint32_t *)NFA_DATA(cda[CTA_EXPECT_CLASS-1])); set_bit(ATTR_EXP_CLASS, exp->set); } if (cda[CTA_EXPECT_NAT-1]) { @@ -107,7 +107,7 @@ void __parse_expect(const struct nlmsghdr *nlh, } if (tb[CTA_EXPECT_NAT_DIR-1]) { exp->nat_dir = - ntohl(*((u_int32_t *) + ntohl(*((uint32_t *) NFA_DATA(tb[CTA_EXPECT_NAT_DIR-1]))); set_bit(ATTR_EXP_NAT_DIR, exp->set); } |