deleted file mode 100644

@@ -1,295 +0,0 @@

-/*

- * Copyright (C) 2001-2003 FhG Fokus

- *

- * This file is part of Kamailio, a free SIP server.

- *

- * Kamailio is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version

- *

- * Kamailio is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * 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 

- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

- */

-/*!

-* \file

-* \brief Kamailio core :: Message forwarding

-* \author andrei

-* \ingroup core

-* Module: \ref core

-*/

-

-#ifndef forward_h

-#define forward_h

-

-#include "globals.h"

-#include "parser/msg_parser.h"

-#include "route.h"

-#include "proxy.h"

-#include "ip_addr.h"

-

-#include "stats.h"

-#include "udp_server.h"

-#ifdef USE_TCP

-#include "tcp_server.h"

-#include "tcp_conn.h"

-#endif

-#ifdef USE_SCTP

-#include "sctp_core.h"

-#endif

-

-#include "compiler_opt.h"

-#include "events.h"

-

-

-enum ss_mismatch {

-	SS_MISMATCH_OK=0,

-	SS_MISMATCH_PROTO, /* proto mismatch, but found same addr:port */

-	SS_MISMATCH_ADDR,  /* proto and addr:port mismatch */

-	SS_MISMATCH_AF,    /* af mismatch */

-	SS_MISMATCH_MCAST  /* mcast forced send socket */

-};

-

-

-struct socket_info* get_send_socket2(struct socket_info* force_send_socket,

-									union sockaddr_union* su, int proto,

-									enum ss_mismatch* mismatch);

-

-

-inline static struct socket_info* get_send_socket(struct sip_msg* msg,

-									union sockaddr_union* su, int proto)

-{

-	return get_send_socket2(msg?msg->force_send_socket:0, su, proto, 0);

-}

-

-

-#define GET_URI_PORT(uri) ((uri)->port_no?(uri)->port_no:(((uri)->proto==PROTO_TLS)?SIPS_PORT:SIP_PORT))

-

-struct socket_info* get_out_socket(union sockaddr_union* to, int proto);

-typedef int (*check_self_f)(str* host, unsigned short port,

-		unsigned short proto);

-int register_check_self_func(check_self_f f);

-int check_self(str* host, unsigned short port, unsigned short proto);

-int check_self_port(unsigned short port, unsigned short proto);

-int forward_request( struct sip_msg* msg, str* dst,  unsigned short port,

-						struct dest_info* send_info);

-int update_sock_struct_from_via( union sockaddr_union* to,

-								 struct sip_msg* msg,

-								 struct via_body* via );

-

-/* use src_ip, port=src_port if rport, via port if via port, 5060 otherwise */

-#define update_sock_struct_from_ip(  to, msg ) \

-	init_su((to), &(msg)->rcv.src_ip, \

-			(((msg)->via1->rport)|| \

-			 (((msg)->msg_flags|global_req_flags)&FL_FORCE_RPORT))? \

-							(msg)->rcv.src_port: \

-							((msg)->via1->port)?(msg)->via1->port: SIP_PORT )

-

-int forward_reply( struct sip_msg* msg);

-int forward_reply_nocb( struct sip_msg* msg);

-

-void forward_set_send_info(int v);

-

-int is_check_self_func_list_set(void);

-

-#define msg_send(_dst, _buf, _len) msg_send_buffer((_dst), (_buf), (_len), 0)

-

-/* params:

- * dst = struct dest_info containing:

- *    send_sock = 0 if not known (e.g. for udp in some cases), non-0 otherwise;

- *                if 0 or mcast a new send_sock will be automatically choosen

- *    proto = TCP|UDP

- *    to = destination (sockaddr_union)

- *    id = only used on tcp, it will force sending on connection "id" if id!=0 

- *         and the connection exists, else it will send to "to" 

- *        (useful for sending replies on  the same connection as the request

- *         that generated them; use 0 if you don't want this)

- * buf, len = buffer

- * flags = control internal behavior

- *    * 1 - skip executing event SREV_NET_DATA_OUT

- * returns: 0 if ok, -1 on error*/

-

-static inline int msg_send_buffer(struct dest_info* dst, char* buf, int len,

-		int flags)

