MT#55283 Avoiding "Too many packets in UDP receive ...

... queue (more than 50), aborting loop. Dropped packets possible" errors.

closes #1769

Change-Id: I2c5041756aa6b14182bb1bbc2d037120064edcb0

daemon/cli.c

@@ -302,7 +302,8 @@ static void cli_incoming_params_start(str *instr, struct cli_writer *cw) {
 			"redis_allowed_errors = %d\nredis_disable_time = %d\nredis_cmd_timeout = %d\nredis_connect_timeout = %d\n"
 			"max-cpu = %.1f\n"
 			"max-load = %.2f\n"
-			"max-bandwidth = %" PRIu64 "\n",
+			"max-bandwidth = %" PRIu64 "\n"
+			"max-recv-iters = %d\n",
 			initial_rtpe_config.kernel_table, initial_rtpe_config.max_sessions,
 			initial_rtpe_config.timeout, initial_rtpe_config.silent_timeout, initial_rtpe_config.final_timeout,
 			initial_rtpe_config.offer_timeout, initial_rtpe_config.delete_delay,
@@ -316,7 +317,8 @@ static void cli_incoming_params_start(str *instr, struct cli_writer *cw) {
 			initial_rtpe_config.redis_disable_time, initial_rtpe_config.redis_cmd_timeout, initial_rtpe_config.redis_connect_timeout,
 			(double) initial_rtpe_config.cpu_limit / 100,
 			(double) initial_rtpe_config.load_limit / 100,
-			initial_rtpe_config.bw_limit);
+			initial_rtpe_config.bw_limit,
+			initial_rtpe_config.max_recv_iters);
 
 	for(s = initial_rtpe_config.interfaces.head; s ; s = s->next) {
 		ifa = s->data;
@@ -357,7 +359,8 @@ static void cli_incoming_params_current(str *instr, struct cli_writer *cw) {
 			"redis_allowed_errors = %d\nredis_disable_time = %d\nredis_cmd_timeout = %d\nredis_connect_timeout = %d\n"
 			"max-cpu = %.1f\n"
 			"max-load = %.2f\n"
-			"max-bw = %" PRIu64 "\n",
+			"max-bw = %" PRIu64 "\n"
+			"max-recv-iters = %d\n",
 			rtpe_config.kernel_table, rtpe_config.max_sessions, rtpe_config.timeout,
 			rtpe_config.silent_timeout, rtpe_config.final_timeout, rtpe_config.offer_timeout,
 			rtpe_config.delete_delay, rtpe_config.redis_expires_secs, rtpe_config.default_tos,
@@ -368,7 +371,8 @@ static void cli_incoming_params_current(str *instr, struct cli_writer *cw) {
 			rtpe_config.redis_disable_time, rtpe_config.redis_cmd_timeout, rtpe_config.redis_connect_timeout,
 			(double) rtpe_config.cpu_limit / 100,
 			(double) rtpe_config.load_limit / 100,
-			rtpe_config.bw_limit);
+			rtpe_config.bw_limit,
+			rtpe_config.max_recv_iters);
 
 	for(c = rtpe_config.interfaces.head; c ; c = c->next) {
 		ifa = c->data;

daemon/main.c

@@ -106,6 +106,7 @@ struct rtpengine_config rtpe_config = {
 			[log_level_index_internals] = -1,
 		},
 	},
+	.max_recv_iters = MAX_RECV_ITERS,
 };
 
 static void sighandler(gpointer x) {
@@ -645,6 +646,7 @@ static void options(int *argc, char ***argv) {
 #endif
 		{ "janus-secret", 0,0,	G_OPTION_ARG_STRING,	&rtpe_config.janus_secret,"Admin secret for Janus protocol","STRING"},
 		{ "rtcp-interval", 0,0,	G_OPTION_ARG_INT,	&rtpe_config.rtcp_interval,"Delay in milliseconds between RTCP packets when generate-rtcp flag is on, where random dispersion < 1 sec is added on top","INT"},
+		{ "max-recv-iters", 0, 0, G_OPTION_ARG_INT,    &rtpe_config.max_recv_iters,  "Maximun continuous reading cycles in UDP poller loop.", "INT"},
 
 		{ NULL, }
 	};
@@ -790,6 +792,9 @@ static void options(int *argc, char ***argv) {
 	if (rtpe_config.control_tos < 0 || rtpe_config.control_tos > 255)
 		die("Invalid control-ng TOS value");
 
+	if (rtpe_config.max_recv_iters < 1)
+		die("Invalid max-recv-iters value");
+
 	if (rtpe_config.timeout <= 0)
 		rtpe_config.timeout = 60;
 
@@ -1091,6 +1096,8 @@ static void fill_initial_rtpe_cfg(struct rtpengine_config* ini_rtpe_cfg) {
 	ini_rtpe_cfg->jb_clock_drift = rtpe_config.jb_clock_drift;
 	ini_rtpe_cfg->rtcp_interval = rtpe_config.rtcp_interval;
 
+	ini_rtpe_cfg->max_recv_iters = rtpe_config.max_recv_iters;
+
 	rwlock_unlock_w(&rtpe_config.config_lock);
 }
 

daemon/media_socket.c

@@ -37,9 +37,6 @@
 #define PORT_RANDOM_MAX 20
 #endif
 
-#ifndef MAX_RECV_ITERS
-#define MAX_RECV_ITERS 50
-#endif
 
 #ifndef MAX_RECV_LOOP_STRIKES
 #define MAX_RECV_LOOP_STRIKES 5
@@ -3139,10 +3136,11 @@ restart:
 
 	for (iters = 0; ; iters++) {
 #if MAX_RECV_ITERS
-		if (iters >= MAX_RECV_ITERS) {
+		if (iters >= rtpe_config.max_recv_iters) {
 			ilog(LOG_ERROR | LOG_FLAG_LIMIT, "Too many packets in UDP receive queue (more than %d), "
 					"aborting loop. Dropped packets possible", iters);
 			g_atomic_int_inc(&sfd->error_strikes);
+			g_atomic_int_set(&sfd->active_read_events,0);
 			goto strike;
 		}
 #endif

docs/rtpengine.md

@@ -641,6 +641,11 @@ call to inject-DTMF won't be sent to __\-\-dtmf-log-dest=__ or __\-\-listen-tcp-
     Bandwidth usage is sampled in 1-second intervals and is based on
     received packets, not sent packets.
 
+- __\-\-max-recv-iters=__*INT*
+
+    This parameter sets maximum continuous reading cycles in UDP poller loop,
+    can help to avoid dropped packets errors on burstly streams (default 50).
+
 - __\-\-homer=__*IP46*:*PORT*
 
     Enables sending the decoded contents of RTCP packets to a Homer SIP

include/main.h

@@ -27,6 +27,10 @@ enum endpoint_learning {
 	__EL_LAST
 };
 
+#ifndef MAX_RECV_ITERS
+#define MAX_RECV_ITERS 50
+#endif
+
 struct rtpengine_config {
 	/* everything below protected by config_lock */
 	rwlock_t		config_lock;
@@ -182,6 +186,7 @@ struct rtpengine_config {
 	int			rtcp_interval;
 	int			cpu_affinity;
 	char			*janus_secret;
+	int			max_recv_iters;
 };