@@ -193,12 +193,22 @@ typedef struct tcp_conn_alias {

 #endif

+enum tcp_closed_reason {

+	TCP_CLOSED_EOF = 0,

+	TCP_CLOSED_TIMEOUT,

+	TCP_CLOSED_RESET,

+

+	_TCP_CLOSED_REASON_MAX /* /!\ keep this one always at the end */

+};

+

+

 typedef struct tcp_connection {

 	int s; /*socket, used by "tcp main" */

 	int fd; /* used only by "children", don't modify it! private data! */

 	gen_lock_t write_lock;

 	int id; /* id (unique!) used to retrieve a specific connection when

 			 * reply-ing */

+	enum tcp_closed_reason event; /* connection close reason */

 	int reader_pid; /* pid of the active reader process */

 	struct receive_info rcv; /* src & dst ip, ports, proto a.s.o*/

 	ksr_coninfo_t cinfo; /* connection info (e.g., for haproxy ) */

@@ -343,14 +353,6 @@ typedef struct tcp_event_info {

 	struct tcp_connection *con;

 } tcp_event_info_t;

-enum tcp_closed_reason {

-	TCP_CLOSED_EOF = 0,

-	TCP_CLOSED_TIMEOUT,

-	TCP_CLOSED_RESET,

-

-	_TCP_CLOSED_REASON_MAX /* /!\ keep this one always at the end */

-};

-

 typedef struct tcp_closed_event_info {

 	enum tcp_closed_reason reason;

 	struct tcp_connection *con;

@@ -79,6 +79,7 @@

 #include "tcp_stats.h"

 #include "tcp_ev.h"

 #include "tsend.h"

+#include "events.h"

 #include "timer_ticks.h"

 #include "local_timer.h"

 #ifdef CORE_TLS

@@ -3548,6 +3549,33 @@ again:

 }

+static int tcp_emit_closed_event(struct tcp_connection *con)

+{

+	int ret;

+	tcp_closed_event_info_t tev;

+	sr_event_param_t evp = {0};

+	enum tcp_closed_reason reason;

+

+	if (con->event) {

+		reason = con->event;

+	} else {

+		reason = TCP_CLOSED_EOF;

+	}

+

+	ret = 0;

+	LM_DBG("TCP closed event creation triggered (reason: %d)\n", reason);

+	if(likely(sr_event_enabled(SREV_TCP_CLOSED))) {

+		memset(&tev, 0, sizeof(tcp_closed_event_info_t));

+		tev.reason = reason;

+		tev.con = con;

+		evp.data = (void*)(&tev);

+		ret = sr_event_exec(SREV_TCP_CLOSED, &evp);

+	} else {

+		LM_DBG("no callback registering for handling TCP closed event\n");

+	}

+	return ret;

+}

+

 /* handles io from a tcp child process

  * params: tcp_c - pointer in the tcp_children array, to the entry for

@@ -3628,6 +3656,7 @@ inline static int handle_tcp_child(struct tcp_child* tcp_c, int fd_i)

 				/* if refcnt was 1 => it was used only in the

 				   tcp reader => it's not hashed or watched for IO

 				   anymore => no need to io_watch_del() */

+				tcp_emit_closed_event(tcpconn);

 				tcpconn_destroy(tcpconn);

 				break;

 			}

@@ -3639,6 +3668,7 @@ inline static int handle_tcp_child(struct tcp_child* tcp_c, int fd_i)

 						tcpconn->flags &= ~F_CONN_WRITE_W;

 					}

 #endif /* TCP_ASYNC */

+					tcp_emit_closed_event(tcpconn);

 					tcpconn_put_destroy(tcpconn);

 				}

 #ifdef TCP_ASYNC

@@ -3690,6 +3720,8 @@ inline static int handle_tcp_child(struct tcp_child* tcp_c, int fd_i)

 							io_watch_del(&io_h, tcpconn->s, -1, IO_FD_CLOSING);

 							tcpconn->flags&=~F_CONN_WRITE_W;

 						}