-{

-	struct dest_info new_dst;

-	str outb;

-	sr_net_info_t netinfo;

-

-#ifdef USE_TCP 

-	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;

-	int ret;

-#endif

-	

-	outb.s = buf;

-	outb.len = len;

-	if(!(flags&1)) {

-		sr_event_exec(SREV_NET_DATA_OUT, (void*)&outb);

-	}

-

-	if(outb.s==NULL) {

-		LM_ERR("failed to update outgoing buffer\n");

-		return -1;

-	}

-

-#ifdef USE_TCP

-	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;

-			su_setport(&local_addr, 0); /* any local port will do */

-			from = &local_addr;

-		}

-

-		port = su_getport(&dst->to);

-		if (likely(port)) {

-			su2ip_addr(&ip, &dst->to);

-			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 = outb.s;

-		wsev.len = outb.len;

-		wsev.id = con->id;

-		ret = sr_event_exec(SREV_TCP_WS_FRAME_OUT, (void *) &wsev);

-		tcpconn_put(con);

-		goto done;

-	}

-#endif

-

-	if (likely(dst->proto==PROTO_UDP)){

-		if (unlikely((dst->send_sock==0) || 

-					(dst->send_sock->flags & SI_IS_MCAST))){

-			new_dst=*dst;

-			new_dst.send_sock=get_send_socket(0, &dst->to, dst->proto);

-			if (unlikely(new_dst.send_sock==0)){

-				LM_ERR("no sending socket found\n");

-				goto error;

-			}

-			dst=&new_dst;

-		}

-		if (unlikely(udp_send(dst, outb.s, outb.len)==-1)){

-			STATS_TX_DROPS;

-			LOG(cfg_get(core, core_cfg, corelog), "udp_send failed\n");

-			goto error;

-		}

-	}

-#ifdef USE_TCP

-	else if (dst->proto==PROTO_TCP){

-		if (unlikely(tcp_disable)){

-			STATS_TX_DROPS;

-			LM_WARN("attempt to send on tcp and tcp support is disabled\n");

-			goto error;

-		}else{

-			if (unlikely((dst->send_flags.f & SND_F_FORCE_SOCKET) &&

-						dst->send_sock)) {

-				local_addr=dst->send_sock->su;

-				su_setport(&local_addr, 0); /* any local port will do */

-				from=&local_addr;

-			}

-			if (unlikely(tcp_send(dst, from, outb.s, outb.len)<0)){

-				STATS_TX_DROPS;

-				LOG(cfg_get(core, core_cfg, corelog), "tcp_send failed\n");

-				goto error;

-			}

-		}

-	}

-#ifdef USE_TLS

-	else if (dst->proto==PROTO_TLS){

-		if (unlikely(tls_disable)){

-			STATS_TX_DROPS;

-			LM_WARN("attempt to send on tls and tls support is disabled\n");

-			goto error;

-		}else{

-			if (unlikely((dst->send_flags.f & SND_F_FORCE_SOCKET) &&

-						dst->send_sock)) {

-				local_addr=dst->send_sock->su;

-				su_setport(&local_addr, 0); /* any local port will do */

-				from=&local_addr;

-			}

-			if (unlikely(tcp_send(dst, from, outb.s, outb.len)<0)){

-				STATS_TX_DROPS;

-				LOG(cfg_get(core, core_cfg, corelog), "tcp_send failed\n");

-				goto error;

-			}

-		}

-	}

-#endif /* USE_TLS */

-#endif /* USE_TCP */

-#ifdef USE_SCTP

-	else if (dst->proto==PROTO_SCTP){

-		if (unlikely(sctp_disable)){

-			STATS_TX_DROPS;

-			LM_WARN("attempt to send on sctp and sctp support is disabled\n");

-			goto error;

-		}else{

-			if (unlikely(dst->send_sock==0)){

-				new_dst=*dst;

-				new_dst.send_sock=get_send_socket(0, &dst->to, dst->proto);

-				if (unlikely(new_dst.send_sock==0)){

-					LM_ERR("no sending SCTP socket found\n");

-					goto error;

-				}

-				dst=&new_dst;

-			}

-			if (unlikely(sctp_core_msg_send(dst, outb.s, outb.len)<0)){

-				STATS_TX_DROPS;

-				LOG(cfg_get(core, core_cfg, corelog), "sctp_msg_send failed\n");

-				goto error;

-			}

-		}

-	}

