1 files changed, 32 insertions, 27 deletions

diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c
index aad4e7571d..84111e4b7d 100644
--- a/ospf6d/ospf6_asbr.c
+++ b/ospf6d/ospf6_asbr.c
@@ -121,7 +121,7 @@ void ospf6_as_external_lsa_originate(struct ospf6_route *route,
 	as_external_lsa->prefix.prefix_length = route->prefix.prefixlen;
 
 	/* PrefixOptions */
-	as_external_lsa->prefix.prefix_options = route->path.prefix_options;
+	as_external_lsa->prefix.prefix_options = route->prefix_options;
 
 	/* don't use refer LS-type */
 	as_external_lsa->prefix.prefix_refer_lstype = htons(0);
@@ -589,12 +589,12 @@ void ospf6_asbr_lsa_add(struct ospf6_lsa *lsa)
 	route->prefix.prefixlen = external->prefix.prefix_length;
 	ospf6_prefix_in6_addr(&route->prefix.u.prefix6, external,
 			      &external->prefix);
+	route->prefix_options = external->prefix.prefix_options;
 
 	route->path.area_id = asbr_entry->path.area_id;
 	route->path.origin.type = lsa->header->type;
 	route->path.origin.id = lsa->header->id;
 	route->path.origin.adv_router = lsa->header->adv_router;
-	route->path.prefix_options = external->prefix.prefix_options;
 	memcpy(&route->path.ls_prefix, &asbr_id, sizeof(struct prefix));
 
 	if (CHECK_FLAG(external->bits_metric, OSPF6_ASBR_BIT_E)) {
@@ -2568,36 +2568,41 @@ int config_write_ospf6_debug_asbr(struct vty *vty)
 	return 0;
 }
 
-int ospf6_distribute_config_write(struct vty *vty, struct ospf6 *ospf6)
+static void ospf6_default_originate_write(struct vty *vty, struct ospf6 *o)
 {
 	struct ospf6_redist *red;
 
-	if (ospf6) {
-		/* default-route print. */
-		if (ospf6->default_originate != DEFAULT_ORIGINATE_NONE) {
-			vty_out(vty, " default-information originate");
-			if (ospf6->default_originate
-			    == DEFAULT_ORIGINATE_ALWAYS)
-				vty_out(vty, " always");
-
-			red = ospf6_redist_lookup(ospf6, DEFAULT_ROUTE, 0);
-			if (red) {
-				if (red->dmetric.value >= 0)
-					vty_out(vty, " metric %d",
-						red->dmetric.value);
-
-				if (red->dmetric.type >= 0)
-					vty_out(vty, " metric-type %d",
-						red->dmetric.type);
-
-				if (ROUTEMAP_NAME(red))
-					vty_out(vty, " route-map %s",
-						ROUTEMAP_NAME(red));
-			}
+	vty_out(vty, " default-information originate");
+	if (o->default_originate == DEFAULT_ORIGINATE_ALWAYS)
+		vty_out(vty, " always");
 
-			vty_out(vty, "\n");
-		}
+	red = ospf6_redist_lookup(o, DEFAULT_ROUTE, 0);
+	if (red == NULL) {
+		vty_out(vty, "\n");
+		return;
 	}
+
+	if (red->dmetric.value >= 0)
+		vty_out(vty, " metric %d", red->dmetric.value);
+
+	if (red->dmetric.type >= 0)
+		vty_out(vty, " metric-type %d", red->dmetric.type);
+
+	if (ROUTEMAP_NAME(red))
+		vty_out(vty, " route-map %s", ROUTEMAP_NAME(red));
+
+	vty_out(vty, "\n");
+}
+
+int ospf6_distribute_config_write(struct vty *vty, struct ospf6 *o)
+{
+	if (o == NULL)
+		return 0;
+
+	/* Print default originate configuration. */
+	if (o->default_originate != DEFAULT_ORIGINATE_NONE)
+		ospf6_default_originate_write(vty, o);
+
 	return 0;
 }