Increase net.unix.max_dgram_qlen

Author: svpcom

Makefile

@@ -93,12 +93,12 @@ pylint:
 	pylint --disable=R,C wfb_ng/*.py
 
 clean:
-	rm -rf env wfb_rx wfb_tx wfb_tx_cmd wfb_tun wfb_rtsp wfb_keygen dist deb_dist build wfb_ng.egg-info wfb-ng-*.tar.gz _trial_temp *~ src/*.o
+	rm -rf env wfb_rx wfb_tx wfb_tx_cmd wfb_tun wfb_rtsp wfb_keygen dist deb_dist build wfb_ng.egg-info wfb_ng-*.tar.gz _trial_temp *~ src/*.o
 
 deb_docker:  /opt/qemu/bin
 	@if ! [ -d /opt/qemu ]; then echo "Docker cross build requires patched QEMU!\nApply ./scripts/qemu/qemu.patch to qemu-7.2.0 and build it:\n  ./configure --prefix=/opt/qemu --static --disable-system && make && sudo make install"; exit 1; fi
 	if ! ls /proc/sys/fs/binfmt_misc | grep -q qemu ; then sudo ./scripts/qemu/qemu-binfmt-conf.sh --qemu-path /opt/qemu/bin --persistent yes; fi
 	cp -a Makefile docker/src/
 	TAG="wfb-ng:build-`date +%s`"; docker build --platform linux/$(DOCKER_ARCH) -t $$TAG --build-arg SRC_IMAGE=$(DOCKER_SRC_IMAGE) --build-arg QEMU_CPU=$(QEMU_CPU) docker && \
-	docker run --platform linux/$(DOCKER_ARCH) -i --rm -v $(PWD):/build $$TAG bash -c "trap 'chown -R --reference=. .' EXIT; export VERSION=$(VERSION) COMMIT=$(COMMIT) SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) && cd /build && make clean && make test && make deb"
+	docker run --privileged --platform linux/$(DOCKER_ARCH) -i --rm -v $(PWD):/build $$TAG bash -c "trap 'chown -R --reference=. .' EXIT; export VERSION=$(VERSION) COMMIT=$(COMMIT) SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) && /sbin/sysctl net.unix.max_dgram_qlen=512 && cd /build && make clean && make test && make deb"
 	docker image ls -q "wfb-ng:build-*" | uniq | tail -n+6 | while read i ; do docker rmi -f $$i; done

docker/Dockerfile

@@ -12,7 +12,7 @@ RUN apt-get update && \
     python3-twisted python3-pyroute2 \
     python3-all python3-all-dev \
     python3-serial dh-python python3-setuptools python3-msgpack \
-    libgstrtspserver-1.0-dev
+    libgstrtspserver-1.0-dev procps net-tools iproute2 iputils-ping
 
 COPY src/Makefile /tmp
 ENV ENV=/opt/env

scripts/sysctl/98-wifibroadcast.conf

@@ -1,2 +1,4 @@
 net.core.bpf_jit_enable = 1
 net.core.rmem_max = 5000000
+net.core.wmem_max = 5000000
+net.unix.max_dgram_qlen=4096

src/rx.cpp

@@ -1150,9 +1150,12 @@ int main(int argc, char* const *argv)
             break;
         default: /* '?' */
         show_usage:
-            WFB_INFO("Local receiver: %s [-K rx_key] { [-c client_addr] [-u client_port] | [-U unix_socket] } [-p radio_port] [-R rcv_buf] [-s snd_buf] [-l log_interval] [-e epoch] [-i link_id] interface1 [interface2] ...\n", argv[0]);
-            WFB_INFO("Remote (forwarder): %s -f [-c client_addr] [-u client_port] [-p radio_port]  [-R rcv_buf] [-s snd_buf] [-i link_id] interface1 [interface2] ...\n", argv[0]);
-            WFB_INFO("Remote (aggregator): %s -a server_port [-K rx_key] { [-c client_addr] [-u client_port] | [-U unix_socket] } [-R rcv_buf] [-s snd_buf] [-l log_interval] [-p radio_port] [-e epoch] [-i link_id]\n", argv[0]);
+            WFB_INFO("Local RX: %s [-K rx_key] { [-c client_addr] [-u client_port] | [-U unix_socket] } [-p radio_port]\n"
+                     "             [-R rcv_buf] [-s snd_buf] [-l log_interval] [-e epoch] [-i link_id] interface1 [interface2] ...\n", argv[0]);
+            WFB_INFO("RX forwarder: %s -f [-c client_addr] [-u client_port] [-p radio_port]  [-R rcv_buf] [-s snd_buf]\n"
+                     "                    [-i link_id] interface1 [interface2] ...\n", argv[0]);
+            WFB_INFO("RX aggregator: %s -a server_port [-K rx_key] { [-c client_addr] [-u client_port] | [-U unix_socket] } [-R rcv_buf]\n"
+                     "                                 [-s snd_buf] [-l log_interval] [-p radio_port] [-e epoch] [-i link_id]\n", argv[0]);
             WFB_INFO("Default: K='%s', connect=%s:%d, link_id=0x%06x, radio_port=%u, epoch=%" PRIu64 ", log_interval=%d, rcv_buf=system_default, snd_buf=system_default\n", keypair.c_str(), client_addr.c_str(), client_port, link_id, radio_port, epoch, log_interval);
             WFB_INFO("WFB-ng version %s\n", WFB_VERSION);
             WFB_INFO("WFB-ng home page: <http://wfb-ng.org>\n");

