@@ -2809,19 +2809,6 @@ do_init_fragment (struct context *c)

 #endif

 /*

- * Set the --mssfix option.

- */

-static void

-do_init_mssfix (struct context *c)

-{

-  if (c->options.ce.mssfix)

-    {

-      frame_set_mtu_dynamic (&c->c2.frame,

-			     c->options.ce.mssfix, SET_MTU_UPPER_BOUND);

-    }

-}

-

-/*

  * Allocate our socket object.

  */

 static void

@@ -3663,7 +3650,7 @@ init_instance (struct context *c, const struct env_set *env, const unsigned int

 #endif

   /* initialize dynamic MTU variable */

-  do_init_mssfix (c);

+  frame_init_mssfix (&c->c2.frame, &c->options);

   /* bind the TCP/UDP socket */

   if (c->mode == CM_P2P || c->mode == CM_TOP || c->mode == CM_CHILD_TCP)

@@ -35,6 +35,7 @@

 #include "error.h"

 #include "integer.h"

 #include "mtu.h"

+#include "options.h"

 #include "memdbg.h"

@@ -125,6 +126,15 @@ frame_subtract_extra (struct frame *frame, const struct frame *src)

 }

 void

+frame_init_mssfix (struct frame *frame, const struct options *options)

+{

+  if (options->ce.mssfix)

+    {

+      frame_set_mtu_dynamic (frame, options->ce.mssfix, SET_MTU_UPPER_BOUND);

+    }

+}

+

+void

 frame_print (const struct frame *frame,

 	     int level,

 	     const char *prefix)

@@ -135,6 +135,9 @@ struct frame {

   int align_adjust;

 };

+/* Forward declarations, to prevent includes */

+struct options;

+

 /* Routines which read struct frame should use the macros below */

 /*

@@ -227,6 +230,9 @@ void alloc_buf_sock_tun (struct buffer *buf,

 			 const bool tuntap_buffer,

 			 const unsigned int align_mask);

+/** Set the --mssfix option. */

+void frame_init_mssfix (struct frame *frame, const struct options *options);

+

 /*

  * EXTENDED_SOCKET_ERROR_CAPABILITY functions -- print extra error info

  * on socket errors, such as PMTU size.  As of 2003.05.11, only works

@@ -1691,6 +1691,7 @@ tls_session_update_crypto_params(struct tls_session *session,

       options->use_iv, options->replay, packet_id_long_form);

   frame_finalize(frame, options->ce.link_mtu_defined, options->ce.link_mtu,

       options->ce.tun_mtu_defined, options->ce.tun_mtu);

+  frame_init_mssfix(frame, options);

   frame_print (frame, D_MTU_INFO, "Data Channel MTU parms");

   const struct session_id *client_sid = session->opt->server ?