diff options
| author | /C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=pablo/emailAddress=pablo@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=pablo/emailAddress=pablo@netfilter.org> | 2006-02-09 00:51:31 +0000 |
|---|---|---|
| committer | /C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=pablo/emailAddress=pablo@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=pablo/emailAddress=pablo@netfilter.org> | 2006-02-09 00:51:31 +0000 |
| commit | 0f8c831ce7ee520a7f290d34ae62fe729b122d1c (patch) | |
| tree | b47a4c39fb41362fbe9ed39b89673cd86f5c3e27 | |
| parent | dafdbc6db7731e56a386ab76943bf8d91629d43a (diff) | |
Simplification: nfnl_send + nfnl_listen calls for nfnl_talk
| -rw-r--r-- | src/libnetfilter_conntrack.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/src/libnetfilter_conntrack.c b/src/libnetfilter_conntrack.c index d740fce..3ba99ff 100644 --- a/src/libnetfilter_conntrack.c +++ b/src/libnetfilter_conntrack.c @@ -959,7 +959,6 @@ int nfct_update_conntrack(struct nfct_handle *cth, struct nfct_conntrack *ct) { struct nfnlhdr *req; char buf[NFCT_BUFSIZE]; - int err; u_int32_t status = htonl(ct->status | IPS_CONFIRMED); u_int32_t timeout = htonl(ct->timeout); u_int32_t id = htonl(ct->id); @@ -995,11 +994,7 @@ int nfct_update_conntrack(struct nfct_handle *cth, struct nfct_conntrack *ct) nfct_build_protoinfo(req, sizeof(buf), ct); - err = nfnl_send(cth->nfnlh, &req->nlh); - if (err < 0) - return err; - - return nfnl_listen(cth->nfnlh, &callback_handler, cth); + return nfnl_talk(cth->nfnlh, &req->nlh, 0, 0, NULL, NULL, NULL); } int nfct_delete_conntrack(struct nfct_handle *cth, struct nfct_tuple *tuple, @@ -1217,7 +1212,6 @@ void nfct_expect_free(struct nfct_expect *exp) int nfct_create_expectation(struct nfct_handle *cth, struct nfct_expect *exp) { - int err; struct nfnlhdr *req; char buf[NFCT_BUFSIZE]; req = (void *) &buf; @@ -1243,18 +1237,13 @@ int nfct_create_expectation(struct nfct_handle *cth, struct nfct_expect *exp) if (queuenr) nfnl_addattr_l(&req->nlh, sizeof(buf), CTA_EXPECT_QUEUENR, &queuenr, sizeof(u_int16_t)); - - err = nfnl_send(cth->nfnlh, &req->nlh); - if (err < 0) - return err; - return nfnl_listen(cth->nfnlh, &callback_handler, cth); + return nfnl_talk(cth->nfnlh, &req->nlh, 0, 0, NULL, NULL, NULL); } int nfct_delete_expectation(struct nfct_handle *cth, struct nfct_tuple *tuple, u_int32_t id) { - int err; struct nfnlhdr *req; char buf[NFCT_BUFSIZE]; u_int8_t l3num = tuple->l3protonum; @@ -1271,12 +1260,8 @@ int nfct_delete_expectation(struct nfct_handle *cth, struct nfct_tuple *tuple, if (id != NFCT_ANY_ID) nfnl_addattr_l(&req->nlh, sizeof(buf), CTA_EXPECT_ID, &id, sizeof(u_int32_t)); - - err = nfnl_send(cth->nfnlh, &req->nlh); - if (err < 0) - return err; - return nfnl_listen(cth->nfnlh, &callback_handler, cth); + return nfnl_talk(cth->nfnlh, &req->nlh, 0, 0, NULL, NULL, NULL); } int nfct_event_expectation(struct nfct_handle *cth) |