diff options
| author | Thomas Graf <tgraf@redhat.com> | 2012-04-21 08:35:20 (GMT) |
|---|---|---|
| committer | Thomas Graf <tgraf@redhat.com> | 2012-04-21 08:35:20 (GMT) |
| commit | e78975aea8dc6b091d56f5ac4c0bd6def598f070 (patch) | |
| tree | 987b933a81e2119e11f8021c9cbb9de1c1521d4c /tests/test-nf-cache-mngr.c | |
| parent | 9af54690041aaa0a4934c336709bdf42a57afe28 (diff) | |
| download | libnl-e78975aea8dc6b091d56f5ac4c0bd6def598f070.zip libnl-e78975aea8dc6b091d56f5ac4c0bd6def598f070.tar.gz libnl-e78975aea8dc6b091d56f5ac4c0bd6def598f070.tar.bz2 | |
tests: fix test programs to compile again
Diffstat (limited to 'tests/test-nf-cache-mngr.c')
| -rw-r--r-- | tests/test-nf-cache-mngr.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/tests/test-nf-cache-mngr.c b/tests/test-nf-cache-mngr.c index 05485bf..b4f3022 100644 --- a/tests/test-nf-cache-mngr.c +++ b/tests/test-nf-cache-mngr.c @@ -1,13 +1,13 @@ -#include "../src/utils.h" +#include <netlink/cli/utils.h> static void change_cb(struct nl_cache *cache, struct nl_object *obj, - int action) + int action, void *data) { struct nfnl_ct *ct = (struct nfnl_ct *) obj; static struct nl_addr *hack = NULL; if (!hack) - hack = nl_addr_parse("194.88.212.233", AF_INET); + nl_addr_parse("194.88.212.233", AF_INET, &hack); if (!nl_addr_cmp(hack, nfnl_ct_get_src(ct, 1)) || !nl_addr_cmp(hack, nfnl_ct_get_dst(ct, 1))) { @@ -26,25 +26,26 @@ int main(int argc, char *argv[]) struct nl_cache_mngr *mngr; struct nl_sock *sock; struct nl_cache *ct; + int err; - sock = nlt_socket_alloc(); + sock = nl_cli_alloc_socket(); - mngr = nl_cache_mngr_alloc(sock, NETLINK_NETFILTER, NL_AUTO_PROVIDE); - if (!mngr) { - nl_perror("nl_cache_mngr_alloc"); + err = nl_cache_mngr_alloc(sock, NETLINK_NETFILTER, NL_AUTO_PROVIDE, &mngr); + if (err < 0) { + nl_perror(err, "nl_cache_mngr_alloc"); return -1; } - ct = nl_cache_mngr_add(mngr, "netfilter/ct", &change_cb); - if (ct == NULL) { - nl_perror("nl_cache_mngr_add(netfilter/ct)"); + err = nl_cache_mngr_add(mngr, "netfilter/ct", &change_cb, NULL, &ct); + if (err < 0) { + nl_perror(err, "nl_cache_mngr_add(netfilter/ct)"); return -1; } for (;;) { int err = nl_cache_mngr_poll(mngr, 5000); if (err < 0) { - nl_perror("nl_cache_mngr_poll()"); + nl_perror(err, "nl_cache_mngr_poll()"); return -1; } |