blob: 243c3ceb8860a4a6b62bd73e8dced4e22d94b428 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
--- a/include/netlink/genl/mngt.h
+++ b/include/netlink/genl/mngt.h
@@ -22,6 +22,15 @@ extern "C" {
struct nl_cache_ops;
+struct genl_info
+{
+ struct sockaddr_nl * who;
+ struct nlmsghdr * nlh;
+ struct genlmsghdr * genlhdr;
+ void * userhdr;
+ struct nlattr ** attrs;
+};
+
/**
* @ingroup genl_mngt
* Generic Netlink Command
--- a/include/netlink-types.h
+++ b/include/netlink-types.h
@@ -95,15 +95,6 @@ struct nl_cache_mngr
struct nl_parser_param;
-struct genl_info
-{
- struct sockaddr_nl * who;
- struct nlmsghdr * nlh;
- struct genlmsghdr * genlhdr;
- void * userhdr;
- struct nlattr ** attrs;
-};
-
#define LOOSE_FLAG_COMPARISON 1
#define NL_OBJ_MARK 1
--- a/src/nl-list-caches.c
+++ b/src/nl-list-caches.c
@@ -10,6 +10,7 @@
*/
#include "utils.h"
+#include <netlink-local.h>
static void print_usage(void)
{
--- a/src/utils.c
+++ b/src/utils.c
@@ -12,6 +12,7 @@
#include "utils.h"
#include <stdlib.h>
+#include <stdarg.h>
int nltool_init(int argc, char *argv[])
{
--- a/src/utils.h
+++ b/src/utils.h
@@ -22,7 +22,6 @@
#include <sys/types.h>
#include <sys/socket.h>
-#include <netlink-local.h>
#include <netlink/netlink.h>
#include <netlink/utils.h>
#include <netlink/addr.h>
|