From 87244f739c60522dae305b82a0ad7e864b1401ae Mon Sep 17 00:00:00 2001 From: Rich Fought Date: Thu, 24 Jan 2013 08:18:35 -0800 Subject: [PATCH] netfilter: keep 8-bit API for 32-bit NAT dir attribute --- include/netlink/netfilter/exp.h | 4 ++-- lib/netfilter/exp_obj.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/netlink/netfilter/exp.h b/include/netlink/netfilter/exp.h index 761d3d5..4e95014 100644 --- a/include/netlink/netfilter/exp.h +++ b/include/netlink/netfilter/exp.h @@ -92,9 +92,9 @@ extern int nfnl_exp_set_fn(struct nfnl_exp *, void *); extern int nfnl_exp_test_fn(const struct nfnl_exp *); extern const char * nfnl_exp_get_fn(const struct nfnl_exp *); -extern void nfnl_exp_set_nat_dir(struct nfnl_exp *, uint32_t); +extern void nfnl_exp_set_nat_dir(struct nfnl_exp *, uint8_t); extern int nfnl_exp_test_nat_dir(const struct nfnl_exp *); -extern uint32_t nfnl_exp_get_nat_dir(const struct nfnl_exp *); +extern uint8_t nfnl_exp_get_nat_dir(const struct nfnl_exp *); // The int argument specifies which nfnl_exp_dir (expect, master, mask or nat) // Expectation objects only use orig, not reply diff --git a/lib/netfilter/exp_obj.c b/lib/netfilter/exp_obj.c index 71caeda..182df23 100644 --- a/lib/netfilter/exp_obj.c +++ b/lib/netfilter/exp_obj.c @@ -589,7 +589,7 @@ const char * nfnl_exp_get_fn(const struct nfnl_exp *exp) return exp->exp_fn; } -void nfnl_exp_set_nat_dir(struct nfnl_exp *exp, uint32_t nat_dir) +void nfnl_exp_set_nat_dir(struct nfnl_exp *exp, uint8_t nat_dir) { exp->exp_nat_dir = nat_dir; exp->ce_mask |= EXP_ATTR_NAT_DIR; @@ -600,7 +600,7 @@ int nfnl_exp_test_nat_dir(const struct nfnl_exp *exp) return !!(exp->ce_mask & EXP_ATTR_NAT_DIR); } -uint32_t nfnl_exp_get_nat_dir(const struct nfnl_exp *exp) +uint8_t nfnl_exp_get_nat_dir(const struct nfnl_exp *exp) { return exp->exp_nat_dir; }