From d40ba2a67c469a56ea9954fab71b64aa6bbba00c Mon Sep 17 00:00:00 2001
From: Sukchan Lee <acetcom@gmail.com>
Date: Fri, 20 Oct 2017 13:47:43 +0900
Subject: [PATCH] Oops! re-add net_read() in testcode

---
 test/testpacket.c | 77 +++++++++++++++++++++++++++++++++--------------
 1 file changed, 55 insertions(+), 22 deletions(-)

diff --git a/test/testpacket.c b/test/testpacket.c
index 2f1a0791c..9ee0d4e22 100644
--- a/test/testpacket.c
+++ b/test/testpacket.c
@@ -88,6 +88,7 @@ int tests1ap_enb_read(net_sock_t *sock, pkbuf_t *recvbuf)
 {
     int rc = 0;
 
+#if USE_USRSCTP == 1
 	struct socket *psock = (struct socket *)sock;
 	struct sockaddr_in addr;
 	char name[INET6_ADDRSTRLEN];
@@ -98,32 +99,64 @@ int tests1ap_enb_read(net_sock_t *sock, pkbuf_t *recvbuf)
 	struct sctp_rcvinfo rcv_info;
 	unsigned int infotype;
 
-    n = usrsctp_recvv(psock, recvbuf->payload, MAX_SDU_LEN,
-            (struct sockaddr *)&addr, &from_len, (void *)&rcv_info,
-            &infolen, &infotype, &flags);
-    if (n > 0) {
-        if (flags & MSG_NOTIFICATION) {
-            printf("Notification of length %llu received.\n",
-                    (unsigned long long)n);
-        } else {
-            if (infotype == SCTP_RECVV_RCVINFO) {
-                printf("Msg of length %llu received from %s:%u"
-                       "on stream %u with SSN %u and TSN %u, PPID %u,"
-                       "context %u, complete %d.\n",
-                        (unsigned long long)n,
-                        inet_ntop(AF_INET, &addr.sin_addr,
-                            name, INET_ADDRSTRLEN), ntohs(addr.sin_port),
-                        rcv_info.rcv_sid,
-                        rcv_info.rcv_ssn,
-                        rcv_info.rcv_tsn,
-                        ntohl(rcv_info.rcv_ppid),
-                        rcv_info.rcv_context,
-                        (flags & MSG_EOR) ? 1 : 0);
+    while(1)
+    {
+        n = usrsctp_recvv(psock, recvbuf->payload, MAX_SDU_LEN,
+                (struct sockaddr *)&addr, &from_len, (void *)&rcv_info,
+                &infolen, &infotype, &flags);
+        if (n > 0) {
+            if (flags & MSG_NOTIFICATION) {
+                printf("Notification of length %llu received.\n",
+                        (unsigned long long)n);
             } else {
-                rc = n;
+                c_uint32_t ppid = ntohl(rcv_info.rcv_ppid);
+                if (infotype == SCTP_RECVV_RCVINFO) {
+                    printf("Msg of length %llu received from %s:%u"
+                           "on stream %u with SSN %u and TSN %u, PPID %u,"
+                           "context %u, complete %d.\n",
+                            (unsigned long long)n,
+                            inet_ntop(AF_INET, &addr.sin_addr,
+                                name, INET_ADDRSTRLEN), ntohs(addr.sin_port),
+                            rcv_info.rcv_sid,
+                            rcv_info.rcv_ssn,
+                            rcv_info.rcv_tsn,
+                            ppid,
+                            rcv_info.rcv_context,
+                            (flags & MSG_EOR) ? 1 : 0);
+                } else {
+#if 0
+                    if (ppid == SCTP_S1AP_PPID)
+#endif
+                    {
+                        rc = n;
+                        break;
+                    }
+                }
             }
         }
     }
+#else
+    while(1)
+    {
+        rc = net_read(sock, recvbuf->payload, recvbuf->len, 0);
+        if (rc == -2) 
+        {
+            continue;
+        }
+        else if (rc <= 0)
+        {
+            if (sock->sndrcv_errno == EAGAIN)
+            {
+                continue;
+            }
+            break;
+        }
+        else
+        {
+            break;
+        }
+    }
+#endif
 
     return rc;
 }