rtpproxy: hook up notification socket into rtp.io automatically when

rtp.io is enabled. Start notification listener process always,
turn it into dummy if rtp.io is not enabled and notification
socket is not configured either. WiP.

Author: sobomax

modules/rtpproxy/notification_process.c

@@ -325,6 +325,26 @@ int init_rtpp_notify(void)
 	return 0;
 }
 
+static rtp_io_getrnsock_t
+rtp_io_rnsock_f(void)
+{
+	static rtp_io_getrnsock_t _rtp_io_getrnsock = {0};
+	if (_rtp_io_getrnsock == NULL)
+		_rtp_io_getrnsock = (rtp_io_getrnsock_t)find_export("rtp_io_getrnsock", 0);
+	return _rtp_io_getrnsock;
+}
+
+int fill_rtp_io_rnsock(void)
+{
+
+	rtp_io_getrnsock_t rtp_io_rnsock = rtp_io_rnsock_f();
+	if (rtp_io_rnsock == NULL)
+		return -1;
+	if (rtp_io_rnsock(&rtpp_notify_cfg) != 0)
+		return -1;
+	return 0;
+}
+
 void notification_listener_process(int rank)
 {
 	struct sockaddr_un saddr_un;
@@ -335,12 +355,19 @@ void notification_listener_process(int rank)
 	struct sockaddr* saddr;
 	int len, n;
 	int optval = 1;
-	int socket_fd;
+	int socket_fd = -1;
 	str *rn_name = &rtpp_notify_cfg.name;
+	struct rtpp_sock *rn_sock = &rtpp_notify_cfg.sock;
+
+	if (rn_name->s == NULL) {
+		if (fill_rtp_io_rnsock() != 0)
+			goto serve;
+	}
 
 	*rtpp_notify_process_no = process_no;
 
-	if (rtpp_notify_cfg.sock.rn_umode == CM_TCP) {
+	switch (rn_sock->rn_umode) {
+	case CM_TCP:
 		p = strrchr(rn_name->s, ':');
 		if (!p) {
 			LM_ERR("invalid udp address <%.*s>\n", rn_name->len, rn_name->s);
@@ -371,7 +398,8 @@ void notification_listener_process(int rank)
 		saddr = (struct sockaddr*)&saddr_in;
 		len = sizeof(saddr_in);
 		LM_DBG("binding socket %d to %s:%d\n", socket_fd, rn_name->s, port);
-	} else {
+		break;
+	case CM_UNIX:
 		/* create socket */
 		socket_fd = socket(AF_UNIX, SOCK_STREAM, 0);
 		if (socket_fd == -1) {
@@ -386,34 +414,50 @@ void notification_listener_process(int rank)
 		saddr = (struct sockaddr*)&saddr_un;
 		len = sizeof(saddr_un);
 		LM_DBG("binding unix socket %s\n", rn_name->s);
+		break;
+	case CM_RTPIO:
+		socket_fd = rn_sock->fd;
+		len = -1;
+		saddr = NULL;
+		LM_DBG("using rtp.io notification socket %d\n", socket_fd);
+		break;
+	default:
+		abort();
 	}
 
-	if (setsockopt(socket_fd, SOL_SOCKET, SO_REUSEADDR, (void*)&optval,
+	if (rn_sock->rn_umode != CM_RTPIO) {
+		if (setsockopt(socket_fd, SOL_SOCKET, SO_REUSEADDR, (void*)&optval,
 				sizeof(optval)) == -1) {
-		LM_ERR("setsockopt failed %s\n", strerror(errno));
-		return;
-	}
+			LM_ERR("setsockopt failed %s\n", strerror(errno));
+			return;
+		}
 
-	if (bind(socket_fd, saddr, len) == -1) {
-		LM_ERR("failed to bind to socket: %s\n", strerror(errno));
-		return;
-	}
+		if (bind(socket_fd, saddr, len) == -1) {
+			LM_ERR("failed to bind to socket: %s\n", strerror(errno));
+			return;
+		}
 
-	/* open socket for listening */
-	if(listen(socket_fd, 10) == -1) {
-		LM_ERR("socket listen failed: %s(%d)\n", strerror(errno), errno);
-		close(socket_fd);
-		return;
+		/* open socket for listening */
+		if(listen(socket_fd, 10) == -1) {
+			LM_ERR("socket listen failed: %s(%d)\n", strerror(errno), errno);
+			close(socket_fd);
+			return;
+		}
 	}
 
+serve:
 	if (reactor_proc_init("RTPProxy events") < 0) {
 		LM_ERR("failed to init the RTPProxy events\n");
 		return;
 	}
 
-	if (reactor_proc_add_fd( socket_fd, rtpproxy_io_new_callback, NULL) < 0) {
-		LM_CRIT("failed to add RTPProxy listen socket to reactor\n");
-		return;
+	if (socket_fd != -1) {
+		reactor_proc_cb_f cb_f = (rn_sock->rn_umode != CM_RTPIO) ? rtpproxy_io_new_callback :
+		    rtpproxy_io_callback;
+		if (reactor_proc_add_fd(socket_fd, cb_f, NULL) < 0) {
+			LM_CRIT("failed to add RTPProxy listen socket to reactor\n");
+			return;
+		}
 	}
 
 	reactor_proc_loop();

modules/rtpproxy/rtpproxy.c

@@ -188,7 +188,6 @@
 #include "rtpproxy_vcmd.h"
 #include "rtppn_connect.h"
 #include "../rtp_relay/rtp_relay.h"
-#include "../rtp.io/rtp_io_api.h"
 
 #define NH_TABLE_VERSION  0
 
@@ -568,7 +567,7 @@ struct module_exports exports = {
 	mi_cmds,     /* exported MI functions */
 	0,           /* exported pseudo-variables */
 	0,			 /* exported transformations */
-	0,           /* extra processes */
+	procs,       /* extra processes */
 	mod_preinit,
 	mod_init,
 	0,           /* reply processing */
@@ -634,8 +633,6 @@ static int rtpproxy_set_notify(modparam_t type, void * val)
 	rtpp_notify_cfg.name.s = p;
 	rtpp_notify_cfg.name.len = strlen(p);
 
-	exports.procs = procs;
-
 	return 0;
 }
 
@@ -1310,11 +1307,11 @@ mod_init(void)
 				" timeout notification feature\n");
 			return -1;
 		}
+	}
 
-		if (init_rtpp_notify() < 0) {
-			LM_ERR("cannot init notify handlers\n");
-			return -1;
-		}
+	if (init_rtpp_notify() < 0) {
+		LM_ERR("cannot init notify handlers\n");
+		return -1;
 	}
 
 	ei_id = evi_publish_event(event_name);
@@ -1542,6 +1539,12 @@ int connect_rtpproxies(struct rtpp_set *filter)
 						LM_ERR("rtp.io is not loaded\n");
 						return -1;
 					}
+					if (rtpp_notify_cfg.name.s == NULL) {
+						if (fill_rtp_io_rnsock() != 0) {
+							LM_ERR("rtp.io notification socket cannot be initialized\n");
+							return -1;
+						}
+					}
 					rtpp_socks[pnode->idx].fd = gcs_f(myrank);
 				}
 				break;

modules/rtpproxy/rtpproxy.h

@@ -30,6 +30,7 @@
 #include "../../pvar.h"
 #include "../dialog/dlg_load.h"
 #include "../../rw_locking.h"
+#include "../rtp.io/rtp_io_api.h"
 
 struct rtpproxy_vcmd;
 
@@ -168,6 +169,7 @@ extern struct rtpp_set_head ** rtpp_set_list;
 int init_rtpp_notify();
 void update_rtpp_notify();
 void notification_listener_process(int rank);
+int fill_rtp_io_rnsock(void);
 
 /* Functions from nathelper */
 struct rtpp_set *get_rtpp_set(nh_set_param_t *);