From 81f13e18e455615ca7e81a0e48ebe83f1407eb9e Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Thu, 16 Aug 2012 13:45:22 +0200 Subject: examples: update to use the new callback API This patch updates all examples to use the new callback API. Signed-off-by: Pablo Neira Ayuso --- examples/genl/genl-family-get.c | 2 +- examples/netfilter/nf-log.c | 7 +++---- examples/netfilter/nf-queue.c | 8 ++++---- examples/netfilter/nfct-create-batch.c | 9 +++++---- examples/netfilter/nfct-event.c | 5 +++-- examples/rtnl/rtnl-link-dump.c | 2 +- examples/rtnl/rtnl-link-dump2.c | 2 +- examples/rtnl/rtnl-link-dump3.c | 2 +- examples/rtnl/rtnl-link-event.c | 2 +- examples/rtnl/rtnl-link-set.c | 2 +- examples/rtnl/rtnl-route-dump.c | 2 +- 11 files changed, 22 insertions(+), 21 deletions(-) diff --git a/examples/genl/genl-family-get.c b/examples/genl/genl-family-get.c index 50f7ea3..0fa3d77 100644 --- a/examples/genl/genl-family-get.c +++ b/examples/genl/genl-family-get.c @@ -225,7 +225,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, data_cb, NULL); + ret = mnl_callback_run(buf, ret, seq, portid, data_cb, NULL, 0); if (ret <= 0) break; ret = mnl_socket_recvfrom(nl, buf, sizeof(buf)); diff --git a/examples/netfilter/nf-log.c b/examples/netfilter/nf-log.c index a862912..2bb2add 100644 --- a/examples/netfilter/nf-log.c +++ b/examples/netfilter/nf-log.c @@ -151,7 +151,7 @@ int main(int argc, char *argv[]) char buf[MNL_SOCKET_BUFFER_SIZE]; struct nlmsghdr *nlh; int ret; - unsigned int portid, qnum; + unsigned int qnum; if (argc != 2) { printf("Usage: %s [queue_num]\n", argv[0]); @@ -169,7 +169,6 @@ int main(int argc, char *argv[]) perror("mnl_socket_bind"); exit(EXIT_FAILURE); } - portid = mnl_socket_get_portid(nl); nlh = nflog_build_cfg_pf_request(buf, NFULNL_CFG_CMD_PF_UNBIND); @@ -205,9 +204,9 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } while (ret > 0) { - ret = mnl_cb_run(buf, ret, 0, portid, log_cb, NULL); + ret = mnl_callback_run(buf, ret, 0, 0, log_cb, NULL, 0); if (ret < 0){ - perror("mnl_cb_run"); + perror("mnl_callback_run"); exit(EXIT_FAILURE); } diff --git a/examples/netfilter/nf-queue.c b/examples/netfilter/nf-queue.c index c66611f..1dad6ef 100644 --- a/examples/netfilter/nf-queue.c +++ b/examples/netfilter/nf-queue.c @@ -165,7 +165,7 @@ int main(int argc, char *argv[]) char buf[MNL_SOCKET_BUFFER_SIZE]; struct nlmsghdr *nlh; int ret; - unsigned int portid, queue_num; + unsigned int queue_num; if (argc != 2) { printf("Usage: %s [queue_num]\n", argv[0]); @@ -183,7 +183,6 @@ int main(int argc, char *argv[]) perror("mnl_socket_bind"); exit(EXIT_FAILURE); } - portid = mnl_socket_get_portid(nl); nlh = nfq_build_cfg_pf_request(buf, NFQNL_CFG_CMD_PF_UNBIND); @@ -221,9 +220,10 @@ int main(int argc, char *argv[]) while (ret > 0) { uint32_t id; - ret = mnl_cb_run(buf, ret, 0, portid, queue_cb, NULL); + ret = mnl_callback_run(buf, ret, 0, 0, queue_cb, NULL, + MNL_CB_F_ANY_SEQ); if (ret < 0){ - perror("mnl_cb_run"); + perror("mnl_callback_run"); exit(EXIT_FAILURE); } diff --git a/examples/netfilter/nfct-create-batch.c b/examples/netfilter/nfct-create-batch.c index dd6623f..077131c 100644 --- a/examples/netfilter/nfct-create-batch.c +++ b/examples/netfilter/nfct-create-batch.c @@ -112,11 +112,12 @@ send_batch(struct mnl_socket *nl, struct mnl_nlmsg_batch *b, int portid) exit(EXIT_FAILURE); } - ret = mnl_cb_run2(rcv_buf, ret, 0, portid, - NULL, NULL, cb_ctl_array, - MNL_ARRAY_SIZE(cb_ctl_array)); + ret = mnl_callback_run2(rcv_buf, ret, 0, portid, + NULL, NULL, cb_ctl_array, + MNL_ARRAY_SIZE(cb_ctl_array), + MNL_CB_F_ANY_SEQ); if (ret == -1) { - perror("mnl_cb_run"); + perror("mnl_callback_run"); exit(EXIT_FAILURE); } diff --git a/examples/netfilter/nfct-event.c b/examples/netfilter/nfct-event.c index 94603d4..06a4901 100644 --- a/examples/netfilter/nfct-event.c +++ b/examples/netfilter/nfct-event.c @@ -227,9 +227,10 @@ int main(void) exit(EXIT_FAILURE); } - ret = mnl_cb_run(buf, ret, 0, 0, data_cb, NULL); + ret = mnl_callback_run(buf, ret, 0, 0, data_cb, NULL, + MNL_CB_F_ANY_PORTID); if (ret == -1) { - perror("mnl_cb_run"); + perror("mnl_callback_run"); exit(EXIT_FAILURE); } } diff --git a/examples/rtnl/rtnl-link-dump.c b/examples/rtnl/rtnl-link-dump.c index 159f3b6..5e74cb9 100644 --- a/examples/rtnl/rtnl-link-dump.c +++ b/examples/rtnl/rtnl-link-dump.c @@ -96,7 +96,7 @@ int main(void) ret = mnl_socket_recvfrom(nl, buf, sizeof(buf)); while (ret > 0) { - ret = mnl_cb_run(buf, ret, seq, portid, data_cb, NULL); + ret = mnl_callback_run(buf, ret, seq, portid, data_cb, NULL, 0); if (ret <= MNL_CB_STOP) break; ret = mnl_socket_recvfrom(nl, buf, sizeof(buf)); diff --git a/examples/rtnl/rtnl-link-dump2.c b/examples/rtnl/rtnl-link-dump2.c index 78f31a8..a070c82 100644 --- a/examples/rtnl/rtnl-link-dump2.c +++ b/examples/rtnl/rtnl-link-dump2.c @@ -87,7 +87,7 @@ int main(void) ret = mnl_socket_recvfrom(nl, buf, sizeof(buf)); while (ret > 0) { - ret = mnl_cb_run(buf, ret, seq, portid, data_cb, NULL); + ret = mnl_callback_run(buf, ret, seq, portid, data_cb, NULL, 0); if (ret <= MNL_CB_STOP) break; ret = mnl_socket_recvfrom(nl, buf, sizeof(buf)); diff --git a/examples/rtnl/rtnl-link-dump3.c b/examples/rtnl/rtnl-link-dump3.c index a6dce6f..32a17c2 100644 --- a/examples/rtnl/rtnl-link-dump3.c +++ b/examples/rtnl/rtnl-link-dump3.c @@ -87,7 +87,7 @@ int main(void) ret = mnl_socket_recvfrom(nl, buf, sizeof(buf)); while (ret > 0) { - ret = mnl_cb_run(buf, ret, seq, portid, data_cb, NULL); + ret = mnl_callback_run(buf, ret, seq, portid, data_cb, NULL, 0); if (ret <= MNL_CB_STOP) break; ret = mnl_socket_recvfrom(nl, buf, sizeof(buf)); diff --git a/examples/rtnl/rtnl-link-event.c b/examples/rtnl/rtnl-link-event.c index 90bb8e5..3f6da12 100644 --- a/examples/rtnl/rtnl-link-event.c +++ b/examples/rtnl/rtnl-link-event.c @@ -79,7 +79,7 @@ int main(void) ret = mnl_socket_recvfrom(nl, buf, sizeof(buf)); while (ret > 0) { - ret = mnl_cb_run(buf, ret, 0, 0, data_cb, NULL); + ret = mnl_callback_run(buf, ret, 0, 0, data_cb, NULL, 0); if (ret <= 0) break; ret = mnl_socket_recvfrom(nl, buf, sizeof(buf)); diff --git a/examples/rtnl/rtnl-link-set.c b/examples/rtnl/rtnl-link-set.c index dad8856..859956c 100644 --- a/examples/rtnl/rtnl-link-set.c +++ b/examples/rtnl/rtnl-link-set.c @@ -72,7 +72,7 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } - ret = mnl_cb_run(buf, ret, seq, portid, NULL, NULL); + ret = mnl_callback_run(buf, ret, seq, portid, NULL, NULL, 0); if (ret == -1){ perror("callback"); exit(EXIT_FAILURE); diff --git a/examples/rtnl/rtnl-route-dump.c b/examples/rtnl/rtnl-route-dump.c index a798515..885f1a8 100644 --- a/examples/rtnl/rtnl-route-dump.c +++ b/examples/rtnl/rtnl-route-dump.c @@ -329,7 +329,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, data_cb, NULL); + ret = mnl_callback_run(buf, ret, seq, portid, data_cb, NULL, 0); if (ret <= MNL_CB_STOP) break; ret = mnl_socket_recvfrom(nl, buf, sizeof(buf)); -- cgit v1.2.1