route/link: fix parsing of 'remote' attribute for GRE links

Fixes: 57bdc4f http://lists.infradead.org/pipermail/libnl/2015-November/002004.html Signed-off-by: Beniamino Galvani <bgalvani@redhat.com> [thaller@redhat.com: add capability to indicate bug-fix] Signed-off-by: Thomas Haller <thaller@redhat.com>
thom311 · Nov 19, 2015 · a0b2710 · a0b2710
1 parent 5f044ac
commit a0b2710
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/include/netlink/utils.h b/include/netlink/utils.h
@@ -171,6 +171,12 @@ enum {
 	NL_CAPABILITY_RTNL_LINK_VLAN_PROTOCOL_SERIALZE = 12,
 #define NL_CAPABILITY_RTNL_LINK_VLAN_PROTOCOL_SERIALZE NL_CAPABILITY_RTNL_LINK_VLAN_PROTOCOL_SERIALZE
 
+	/**
+	 * Properly read gre REMOTE port.
+	 */
+	NL_CAPABILITY_RTNL_LINK_PARSE_GRE_REMOTE = 13,
+#define NL_CAPABILITY_RTNL_LINK_PARSE_GRE_REMOTE NL_CAPABILITY_RTNL_LINK_PARSE_GRE_REMOTE
+
 	__NL_CAPABILITY_MAX,
 	NL_CAPABILITY_MAX = (__NL_CAPABILITY_MAX - 1),
 #define NL_CAPABILITY_MAX NL_CAPABILITY_MAX

diff --git a/lib/route/link/ipgre.c b/lib/route/link/ipgre.c
@@ -137,8 +137,8 @@ static int ipgre_parse(struct rtnl_link *link, struct nlattr *data,
 		ipgre->ipgre_mask |= IPGRE_ATTR_LOCAL;
 	}
 
-	if (tb[IFLA_GRE_LOCAL]) {
-		ipgre->remote = nla_get_u32(tb[IFLA_GRE_LOCAL]);
+	if (tb[IFLA_GRE_REMOTE]) {
+		ipgre->remote = nla_get_u32(tb[IFLA_GRE_REMOTE]);
 		ipgre->ipgre_mask |= IPGRE_ATTR_REMOTE;
 	}
 

diff --git a/lib/utils.c b/lib/utils.c
@@ -1156,7 +1156,7 @@ int nl_has_capability (int capability)
 			NL_CAPABILITY_RTNL_NEIGH_GET_FILTER_AF_UNSPEC_FIX,
 			NL_CAPABILITY_VERSION_3_2_27,
 			NL_CAPABILITY_RTNL_LINK_VLAN_PROTOCOL_SERIALZE,
-			0,
+			NL_CAPABILITY_RTNL_LINK_PARSE_GRE_REMOTE,
 			0,
 			0,
 			0),