]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: stream: Don't retrieve anymore timing info from the mux csinfo
authorChristopher Faulet <cfaulet@haproxy.com>
Wed, 30 Sep 2020 12:03:54 +0000 (14:03 +0200)
committerChristopher Faulet <cfaulet@haproxy.com>
Fri, 4 Dec 2020 13:41:48 +0000 (14:41 +0100)
These info are only provided by the mux-h1. But, thanks to previous patches,
we can get them from the session directly. There is no need to retrieve them
from the mux anymore.

src/stream.c

index 49654bdb313f4f5f5aa346ddb92f631424a0d475..abef21032a0d039df90efa87a6897ca6ec9aada8 100644 (file)
@@ -321,7 +321,6 @@ struct stream *stream_new(struct session *sess, enum obj_type *origin)
        struct task *t;
        struct conn_stream *cs  = objt_cs(origin);
        struct appctx *appctx   = objt_appctx(origin);
-       const struct cs_info *csinfo;
 
        DBG_TRACE_ENTER(STRM_EV_STRM_NEW);
        if (unlikely((s = pool_alloc(pool_head_stream)) == NULL))
@@ -346,17 +345,9 @@ struct stream *stream_new(struct session *sess, enum obj_type *origin)
        s->logs.srv_queue_pos = 0; /* we will get this number soon */
        s->obj_type = OBJ_TYPE_STREAM;
 
-       csinfo = si_get_cs_info(cs);
-       if (csinfo) {
-               s->logs.accept_date = csinfo->create_date;
-               s->logs.tv_accept = csinfo->tv_create;
-               s->logs.t_handshake = csinfo->t_handshake;
-       }
-       else {
-               s->logs.accept_date = sess->accept_date;
-               s->logs.tv_accept = sess->tv_accept;
-               s->logs.t_handshake = sess->t_handshake;
-       }
+       s->logs.accept_date = sess->accept_date;
+       s->logs.tv_accept = sess->tv_accept;
+       s->logs.t_handshake = sess->t_handshake;
        s->logs.t_idle = sess->t_idle;
 
        /* default logging function */