-#endif /* USE_SCTP */

-	else{

-			LM_CRIT("unknown proto %d\n", dst->proto);

-			goto error;

-	}

-	ret = 0;

-done:

-

-	if(!(flags&1)) {

-		memset(&netinfo, 0, sizeof(sr_net_info_t));

-		netinfo.data.s = outb.s;

-		netinfo.data.len = outb.len;

-		netinfo.dst = dst;

-		sr_event_exec(SREV_NET_DATA_SEND, (void*)&netinfo);

-	}

-

-	if(outb.s != buf)

-		pkg_free(outb.s);

-	return ret;

-error:

-	if(outb.s != buf)

-		pkg_free(outb.s);

-	return -1;

-}

-

-#endif

@@ -56,10 +56,6 @@ enum ss_mismatch {

 	SS_MISMATCH_MCAST  /* mcast forced send socket */

 };

-typedef struct sr_send_info {

-	str data;

-	struct dest_info* dst;

-} sr_net_info_t;

 struct socket_info* get_send_socket2(struct socket_info* force_send_socket,

 									union sockaddr_union* su, int proto,

@@ -56,6 +56,11 @@ enum ss_mismatch {

 	SS_MISMATCH_MCAST  /* mcast forced send socket */

 };

+typedef struct sr_send_info {

+	str data;

+	struct dest_info* dst;

+} sr_net_info_t;

+

 struct socket_info* get_send_socket2(struct socket_info* force_send_socket,

 									union sockaddr_union* su, int proto,

 									enum ss_mismatch* mismatch);

@@ -119,6 +124,8 @@ static inline int msg_send_buffer(struct dest_info* dst, char* buf, int len,

 {

 	struct dest_info new_dst;

 	str outb;

+	sr_net_info_t netinfo;

+

 #ifdef USE_TCP 

 	int port;

 	struct ip_addr ip;

@@ -271,6 +278,15 @@ static inline int msg_send_buffer(struct dest_info* dst, char* buf, int len,

 	}

 	ret = 0;

 done:

+

+	if(!(flags&1)) {

+		memset(&netinfo, 0, sizeof(sr_net_info_t));

+		netinfo.data.s = outb.s;

+		netinfo.data.len = outb.len;

+		netinfo.dst = dst;

+		sr_event_exec(SREV_NET_DATA_SEND, (void*)&netinfo);

+	}

+

 	if(outb.s != buf)

 		pkg_free(outb.s);

 	return ret;

@@ -97,6 +97,7 @@ void forward_set_send_info(int v);

 int is_check_self_func_list_set(void);

+#define msg_send(_dst, _buf, _len) msg_send_buffer((_dst), (_buf), (_len), 0)

 /* params:

  * dst = struct dest_info containing:

@@ -109,9 +110,12 @@ int is_check_self_func_list_set(void);

  *        (useful for sending replies on  the same connection as the request

  *         that generated them; use 0 if you don't want this)

  * buf, len = buffer

+ * flags = control internal behavior

+ *    * 1 - skip executing event SREV_NET_DATA_OUT

  * returns: 0 if ok, -1 on error*/

-static inline int msg_send(struct dest_info* dst, char* buf, int len)

+static inline int msg_send_buffer(struct dest_info* dst, char* buf, int len,

+		int flags)

 {

 	struct dest_info new_dst;

 	str outb;

@@ -127,7 +131,9 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len)

 	outb.s = buf;

 	outb.len = len;

-	sr_event_exec(SREV_NET_DATA_OUT, (void*)&outb);

+	if(!(flags&1)) {

+		sr_event_exec(SREV_NET_DATA_OUT, (void*)&outb);

+	}

 	if(outb.s==NULL) {

 		LM_ERR("failed to update outgoing buffer\n");

@@ -1,21 +1,14 @@

 /*

- *  $Id$

- *

  * Copyright (C) 2001-2003 FhG Fokus

  *

- * This file is part of ser, a free SIP server.

+ * This file is part of Kamailio, a free SIP server.

  *

- * ser is free software; you can redistribute it and/or modify

+ * Kamailio is free software; you can redistribute it and/or modify

  * it under the terms of the GNU General Public License as published by

  * the Free Software Foundation; either version 2 of the License, or

  * (at your option) any later version

  *

- * For a license to use the ser software under conditions

- * other than those described here, or to purchase support for this

- * software, please contact iptel.org by e-mail at the following addresses:

- *    info@iptel.org

- *

- * ser is distributed in the hope that it will be useful,

+ * Kamailio is distributed in the hope that it will be useful,

  * but WITHOUT ANY WARRANTY; without even the implied warranty of

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

@@ -24,22 +17,13 @@

  * along with this program; if not, write to the Free Software 

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

  */

-/*

- * History:

- * -------

- *  2001-??-?? created by andrei

- *  ????-??-?? lots of changes by a lot of people

- *  2003-02-11 added inline msg_send (andrei)

- *  2003-04-07 changed all ports to host byte order (andrei)

- *  2003-04-12  FORCE_RPORT_T added (andrei)

- *  2003-04-15  added tcp_disable support (andrei)

- *  2006-04-12  reduced msg_send() parameter list: it uses now a struct 

- *               dest_info param. (andrei)

- *  2007-10-08  msg_send() will ignore a mcast send_sock and choose another

- *               one by itself (andrei)

- */

-

-

+/*!

+* \file

+* \brief Kamailio core :: Message forwarding

+* \author andrei

+* \ingroup core

+* Module: \ref core

+*/

 #ifndef forward_h

 #define forward_h

@@ -205,7 +205,7 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len)

 		}

 		if (unlikely(udp_send(dst, outb.s, outb.len)==-1)){

 			STATS_TX_DROPS;

-			LM_ERR("udp_send failed\n");

+			LOG(cfg_get(core, core_cfg, corelog), "udp_send failed\n");

 			goto error;

 		}

 	}

@@ -224,7 +224,7 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len)

 			}

 			if (unlikely(tcp_send(dst, from, outb.s, outb.len)<0)){

 				STATS_TX_DROPS;

-				LM_ERR("tcp_send failed\n");

+				LOG(cfg_get(core, core_cfg, corelog), "tcp_send failed\n");

 				goto error;

 			}

 		}

