@@ -160,6 +160,7 @@ comp_generate_peer_info_string(const struct compress_options *opt, struct buffer

 	buf_printf (out, "IV_LZO_STUB=1\n");

       buf_printf (out, "IV_COMP_STUB=1\n");

       buf_printf (out, "IV_COMP_STUBv2=1\n");

+      buf_printf (out, "IV_TCPNL=1\n");

     }

 }

@@ -2140,7 +2140,6 @@ do_init_crypto_static (struct context *c, const unsigned int flags)

   if (options->replay)

     {

       packet_id_init (&c->c2.crypto_options.packet_id,

-		      link_socket_proto_connection_oriented (options->ce.proto),

 		      options->replay_window,

 		      options->replay_time,

 		      "STATIC", 0);

@@ -2211,11 +2211,6 @@ options_postprocess_verify_ce (const struct options *options, const struct conne

   /*

    * Check consistency of replay options

    */

-  if ((!proto_is_udp(ce->proto))

-      && (options->replay_window != defaults.replay_window

-	  || options->replay_time != defaults.replay_time))

-    msg (M_USAGE, "--replay-window only makes sense with --proto udp");

-

   if (!options->replay

       && (options->replay_window != defaults.replay_window

 	  || options->replay_time != defaults.replay_time))

@@ -76,10 +76,9 @@ packet_id_debug (int msglevel,

 }

 void

-packet_id_init (struct packet_id *p, bool tcp_mode, int seq_backtrack, int time_backtrack, const char *name, int unit)

+packet_id_init (struct packet_id *p, int seq_backtrack, int time_backtrack, const char *name, int unit)

 {

-  dmsg (D_PID_DEBUG, "PID packet_id_init tcp_mode=%d seq_backtrack=%d time_backtrack=%d",

-	tcp_mode,

+  dmsg (D_PID_DEBUG, "PID packet_id_init seq_backtrack=%d time_backtrack=%d",

 	seq_backtrack,

 	time_backtrack);

@@ -88,7 +87,7 @@ packet_id_init (struct packet_id *p, bool tcp_mode, int seq_backtrack, int time_

   p->rec.name = name;

   p->rec.unit = unit;

-  if (seq_backtrack && !tcp_mode)

+  if (seq_backtrack)

     {

       ASSERT (MIN_SEQ_BACKTRACK <= seq_backtrack && seq_backtrack <= MAX_SEQ_BACKTRACK);

       ASSERT (MIN_TIME_BACKTRACK <= time_backtrack && time_backtrack <= MAX_TIME_BACKTRACK);

@@ -210,7 +210,7 @@ struct packet_id

   struct packet_id_rec rec;

 };

-void packet_id_init (struct packet_id *p, bool tcp_mode, int seq_backtrack, int time_backtrack, const char *name, int unit);

+void packet_id_init (struct packet_id *p, int seq_backtrack, int time_backtrack, const char *name, int unit);

 void packet_id_free (struct packet_id *p);

 /* should we accept an incoming packet id ? */

@@ -799,7 +799,7 @@ key_state_init (struct tls_session *session, struct key_state *ks)

   /* init packet ID tracker */

   if (session->opt->replay)

     {

-      packet_id_init (&ks->crypto_options.packet_id, session->opt->tcp_mode,

+      packet_id_init (&ks->crypto_options.packet_id,

 	  session->opt->replay_window, session->opt->replay_time, "SSL",

 	  ks->key_id);

     }

@@ -948,7 +948,6 @@ tls_session_init (struct tls_multi *multi, struct tls_session *session)

   /* initialize packet ID replay window for --tls-auth */

   packet_id_init (&session->tls_auth.packet_id,

-		  session->opt->tcp_mode,

 		  session->opt->replay_window,

 		  session->opt->replay_time,

 		  "TLS_AUTH", session->key_id);