diff options
Diffstat (limited to 'src/expect/api.c')
| -rw-r--r-- | src/expect/api.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/expect/api.c b/src/expect/api.c index b100c72..5cdd335 100644 --- a/src/expect/api.c +++ b/src/expect/api.c @@ -515,7 +515,7 @@ int nfexp_build_expect(struct nfnl_subsys_handle *ssh, memset(req, 0, size); - return __build_expect(ssh, req, size, type, flags, exp); + return __build_expect(req, size, type, flags, exp); } static void nfexp_fill_hdr(struct nfnlhdr *req, uint16_t type, uint16_t flags, @@ -537,14 +537,12 @@ static void nfexp_fill_hdr(struct nfnlhdr *req, uint16_t type, uint16_t flags, } static int -__build_query_exp(struct nfnl_subsys_handle *ssh, - const enum nf_conntrack_query qt, +__build_query_exp(const enum nf_conntrack_query qt, const void *data, void *buffer, unsigned int size) { struct nfnlhdr *req = buffer; const uint8_t *family = data; - assert(ssh != NULL); assert(data != NULL); assert(req != NULL); @@ -552,16 +550,16 @@ __build_query_exp(struct nfnl_subsys_handle *ssh, switch(qt) { case NFCT_Q_CREATE: - __build_expect(ssh, req, size, IPCTNL_MSG_EXP_NEW, NLM_F_REQUEST|NLM_F_CREATE|NLM_F_ACK|NLM_F_EXCL, data); + __build_expect(req, size, IPCTNL_MSG_EXP_NEW, NLM_F_REQUEST|NLM_F_CREATE|NLM_F_ACK|NLM_F_EXCL, data); break; case NFCT_Q_CREATE_UPDATE: - __build_expect(ssh, req, size, IPCTNL_MSG_EXP_NEW, NLM_F_REQUEST|NLM_F_CREATE|NLM_F_ACK, data); + __build_expect(req, size, IPCTNL_MSG_EXP_NEW, NLM_F_REQUEST|NLM_F_CREATE|NLM_F_ACK, data); break; case NFCT_Q_GET: - __build_expect(ssh, req, size, IPCTNL_MSG_EXP_GET, NLM_F_REQUEST|NLM_F_ACK, data); + __build_expect(req, size, IPCTNL_MSG_EXP_GET, NLM_F_REQUEST|NLM_F_ACK, data); break; case NFCT_Q_DESTROY: - __build_expect(ssh, req, size, IPCTNL_MSG_EXP_DELETE, NLM_F_REQUEST|NLM_F_ACK, data); + __build_expect(req, size, IPCTNL_MSG_EXP_DELETE, NLM_F_REQUEST|NLM_F_ACK, data); break; case NFCT_Q_FLUSH: nfexp_fill_hdr(req, IPCTNL_MSG_EXP_DELETE, NLM_F_ACK, *family, @@ -614,7 +612,7 @@ int nfexp_build_query(struct nfnl_subsys_handle *ssh, void *buffer, unsigned int size) { - return __build_query_exp(ssh, qt, data, buffer, size); + return __build_query_exp(qt, data, buffer, size); } static int __parse_expect_message_type(const struct nlmsghdr *nlh) @@ -707,7 +705,7 @@ int nfexp_query(struct nfct_handle *h, assert(h != NULL); assert(data != NULL); - if (__build_query_exp(h->nfnlssh_exp, qt, data, &u.req, size) == -1) + if (__build_query_exp(qt, data, &u.req, size) == -1) return -1; return nfnl_query(h->nfnlh, &u.req.nlh); @@ -739,7 +737,7 @@ int nfexp_send(struct nfct_handle *h, assert(h != NULL); assert(data != NULL); - if (__build_query_exp(h->nfnlssh_exp, qt, data, &u.req, size) == -1) + if (__build_query_exp(qt, data, &u.req, size) == -1) return -1; return nfnl_send(h->nfnlh, &u.req.nlh); |