@@ -244,7 +244,7 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len)

 			}

 			if (unlikely(tcp_send(dst, from, outb.s, outb.len)<0)){

 				STATS_TX_DROPS;

-				LM_ERR("tcp_send failed\n");

+				LOG(cfg_get(core, core_cfg, corelog), "tcp_send failed\n");

 				goto error;

 			}

 		}

@@ -269,7 +269,7 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len)

 			}

 			if (unlikely(sctp_core_msg_send(dst, outb.s, outb.len)<0)){

 				STATS_TX_DROPS;

-				LM_ERR("sctp_msg_send failed\n");

+				LOG(cfg_get(core, core_cfg, corelog), "sctp_msg_send failed\n");

 				goto error;

 			}

 		}

@@ -171,7 +171,7 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len)

 		else if (likely(dst->id))

 			con = tcpconn_get(dst->id, 0, 0, 0, 0);

 		else {

-			LM_CRIT("BUG: msg_send called with null_id & to\n");

+			LM_CRIT("null_id & to\n");

 			goto error;

 		}

@@ -198,14 +198,14 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len)

 			new_dst=*dst;

 			new_dst.send_sock=get_send_socket(0, &dst->to, dst->proto);

 			if (unlikely(new_dst.send_sock==0)){

-				LOG(L_ERR, "msg_send: ERROR: no sending socket found\n");

+				LM_ERR("no sending socket found\n");

 				goto error;

 			}

 			dst=&new_dst;

 		}

 		if (unlikely(udp_send(dst, outb.s, outb.len)==-1)){

 			STATS_TX_DROPS;

-			LOG(L_ERR, "msg_send: ERROR: udp_send failed\n");

+			LM_ERR("udp_send failed\n");

 			goto error;

 		}

 	}

