@@ -2778,6 +2778,11 @@ pre_pull_save (struct options *o)

 	  o->pre_pull->routes = clone_route_option_list(o->routes, &o->gc);

 	  o->pre_pull->routes_defined = true;

 	}

+      if (o->routes_ipv6)

+	{

+	  o->pre_pull->routes_ipv6 = clone_route_ipv6_option_list(o->routes_ipv6, &o->gc);

+	  o->pre_pull->routes_ipv6_defined = true;

+	}

 #ifdef ENABLE_CLIENT_NAT

       if (o->client_nat)

 	{

@@ -2806,6 +2811,14 @@ pre_pull_restore (struct options *o)

       else

 	o->routes = NULL;

+      if (pp->routes_ipv6_defined)

+	{

+	  rol6_check_alloc (o);

+	  copy_route_ipv6_option_list (o->routes_ipv6, pp->routes_ipv6);

+	}

+      else

+	o->routes_ipv6 = NULL;

+

 #ifdef ENABLE_CLIENT_NAT

       if (pp->client_nat_defined)

 	{

@@ -68,6 +68,9 @@ struct options_pre_pull

   bool routes_defined;

   struct route_option_list *routes;

+  bool routes_ipv6_defined;

+  struct route_ipv6_option_list *routes_ipv6;

+

 #ifdef ENABLE_CLIENT_NAT

   bool client_nat_defined;

   struct client_nat_option_list *client_nat;

@@ -108,6 +108,15 @@ clone_route_option_list (const struct route_option_list *src, struct gc_arena *a

   return ret;

 }

+struct route_ipv6_option_list *

+clone_route_ipv6_option_list (const struct route_ipv6_option_list *src, struct gc_arena *a)

+{

+  const size_t rl_size = array_mult_safe (sizeof(struct route_ipv6_option), src->capacity, sizeof(struct route_ipv6_option_list));

+  struct route_ipv6_option_list *ret = gc_malloc (rl_size, false, a);

+  memcpy (ret, src, rl_size);

+  return ret;

+}

+

 void

 copy_route_option_list (struct route_option_list *dest, const struct route_option_list *src)

 {

@@ -117,6 +126,16 @@ copy_route_option_list (struct route_option_list *dest, const struct route_optio

   memcpy (dest, src, src_size);

 }

+void

+copy_route_ipv6_option_list (struct route_ipv6_option_list *dest,

+			     const struct route_ipv6_option_list *src)

+{

+  const size_t src_size = array_mult_safe (sizeof(struct route_ipv6_option), src->capacity, sizeof(struct route_ipv6_option_list));

+  if (src->n > dest->capacity)

+    msg (M_FATAL, PACKAGE_NAME " ROUTE: (copy) number of route options in src (%d) is greater than route list capacity in dest (%d)", src->n, dest->capacity);

+  memcpy (dest, src, src_size);

+}

+

 struct route_list *

 new_route_list (const int max_routes, struct gc_arena *a)

 {

@@ -211,7 +211,10 @@ struct route_option_list *new_route_option_list (const int max_routes, struct gc

 struct route_ipv6_option_list *new_route_ipv6_option_list (const int max_routes, struct gc_arena *a);

 struct route_option_list *clone_route_option_list (const struct route_option_list *src, struct gc_arena *a);

+struct route_ipv6_option_list *clone_route_ipv6_option_list (const struct route_ipv6_option_list *src, struct gc_arena *a);

 void copy_route_option_list (struct route_option_list *dest, const struct route_option_list *src);

+void copy_route_ipv6_option_list (struct route_ipv6_option_list *dest,

+				  const struct route_ipv6_option_list *src);

 struct route_list *new_route_list (const int max_routes, struct gc_arena *a);

 struct route_ipv6_list *new_route_ipv6_list (const int max_routes, struct gc_arena *a);