net: bind TCP listeners only in main

Author: razvancrainea

main.c

@@ -234,7 +234,7 @@ static const struct main_script main_script[] = {
 	FN_HNDLR(fix_rls, !=, 0, "routing lists"),
 	FN_HNDLR(init_log_level, !=, 0, "logging levels"),
 	FN_HNDLR(init_log_event_cons, <, 0, "log event consumer"),
-	FN_HNDLR(trans_init_all_listeners, <, 0, "all SIP listeners"),
+	FN_HNDLR(trans_init_udp_listeners, <, 0, "all SIP listeners"),
 	FN_HNDLR(init_script_reload, <, 0, "cfg reload ctx"),
 	FN_HNDLR(init_suid, ==, -1, "do_suid"),
 	FN_HNDLR(run_post_fork_handlers, <, 0, "post-fork handlers"),

net/net_tcp.c

@@ -1689,8 +1689,19 @@ static void tcp_main_server(void)
 		if ( is_tcp_based_proto(n) )
 			for( sif=protos[n].listeners ; sif ; sif=sif->next ) {
 				struct socket_info* si = &sif->socket_info;
-				if ( (si->socket!=-1) &&
-				reactor_add_reader( si->socket, F_TCP_LISTENER,
+				if (protos[n].tran.init_listener(si)<0) {
+					LM_ERR("failed to init listener [%.*s], proto %s\n",
+						si->name.len, si->name.s,
+						protos[n].name );
+					goto error;
+				}
+				if (protos[n].tran.bind_listener && protos[n].tran.bind_listener(si)<0) {
+					LM_ERR("failed to bind listener [%.*s], proto %s\n",
+						si->name.len, si->name.s,
+						protos[n].name );
+					goto error;
+				}
+				if(reactor_add_reader( si->socket, F_TCP_LISTENER,
 				RCT_PRIO_NET, si)<0 ) {
 					LM_ERR("failed to add listen socket to reactor\n");
 					goto error;

net/trans.c

@@ -228,7 +228,7 @@ int fix_all_socket_lists(void)
 }
 
 
-int trans_init_all_listeners(void)
+int trans_init_udp_listeners(void)
 {
 	struct socket_info_full *sif;
 	int i;
@@ -237,17 +237,19 @@ int trans_init_all_listeners(void)
 		if (protos[i].id != PROTO_NONE)
 			for( sif=protos[i].listeners ; sif ; sif=sif->next ) {
 				struct socket_info *si = &sif->socket_info;
-				if (protos[i].tran.init_listener(si)<0) {
-					LM_ERR("failed to init listener [%.*s], proto %s\n",
-						si->name.len, si->name.s,
-						protos[i].name );
-					return -1;
-				}
-				if (protos[i].tran.bind_listener && protos[i].tran.bind_listener(si)<0) {
-					LM_ERR("failed to bind listener [%.*s], proto %s\n",
-						si->name.len, si->name.s,
-						protos[i].name );
-					return -1;
+				if (is_udp_based_proto(si->proto)) {
+					if (protos[i].tran.init_listener(si)<0) {
+						LM_ERR("failed to init listener [%.*s], proto %s\n",
+							si->name.len, si->name.s,
+							protos[i].name );
+						return -1;
+					}
+					if (protos[i].tran.bind_listener && protos[i].tran.bind_listener(si)<0) {
+						LM_ERR("failed to bind listener [%.*s], proto %s\n",
+							si->name.len, si->name.s,
+							protos[i].name );
+						return -1;
+					}
 				}
 				/* set first IPv4 and IPv6 listeners for this proto */
 				if ((si->address.af==AF_INET) &&

net/trans.h

@@ -115,7 +115,7 @@ int fix_all_socket_lists(void);
 /*
  * init all registered listening sockets
  */
-int trans_init_all_listeners(void);
+int trans_init_udp_listeners(void);
 
 void print_all_socket_lists(void);