From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Mon, 17 Aug 2015 23:07:24 +0000 (+0200)
Subject: Merge branch 'next-4.2'
X-Git-Tag: v0.5~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94002b41384890224bfb14d1b0986bd8b279b17e;p=thirdparty%2Fnftables.git

Merge branch 'next-4.2'

This branch adds support for the new 'netdev' family. This also resolves a
simple conflict with the default chain policy printing.

Conflicts:
	src/rule.c

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

94002b41384890224bfb14d1b0986bd8b279b17e
diff --cc src/rule.c
index 09d1ffd45,f930a374c..8e3ef5f67
--- a/src/rule.c
+++ b/src/rule.c
@@@ -465,9 -475,17 +475,18 @@@ static void chain_print(const struct ch
  
  	printf("\tchain %s {\n", chain->handle.chain);
  	if (chain->flags & CHAIN_F_BASECHAIN) {
- 		printf("\t\ttype %s hook %s priority %d; policy %s;\n",
- 		       chain->type, chain->hookstr,
- 		       chain->priority, chain_policy2str(chain->policy));
+ 		if (chain->dev != NULL) {
 -			printf("\t\ttype %s hook %s device %s priority %d;\n",
++			printf("\t\ttype %s hook %s device %s priority %d; policy %s;\n",
+ 			       chain->type,
+ 			       hooknum2str(chain->handle.family, chain->hooknum),
 -			       chain->dev, chain->priority);
++			       chain->dev, chain->priority,
++			       chain_policy2str(chain->policy));
+ 		} else {
 -			printf("\t\ttype %s hook %s priority %d;\n",
++			printf("\t\ttype %s hook %s priority %d; policy %s;\n",
+ 			       chain->type,
+ 			       hooknum2str(chain->handle.family, chain->hooknum),
 -			       chain->priority);
++			       chain->priority, chain_policy2str(chain->policy));
+ 		}
  	}
  	list_for_each_entry(rule, &chain->rules, list) {
  		printf("\t\t");