@@ -213,8 +213,7 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len)

 	else if (dst->proto==PROTO_TCP){

 		if (unlikely(tcp_disable)){

 			STATS_TX_DROPS;

-			LOG(L_WARN, "msg_send: WARNING: attempt to send on tcp and tcp"

-					" support is disabled\n");

+			LM_WARN("attempt to send on tcp and tcp support is disabled\n");

 			goto error;

 		}else{

 			if (unlikely((dst->send_flags.f & SND_F_FORCE_SOCKET) &&

@@ -225,7 +224,7 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len)

 			}

 			if (unlikely(tcp_send(dst, from, outb.s, outb.len)<0)){

 				STATS_TX_DROPS;

-				LOG(L_ERR, "msg_send: ERROR: tcp_send failed\n");

+				LM_ERR("tcp_send failed\n");

 				goto error;

 			}

 		}

@@ -234,8 +233,7 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len)

 	else if (dst->proto==PROTO_TLS){

 		if (unlikely(tls_disable)){

 			STATS_TX_DROPS;

-			LOG(L_WARN, "msg_send: WARNING: attempt to send on tls and tls"

-					" support is disabled\n");

+			LM_WARN("attempt to send on tls and tls support is disabled\n");

 			goto error;

 		}else{

 			if (unlikely((dst->send_flags.f & SND_F_FORCE_SOCKET) &&

@@ -246,7 +244,7 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len)

 			}

 			if (unlikely(tcp_send(dst, from, outb.s, outb.len)<0)){

 				STATS_TX_DROPS;

-				LOG(L_ERR, "msg_send: ERROR: tcp_send failed\n");

+				LM_ERR("tcp_send failed\n");

 				goto error;

 			}

 		}

@@ -257,29 +255,28 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len)

 	else if (dst->proto==PROTO_SCTP){

 		if (unlikely(sctp_disable)){

 			STATS_TX_DROPS;

-			LOG(L_WARN, "msg_send: WARNING: attempt to send on sctp and sctp"

-					" support is disabled\n");

+			LM_WARN("attempt to send on sctp and sctp support is disabled\n");

 			goto error;

 		}else{

 			if (unlikely(dst->send_sock==0)){

 				new_dst=*dst;

 				new_dst.send_sock=get_send_socket(0, &dst->to, dst->proto);

 				if (unlikely(new_dst.send_sock==0)){

-					LOG(L_ERR, "msg_send: ERROR: no sending SCTP socket found\n");

+					LM_ERR("no sending SCTP socket found\n");

 					goto error;

 				}

 				dst=&new_dst;

 			}

 			if (unlikely(sctp_core_msg_send(dst, outb.s, outb.len)<0)){

 				STATS_TX_DROPS;

-				LOG(L_ERR, "msg_send: ERROR: sctp_msg_send failed\n");

+				LM_ERR("sctp_msg_send failed\n");

 				goto error;

 			}

 		}

 	}

 #endif /* USE_SCTP */

 	else{

-			LOG(L_CRIT, "BUG: msg_send: unknown proto %d\n", dst->proto);

+			LM_CRIT("unknown proto %d\n", dst->proto);

 			goto error;

 	}

 	ret = 0;

@@ -145,6 +145,11 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len)

 	outb.len = len;

 	sr_event_exec(SREV_NET_DATA_OUT, (void*)&outb);

+	if(outb.s==NULL) {

+		LM_ERR("failed to update outgoing buffer\n");

+		return -1;

+	}

+

 #ifdef USE_TCP

 	if (unlikely((dst->proto == PROTO_WS

 #ifdef USE_TLS

@@ -183,7 +183,7 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len)

 		wsev.id = con->id;

 		ret = sr_event_exec(SREV_TCP_WS_FRAME_OUT, (void *) &wsev);

 		tcpconn_put(con);

-		return ret;

+		goto done;

 	}

 #endif

@@ -277,9 +277,11 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len)

 			LOG(L_CRIT, "BUG: msg_send: unknown proto %d\n", dst->proto);

 			goto error;

 	}

+	ret = 0;

+done:

 	if(outb.s != buf)

 		pkg_free(outb.s);

-	return 0;

+	return ret;

 error:

 	if(outb.s != buf)

 		pkg_free(outb.s);

