From: Willy Tarreau <w@1wt.eu>
Date: Fri, 29 Jan 2021 11:27:57 +0000 (+0100)
Subject: MINOR: session: export session_expire_embryonic()
X-Git-Tag: v2.4-dev7~57
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=02922e19ca4af9b219ede00766af8b9c0d0d096b;p=thirdparty%2Fhaproxy.git

MINOR: session: export session_expire_embryonic()

This is only to make it resolve nicely in "show tasks".
---

diff --git a/include/haproxy/session.h b/include/haproxy/session.h
index 3b96f35a91..f62ea50e72 100644
--- a/include/haproxy/session.h
+++ b/include/haproxy/session.h
@@ -37,6 +37,7 @@ struct session *session_new(struct proxy *fe, struct listener *li, enum obj_type
 void session_free(struct session *sess);
 int session_accept_fd(struct connection *cli_conn);
 int conn_complete_session(struct connection *conn);
+struct task *session_expire_embryonic(struct task *t, void *context, unsigned short state);
 
 /* Remove the refcount from the session to the tracked counters, and clear the
  * pointer to ensure this is only performed once. The caller is responsible for
diff --git a/src/session.c b/src/session.c
index 07828df967..055b578c43 100644
--- a/src/session.c
+++ b/src/session.c
@@ -28,7 +28,6 @@ DECLARE_POOL(pool_head_sess_srv_list, "session server list",
 		sizeof(struct sess_srv_list));
 
 int conn_complete_session(struct connection *conn);
-static struct task *session_expire_embryonic(struct task *t, void *context, unsigned short state);
 
 /* Create a a new session and assign it to frontend <fe>, listener <li>,
  * origin <origin>, set the current date and clear the stick counters pointers.
@@ -376,9 +375,10 @@ static void session_kill_embryonic(struct session *sess, unsigned short state)
 }
 
 /* Manages the embryonic session timeout. It is only called when the timeout
- * strikes and performs the required cleanup.
+ * strikes and performs the required cleanup. It's only exported to make it
+ * resolve in "show tasks".
  */
-static struct task *session_expire_embryonic(struct task *t, void *context, unsigned short state)
+struct task *session_expire_embryonic(struct task *t, void *context, unsigned short state)
 {
 	struct session *sess = context;
 
diff --git a/src/tools.c b/src/tools.c
index 8891d472de..4ad6b95e09 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -4699,6 +4699,7 @@ const void *resolve_sym_name(struct buffer *buf, const char *pfx, const void *ad
 		{ .func = listener_accept, .name = "listener_accept" },
 		{ .func = poller_pipe_io_handler, .name = "poller_pipe_io_handler" },
 		{ .func = mworker_accept_wrapper, .name = "mworker_accept_wrapper" },
+		{ .func = session_expire_embryonic, .name = "session_expire_embryonic" },
 #ifdef USE_THREAD
 		{ .func = accept_queue_process, .name = "accept_queue_process" },
 #endif