summaryrefslogtreecommitdiff
path: root/examples/netfilter
diff options
context:
space:
mode:
Diffstat (limited to 'examples/netfilter')
-rw-r--r--examples/netfilter/nf-log.c7
-rw-r--r--examples/netfilter/nf-queue.c8
-rw-r--r--examples/netfilter/nfct-create-batch.c9
-rw-r--r--examples/netfilter/nfct-event.c5
4 files changed, 15 insertions, 14 deletions
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);
}
}