[netfilter-cvslog] r6459 - trunk/libnetfilter_conntrack/src

[pablo at netfilter.org]

Author: pablo at netfilter.org
Date: 2006-02-09 01:51:31 +0100 (Thu, 09 Feb 2006)
New Revision: 6459

Modified:
   trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c
Log:
Simplification: nfnl_send + nfnl_listen calls for nfnl_talk



Modified: trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c
===================================================================
--- trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c	2006-02-01 13:13:21 UTC (rev 6458)
+++ trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c	2006-02-09 00:51:31 UTC (rev 6459)
@@ -959,7 +959,6 @@
 {
 	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 @@
 
 	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 @@
 
 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 @@
 	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 @@
 	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)