[sr-dev] git:5.3:29ab33d4: Revert "websocket: emit core event on close"

Daniel-Constantin Mierla miconda at gmail.com
Sat Oct 3 08:03:49 CEST 2020


Module: kamailio
Branch: 5.3
Commit: 29ab33d439378b9944dd63c1112afd7731ccc4de
URL: https://github.com/kamailio/kamailio/commit/29ab33d439378b9944dd63c1112afd7731ccc4de

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2020-10-03T08:02:56+02:00

Revert "websocket: emit core event on close"

This reverts commit 288d760f8f11e4028ccd56f4941a19e649509d65.

---

Modified: src/modules/websocket/ws_conn.c

---

Diff:  https://github.com/kamailio/kamailio/commit/29ab33d439378b9944dd63c1112afd7731ccc4de.diff
Patch: https://github.com/kamailio/kamailio/commit/29ab33d439378b9944dd63c1112afd7731ccc4de.patch

---

diff --git a/src/modules/websocket/ws_conn.c b/src/modules/websocket/ws_conn.c
index 7ffedd9be5..8570afa086 100644
--- a/src/modules/websocket/ws_conn.c
+++ b/src/modules/websocket/ws_conn.c
@@ -31,7 +31,6 @@
 #include "../../core/counters.h"
 #include "../../core/kemi.h"
 #include "../../core/mem/mem.h"
-#include "../../core/events.h"
 #include "ws_conn.h"
 #include "websocket.h"
 
@@ -262,14 +261,6 @@ int wsconn_add(struct receive_info *rcv, unsigned int sub_protocol)
 	return 0;
 }
 
-static void wsconn_run_close_callback(ws_connection_t *wsc)
-{
-	sr_event_param_t evp = {0};
-	wsc->rcv.proto_reserved1 = wsc->id;
-	evp.rcv = &wsc->rcv;
-	sr_event_exec(SREV_TCP_WS_CLOSE, &evp);
-}
-
 static void wsconn_run_route(ws_connection_t *wsc)
 {
 	int rt, backup_rt;
@@ -330,8 +321,6 @@ static void wsconn_dtor(ws_connection_t *wsc)
 	if(wsc->run_event)
 		wsconn_run_route(wsc);
 
-	wsconn_run_close_callback(wsc);
-
 	shm_free(wsc);
 
 	LM_DBG("wsconn_dtor for [%p] destroyed\n", wsc);




More information about the sr-dev mailing list