+						tcpconn->event = TCP_CLOSED_TIMEOUT;

+						tcp_emit_closed_event(tcpconn);

 						tcpconn_put_destroy(tcpconn);

 					} else if (unlikely(tcpconn->flags & F_CONN_WRITE_W)){

 						BUG("unhashed connection watched for write\n");

@@ -3726,6 +3758,7 @@ inline static int handle_tcp_child(struct tcp_child* tcp_c, int fd_i)

 						tcpconn->flags&=~F_CONN_WRITE_W;

 					}

 #endif /* TCP_ASYNC */

+					tcp_emit_closed_event(tcpconn);

 					tcpconn_put_destroy(tcpconn);

 				}

 #ifdef TCP_ASYNC

@@ -3757,6 +3790,7 @@ inline static int handle_tcp_child(struct tcp_child* tcp_c, int fd_i)

 #endif /* TCP_ASYNC */

 				if (tcpconn_try_unhash(tcpconn))

 					tcpconn_put(tcpconn);

+				tcp_emit_closed_event(tcpconn);

 				tcpconn_put_destroy(tcpconn); /* deref & delete if refcnt==0 */

 				break;

 		default:

@@ -174,26 +174,6 @@ int tcp_http11_continue(struct tcp_connection *c)

 }

 #endif /* HTTP11 */

-static int tcp_emit_closed_event(struct tcp_connection *con, enum tcp_closed_reason reason)

-{

-	int ret;

-	tcp_closed_event_info_t tev;

-	sr_event_param_t evp = {0};

-

-	ret = 0;

-	LM_DBG("TCP closed event creation triggered (reason: %d)\n", reason);

-	if(likely(sr_event_enabled(SREV_TCP_CLOSED))) {

-		memset(&tev, 0, sizeof(tcp_closed_event_info_t));

-		tev.reason = reason;

-		tev.con = con;

-		evp.data = (void*)(&tev);

-		ret = sr_event_exec(SREV_TCP_CLOSED, &evp);

-	} else {

-		LM_DBG("no callback registering for handling TCP closed event\n");

-	}

-	return ret;

-}

-

 /** reads data from an existing tcp connection.

  * Side-effects: blocklisting, sets connection state to S_CONN_OK, tcp stats.

@@ -289,9 +269,9 @@ again:

 				LOG(cfg_get(core, core_cfg, corelog),"-> [%s]:%u)\n",

 						ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port);

 				if (errno == ETIMEDOUT) {

-					tcp_emit_closed_event(c, TCP_CLOSED_TIMEOUT);

+					c->event = TCP_CLOSED_TIMEOUT;

 				} else if (errno == ECONNRESET) {

-					tcp_emit_closed_event(c, TCP_CLOSED_RESET);

+					c->event = TCP_CLOSED_RESET;

 				}

 				return -1;

 			}

@@ -304,7 +284,7 @@ again:

 					ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port);

 			c->state=S_CONN_EOF;

 			*flags|=RD_CONN_EOF;

-			tcp_emit_closed_event(c, TCP_CLOSED_EOF);

+			c->event=TCP_CLOSED_EOF;

 		}else{

 			if (unlikely(c->state==S_CONN_CONNECT || c->state==S_CONN_ACCEPT)){

 				TCP_STATS_ESTABLISHED(c->state);

@@ -1696,6 +1676,7 @@ static ticks_t tcpconn_read_timeout(ticks_t t, struct timer_ln* tl, void* data)

 	}

 	if(tcp_conn_lst!=NULL) {

 		tcpconn_listrm(tcp_conn_lst, c, c_next, c_prev);

+		c->event = TCP_CLOSED_TIMEOUT;

 		release_tcpconn(c, (c->state<0)?CONN_ERROR:CONN_RELEASE, tcpmain_sock);

 	}

 	return 0;