Patchwork expect: support NFCT_Q_CREATE_UPDATE in nfexp_query

login
register
mail settings
Submitter Kelvie Wong
Date May 3, 2012, 12:39 a.m.
Message ID <1336005564-23171-2-git-send-email-kelvie@ieee.org>
Download mbox | patch
Permalink /patch/156580/
State Accepted
Headers show

Comments

Kelvie Wong - May 3, 2012, 12:39 a.m.
This will work as it does in conntrack; it won't pass NLM_F_ACK into
ctnetlink_new_expect in the kernel, and will thus invoke
ctnetlink_change_expect if the expectation already exists.

Signed-off-by: Kelvie Wong <kelvie@ieee.org>
---
 src/expect/api.c |    3 +++
 1 file changed, 3 insertions(+)

Patch

diff --git a/src/expect/api.c b/src/expect/api.c
index 4da44a0..a101042 100644
--- a/src/expect/api.c
+++ b/src/expect/api.c
@@ -533,6 +533,9 @@  __build_query_exp(struct nfnl_subsys_handle *ssh,
 	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);
 		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);
+		break;
 	case NFCT_Q_GET:
 		__build_expect(ssh, req, size, IPCTNL_MSG_EXP_GET, NLM_F_REQUEST|NLM_F_ACK, data);
 		break;