9 Oct
2020
9 Oct
'20
8:32 p.m.
Module: kamailio
Branch: 5.4
Commit: 83f242845a8b2759d8eec0559154cfd62cf89278
URL: https://github.com/kamailio/kamailio/commit/83f242845a8b2759d8eec0559154cfd…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2020-10-09T22:30:32+02:00
core: tcp - helper function to send data over ws/wss connection
(cherry picked from commit 5e107824d684cdf30514b033e7f600862123ece5)
---
Modified: src/core/tcp_main.c
Modified: src/core/tcp_server.h
---
Diff:
https://github.com/kamailio/kamailio/commit/83f242845a8b2759d8eec0559154cfd…
Patch:
https://github.com/kamailio/kamailio/commit/83f242845a8b2759d8eec0559154cfd…
---
diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c
index f19f75a588..84fec376a3 100644
--- a/src/core/tcp_main.c
+++ b/src/core/tcp_main.c
@@ -95,6 +95,7 @@
#include "tcp_info.h"
#include "tcp_options.h"
#include "ut.h"
+#include "events.h"
#include "cfg/cfg_struct.h"
#include <fcntl.h> /* must be included after io_wait.h if SIGIO_RT is used */
@@ -5135,4 +5136,88 @@ void tcp_get_info(struct tcp_gen_info *ti)
#endif /* TCP_ASYNC */
}
+
+/* finds an ws/wss tcpconn & sends on it
+ * uses the dst members to, proto (ws/wss) and id and tries to send
+ * returns: number of bytes written (>=0) on success
+ * <0 on error */
+int wss_send(dest_info_t* dst, const char* buf, unsigned len)
+{
+ int port;
+ struct ip_addr ip;
+ union sockaddr_union* from = NULL;
+ union sockaddr_union local_addr;
+ struct tcp_connection *con = NULL;
+ struct ws_event_info wsev;
+ sr_event_param_t evp = {0};
+ int ret;
+
+ if (unlikely((dst->proto == PROTO_WS
+#ifdef USE_TLS
+ || dst->proto == PROTO_WSS
#endif
+ ) && sr_event_enabled(SREV_TCP_WS_FRAME_OUT))) {
+ if (unlikely(dst->send_flags.f & SND_F_FORCE_SOCKET
+ && dst->send_sock)) {
+
+ local_addr = dst->send_sock->su;
+#ifdef SO_REUSEPORT
+ if (cfg_get(tcp, tcp_cfg, reuse_port)) {
+ LM_DBG("sending to: %s, force_socket=%d, send_sock=%p\n",
+ su2a(&dst->to,sizeof(struct sockaddr_in)),
+ (dst->send_flags.f & SND_F_FORCE_SOCKET),
+ dst->send_sock);
+
+ su_setport(&local_addr, dst->send_sock->port_no);
+ }
+ else
+ su_setport(&local_addr, 0); /* any local port will do */
+#else
+ su_setport(&local_addr, 0); /* any local port will do */
+#endif
+ from = &local_addr;
+ }
+
+ port = su_getport(&dst->to);
+ if (likely(port)) {
+ su2ip_addr(&ip, &dst->to);
+ if(tcp_connection_match==TCPCONN_MATCH_STRICT) {
+ con = tcpconn_lookup(dst->id, &ip, port, from,
+ (dst->send_sock)?dst->send_sock->port_no:0, 0);
+ } else {
+ con = tcpconn_get(dst->id, &ip, port, from, 0);
+ }
+ }
+ else if (likely(dst->id))
+ con = tcpconn_get(dst->id, 0, 0, 0, 0);
+ else {
+ LM_CRIT("null_id & to\n");
+ goto error;
+ }
+
+ if (con == NULL) {
+ LM_WARN("TCP/TLS connection for WebSocket could not be found\n");
+ goto error;
+ }
+
+ memset(&wsev, 0, sizeof(ws_event_info_t));
+ wsev.type = SREV_TCP_WS_FRAME_OUT;
+ wsev.buf = (char*)buf;
+ wsev.len = len;
+ wsev.id = con->id;
+ evp.data = (void *)&wsev;
+ ret = sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp);
+ tcpconn_put(con);
+ goto done;
+ } else {
+ LM_CRIT("used with invalid proto %d\n", dst->proto);
+ goto error;
+ }
+
+done:
+ return ret;
+error:
+ return -1;
+}
+
+#endif /* USE_TCP */
diff --git a/src/core/tcp_server.h b/src/core/tcp_server.h
index 0566c500dc..dac25bb152 100644
--- a/src/core/tcp_server.h
+++ b/src/core/tcp_server.h
@@ -13,8 +13,8 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
@@ -33,7 +33,7 @@ int tcp_send(struct dest_info* dst, union sockaddr_union* from,
int tcpconn_add_alias(int id, int port, int proto);
-
+int wss_send(dest_info_t* dst, const char* buf, unsigned len);
#endif