4 files changed, 148 insertions, 0 deletions
diff --git a/tests/multi_net/tcp_recv_peek.py b/tests/multi_net/tcp_recv_peek.py
new file mode 100644
index 0000000000..ff540dd3c3
--- /dev/null
+++ b/tests/multi_net/tcp_recv_peek.py
@@ -0,0 +1,46 @@
+# Test TCP recv with MSG_PEEK
+#
+# Note that bare metal LWIP only returns at most one packet's worth of TCP data
+# in any recv() call - including when peeking - so can't be too clever with
+# different recv() combinations
+import socket
+import random
+
+
+# Server
+def instance0():
+    PORT = random.randrange(10000, 50000)
+    multitest.globals(IP=multitest.get_network_ip(), PORT=PORT)
+    s = socket.socket()
+    s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+    s.bind(socket.getaddrinfo("0.0.0.0", PORT)[0][-1])
+    s.listen()
+    multitest.next()
+    s2, _ = s.accept()
+    print(s2.recv(8, socket.MSG_PEEK))
+    print(s2.recv(8))
+    s2.send(b"1234567890")
+    multitest.broadcast("0-sent")
+    multitest.wait("1-sent")
+    print(s2.recv(5, socket.MSG_PEEK))
+    print(s2.recv(5, socket.MSG_PEEK))
+    multitest.broadcast("0-recved")
+    multitest.wait("1-recved")  # sync here necessary as MP sends RST if closing TCP early
+    s2.close()
+    s.close()
+
+
+# Client
+def instance1():
+    multitest.next()
+    s = socket.socket()
+    s.connect(socket.getaddrinfo(IP, PORT)[0][-1])
+    s.send(b"abcdefgh")
+    multitest.broadcast("1-sent")
+    multitest.wait("0-sent")
+    s.send(b"klmnopqr")
+    print(s.recv(5, socket.MSG_PEEK))
+    print(s.recv(10))
+    multitest.broadcast("1-recved")
+    multitest.wait("0-recved")
+    s.close()
diff --git a/tests/multi_net/udp_recv_dontwait.py b/tests/multi_net/udp_recv_dontwait.py
new file mode 100644
index 0000000000..640f3f060e
--- /dev/null
+++ b/tests/multi_net/udp_recv_dontwait.py
@@ -0,0 +1,59 @@
+# Test UDP recv and recvfrom with MSG_DONTWAIT
+import random
+import socket
+
+try:
+    import errno, time
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+
+# Server
+def instance0():
+    PORT = random.randrange(10000, 50000)
+    multitest.globals(IP=multitest.get_network_ip(), PORT=PORT)
+    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+    s.bind(socket.getaddrinfo("0.0.0.0", PORT)[0][-1])
+    multitest.next()
+    begin = time.ticks_ms()
+
+    # do some recvs before instance1 starts, when we know no packet is waiting
+    try:
+        print(s.recvfrom(8, socket.MSG_DONTWAIT))
+    except OSError as e:
+        print(e.errno == errno.EAGAIN)
+    try:
+        print(s.recv(8, socket.MSG_DONTWAIT))
+    except OSError as e:
+        print(e.errno == errno.EAGAIN)
+
+    # the above steps should not have taken any substantial time
+    elapsed = time.ticks_diff(time.ticks_ms(), begin)
+    print(True if elapsed < 50 else elapsed)
+
+    # Now instance1 will send us a UDP packet
+    multitest.broadcast("0-ready")
+    multitest.wait("1-sent")
+
+    for _ in range(10):  # retry if necessary, to allow for network delay
+        time.sleep_ms(100)
+        try:
+            print(s.recv(8, socket.MSG_DONTWAIT))
+            break
+        except OSError as er:
+            if er.errno != errno.EAGAIN:
+                raise er
+    s.close()
+
+
+# Client
+def instance1():
+    multitest.next()
+    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    s.connect(socket.getaddrinfo(IP, PORT)[0][-1])
+    multitest.wait("0-ready")
+    print(s.send(b"abcdefgh"))
+    multitest.broadcast("1-sent")
+    s.close()
diff --git a/tests/multi_net/udp_recv_dontwait.py.exp b/tests/multi_net/udp_recv_dontwait.py.exp
new file mode 100644
index 0000000000..f61fd4bbe2
--- /dev/null
+++ b/tests/multi_net/udp_recv_dontwait.py.exp
@@ -0,0 +1,7 @@
+--- instance0 ---
+True
+True
+True
+b'abcdefgh'
+--- instance1 ---
+8
diff --git a/tests/multi_net/udp_recv_peek.py b/tests/multi_net/udp_recv_peek.py
new file mode 100644
index 0000000000..47897ce553
--- /dev/null
+++ b/tests/multi_net/udp_recv_peek.py
@@ -0,0 +1,36 @@
+# Test UDP recv and recvfrom with MSG_PEEK
+import random
+import socket
+import time
+
+
+# Server
+def instance0():
+    PORT = random.randrange(10000, 50000)
+    multitest.globals(IP=multitest.get_network_ip(), PORT=PORT)
+    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+    s.bind(socket.getaddrinfo("0.0.0.0", PORT)[0][-1])
+    multitest.next()
+    peek_bytes, peek_addr = s.recvfrom(8, socket.MSG_PEEK)
+    print(peek_bytes)
+    real_bytes, real_addr = s.recvfrom(8)
+    print(real_bytes)
+    print(peek_addr == real_addr)  # source addr should be the same for each
+    res = s.sendto(b"1234567890", peek_addr)
+    print(res)
+    print(s.recv(5, socket.MSG_PEEK))
+    print(s.recv(5, socket.MSG_PEEK))
+    s.close()
+
+
+# Client
+def instance1():
+    multitest.next()
+    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    s.connect(socket.getaddrinfo(IP, PORT)[0][-1])
+    s.send(b"abcdefgh")
+    s.send(b"klmnopqr")
+    print(s.recv(5, socket.MSG_PEEK))
+    print(s.recv(10))
+    s.close()