foo: bar

lib/logproto/logproto-auto-server.c

@@ -25,6 +25,8 @@
 #include "logproto-framed-server.h"
 #include "messages.h"
 
+#include "transport/transport-haproxy.h"
+
 enum
 {
   LPAS_FAILURE,
@@ -213,6 +215,11 @@ log_proto_auto_handshake(LogProtoServer *s, gboolean *handshake_finished, LogPro
           break;
         case LPAS_SUCCESS:
           self->haproxy_detected = TRUE;
+
+          /* FIXME: make this a factory */
+          log_transport_stack_add_transport(&self->super.transport_stack, LOG_TRANSPORT_HAPROXY,
+                                            log_transport_haproxy_new(self->super.transport_stack.active_transport, self->super.transport_stack.active_transport));
+
           /* this is a haproxy header */
           if (log_transport_stack_switch(&self->super.transport_stack, LOG_TRANSPORT_HAPROXY))
             {

lib/transport/transport-factory-tls.c

@@ -39,7 +39,7 @@ _construct_transport(const LogTransportFactory *s, LogTransportStack *stack)
 
   tls_session_set_verifier(tls_session, self->tls_verifier);
 
-  return log_transport_tls_new(tls_session, log_transport_stack_get_active(stack));
+  return log_transport_tls_new(tls_session, log_transport_stack_get_transport(stack, LOG_TRANSPORT_SOCKET));
 }
 
 void

modules/afsocket/transport-mapper-inet.c

@@ -134,20 +134,14 @@ transport_mapper_inet_setup_stack(TransportMapper *s, LogTransportStack *stack)
     {
       LogTransportIndex switch_to;
 
-      if (self->tls_context && !_is_tls_required(self))
+      if (self->tls_context)
         switch_to = LOG_TRANSPORT_TLS;
       else
         switch_to = LOG_TRANSPORT_SOCKET;
       if (!_setup_haproxy_transport(self, stack, initial_transport_index, switch_to))
         return FALSE;
       initial_transport_index = LOG_TRANSPORT_HAPROXY;
     }
-  else
-    {
-      /* is this auto? */
-      if (!_setup_haproxy_transport(self, stack, initial_transport_index, LOG_TRANSPORT_NONE))
-        return FALSE;
-    }
 
   if (!log_transport_stack_switch(stack, initial_transport_index))
     g_assert_not_reached();