src/tx.cpp

@@ -1732,7 +1732,7 @@ int main(int argc, char * const *argv)
                      "             [-T fec_timeout] [-l log_interval] [-e epoch] [-i link_id] [-f { data | rts }] [-m] [-V] [-Q]\n"
                      "             [-P fwmark] [-C control_port] interface1 [interface2] ...\n",
                     argv[0]);
-            WFB_INFO("TX distributor: %s -d [-K tx_key] [-k RS_K] [-n RS_N] [-u udp_port] [-R rcv_buf] [-s snd_buf] [-p radio_port]\n"
+            WFB_INFO("TX distributor: %s -d [-K tx_key] [-k RS_K] [-n RS_N] { [-u udp_port] | [-U unix_socket] } [-R rcv_buf] [-s snd_buf] [-p radio_port]\n"
                      "                      [-F fec_delay] [-B bandwidth] [-G guard_interval] [-S stbc] [-L ldpc] [-M mcs_index] [-N VHT_NSS]\n"
                      "                      [-T fec_timeout] [-l log_interval] [-e epoch] [-i link_id] [-f { data | rts }] [-m] [-V] [-Q]\n"
                      "                      [-P fwmark] [-C control_port] host1:port1,port2,... [host2:port1,port2,...] ...\n",

wfb_ng/tests/test_tuntap.py

@@ -3,15 +3,32 @@
 
 import os
 import time
+from twisted import version as twisted_version
 from twisted.python import log
 from twisted.trial import unittest
 from twisted.internet import reactor, defer
+from twisted.internet.utils import getProcessOutputAndValue
+from incremental import Version
 from ..tuntap import TUNTAPTransport, TUNTAPProtocol
 from ..common import df_sleep
 
 
+test_script="""\
+set -e
+trap 'ip netns delete tuntest' EXIT
+ip netns add tuntest
+ip link set tuntest2 netns tuntest
+ip netns exec tuntest bash -c "ifconfig tuntest2 up 192.168.77.2/24 && ping -c1 -I tuntest2 192.168.77.1"
+"""
+
+arch = os.uname().machine
+bad_arch = ("mips64", "s390x", "ppc64le")
+
 class TUNTAPTestCase(unittest.TestCase):
-    skip = ("Root permission is required to test tunnel" if os.geteuid() != 0 or not os.path.exists('/dev/net/tun') else False)
+    if os.geteuid() != 0 or not os.path.exists('/dev/net/tun') \
+       or arch in bad_arch \
+       or twisted_version < Version("Twisted", 19, 7, 0):
+        skip = "Root requires or system is incompatible"
 
     def setUp(self):
         self.p1 = TUNTAPProtocol(mtu=1400)
@@ -28,6 +45,12 @@ def tearDown(self):
         self.p2._cleanup()
 
     def test_tuntap(self):
-        # Test manually via "ping -I tuntest1 192.168.77.2" and "tcpdump -i tuntest2 -nn -p icmp"
-        return df_sleep(100)
+        def _got_rc(x):
+            (out, err, code) = x
+            log.msg(out.decode('utf-8'))
+            log.msg(err.decode('utf-8'))
+            self.assertEqual(code, 0)
+
+        return getProcessOutputAndValue('bash', env=os.environ, stdinBytes=test_script.encode())\
+            .addCallback(_got_rc)
 

wfb_ng/tests/test_txrx.py

@@ -26,17 +26,19 @@ def batched(iterable, n):
 
 
 class UDP_TXRX(DatagramProtocol):
-    def __init__(self, tx_addr, tx_transport=None):
+    def __init__(self, tx_addr, tx_proto=None):
         self.rxq = []
         self.tx_addr = tx_addr
-        self.tx_transport = tx_transport
+        self.tx_proto = tx_proto
 
     def datagramReceived(self, data, addr):
         log.msg("got %r from %s" % (data, addr))
         self.rxq.append(data)
 
     def send_msg(self, data):
-        (self.tx_transport or self.transport).write(data, self.tx_addr)
+        t = (self.tx_proto.transport if self.tx_proto else self.transport)
+        t.write(data, self.tx_addr)
+        log.msg("sent %r to %r" % (data, t,))
 
 
 def gen_req_id(f):
@@ -443,11 +445,11 @@ def setUp(self):
 
         self.rxp_txp = DatagramProtocol()
         self.rx_tx_ep = reactor.listenUDP(0, self.rxp_txp)
-        self.rxp = UDP_TXRX(('127.0.0.1', 10001), self.rxp_txp.transport)
+        self.rxp = UDP_TXRX(('127.0.0.1', 10001), self.rxp_txp)
 
         self.txp_rxp = DatagramProtocol()
         self.tx_rx_ep = reactor.listenUNIXDatagram(None, self.txp_rxp)
-        self.txp = UDP_TXRX('\0wfb-tx-test', self.txp_rxp.transport)
+        self.txp = UDP_TXRX('\0wfb-tx-test', self.txp_rxp)
 
         self.cmdp = TXCommandClient(('127.0.0.1', 7003))