OS-7120 ipmi_lan_get_config() doesn't really get IPv6cr4671-OS-7120

5 files changed, 208 insertions, 102 deletions

diff --git a/usr/src/lib/fm/topo/libtopo/common/topo_hc.h b/usr/src/lib/fm/topo/libtopo/common/topo_hc.h
index fdeb5f7193..2552f8ad04 100644
--- a/usr/src/lib/fm/topo/libtopo/common/topo_hc.h
+++ b/usr/src/lib/fm/topo/libtopo/common/topo_hc.h
@@ -207,8 +207,8 @@ extern "C" {
 #define	TOPO_PROP_NETCFG_IPV4_SUBNET	"ipv4-subnet"
 #define	TOPO_PROP_NETCFG_IPV4_GATEWAY	"ipv4-gateway"
 #define	TOPO_PROP_NETCFG_IPV4_TYPE	"ipv4-config-type"
-#define	TOPO_PROP_NETCFG_IPV6_ADDR	"ipv6-address"
-#define	TOPO_PROP_NETCFG_IPV6_ROUTES	"ipv6-routes"
+#define	TOPO_PROP_NETCFG_IPV6_ADDRS	"ipv6-addresses"
+#define	TOPO_PROP_NETCFG_IPV6_ROUTES	"ipv6-route-targets"
 #define	TOPO_PROP_NETCFG_IPV6_TYPE	"ipv6-config-type"
 
 /* Possible values for TOPO_PROP_NETCFG_TYPE */
diff --git a/usr/src/lib/fm/topo/modules/common/ipmi/ipmi_enum.c b/usr/src/lib/fm/topo/modules/common/ipmi/ipmi_enum.c
index 1220305584..e0dd15b88b 100644
--- a/usr/src/lib/fm/topo/modules/common/ipmi/ipmi_enum.c
+++ b/usr/src/lib/fm/topo/modules/common/ipmi/ipmi_enum.c
@@ -504,13 +504,11 @@ static int
 ipmi_enum_sp(topo_mod_t *mod, tnode_t *pnode)
 {
 	ipmi_handle_t *ihp;
-	ipmi_channel_info_t *chinfo;
 	ipmi_lan_config_t lancfg = { 0 };
 	boolean_t found_lan = B_TRUE;
 	char ipv4_addr[INET_ADDRSTRLEN], subnet[INET_ADDRSTRLEN];
 	char gateway[INET_ADDRSTRLEN], macaddr[18];
-	char ipv6_addr[INET6_ADDRSTRLEN];
-	char **ipv6_routes;
+	char **ipv6_addrs = NULL, **ipv6_routes = NULL;
 	const char *sp_rev, *ipv4_cfgtype, *ipv6_cfgtype;
 	nvlist_t *auth, *fmri;
 	tnode_t *sp_node;
@@ -580,6 +578,8 @@ ipmi_enum_sp(topo_mod_t *mod, tnode_t *pnode)
 	 * Iterate through the channels to find the LAN channel.
 	 */
 	for (ch = 0; ch <= IPMI_MAX_CHANNEL; ch++) {
+		ipmi_channel_info_t *chinfo;
+
 		if ((chinfo = ipmi_get_channel_info(ihp, ch)) != NULL &&
 		    chinfo->ici_medium == IPMI_MEDIUM_8023LAN) {
 			found_lan = B_TRUE;
@@ -592,7 +592,7 @@ ipmi_enum_sp(topo_mod_t *mod, tnode_t *pnode)
 	 */
 	if (found_lan != B_TRUE ||
 	    ipmi_lan_get_config(ihp, ch, &lancfg) != 0) {
-		(void) fprintf(stderr, "failed to get LAN config\n");
+		topo_mod_dprintf(mod, "failed to get LAN config\n");
 		(void) topo_mod_seterrno(mod, EMOD_UNKNOWN);
 		goto out;
 	}
@@ -642,7 +642,7 @@ ipmi_enum_sp(topo_mod_t *mod, tnode_t *pnode)
 	    sizeof (subnet)) == NULL ||
 	    inet_ntop(AF_INET, &lancfg.ilc_gateway_addr, gateway,
 	    sizeof (gateway)) == NULL)) {
-		(void) fprintf(stderr, "failed to convert IP addresses: %s\n",
+		topo_mod_dprintf(mod, "failed to convert IP addresses: %s\n",
 		    strerror(errno));
 		(void) topo_mod_seterrno(mod, EMOD_UNKNOWN);
 		goto out;
@@ -671,41 +671,71 @@ ipmi_enum_sp(topo_mod_t *mod, tnode_t *pnode)
 	if (lancfg.ilc_ipv6_enabled == B_TRUE) {
 		ipv6_cfgtype = ipmi2toposrc(lancfg.ilc_ipv6_source);
 
-		if (inet_ntop(AF_INET6, &lancfg.ilc_ipv6_addr, ipv6_addr,
-		    sizeof (ipv6_addr)) == NULL) {
-			(void) fprintf(stderr, "failed to convert IPv6 "
-			    "address: %s\n", strerror(errno));
-			(void) topo_mod_seterrno(mod, EMOD_UNKNOWN);
+		/* allocate and populate ipv6-naddrs string array */
+		if ((ipv6_addrs = topo_mod_zalloc(mod,
+		    lancfg.ilc_ipv6_naddrs * sizeof (char *))) == NULL) {
+			/* errno set */
 			goto out;
 		}
 
-		/* allocate and populate ipv6-routes string array */
-		if ((ipv6_routes = topo_mod_zalloc(mod,
+		for (i = 0; i < lancfg.ilc_ipv6_naddrs; i++) {
+			if ((ipv6_addrs[i] = topo_mod_alloc(mod,
+			    INET6_ADDRSTRLEN + 4)) == NULL) {
+				/* errno set */
+				goto out;
+			}
+		}
+
+		for (i = 0; i < lancfg.ilc_ipv6_naddrs; i++) {
+			char v6addr[INET6_ADDRSTRLEN];
+
+			if (inet_ntop(AF_INET6,
+			    &lancfg.ilc_ipv6_addrs[i].iiv6_addr, v6addr,
+			    sizeof (v6addr)) == NULL) {
+				topo_mod_dprintf(mod, "failed to convert "
+				    "IPv6 addresses: %s\n", strerror(errno));
+				(void) topo_mod_seterrno(mod, EMOD_UNKNOWN);
+				goto out;
+			}
+			(void) snprintf(ipv6_addrs[i], INET6_ADDRSTRLEN + 3,
+			    "%s/%u", v6addr,
+			    lancfg.ilc_ipv6_addrs[i].iiv6_pfxlen);
+		}
+
+		/* allocate and populate ipv6-route-targets string array */
+		if (lancfg.ilc_ipv6_nroutes > 0 &&
+		    (ipv6_routes = topo_mod_zalloc(mod,
 		    lancfg.ilc_ipv6_nroutes * sizeof (char *))) == NULL) {
 			/* errno set */
 			goto out;
 		}
 		for (i = 0; i < lancfg.ilc_ipv6_nroutes; i++) {
 			if ((ipv6_routes[i] = topo_mod_alloc(mod,
-			    INET6_ADDRSTRLEN)) == NULL) {
+			    INET6_ADDRSTRLEN + 4)) == NULL) {
 				/* errno set */
 				goto out;
 			}
 		}
 		for (i = 0; i < lancfg.ilc_ipv6_nroutes; i++) {
-			if (inet_ntop(AF_INET6, &lancfg.ilc_ipv6_routes[i],
-			    ipv6_routes[i], sizeof (ipv6_routes[i])) == NULL) {
-				(void) fprintf(stderr, "failed to convert "
+			char v6route[INET6_ADDRSTRLEN];
+
+			if (inet_ntop(AF_INET6,
+			    &lancfg.ilc_ipv6_routes[i].iiv6_addr, v6route,
+			    sizeof (v6route)) == NULL) {
+				topo_mod_dprintf(mod, "failed to convert "
 				    "IPv6 addresses: %s\n", strerror(errno));
 				(void) topo_mod_seterrno(mod, EMOD_UNKNOWN);
 				goto out;
 			}
+			(void) snprintf(ipv6_routes[i], INET6_ADDRSTRLEN + 3,
+			    "%s/%u", v6route,
+			    lancfg.ilc_ipv6_routes[i].iiv6_pfxlen);
 		}
 	}
 	if (lancfg.ilc_ipv6_enabled == B_TRUE &&
-	    (topo_prop_set_string(sp_node, TOPO_PGROUP_NETCFG,
-	    TOPO_PROP_NETCFG_IPV6_ADDR, TOPO_PROP_IMMUTABLE, ipv6_addr,
-	    &err) != 0 ||
+	    (topo_prop_set_string_array(sp_node, TOPO_PGROUP_NETCFG,
+	    TOPO_PROP_NETCFG_IPV6_ADDRS, TOPO_PROP_IMMUTABLE,
+	    (const char **)ipv6_addrs, lancfg.ilc_ipv6_naddrs, &err) != 0 ||
 	    topo_prop_set_string_array(sp_node, TOPO_PGROUP_NETCFG,
 	    TOPO_PROP_NETCFG_IPV6_ROUTES, TOPO_PROP_IMMUTABLE,
 	    (const char **)ipv6_routes, lancfg.ilc_ipv6_nroutes, &err) != 0 ||
@@ -719,7 +749,14 @@ ipmi_enum_sp(topo_mod_t *mod, tnode_t *pnode)
 	}
 	ret = 0;
 out:
-	if (lancfg.ilc_ipv6_nroutes > 0) {
+	ipmi_lan_free_config(&lancfg);
+	if (lancfg.ilc_ipv6_naddrs > 0 && ipv6_addrs != NULL) {
+		for (i = 0; i < lancfg.ilc_ipv6_naddrs; i++)
+			topo_mod_free(mod, ipv6_addrs[i], INET6_ADDRSTRLEN);
+		topo_mod_free(mod, ipv6_addrs,
+		    lancfg.ilc_ipv6_naddrs * sizeof (char *));
+	}
+	if (lancfg.ilc_ipv6_nroutes > 0 && ipv6_routes != NULL) {
 		for (i = 0; i < lancfg.ilc_ipv6_nroutes; i++)
 			topo_mod_free(mod, ipv6_routes[i], INET6_ADDRSTRLEN);
 		topo_mod_free(mod, ipv6_routes,
diff --git a/usr/src/lib/libipmi/common/ipmi_lancfg.c b/usr/src/lib/libipmi/common/ipmi_lancfg.c
index b324891e3f..1a86749a78 100644
--- a/usr/src/lib/libipmi/common/ipmi_lancfg.c
+++ b/usr/src/lib/libipmi/common/ipmi_lancfg.c
@@ -62,24 +62,27 @@ typedef struct ipmi_cmd_lan_set_config {
 #define	IPMI_LAN_SET_LEN(dlen)	\
 	(offsetof(ipmi_cmd_lan_set_config_t, ilsc_data) + (dlen))
 
-#define	IPMI_LAN_PARAM_SET_IN_PROGRESS		0
-#define	IPMI_LAN_PARAM_IP_ADDR			3
-#define	IPMI_LAN_PARAM_IP_SOURCE		4
-#define	IPMI_LAN_PARAM_MAC_ADDR			5
-#define	IPMI_LAN_PARAM_SUBNET_MASK		6
-#define	IPMI_LAN_PARAM_GATEWAY_ADDR		12
+#define	IPMI_LAN_PARAM_SET_IN_PROGRESS			0
+#define	IPMI_LAN_PARAM_IP_ADDR				3
+#define	IPMI_LAN_PARAM_IP_SOURCE			4
+#define	IPMI_LAN_PARAM_MAC_ADDR				5
+#define	IPMI_LAN_PARAM_SUBNET_MASK			6
+#define	IPMI_LAN_PARAM_GATEWAY_ADDR			12
 
 /* VLAN/IPv6 parameters are currently only supported for GET operations */
-#define	IPMI_LAN_PARAM_VLAN_ID			20
-#define	IPMI_LAN_PARAM_IPVX_ENABLED		51
-#define	IPMI_LAN_PARAM_IPV6_NUM_ADDRS		55
-#define	IPMI_LAN_PARAM_IPV6_SADDR		56
-#define	IPMI_LAN_PARAM_IPV6_DADDR		59
-#define	IPMI_LAN_PARAM_IPV6_ROUTER_CONFIG	64
-#define	IPMI_LAN_PARAM_IPV6_STATIC_ROUTE1	65
-#define	IPMI_LAN_PARAM_IPV6_STATIC_ROUTE2	68
-#define	IPMI_LAN_PARAM_IPV6_NUM_DYN_ROUTES	72
-#define	IPMI_LAN_PARAM_IPV6_DYN_ROUTE		73
+#define	IPMI_LAN_PARAM_VLAN_ID				20
+#define	IPMI_LAN_PARAM_IPVX_ENABLED			51
+#define	IPMI_LAN_PARAM_IPV6_NUM_ADDRS			55
+#define	IPMI_LAN_PARAM_IPV6_SADDR			56
+#define	IPMI_LAN_PARAM_IPV6_DADDR			59
+#define	IPMI_LAN_PARAM_IPV6_ROUTER_CONFIG		64
+#define	IPMI_LAN_PARAM_IPV6_STATIC_ROUTE1		65
+#define	IPMI_LAN_PARAM_IPV6_STATIC_ROUTE1_PFXLEN	67
+#define	IPMI_LAN_PARAM_IPV6_STATIC_ROUTE2		69
+#define	IPMI_LAN_PARAM_IPV6_STATIC_ROUTE2_PFXLEN	71
+#define	IPMI_LAN_PARAM_IPV6_NUM_DYN_ROUTES		72
+#define	IPMI_LAN_PARAM_IPV6_DYN_ROUTE			73
+#define	IPMI_LAN_PARAM_IPV6_DYN_ROUTE_PFXLEN		76
 
 #define	IPMI_LAN_SET_COMPLETE			0x0
 #define	IPMI_LAN_SET_INPROGRESS			0x1
@@ -153,7 +156,7 @@ struct ipmi_lan_ipv6_addr {
 	uint8_t		ipva_selector;
 	uint8_t		ipva_source;
 	uint8_t		ipva_addr[16];
-	uint8_t		ipva_prefixlen;
+	uint8_t		ipva_pfxlen;
 	uint8_t		ipva_status;
 };
 
@@ -171,16 +174,30 @@ struct ipmi_lan_vlan_cfg {
 	    ivla_vlan_enable	:1);
 };
 
+void
+ipmi_lan_free_config(ipmi_lan_config_t *cfgp)
+{
+	if (cfgp == NULL)
+		return;
+
+	if (cfgp->ilc_ipv6_naddrs > 0) {
+		free(cfgp->ilc_ipv6_addrs);
+	}
+	if (cfgp->ilc_ipv6_nroutes > 0) {
+		free(cfgp->ilc_ipv6_routes);
+	}
+}
+
 int
 ipmi_lan_get_config(ipmi_handle_t *ihp, int channel, ipmi_lan_config_t *cfgp)
 {
 	uint8_t set, enabled, route_cfg, ndynroutes = 0;
+	uint_t max_ipv6_addrs, max_ipv6_routes;
 	int i, j;
-	ipmi_lan_entry_t *lep;
 	struct ipmi_lan_ipv6_numaddrs numaddrs = { 0 };
-	struct ipmi_lan_ipv6_addr addrv6 = { 0 };
 	struct ipmi_lan_vlan_cfg vlancfg = { 0 };
-	struct in6_addr sroute1 = { 0 }, sroute2 = { 0 }, droute = { 0 };
+	struct in6_addr sroute1 = { 0 }, sroute2 = { 0 };
+	uint8_t sroute1_pfxlen, sroute2_pfxlen;
 	boolean_t found_addr = B_FALSE;
 	boolean_t stat_routes_enabled = B_FALSE, dyn_routes_enabled = B_FALSE;
 
@@ -226,7 +243,8 @@ ipmi_lan_get_config(ipmi_handle_t *ihp, int channel, ipmi_lan_config_t *cfgp)
 	/* If IPv4 support is enabled, gather the current configuration. */
 	if (cfgp->ilc_ipv4_enabled == B_TRUE) {
 		for (i = 0; i < IPMI_LAN_IPV4_NENTRIES; i++) {
-			lep = &ipmi_lan_ipv4_table[i];
+			ipmi_lan_entry_t *lep = &ipmi_lan_ipv4_table[i];
+
 			if (ipmi_lan_get_param(ihp, channel, lep->ile_param,
 			    lep->ile_set, lep->ile_block,
 			    (char *)cfgp + lep->ile_offset, lep->ile_len) != 0)
@@ -252,10 +270,10 @@ ipmi_lan_get_config(ipmi_handle_t *ihp, int channel, ipmi_lan_config_t *cfgp)
 		return (0);
 
 	/*
-	 * First check for a static address.  If we can't find one, we'll look
-	 * for a dynamic address.  The spec allows for multiple IPv6 static and
-	 * dynamic addresses to exist in various states.  For simplicity, we
-	 * will search for the first address that is configured and active.
+	 * First check for a static addresses.  If we can't find any, we'll
+	 * look for dynamic addresses.  The spec allows for multiple static and
+	 * dynamic addresses to exist in various states.  We return only
+	 * addresses that are configured and active.
 	 */
 	if (ipmi_lan_get_param(ihp, channel, IPMI_LAN_PARAM_IPV6_NUM_ADDRS, 0,
 	    0, &numaddrs, sizeof (numaddrs)) != 0) {
@@ -263,23 +281,43 @@ ipmi_lan_get_config(ipmi_handle_t *ihp, int channel, ipmi_lan_config_t *cfgp)
 		return (-1);
 	}
 
-	for (i = 0; i < numaddrs.inva_num_saddrs; i++) {
+	max_ipv6_addrs = numaddrs.inva_num_saddrs + numaddrs.inva_num_daddrs;
+	if (max_ipv6_addrs > 0 &&
+	    (cfgp->ilc_ipv6_addrs = ipmi_zalloc(ihp,
+	    sizeof (ipmi_ipv6_addr_t) * max_ipv6_addrs)) == NULL) {
+		/* errno set */
+		goto err;
+	}
+	for (i = 0, j = 0; i < numaddrs.inva_num_saddrs; i++) {
+		struct ipmi_lan_ipv6_addr addrv6 = { 0 };
+
 		if (ipmi_lan_get_param(ihp, channel, IPMI_LAN_PARAM_IPV6_SADDR,
-		    i, 0, &addrv6, sizeof (addrv6)) == 0 &&
+		    i, 0, &addrv6, sizeof (struct ipmi_lan_ipv6_addr)) == 0 &&
 		    addrv6.ipva_status == 0) {
 			found_addr = B_TRUE;
 			cfgp->ilc_ipv6_source = IPMI_LAN_SRC_STATIC;
-			break;
+			(void) memcpy(cfgp->ilc_ipv6_addrs[j].iiv6_addr,
+			    addrv6.ipva_addr, sizeof (addrv6.ipva_addr));
+			cfgp->ilc_ipv6_addrs[j].iiv6_pfxlen =
+			    addrv6.ipva_pfxlen;
+			cfgp->ilc_ipv6_naddrs++;
+			j++;
 		}
 	}
-	for (i = 0; found_addr == B_FALSE && i < numaddrs.inva_num_daddrs;
-	    i++) {
+	for (i = 0; i < numaddrs.inva_num_daddrs; i++) {
+		struct ipmi_lan_ipv6_addr addrv6 = { 0 };
+
 		if (ipmi_lan_get_param(ihp, channel, IPMI_LAN_PARAM_IPV6_DADDR,
-		    i, 0, &addrv6, sizeof (addrv6)) == 0 &&
+		    i, 0, &addrv6, sizeof (struct ipmi_lan_ipv6_addr)) == 0 &&
 		    addrv6.ipva_status == 0) {
 			found_addr = B_TRUE;
 			cfgp->ilc_ipv6_source = IPMI_LAN_SRC_DHCP;
-			break;
+			(void) memcpy(cfgp->ilc_ipv6_addrs[j].iiv6_addr,
+			    addrv6.ipva_addr, sizeof (addrv6.ipva_addr));
+			cfgp->ilc_ipv6_addrs[j].iiv6_pfxlen =
+			    addrv6.ipva_pfxlen;
+			cfgp->ilc_ipv6_naddrs++;
+			j++;
 		}
 	}
 
@@ -294,9 +332,6 @@ ipmi_lan_get_config(ipmi_handle_t *ihp, int channel, ipmi_lan_config_t *cfgp)
 		return (0);
 	}
 
-	(void) memcpy(cfgp->ilc_ipv6_addr, addrv6.ipva_addr,
-	    sizeof (addrv6.ipva_addr));
-
 	/*
 	 * For the case that static addressing was used for the SP IP then we
 	 * need to get the IPMI_LAN_PARAM_IPV6_ROUTER_CONFIG parameter to
@@ -309,7 +344,7 @@ ipmi_lan_get_config(ipmi_handle_t *ihp, int channel, ipmi_lan_config_t *cfgp)
 	    ipmi_lan_get_param(ihp, channel, IPMI_LAN_PARAM_IPV6_ROUTER_CONFIG,
 	    0, 0, &route_cfg, sizeof (route_cfg)) != 0) {
 		/* errno set */
-		return (-1);
+		goto err;
 	}
 
 	if (cfgp->ilc_ipv6_source == IPMI_LAN_SRC_STATIC) {
@@ -321,60 +356,84 @@ ipmi_lan_get_config(ipmi_handle_t *ihp, int channel, ipmi_lan_config_t *cfgp)
 		dyn_routes_enabled = B_TRUE;
 	}
 
+	if (dyn_routes_enabled == B_TRUE &&
+	    ipmi_lan_get_param(ihp, channel, IPMI_LAN_PARAM_IPV6_NUM_DYN_ROUTES,
+	    0, 0, &ndynroutes, sizeof (ndynroutes)) != 0) {
+		/* errno set */
+		goto err;
+	}
+
+	max_ipv6_routes = ndynroutes;
 	/*
 	 * The IPMI spec allows for a max of two static IPv6 routes to be
 	 * configured.
 	 */
+	if (stat_routes_enabled == B_TRUE)
+		max_ipv6_routes += 2;
+
+	if ((cfgp->ilc_ipv6_routes = ipmi_zalloc(ihp,
+	    sizeof (ipmi_ipv6_addr_t) * max_ipv6_routes)) == NULL) {
+		/* errno set */
+		goto err;
+	}
+
 	j = cfgp->ilc_ipv6_nroutes = 0;
 	if (stat_routes_enabled == B_TRUE) {
-		cfgp->ilc_ipv6_nroutes = 2;
 		if (ipmi_lan_get_param(ihp, channel,
 		    IPMI_LAN_PARAM_IPV6_STATIC_ROUTE1, 0, 0, &sroute1,
 		    sizeof (sroute1)) != 0 ||
 		    ipmi_lan_get_param(ihp, channel,
+		    IPMI_LAN_PARAM_IPV6_STATIC_ROUTE1_PFXLEN, 0, 0,
+		    &sroute1_pfxlen, sizeof (uint8_t)) != 0 ||
+		    ipmi_lan_get_param(ihp, channel,
 		    IPMI_LAN_PARAM_IPV6_STATIC_ROUTE2, 0, 0, &sroute1,
-		    sizeof (sroute2)) != 0) {
+		    sizeof (sroute2)) != 0 ||
+		    ipmi_lan_get_param(ihp, channel,
+		    IPMI_LAN_PARAM_IPV6_STATIC_ROUTE2_PFXLEN, 0, 0,
+		    &sroute2_pfxlen, sizeof (uint8_t)) != 0) {
 			/* errno set */
-			return (-1);
+			goto err;
 		}
-		if (IN6_IS_ADDR_UNSPECIFIED(&sroute1)) {
+		if (IN6_IS_ADDR_UNSPECIFIED(&sroute1) != B_TRUE) {
 			cfgp->ilc_ipv6_nroutes++;
-			(void) memcpy(cfgp->ilc_ipv6_routes[j++], &sroute1,
-			    sizeof (sroute1));
+			(void) memcpy(cfgp->ilc_ipv6_routes[j].iiv6_addr,
+			    &sroute1, sizeof (sroute1));
+			cfgp->ilc_ipv6_routes[j++].iiv6_pfxlen =
+			    sroute1_pfxlen;
 		}
 		if (IN6_IS_ADDR_UNSPECIFIED(&sroute2) != B_TRUE) {
 			cfgp->ilc_ipv6_nroutes++;
-			(void) memcpy(cfgp->ilc_ipv6_routes[j++], &sroute2,
-			    sizeof (sroute2));
+			(void) memcpy(cfgp->ilc_ipv6_routes[j].iiv6_addr,
+			    &sroute2, sizeof (sroute2));
+			cfgp->ilc_ipv6_routes[j++].iiv6_pfxlen =
+			    sroute2_pfxlen;
 		}
 	}
 
-	/*
-	 * RFC4861 states that if dynamic routing is used, a host should retain
-	 * a minimum of two routes, though more is recommended.  Retrieve the
-	 * number of dynamic routes and then iterate through them and gather
-	 * up to the first two addresses.
-	 */
-	if (dyn_routes_enabled == B_TRUE &&
-	    ipmi_lan_get_param(ihp, channel, IPMI_LAN_PARAM_IPV6_NUM_DYN_ROUTES,
-	    0, 0, &ndynroutes, sizeof (ndynroutes)) != 0) {
-		/* errno set */
-		return (-1);
-	}
 	for (i = 0; i < ndynroutes && i < 2; i++) {
+		struct in6_addr droute = { 0 };
+		uint8_t droute_pfxlen;
+
 		if (ipmi_lan_get_param(ihp, channel,
 		    IPMI_LAN_PARAM_IPV6_DYN_ROUTE, i, 0, &droute,
-		    sizeof (droute)) != 0)
+		    sizeof (droute)) != 0 ||
+		    ipmi_lan_get_param(ihp, channel,
+		    IPMI_LAN_PARAM_IPV6_DYN_ROUTE_PFXLEN, i, 0, &droute_pfxlen,
+		    sizeof (uint8_t)) != 0)
 			/* errno set */
-			return (-1);
+			goto err;
 
 		if (IN6_IS_ADDR_UNSPECIFIED(&droute) != B_TRUE) {
-			(void) memcpy(cfgp->ilc_ipv6_routes[j++], &droute,
-			    sizeof (droute));
+			(void) memcpy(cfgp->ilc_ipv6_routes[j].iiv6_addr,
+			    &droute, sizeof (droute));
+			cfgp->ilc_ipv6_routes[j++].iiv6_pfxlen = droute_pfxlen;
 			cfgp->ilc_ipv6_nroutes++;
 		}
 	}
 	return (0);
+err:
+	ipmi_lan_free_config(cfgp);
+	return (-1);
 }
 
 static int
@@ -423,8 +482,6 @@ ipmi_lan_set_config(ipmi_handle_t *ihp, int channel, ipmi_lan_config_t *cfgp,
     int mask)
 {
 	uint8_t set;
-	int i;
-	ipmi_lan_entry_t *lep;
 
 	/*
 	 * Cancel any pending transaction, then open a new transaction.
@@ -441,8 +498,9 @@ ipmi_lan_set_config(ipmi_handle_t *ihp, int channel, ipmi_lan_config_t *cfgp,
 	/*
 	 * Iterate over all parameters and set them.
 	 */
-	for (i = 0; i < IPMI_LAN_IPV4_NENTRIES; i++) {
-		lep = &ipmi_lan_ipv4_table[i];
+	for (int i = 0; i < IPMI_LAN_IPV4_NENTRIES; i++) {
+		ipmi_lan_entry_t *lep = &ipmi_lan_ipv4_table[i];
+
 		if (!(lep->ile_mask & mask))
 			continue;
 
diff --git a/usr/src/lib/libipmi/common/libipmi.h b/usr/src/lib/libipmi/common/libipmi.h
index c3605616ed..7c72ea1904 100644
--- a/usr/src/lib/libipmi/common/libipmi.h
+++ b/usr/src/lib/libipmi/common/libipmi.h
@@ -49,6 +49,10 @@ typedef struct ipmi_handle ipmi_handle_t;
 
 #pragma pack(1)
 
+#ifndef	MAX
+#define	MAX(x, y) ((x) > (y) ? (x) : (y))
+#endif
+
 /*
  * Basic netfn definitions.  See section 5.1.
  */
@@ -297,24 +301,29 @@ extern ipmi_channel_info_t *ipmi_get_channel_info(ipmi_handle_t *, int);
  * This can be expanded in the future as needed.
  */
 
-/* We'll return up to a maximum of two static routee + two dynamic routes */
-#define	IPMI_LAN_IPV6_MAX_ROUTES	4
+typedef struct ipmi_ipv6_addr {
+	uint8_t iiv6_addr[16];
+	uint8_t iiv6_pfxlen;
+} ipmi_ipv6_addr_t;
 
 typedef struct ipmi_lan_config {
-	boolean_t	ilc_set_in_progress;
-	uint32_t	ilc_ipaddr;
-	uint8_t		ilc_ipaddr_source;
-	uint8_t		ilc_macaddr[6];
-	uint32_t	ilc_subnet;
-	uint32_t	ilc_gateway_addr;
-	uint8_t		ilc_ipv6_source;
-	uint8_t		ilc_ipv6_addr[16];
-	uint8_t		ilc_ipv6_routes[IPMI_LAN_IPV6_MAX_ROUTES][16];
-	uint8_t		ilc_ipv6_nroutes;
-	uint16_t	ilc_vlan_id;
-	boolean_t	ilc_ipv4_enabled;
-	boolean_t	ilc_ipv6_enabled;
-	boolean_t	ilc_vlan_enabled;
+	boolean_t		ilc_set_in_progress;
+	uint32_t		ilc_ipaddr;
+	uint8_t			ilc_ipaddr_source;
+	uint8_t			ilc_macaddr[6];
+	uint32_t		ilc_subnet;
+	uint32_t		ilc_gateway_addr;
+	uint8_t			ilc_ipv6_source;
+	/* configured and active addresses */
+	ipmi_ipv6_addr_t	*ilc_ipv6_addrs;
+	uint8_t			ilc_ipv6_naddrs;
+	/* route targets */
+	ipmi_ipv6_addr_t	*ilc_ipv6_routes;
+	uint8_t			ilc_ipv6_nroutes;
+	uint16_t		ilc_vlan_id;
+	boolean_t		ilc_ipv4_enabled;
+	boolean_t		ilc_ipv6_enabled;
+	boolean_t		ilc_vlan_enabled;
 } ipmi_lan_config_t;
 
 /* values for ilc_ipaddr_source */
@@ -336,6 +345,7 @@ typedef struct ipmi_lan_config {
 extern int ipmi_lan_get_config(ipmi_handle_t *, int,
     ipmi_lan_config_t *);
 extern int ipmi_lan_set_config(ipmi_handle_t *, int, ipmi_lan_config_t *, int);
+extern void ipmi_lan_free_config(ipmi_lan_config_t *);
 
 /*
  * SEL (System Event Log) commands.  Currently the library only provides
diff --git a/usr/src/lib/libipmi/common/mapfile-vers b/usr/src/lib/libipmi/common/mapfile-vers
index 155fcbc471..0ae2b4d082 100644
--- a/usr/src/lib/libipmi/common/mapfile-vers
+++ b/usr/src/lib/libipmi/common/mapfile-vers
@@ -68,6 +68,7 @@ SYMBOL_VERSION SUNWprivate_1.1 {
 	ipmi_get_sensor_reading;
 	ipmi_get_sensor_thresholds;
 	ipmi_is_sun_ilom;
+	ipmi_lan_free_config;
 	ipmi_lan_get_config;
 	ipmi_lan_set_config;
 	ipmi_open;