diff options
| author | Rich Fought <Rich.Fought@watchguard.com> | 2012-10-05 17:32:20 -0700 |
|---|---|---|
| committer | Rich Fought <Rich.Fought@watchguard.com> | 2012-10-05 17:32:20 -0700 |
| commit | e8b3356dd2d61f27b2506528e291fc051e8340bc (patch) | |
| tree | 1930c6052d644c2cba4cc49917a16f1473a8f83a /include | |
| parent | 20035ce021cf9f8d465e5ac71e4f5d65ad9596cd (diff) | |
| download | libnl-e8b3356dd2d61f27b2506528e291fc051e8340bc.tar.gz | |
"checkpoint"
Diffstat (limited to 'include')
| -rw-r--r-- | include/netlink-types.h | 8 | ||||
| -rw-r--r-- | include/netlink/netfilter/exp.h | 29 |
2 files changed, 17 insertions, 20 deletions
diff --git a/include/netlink-types.h b/include/netlink-types.h index 7884695..0ee1bda 100644 --- a/include/netlink-types.h +++ b/include/netlink-types.h @@ -817,10 +817,10 @@ struct nfnl_exp { char * exp_fn; //optional uint8_t exp_nat_dir; // optional - struct nfnl_ct_dir exp_expect; // required - struct nfnl_ct_dir exp_master; // required - struct nfnl_ct_dir exp_mask; // required - struct nfnl_ct_dir exp_nat; // optional + struct nfnl_exp_dir exp_expect; // required + struct nfnl_exp_dir exp_master; // required + struct nfnl_exp_dir exp_mask; // required + struct nfnl_exp_dir exp_nat; // optional }; struct nfnl_log { diff --git a/include/netlink/netfilter/exp.h b/include/netlink/netfilter/exp.h index 36a28e5..7ace0e5 100644 --- a/include/netlink/netfilter/exp.h +++ b/include/netlink/netfilter/exp.h @@ -26,10 +26,10 @@ extern "C" { struct nfnl_exp; enum nfnl_exp_tuples { - NFNL_EXP_EXPECT, - NFNL_EXP_MASTER, - NFNL_EXP_MASK, - NFNL_EXP_NAT + NFNL_EXP_TUPLE_EXPECT, + NFNL_EXP_TUPLE_MASTER, + NFNL_EXP_TUPLE_MASK, + NFNL_EXP_TUPLE_NAT }; extern struct nl_object_ops exp_obj_ops; @@ -98,31 +98,28 @@ extern uint8_t nfnl_exp_get_nat_dir(const struct nfnl_exp *, int); // The int argument specifies which nfnl_ct_dir (expect, master, mask or nat) // Expectation objects only use orig, not reply -extern int nfnl_exp_test_tuple(const struct nfnl_exp *, int); extern int nfnl_exp_set_src(struct nfnl_exp *, int, struct nl_addr *); +extern int nfnl_exp_test_src(const struct nfnl_exp *); extern struct nl_addr * nfnl_ct_get_src(const struct nfnl_exp *, int); extern int nfnl_exp_set_dst(struct nfnl_exp *, int, struct nl_addr *); +extern int nfnl_exp_test_dst(const struct nfnl_exp *); extern struct nl_addr * nfnl_exp_get_dst(const struct nfnl_exp *, int); -extern int nfnl_exp_set_l4proto(struct nfnl_exp *, int, uint8_t); -extern int nfnl_exp_test_l4proto(const struct nfnl_exp *); -extern struct uint8_t * nfnl_exp_get_l4proto(const struct nfnl_exp *, int); +extern void nfnl_exp_set_l4protonum(struct nfnl_exp *, int, uint8_t); +extern int nfnl_exp_test_l4protonum(const struct nfnl_exp *, int); +extern uint8_t * nfnl_exp_get_l4protonum(const struct nfnl_exp *, int); -extern void nfnl_exp_set_src_port(struct nfnl_exp *, int, uint16_t); +extern void nfnl_exp_set_ports(struct nfnl_exp *, int, uint16_t, uint16_t); +extern int nfnl_exp_test_ports(const struct nfnl_exp *, int); extern uint16_t nfnl_exp_get_src_port(const struct nfnl_exp *, int); - -extern void nfnl_exp_set_dst_port(struct nfnl_exp *, int, uint16_t); extern uint16_t nfnl_exp_get_dst_port(const struct nfnl_exp *, int); -extern void nfnl_exp_set_icmp_id(struct nfnl_exp *, int, uint16_t); +extern void nfnl_exp_set_icmp(struct nfnl_exp *, int, uint16_t, uint8_t, uint8_t); +extern int nfnl_exp_test_icmp(const struct nfnl_exp *, int); extern uint16_t nfnl_exp_get_icmp_id(const struct nfnl_exp *, int); - -extern void nfnl_exp_set_icmp_type(struct nfnl_exp *, int, uint8_t); extern uint8_t nfnl_exp_get_icmp_type(const struct nfnl_exp *, int); - -extern void nfnl_exp_set_icmp_code(struct nfnl_exp *, int, uint8_t); extern uint8_t nfnl_exp_get_icmp_code(const struct nfnl_exp *, int); // TODO: Expectation table does support CPU stats get command, not sure if the same |