From 920c7c45ecede5740607ddd9e799509f26837c4b Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sat, 30 Jan 2021 11:03:46 +0100 Subject: [PATCH] fr + gbproxy: Start to use AF_PACKET ENOBUFS work-around If send() on AF_PACKET returns ENOBUFS, usleep for 2ms and re-try until it succeeds. Change-Id: Id7bdd2c690eae3bec1df7634944cd73f0bf0b29a Closes: OS#5343 --- deps/Makefile | 2 +- fr-net/FRNET_Tests.default | 1 + fr/FR_Tests.default | 1 + gbproxy/GBProxy_Tests.default | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/deps/Makefile b/deps/Makefile index 1f2560b5d..0a5d86ce9 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -112,7 +112,7 @@ titan.ProtocolModules.SNDCP_v7.0.0_commit= R.2.A-5-gd0f0ce6 titan.ProtocolModules.SUA_commit= R.5.A-5-gcf1137a titan.ProtocolModules.TCP_commit= R.3.A-5-g39e5f45 titan.ProtocolModules.UDP_commit= R.4.A-5-geea8aa3 -titan.TestPorts.AF_PACKET_commit= 0.1-1-gcd69809 +titan.TestPorts.AF_PACKET_commit= 0.1-2-g90ef318 titan.TestPorts.Common_Components.Socket-API_commit= R.6.A-6-gf4380d0 titan.TestPorts.Common_Components.Abstract_Socket_commit= R.9.B-4-gbd41994 titan.TestPorts.HTTPmsg_commit= R.9.B-4-g9a0dfde diff --git a/fr-net/FRNET_Tests.default b/fr-net/FRNET_Tests.default index 2fb8c90c3..d694d98ef 100644 --- a/fr-net/FRNET_Tests.default +++ b/fr-net/FRNET_Tests.default @@ -9,6 +9,7 @@ ConsoleMask := ERROR | WARNING | TESTCASE | TIMEROP_START | USER [MODULE_PARAMETERS] [TESTPORT_PARAMETERS] +*.FR.sleep_on_enobufs := "2000" # 2ms [MAIN_CONTROLLER] diff --git a/fr/FR_Tests.default b/fr/FR_Tests.default index 2fb8c90c3..d7afd3179 100644 --- a/fr/FR_Tests.default +++ b/fr/FR_Tests.default @@ -9,6 +9,7 @@ ConsoleMask := ERROR | WARNING | TESTCASE | TIMEROP_START | USER [MODULE_PARAMETERS] [TESTPORT_PARAMETERS] +*.FR.sleep_on_enobufs := "2000" [MAIN_CONTROLLER] diff --git a/gbproxy/GBProxy_Tests.default b/gbproxy/GBProxy_Tests.default index 8634b4916..b0f28f588 100644 --- a/gbproxy/GBProxy_Tests.default +++ b/gbproxy/GBProxy_Tests.default @@ -21,6 +21,7 @@ FileMask := LOG_ALL | TTCN_MATCHING; *.GBPVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" *.GBPVTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes" *.GBPVTY.PROMPT1 := "OsmoGbProxy> " +*.FR.sleep_on_enobufs := "2000" # 2ms [MODULE_PARAMETERS]