]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: session: make use of session_new() when creating a new session
authorWilly Tarreau <w@1wt.eu>
Sat, 4 Apr 2015 22:39:16 +0000 (00:39 +0200)
committerWilly Tarreau <w@1wt.eu>
Mon, 6 Apr 2015 09:37:33 +0000 (11:37 +0200)
It's better than open-coding it.

src/session.c

index 5580d4f3dd4b43681e17d282a28cbf7b33a4631b..7f4e45e7098b524f17e09f21bc534a24ce8a1fb5 100644 (file)
@@ -117,7 +117,7 @@ int session_accept_fd(struct listener *l, int cfd, struct sockaddr_storage *addr
        if (conn_xprt_init(cli_conn) < 0)
                goto out_free_conn;
 
-       sess = pool_alloc2(pool2_session);
+       sess = session_new(p, l, &cli_conn->obj_type);
        if (!sess)
                goto out_free_conn;
 
@@ -128,13 +128,6 @@ int session_accept_fd(struct listener *l, int cfd, struct sockaddr_storage *addr
 
        proxy_inc_fe_conn_ctr(l, p);
 
-       sess->listener = l;
-       sess->fe  = p;
-       sess->origin = &cli_conn->obj_type;
-       sess->accept_date = date; /* user-visible date for logging */
-       sess->tv_accept   = now;  /* corrected date for internal use */
-       memset(sess->stkctr, 0, sizeof(sess->stkctr));
-
        /* now evaluate the tcp-request layer4 rules. We only need a session
         * and no stream for these rules.
         */