libmnl: genl patches

libmnl: genl patches

[Jan Engelhardt]

The following changes since commit 89bb1e00f921a4e8b0e1e3b3e6aea5d26ccd0435:

  Merge branch 'master' of git://dev.medozas.de/libmnl (2011-01-06 03:19:29 +0100)

are available in the git repository at:

  git://dev.medozas.de/libmnl master

Jan Engelhardt (2):
      examples/genl: fix newline imbalance
      examples/genl: support dumping the genl families

 examples/genl/genl-family-get.c |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

[PATCH 1/2] examples/genl: fix newline imbalance

[Jan Engelhardt]

Running `genl-family-get VFS_DQUOT` forgets to print a newline.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 examples/genl/genl-family-get.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/examples/genl/genl-family-get.c b/examples/genl/genl-family-get.c
index ba8291e..1ad1a04 100644
--- a/examples/genl/genl-family-get.c
+++ b/examples/genl/genl-family-get.c
@@ -169,12 +169,13 @@ static int data_cb(const struct nlmsghdr *nlh, void *data)
 		printf("maxattr=%u\t",
 			mnl_attr_get_u32(tb[CTRL_ATTR_MAXATTR]));
 	}
+	printf("\n");
 	if (tb[CTRL_ATTR_OPS]) {
-		printf("\nops:\n");
+		printf("ops:\n");
 		parse_genl_family_ops(tb[CTRL_ATTR_OPS]);
 	}
 	if (tb[CTRL_ATTR_MCAST_GROUPS]) {
-		printf("\ngrps:\n");
+		printf("grps:\n");
 		parse_genl_mc_grps(tb[CTRL_ATTR_MCAST_GROUPS]);
 	}
 	return MNL_CB_OK;
-- 
1.7.1

[PATCH 2/2] examples/genl: support dumping the genl families

[Jan Engelhardt]

The usage text already specified [family] as optional, now implement it :-)

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 examples/genl/genl-family-get.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/examples/genl/genl-family-get.c b/examples/genl/genl-family-get.c
index 1ad1a04..b16f7b6 100644
--- a/examples/genl/genl-family-get.c
+++ b/examples/genl/genl-family-get.c
@@ -178,6 +178,7 @@ static int data_cb(const struct nlmsghdr *nlh, void *data)
 		printf("grps:\n");
 		parse_genl_mc_grps(tb[CTRL_ATTR_MCAST_GROUPS]);
 	}
+	printf("\n");
 	return MNL_CB_OK;
 }
 
@@ -190,7 +191,7 @@ int main(int argc, char *argv[])
 	int ret;
 	unsigned int seq, portid;
 
-	if (argc != 2) {
+	if (argc > 2) {
 		printf("%s [family name]\n", argv[0]);
 		exit(EXIT_FAILURE);
 	}
@@ -205,7 +206,10 @@ int main(int argc, char *argv[])
 	genl->version = 1;
 
 	mnl_attr_put_u32(nlh, CTRL_ATTR_FAMILY_ID, GENL_ID_CTRL);
-	mnl_attr_put_strz(nlh, CTRL_ATTR_FAMILY_NAME, argv[1]);
+	if (argc >= 2)
+		mnl_attr_put_strz(nlh, CTRL_ATTR_FAMILY_NAME, argv[1]);
+	else
+		nlh->nlmsg_flags |= NLM_F_DUMP;
 
 	nl = mnl_socket_open(NETLINK_GENERIC);
 	if (nl == NULL) {
-- 
1.7.1

Re: libmnl: genl patches

[Pablo Neira Ayuso]

On 08/01/11 04:09, Jan Engelhardt wrote:
> The following changes since commit 89bb1e00f921a4e8b0e1e3b3e6aea5d26ccd0435:
> 
>   Merge branch 'master' of git://dev.medozas.de/libmnl (2011-01-06 03:19:29 +0100)
> 
> are available in the git repository at:
> 
>   git://dev.medozas.de/libmnl master

Pulled and applied, thanks Jan.