@@ -22,7 +22,7 @@

  *

  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

  */

 /*

  * History:

@@ -109,6 +109,8 @@ int update_sock_struct_from_via( union sockaddr_union* to,

 int forward_reply( struct sip_msg* msg);

 int forward_reply_nocb( struct sip_msg* msg);

+void forward_set_send_info(int v);

+

 int is_check_self_func_list_set(void);

@@ -84,6 +84,8 @@ inline static struct socket_info* get_send_socket(struct sip_msg* msg,

 }

+#define GET_URI_PORT(uri) ((uri)->port_no?(uri)->port_no:(((uri)->proto==PROTO_TLS)?SIPS_PORT:SIP_PORT))

+

 struct socket_info* get_out_socket(union sockaddr_union* to, int proto);

 typedef int (*check_self_f)(str* host, unsigned short port,

 		unsigned short proto);

@@ -134,6 +134,7 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len)

 	union sockaddr_union local_addr;

 	struct tcp_connection *con = NULL;

 	struct ws_event_info wsev;

+	int ret;

 #endif

 	outb.s = buf;

@@ -162,13 +163,13 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len)

 			con = tcpconn_get(dst->id, 0, 0, 0, 0);

 		else {

 			LM_CRIT("BUG: msg_send called with null_id & to\n");

-			return -1;

+			goto error;

 		}

 		if (con == NULL)

 		{

 			LM_WARN("TCP/TLS connection for WebSocket could not be found\n");

-			return -1;

+			goto error;

 		}

 		memset(&wsev, 0, sizeof(ws_event_info_t));

@@ -176,7 +177,9 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len)

 		wsev.buf = outb.s;

 		wsev.len = outb.len;

 		wsev.id = con->id;

-		return sr_event_exec(SREV_TCP_WS_FRAME_OUT, (void *) &wsev);

+		ret = sr_event_exec(SREV_TCP_WS_FRAME_OUT, (void *) &wsev);

+		tcpconn_put(con);

+		return ret;

 	}

 #endif

@@ -57,7 +57,7 @@

 #include "tcp_conn.h"

 #endif

 #ifdef USE_SCTP

-#include "sctp_server.h"

+#include "sctp_core.h"

 #endif

 #include "compiler_opt.h"

@@ -258,7 +258,7 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len)

 				}

 				dst=&new_dst;

 			}

-			if (unlikely(sctp_msg_send(dst, outb.s, outb.len)<0)){

+			if (unlikely(sctp_core_msg_send(dst, outb.s, outb.len)<0)){

 				STATS_TX_DROPS;

 				LOG(L_ERR, "msg_send: ERROR: sctp_msg_send failed\n");

 				goto error;

@@ -105,6 +105,7 @@ int update_sock_struct_from_via( union sockaddr_union* to,

 							((msg)->via1->port)?(msg)->via1->port: SIP_PORT )

 int forward_reply( struct sip_msg* msg);

+int forward_reply_nocb( struct sip_msg* msg);

 int is_check_self_func_list_set(void);

@@ -164,6 +164,12 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len)

 			return -1;

 		}

+		if (con == NULL)

+		{

+			LM_WARN("TCP/TLS connection for WebSocket could not be found\n");

+			return -1;

+		}

+

 		memset(&wsev, 0, sizeof(ws_event_info_t));

 		wsev.type = SREV_TCP_WS_FRAME_OUT;

 		wsev.buf = outb.s;

@@ -140,11 +140,11 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len)

 	sr_event_exec(SREV_NET_DATA_OUT, (void*)&outb);

 #ifdef USE_TCP

-	if (dst->proto == PROTO_TCP

+	if (unlikely((dst->proto == PROTO_WS

 #ifdef USE_TLS

-		|| dst->proto == PROTO_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;

@@ -152,29 +152,24 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len)

 			from = &local_addr;

 		}

-		if (unlikely(sr_event_enabled(SREV_TCP_WS_FRAME_OUT))) {

-			port = su_getport(&dst->to);

-			if (likely(port)) {

-				su2ip_addr(&ip, &dst->to);

-				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("BUG: msg_send called with null_id & to\n");

-				return -1;

-			}

-

-			if (con && con->flags & F_CONN_WS)

-			{

-				memset(&wsev, 0, sizeof(ws_event_info_t));

-				wsev.type = SREV_TCP_WS_FRAME_OUT;

-				wsev.buf = outb.s;

-				wsev.len = outb.len;

-				wsev.id = con->id;

-				return sr_event_exec(SREV_TCP_WS_FRAME_OUT, (void *) &wsev);

-			}

+		port = su_getport(&dst->to);

+		if (likely(port)) {

+			su2ip_addr(&ip, &dst->to);

+			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("BUG: msg_send called with null_id & to\n");

+			return -1;

+		}

+

+		memset(&wsev, 0, sizeof(ws_event_info_t));

+		wsev.type = SREV_TCP_WS_FRAME_OUT;

+		wsev.buf = outb.s;

+		wsev.len = outb.len;

+		wsev.id = con->id;

+		return sr_event_exec(SREV_TCP_WS_FRAME_OUT, (void *) &wsev);

 	}

 #endif

@@ -203,6 +198,12 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len)

 					" support is disabled\n");

 			goto error;

 		}else{

+			if (unlikely((dst->send_flags.f & SND_F_FORCE_SOCKET) &&

+						dst->send_sock)) {

+				local_addr=dst->send_sock->su;

+				su_setport(&local_addr, 0); /* any local port will do */

