From 3388d7df304f26617c4487418c05734ae4fce5b8 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Wed, 28 Dec 2011 20:16:46 +0100 Subject: src: major API redesign This patch reworks the initial API. Now it provides functions to: - allocate/release accounting objects. - set/unset/get attributes of accounting objects. - build one netlink message from one accounting object. - parse one netlink message to one accounting object. - print one accounting object into a buffer. Binary layout of nfacct objects are opaque. This is good for extensibility without breaking backward compatibility. Signed-off-by: Pablo Neira Ayuso --- examples/nfacct-add.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'examples/nfacct-add.c') diff --git a/examples/nfacct-add.c b/examples/nfacct-add.c index 64f94d1..40e0e31 100644 --- a/examples/nfacct-add.c +++ b/examples/nfacct-add.c @@ -10,18 +10,28 @@ int main(int argc, char *argv[]) char buf[MNL_SOCKET_BUFFER_SIZE]; struct nlmsghdr *nlh; uint32_t portid, seq; - struct nfacct nfacct = {}; + struct nfacct *nfacct; int ret; if (argc != 2) { fprintf(stderr, "Usage: %s [name]\n", argv[0]); exit(EXIT_FAILURE); } - strncpy(nfacct.name, argv[1], NFACCT_NAME_MAX); - nfacct.name[NFACCT_NAME_MAX-1] = '\0'; - nlh = nfacct_add(buf, &nfacct); - seq = nlh->nlmsg_seq = time(NULL); + nfacct = nfacct_alloc(); + if (nfacct == NULL) { + perror("OOM"); + exit(EXIT_FAILURE); + } + + nfacct_attr_set(nfacct, NFACCT_ATTR_NAME, argv[1]); + + seq = time(NULL); + nlh = nfacct_nlmsg_build_hdr(buf, NFNL_MSG_ACCT_NEW, + NLM_F_CREATE | NLM_F_ACK, seq); + nfacct_nlmsg_build_payload(nlh, nfacct); + + nfacct_free(nfacct); nl = mnl_socket_open(NETLINK_NETFILTER); if (nl == NULL) { @@ -42,7 +52,7 @@ int main(int argc, char *argv[]) ret = mnl_socket_recvfrom(nl, buf, sizeof(buf)); while (ret > 0) { - ret = mnl_cb_run(buf, ret, seq, portid, nfacct_list_cb, NULL); + ret = mnl_cb_run(buf, ret, seq, portid, NULL, NULL); if (ret <= 0) break; ret = mnl_socket_recvfrom(nl, buf, sizeof(buf)); -- cgit v1.2.3