+				from=&local_addr;

+			}

 			if (unlikely(tcp_send(dst, from, outb.s, outb.len)<0)){

 				STATS_TX_DROPS;

 				LOG(L_ERR, "msg_send: ERROR: tcp_send failed\n");

@@ -218,6 +219,12 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len)

 					" support is disabled\n");

 			goto error;

 		}else{

+			if (unlikely((dst->send_flags.f & SND_F_FORCE_SOCKET) &&

+						dst->send_sock)) {

+				local_addr=dst->send_sock->su;

+				su_setport(&local_addr, 0); /* any local port will do */

+				from=&local_addr;

+			}

 			if (unlikely(tcp_send(dst, from, outb.s, outb.len)<0)){

 				STATS_TX_DROPS;

 				LOG(L_ERR, "msg_send: ERROR: tcp_send failed\n");

@@ -127,7 +127,9 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len)

 	struct dest_info new_dst;

 	str outb;

 #ifdef USE_TCP 

-	union sockaddr_union* from;

+	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;

@@ -138,21 +140,40 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len)

 	sr_event_exec(SREV_NET_DATA_OUT, (void*)&outb);

 #ifdef USE_TCP

-	if (unlikely(sr_event_enabled(SREV_TCP_WS_FRAME_OUT))) {

-		if (dst->proto == PROTO_TCP)

-			con = tcpconn_get(dst->id, 0, 0, 0, 0);

+	if (dst->proto == PROTO_TCP

 #ifdef USE_TLS

-		else if (dst->proto == PROTO_TLS)

-			con = tcpconn_get(dst->id, 0, 0, 0, 0);

+		|| dst->proto == PROTO_TLS

 #endif

-		if (con && con->flags & F_CONN_WS)

-		{

-			memset(&wsev, 0, sizeof(ws_event_info_t));

-			wsev.type = SREV_TCP_WS_FRAME_OUT;

-			wsev.buf = outb.s;

-			wsev.len = outb.len;

-			wsev.id = dst->id;

-			return sr_event_exec(SREV_TCP_WS_FRAME_OUT, (void *) &wsev);

+	) {

+		if (unlikely(dst->send_flags.f & SND_F_FORCE_SOCKET

+				&& dst->send_sock)) {

+			local_addr = dst->send_sock->su;

+			su_setport(&local_addr, 0); /* any local port will do */

+			from = &local_addr;

+		}

+

+		if (unlikely(sr_event_enabled(SREV_TCP_WS_FRAME_OUT))) {

+			port = su_getport(&dst->to);

+			if (likely(port)) {

+				su2ip_addr(&ip, &dst->to);

+				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("BUG: msg_send called with null_id & to\n");

+				return -1;

+			}

+

+			if (con && con->flags & F_CONN_WS)

+			{

+				memset(&wsev, 0, sizeof(ws_event_info_t));

+				wsev.type = SREV_TCP_WS_FRAME_OUT;

+				wsev.buf = outb.s;

+				wsev.len = outb.len;